1
0
mirror of https://github.com/rancher/steve.git synced 2025-09-07 10:21:33 +00:00

Add watch filtering support for vai (#654)

* Add support for watch filtering

* Remove debug Println

* Validate watch selector
This commit is contained in:
Tom Lebreux
2025-06-03 16:10:36 -06:00
committed by GitHub
parent e3f207ddc2
commit b0aa90cd22
4 changed files with 263 additions and 13 deletions

View File

@@ -23,6 +23,7 @@ import (
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
watch "k8s.io/apimachinery/pkg/watch"
@@ -1929,3 +1930,161 @@ func TestWatchMany(t *testing.T) {
err = waitStopWatcher(errCh3)
assert.NoError(t, err)
}
func TestWatchFilter(t *testing.T) {
startWatcher := func(ctx context.Context, loi *ListOptionIndexer, filter WatchFilter) (chan watch.Event, chan error) {
errCh := make(chan error, 1)
eventsCh := make(chan watch.Event, 100)
go func() {
watchErr := loi.Watch(ctx, WatchOptions{Filter: filter}, eventsCh)
errCh <- watchErr
}()
time.Sleep(100 * time.Millisecond)
return eventsCh, errCh
}
waitStopWatcher := func(errCh chan error) error {
select {
case <-time.After(time.Second * 5):
return fmt.Errorf("not finished in time")
case err := <-errCh:
return err
}
}
receiveEvents := func(eventsCh chan watch.Event) []watch.Event {
timer := time.NewTimer(time.Millisecond * 50)
var events []watch.Event
for {
select {
case <-timer.C:
return events
case ev := <-eventsCh:
events = append(events, ev)
}
}
}
foo := &unstructured.Unstructured{}
foo.SetName("foo")
foo.SetNamespace("foo")
foo.SetLabels(map[string]string{
"app": "foo",
})
fooUpdated := foo.DeepCopy()
fooUpdated.SetLabels(map[string]string{
"app": "changed",
})
bar := &unstructured.Unstructured{}
bar.SetName("bar")
bar.SetNamespace("bar")
bar.SetLabels(map[string]string{
"app": "bar",
})
appSelector, err := labels.Parse("app=foo")
assert.NoError(t, err)
tests := []struct {
name string
filter WatchFilter
setupStore func(store cache.Store) error
expectedEvents []watch.Event
}{
{
name: "namespace filter",
filter: WatchFilter{Namespace: "foo"},
setupStore: func(store cache.Store) error {
err := store.Add(foo)
if err != nil {
return err
}
err = store.Add(bar)
if err != nil {
return err
}
return nil
},
expectedEvents: []watch.Event{{Type: watch.Added, Object: foo}},
},
{
name: "selector filter",
filter: WatchFilter{Selector: appSelector},
setupStore: func(store cache.Store) error {
err := store.Add(foo)
if err != nil {
return err
}
err = store.Add(bar)
if err != nil {
return err
}
err = store.Update(fooUpdated)
if err != nil {
return err
}
return nil
},
expectedEvents: []watch.Event{
{Type: watch.Added, Object: foo},
{Type: watch.Modified, Object: fooUpdated},
},
},
{
name: "id filter",
filter: WatchFilter{ID: "foo"},
setupStore: func(store cache.Store) error {
err := store.Add(foo)
if err != nil {
return err
}
err = store.Add(bar)
if err != nil {
return err
}
err = store.Update(fooUpdated)
if err != nil {
return err
}
err = store.Update(foo)
if err != nil {
return err
}
return nil
},
expectedEvents: []watch.Event{
{Type: watch.Added, Object: foo},
{Type: watch.Modified, Object: fooUpdated},
{Type: watch.Modified, Object: foo},
},
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
loi, err := makeListOptionIndexer(ctx, [][]string{{"metadata", "somefield"}})
assert.NoError(t, err)
wCh, errCh := startWatcher(ctx, loi, WatchFilter{
Namespace: "foo",
})
if test.setupStore != nil {
err = test.setupStore(loi)
assert.NoError(t, err)
}
events := receiveEvents(wCh)
assert.Equal(t, test.expectedEvents, events)
cancel()
err = waitStopWatcher(errCh)
assert.NoError(t, err)
})
}
}