[LTS v0.24] Format kind JSON the same way the manifest is formatted (#…

…487)

The same change as #486,
but including the thema generation, targeting LTS v0.24 branch instead
of main.

Co-authored-by: Igor Suleymanov <[email protected]>

cmd/grafana-app-sdk/generate.go

@@ -309,7 +309,9 @@ func generateCRDsThema(parser *themagen.CustomKindParser, genPath string, encodi
 		ms = themagen.CRDGenerator(yaml.Marshal, "yaml")
 	} else {
 		// Assume JSON
-		ms = themagen.CRDGenerator(json.Marshal, "json")
+		ms = themagen.CRDGenerator(func(v any) ([]byte, error) {
+			return json.MarshalIndent(v, "", "    ")
+		}, "json")
 	}
 	files, err := parser.FilteredGenerate(themagen.Filter(ms, func(c kindsys.Custom) bool {
 		return c.Def().Properties.IsCRD
@@ -383,7 +385,9 @@ func generateKindsCue(modFS fs.FS, cfg kindGenConfig, selectors ...string) (code
 	// CRD
 	var crdFiles codejen.Files
 	if cfg.CRDEncoding != "none" {
-		encFunc := json.Marshal
+		encFunc := func(v any) ([]byte, error) {
+			return json.MarshalIndent(v, "", "    ")
+		}
 		if cfg.CRDEncoding == "yaml" {
 			encFunc = yaml.Marshal
 		}

codegen/cuekind/generators_test.go

@@ -28,7 +28,9 @@ func TestCRDGenerator(t *testing.T) {
 	require.Nil(t, err)
 
 	t.Run("JSON", func(t *testing.T) {
-		files, err := CRDGenerator(json.Marshal, "json").Generate(kinds...)
+		files, err := CRDGenerator(func(v any) ([]byte, error) {
+			return json.MarshalIndent(v, "", "    ")
+		}, "json").Generate(kinds...)
 		require.Nil(t, err)
 		// Check number of files generated
 		assert.Len(t, files, 2)