Revert "implement json.Marshaler in snapshot templates"

solo-io · Jun 17, 2024 · ffe0eaa · ffe0eaa
1 parent ecc4f32
commit ffe0eaa
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 49 deletions.
diff --git a/changelog/v0.35.1/json-apisnapshot.yaml b/changelog/v0.35.1/json-apisnapshot.yaml
diff --git a/pkg/code-generator/codegen/templates/snapshot_template.go b/pkg/code-generator/codegen/templates/snapshot_template.go
@@ -4,16 +4,13 @@ import (
 	"text/template"
 )
 
-const backtick = "`"
-
 var ResourceGroupSnapshotTemplate = template.Must(template.New("resource_group_snapshot").Funcs(Funcs).Parse(
 	`package {{ .Project.ProjectConfig.Version }}
 
 {{/* creating a variable that lets us understand how many resources are hashable input resources. */}}
 
 import (
 	"encoding/binary"
-	"encoding/json"
 	"fmt"
 	"hash"
 	"hash/fnv"
@@ -27,11 +24,9 @@ import (
 	"go.uber.org/zap"
 )
 
-var _ json.Marshaler = new({{ .GoName }}Snapshot)
-
 type {{ .GoName }}Snapshot struct {
 {{- range .Resources}}
-	{{ upper_camel .PluralName }} {{ .ImportPrefix }}{{ .Name }}List ` + backtick + `json:"{{ lower_camel .PluralName }}"` + backtick + `
+	{{ upper_camel .PluralName }} {{ .ImportPrefix }}{{ .Name }}List
 {{- end}}
 }
 
@@ -88,10 +83,6 @@ func (s {{ .GoName }}Snapshot) HashFields() []zap.Field {
 	return append(fields, zap.Uint64("snapshotHash",  snapshotHash))
 }
 
-func (s {{ .GoName }}Snapshot) MarshalJSON() ([]byte, error) {
-    return json.Marshal(&s)
-}
-
 func (s *{{ .GoName }}Snapshot) GetResourcesList(resource resources.Resource) (resources.ResourceList, error) {
 	switch resource.(type) {
 {{- range .Resources }}

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