remove issortedby

contrib/pkg/sets/v2/sets.go

@@ -10,11 +10,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-const (
-	ResourceId SortType = iota
-)
-
-type SortType int
 
 // ResourceSet is a thread-safe container for a set of resources.
 // It provides a set of operations for working with the set of resources, typically used for managing Kubernetes resources.
@@ -75,10 +70,6 @@ type ResourceSet[T client.Object] interface {
 	Clone() ResourceSet[T]
 	// ShallowCopy returns a shallow copy of the set
 	ShallowCopy() ResourceSet[T]
-
-	// Guarantees that when running Iter, Filter, or FilterOutAndCreateList, elements in the set will be processed in a
-	// sorted order by ResourceId. See ezkube.ResourceIdsCompare for the definition of ResourceId sorting.
-	IsSortedBy(SortType) bool
 }
 
 // ResourceDelta represents the set of changes between two ResourceSets.
@@ -101,14 +92,6 @@ type resourceSet[T client.Object] struct {
 	set  []T
 }
 
-func (s *resourceSet[T]) IsSortedBy(r SortType) bool {
-	switch r {
-	case ResourceId:
-		return true
-	}
-	return false
-}
-
 func NewResourceSet[T client.Object](
 	resources ...T,
 ) ResourceSet[T] {
@@ -258,23 +241,10 @@ func (s *resourceSet[T]) Union(set ResourceSet[T]) ResourceSet[T] {
 		return s.ShallowCopy()
 	}
 
-	// if we can use the sets `Iter` method to iterate over the set in a sorted order,
-	// we can use that to iterate over the set and add the elements to the new set.
-	if set.IsSortedBy(ResourceId) {
-		return s.unionSortedSet(set)
-	}
-
-	// fallback to generic union, and sort after the fact (in NewResourceSet())
-	list := []T{}
-	for _, resource := range s.Generic().Union(set.Generic()).List() {
-		list = append(list, resource.(T))
-	}
-	return NewResourceSet[T](
-		list...,
-	)
+	return s.unionSortedSet(set)
 }
 
-// Assuming that the argument set is sorted by resource id (via the SortedByResourceId method),
+// Assuming that the argument set is sorted by resource id,
 // this method will efficiently union the two sets together and return the unioned set.
 func (s *resourceSet[T]) unionSortedSet(set ResourceSet[T]) *resourceSet[T] {
 	merged := make([]T, 0, len(s.set)+set.Len())