Fix duplicate definition of predicate (#562)

solo-io · Sep 19, 2024 · dc4646f · dc4646f
1 parent ee1f4c6
commit dc4646f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/changelog/v0.35.4/fix-duplicate-predicate.yaml b/changelog/v0.35.4/fix-duplicate-predicate.yaml
@@ -0,0 +1,6 @@
+changelog:
+- type: FIX
+  issueLink: https://github.com/solo-io/gloo/issues/9274
+  resolvesIssue: false
+  description: Fixes the issue of multiple declarations of Predicate when multiple snapshots are generated
+
diff --git a/pkg/api/v1/resources/core/metadata_extensions.go b/pkg/api/v1/resources/core/metadata_extensions.go
@@ -17,3 +17,5 @@ func (m *Metadata) Ref() *ResourceRef {
 func (m *Metadata) Match(ref *ResourceRef) bool {
 	return m.GetNamespace() == ref.GetNamespace() && m.GetName() == ref.GetName()
 }
+
+type Predicate func(metadata *Metadata) bool
diff --git a/pkg/code-generator/codegen/templates/snapshot_template.go b/pkg/code-generator/codegen/templates/snapshot_template.go
@@ -114,9 +114,7 @@ func (s *{{ .GoName }}Snapshot) RemoveFromResourceList(resource resources.Resour
 	}
 }
 
-type Predicate func(metadata *core.Metadata) bool
-
-func (s *{{ .GoName }}Snapshot) RemoveMatches(predicate Predicate) {
+func (s *{{ .GoName }}Snapshot) RemoveMatches(predicate core.Predicate) {
 {{- range .Resources }}
 	var {{ upper_camel .PluralName }} {{ .ImportPrefix }}{{ .Name }}List
 	for _, res := range s.{{ upper_camel .PluralName }} {

diff --git a/test/mocks/v1/testing_snapshot.sk.go b/test/mocks/v1/testing_snapshot.sk.go
diff --git a/test/mocks/v1alpha1/testing_snapshot.sk.go b/test/mocks/v1alpha1/testing_snapshot.sk.go
diff --git a/test/mocks/v2alpha1/testing_snapshot.sk.go b/test/mocks/v2alpha1/testing_snapshot.sk.go