Revert "implement json.Marshaler in snapshot templates"

Revert "implement json.Marshaler in snapshot templates"

changelog/v0.35.3/revert-json-apisnapshot.yaml

@@ -0,0 +1,8 @@
+changelog:
+- type: FIX
+  issueLink: https://github.com/solo-io/gloo-mesh-enterprise/issues/16010
+  resolvesIssue: false
+  description: |
+    Reverts the change in https://github.com/solo-io/solo-kit/pull/554 (released in v0.35.1) that implemented json.Marshaler in snapshot templates.
+    That change was unused (the initial issue was resolved without it).
+    However, when pulled into the https://github.com/solo-io/gloo repo to get the subsequent change, it resulted in test failures; reverting to fix the tests.

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 }}