update

solo-io · Apr 1, 2024 · 7c30649 · 7c30649
1 parent dfcaae0
commit 7c30649
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/contrib/codegen/templates/sets/sets.gotmpl b/contrib/codegen/templates/sets/sets.gotmpl
@@ -344,6 +344,7 @@ func (s *{{ $kindLowerCamel }}MergedSet) Insert(
         {{ $kindLowerCamel }}List ...*{{ $import_prefix }}.{{ $resource.Kind }},
 ) {
     if s == nil {
+        panic("cannot insert into nil set")
     }
     if len(s.sets) == 0 {
         s.sets = append(s.sets, makeGeneric{{ $resource.Kind }}Set({{ $kindLowerCamel }}List))

diff --git a/contrib/pkg/sets/sets.go b/contrib/pkg/sets/sets.go
@@ -44,6 +44,7 @@ type ResourceSet interface {
 	Delta(newSet ResourceSet) ResourceDelta
 	// Clone returns a deep copy of the set
 	Clone() ResourceSet
+	Merge(otherSet ResourceSet) ResourceSet
 }
 
 // ResourceDelta represents the set of changes between two ResourceSets.