diff --git a/changelog/v0.23.10/set-filter.yaml b/changelog/v0.23.10/set-filter.yaml new file mode 100644 index 000000000..ecd50410f --- /dev/null +++ b/changelog/v0.23.10/set-filter.yaml @@ -0,0 +1,6 @@ +changelog: + - type: NEW_FEATURE + description: Add a `Filter` method to `v2sets.ResourceSet` to allow for efficient filtering on sets. + issueLink: https://github.com/solo-io/skv2/issues/388 + + diff --git a/contrib/pkg/sets/v2/sets.go b/contrib/pkg/sets/v2/sets.go index a88dac62c..cf53c8b52 100644 --- a/contrib/pkg/sets/v2/sets.go +++ b/contrib/pkg/sets/v2/sets.go @@ -27,6 +27,8 @@ type ResourceSet[T client.Object] interface { Has(resource T) bool // Delete the key matching the resource Delete(resource T) + // Return a set with the matching objects filtered out + Filter(filterResource ...func(T) bool) ResourceSet[T] // Return the union with the provided set Union(set ResourceSet[T]) ResourceSet[T] // Return the difference with the provided set @@ -122,6 +124,28 @@ func (s *resourceSet[T]) UnsortedList(filterResource ...func(T) bool) []T { return resources } +func (s *resourceSet[T]) Filter(filterResource ...func(T) bool) ResourceSet[T] { + s.lock.RLock() + defer s.lock.RUnlock() + + keys := s.set.UnsortedList() + resources := NewResourceSet[T]() + + for _, key := range keys { + var filtered bool + for _, filter := range filterResource { + if filter(s.mapping[key]) { + filtered = true + break + } + } + if !filtered { + resources.Insert(s.mapping[key]) + } + } + return resources +} + func (s *resourceSet[T]) Map() map[string]T { s.lock.RLock() defer s.lock.RUnlock()