Update cog to v0.0.30 (#753)

The grafana/cog update from `v0.0.29` to `v0.0.30` contains breaking
changes to the go type generation command (removing
`AllowMarshalEmptyDisjunctions` from the go gen config), and updates the
NewX methods in generated code. This causes the [dependabot
PR](#752) to fail, so a
manual update must be done to remove `allowMarshalEmptyDisjunctions`
from the CUE and go code, and re-generate the golden test files.

Author: IfSentient

codegen/cuekind/def.cue

@@ -198,9 +198,6 @@ Kind: S={
 			// enabled indicates whether back-end Go code should be generated for this kind's schema
 			enabled: bool | *true
 			config: {
-				// allowMarshalEmptyDisjunctions determines whether to allow marshaling empty disjunctions.
-				// If true, empty disjunctions will be marshaled as `null` instead of returning an error.
-				allowMarshalEmptyDisjunctions: bool | *true
 			}
 		}
 	}

codegen/jennies/gotypes.go

@@ -92,8 +92,7 @@ func (g *GoTypes) generateFiles(version *codegen.KindVersion, name string, machi
 	codegenPipeline := cog.TypesFromSchema().
 		CUEValue(packageName, version.Schema, cog.ForceEnvelope(name)).
 		Golang(cog.GoConfig{
-			AnyAsInterface:                g.AnyAsInterface,
-			AllowMarshalEmptyDisjunctions: version.Codegen.Go.Config.AllowMarshalEmptyDisjunctions,
+			AnyAsInterface: g.AnyAsInterface,
 		})
 
 	if g.AddKubernetesCodegen {
@@ -130,7 +129,6 @@ func (g *GoTypes) generateFilesAtDepth(v cue.Value, kv *codegen.KindVersion, cur
 			NamePrefix:                     namePrefix,
 			AddKubernetesOpenAPIGenComment: g.AddKubernetesCodegen && !(len(fieldName) == 1 && fieldName[0] == "metadata"),
 			AnyAsInterface:                 g.AnyAsInterface,
-			AllowMarshalEmptyDisjunctions:  kv.Codegen.Go.Config.AllowMarshalEmptyDisjunctions,
 		}, len(v.Path().Selectors())-(g.Depth-g.NamingDepth))
 		if err != nil {
 			return nil, err
@@ -165,7 +163,6 @@ type CUEGoConfig struct {
 
 	AddKubernetesOpenAPIGenComment bool
 	AnyAsInterface                 bool
-	AllowMarshalEmptyDisjunctions  bool
 
 	// NamePrefix prefixes all generated types with the provided NamePrefix
 	NamePrefix string
@@ -192,8 +189,7 @@ func GoTypesFromCUE(v cue.Value, cfg CUEGoConfig, maxNamingDepth int) ([]byte, e
 		CUEValue(cfg.PackageName, v, cog.ForceEnvelope(cfg.Name), cog.NameFunc(nameFunc)).
 		SchemaTransformations(cog.PrefixObjectsNames(cfg.NamePrefix)).
 		Golang(cog.GoConfig{
-			AnyAsInterface:                cfg.AnyAsInterface,
-			AllowMarshalEmptyDisjunctions: cfg.AllowMarshalEmptyDisjunctions,
+			AnyAsInterface: cfg.AnyAsInterface,
 		})
 
 	if cfg.AddKubernetesOpenAPIGenComment {

codegen/kind.go

@@ -77,7 +77,6 @@ type KindCodegenTSConfig struct {
 // KindCodegenGoConfig is the Go configuration options for codegen,
 // modeled after the cog Go codegen options.
 type KindCodegenGoConfig struct {
-	AllowMarshalEmptyDisjunctions bool `json:"allowMarshalEmptyDisjunctions"`
 }
 
 type AdditionalPrinterColumn struct {

codegen/testing/golden_generated/go/groupbygroup/customapp/v0_0/customkind_metadata_gen.go.txt

@@ -24,5 +24,8 @@ type CustomKindMetadata struct {
 
 // NewCustomKindMetadata creates a new CustomKindMetadata object.
 func NewCustomKindMetadata() *CustomKindMetadata {
-	return &CustomKindMetadata{}
+	return &CustomKindMetadata{
+		Finalizers: []string{},
+		Labels:     map[string]string{},
+	}
 }

codegen/testing/golden_generated/go/groupbygroup/customapp/v1_0/customkind_metadata_gen.go.txt

@@ -34,5 +34,8 @@ type CustomKindMetadata struct {
 
 // NewCustomKindMetadata creates a new CustomKindMetadata object.
 func NewCustomKindMetadata() *CustomKindMetadata {
-	return &CustomKindMetadata{}
+	return &CustomKindMetadata{
+		Finalizers: []string{},
+		Labels:     map[string]string{},
+	}
 }

codegen/testing/golden_generated/go/groupbygroup/customapp/v1_0/customkind_spec_gen.go.txt

@@ -16,7 +16,11 @@ type CustomKindInnerObject1 struct {
 
 // NewCustomKindInnerObject1 creates a new CustomKindInnerObject1 object.
 func NewCustomKindInnerObject1() *CustomKindInnerObject1 {
-	return &CustomKindInnerObject1{}
+	return &CustomKindInnerObject1{
+		InnerField2: []string{},
+		InnerField3: []CustomKindInnerObject2{},
+		InnerField4: []map[string]interface{}{},
+	}
 }
 
 // +k8s:openapi-gen=true
@@ -27,7 +31,9 @@ type CustomKindInnerObject2 struct {
 
 // NewCustomKindInnerObject2 creates a new CustomKindInnerObject2 object.
 func NewCustomKindInnerObject2() *CustomKindInnerObject2 {
-	return &CustomKindInnerObject2{}
+	return &CustomKindInnerObject2{
+		Details: map[string]interface{}{},
+	}
 }
 
 // +k8s:openapi-gen=true
@@ -52,7 +58,9 @@ type CustomKindType2 struct {
 
 // NewCustomKindType2 creates a new CustomKindType2 object.
 func NewCustomKindType2() *CustomKindType2 {
-	return &CustomKindType2{}
+	return &CustomKindType2{
+		Details: map[string]interface{}{},
+	}
 }
 
 // +k8s:openapi-gen=true
@@ -73,6 +81,7 @@ type CustomKindSpec struct {
 func NewCustomKindSpec() *CustomKindSpec {
 	return &CustomKindSpec{
 		Inner:     *NewCustomKindInnerObject1(),
+		Map:       map[string]CustomKindType2{},
 		BoolField: false,
 	}
 }

codegen/testing/golden_generated/go/groupbygroup/testapp/v1/testkind2_metadata_gen.go.txt

@@ -24,5 +24,8 @@ type TestKind2Metadata struct {
 
 // NewTestKind2Metadata creates a new TestKind2Metadata object.
 func NewTestKind2Metadata() *TestKind2Metadata {
-	return &TestKind2Metadata{}
+	return &TestKind2Metadata{
+		Finalizers: []string{},
+		Labels:     map[string]string{},
+	}
 }

codegen/testing/golden_generated/go/groupbygroup/testapp/v1/testkind_metadata_gen.go.txt

@@ -24,5 +24,8 @@ type TestKindMetadata struct {
 
 // NewTestKindMetadata creates a new TestKindMetadata object.
 func NewTestKindMetadata() *TestKindMetadata {
-	return &TestKindMetadata{}
+	return &TestKindMetadata{
+		Finalizers: []string{},
+		Labels:     map[string]string{},
+	}
 }

codegen/testing/golden_generated/go/groupbygroup/testapp/v2/testkind_metadata_gen.go.txt

@@ -24,5 +24,8 @@ type TestKindMetadata struct {
 
 // NewTestKindMetadata creates a new TestKindMetadata object.
 func NewTestKindMetadata() *TestKindMetadata {
-	return &TestKindMetadata{}
+	return &TestKindMetadata{
+		Finalizers: []string{},
+		Labels:     map[string]string{},
+	}
 }

codegen/testing/golden_generated/go/groupbykind/customkind/v0_0/customkind_metadata_gen.go.txt

@@ -24,5 +24,8 @@ type Metadata struct {
 
 // NewMetadata creates a new Metadata object.
 func NewMetadata() *Metadata {
-	return &Metadata{}
+	return &Metadata{
+		Finalizers: []string{},
+		Labels:     map[string]string{},
+	}
 }