Codegen: Parse the gvk once (#399)

minor PR mostly to see if I can do it :) Rather than parsing and creating a GVK for each property, this gets it once and shares the results.
grafana · Sep 17, 2024 · f8e2175 · f8e2175
1 parent 8ee5fae
commit f8e2175
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 28 deletions.
diff --git a/codegen/templates/resourceobject.tmpl b/codegen/templates/resourceobject.tmpl
@@ -66,12 +66,13 @@ func ({{.ObjectShortName}} *{{.TypeName}}) SetSubresource(name string, value any
 }
 
 func ({{.ObjectShortName}} *{{.TypeName}}) GetStaticMetadata() resource.StaticMetadata {
+    gvk := {{.ObjectShortName}}.GroupVersionKind()
     return resource.StaticMetadata{
         Name:      {{.ObjectShortName}}.ObjectMeta.Name,
     	Namespace: {{.ObjectShortName}}.ObjectMeta.Namespace,
-    	Group:     {{.ObjectShortName}}.GroupVersionKind().Group,
-    	Version:   {{.ObjectShortName}}.GroupVersionKind().Version,
-    	Kind:      {{.ObjectShortName}}.GroupVersionKind().Kind,
+    	Group:     gvk.Group,
+    	Version:   gvk.Version,
+    	Kind:      gvk.Kind,
     }
 }
 

diff --git a/codegen/testing/README.md b/codegen/testing/README.md
@@ -2,4 +2,7 @@
 
 The contents of [golden_generated] are expected output for inputs of `customKind` and `customKind2`. 
 The way these objects can be defined depends on the parser, but any shared output (for example, go types) 
-should always be the same regardless of parser, as they use the same shared jennies.
+should always be the same regardless of parser, as they use the same shared jennies.
+
+There is no helpful utility to re-create the golden files.  Either manually update them or setup a parallel
+project and copy the cue files manually.
diff --git a/codegen/testing/golden_generated/go/groupbygroup/custom/v0_0/customkind_object_gen.go.txt b/codegen/testing/golden_generated/go/groupbygroup/custom/v0_0/customkind_object_gen.go.txt
@@ -65,12 +65,13 @@ func (o *CustomKind) SetSubresource(name string, value any) error {
 }
 
 func (o *CustomKind) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
 	return resource.StaticMetadata{
 		Name:      o.ObjectMeta.Name,
 		Namespace: o.ObjectMeta.Namespace,
-		Group:     o.GroupVersionKind().Group,
-		Version:   o.GroupVersionKind().Version,
-		Kind:      o.GroupVersionKind().Kind,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
 	}
 }
 

diff --git a/codegen/testing/golden_generated/go/groupbygroup/custom/v1_0/customkind_object_gen.go.txt b/codegen/testing/golden_generated/go/groupbygroup/custom/v1_0/customkind_object_gen.go.txt
@@ -65,12 +65,13 @@ func (o *CustomKind) SetSubresource(name string, value any) error {
 }
 
 func (o *CustomKind) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
 	return resource.StaticMetadata{
 		Name:      o.ObjectMeta.Name,
 		Namespace: o.ObjectMeta.Namespace,
-		Group:     o.GroupVersionKind().Group,
-		Version:   o.GroupVersionKind().Version,
-		Kind:      o.GroupVersionKind().Kind,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
 	}
 }
 

diff --git a/codegen/testing/golden_generated/go/groupbygroup/test/v1/testkind2_object_gen.go.txt b/codegen/testing/golden_generated/go/groupbygroup/test/v1/testkind2_object_gen.go.txt
@@ -65,12 +65,13 @@ func (o *TestKind2) SetSubresource(name string, value any) error {
 }
 
 func (o *TestKind2) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
 	return resource.StaticMetadata{
 		Name:      o.ObjectMeta.Name,
 		Namespace: o.ObjectMeta.Namespace,
-		Group:     o.GroupVersionKind().Group,
-		Version:   o.GroupVersionKind().Version,
-		Kind:      o.GroupVersionKind().Kind,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
 	}
 }
 

diff --git a/codegen/testing/golden_generated/go/groupbygroup/test/v1/testkind_object_gen.go.txt b/codegen/testing/golden_generated/go/groupbygroup/test/v1/testkind_object_gen.go.txt
@@ -65,12 +65,13 @@ func (o *TestKind) SetSubresource(name string, value any) error {
 }
 
 func (o *TestKind) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
 	return resource.StaticMetadata{
 		Name:      o.ObjectMeta.Name,
 		Namespace: o.ObjectMeta.Namespace,
-		Group:     o.GroupVersionKind().Group,
-		Version:   o.GroupVersionKind().Version,
-		Kind:      o.GroupVersionKind().Kind,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
 	}
 }
 

diff --git a/codegen/testing/golden_generated/go/groupbygroup/test/v2/testkind_object_gen.go.txt b/codegen/testing/golden_generated/go/groupbygroup/test/v2/testkind_object_gen.go.txt
@@ -65,12 +65,13 @@ func (o *TestKind) SetSubresource(name string, value any) error {
 }
 
 func (o *TestKind) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
 	return resource.StaticMetadata{
 		Name:      o.ObjectMeta.Name,
 		Namespace: o.ObjectMeta.Namespace,
-		Group:     o.GroupVersionKind().Group,
-		Version:   o.GroupVersionKind().Version,
-		Kind:      o.GroupVersionKind().Kind,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
 	}
 }
 

diff --git a/codegen/testing/golden_generated/go/groupbykind/customkind/v0_0/customkind_object_gen.go.txt b/codegen/testing/golden_generated/go/groupbykind/customkind/v0_0/customkind_object_gen.go.txt
@@ -65,12 +65,13 @@ func (o *CustomKind) SetSubresource(name string, value any) error {
 }
 
 func (o *CustomKind) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
 	return resource.StaticMetadata{
 		Name:      o.ObjectMeta.Name,
 		Namespace: o.ObjectMeta.Namespace,
-		Group:     o.GroupVersionKind().Group,
-		Version:   o.GroupVersionKind().Version,
-		Kind:      o.GroupVersionKind().Kind,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
 	}
 }
 

diff --git a/codegen/testing/golden_generated/go/groupbykind/customkind/v1_0/customkind_object_gen.go.txt b/codegen/testing/golden_generated/go/groupbykind/customkind/v1_0/customkind_object_gen.go.txt
@@ -65,12 +65,13 @@ func (o *CustomKind) SetSubresource(name string, value any) error {
 }
 
 func (o *CustomKind) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
 	return resource.StaticMetadata{
 		Name:      o.ObjectMeta.Name,
 		Namespace: o.ObjectMeta.Namespace,
-		Group:     o.GroupVersionKind().Group,
-		Version:   o.GroupVersionKind().Version,
-		Kind:      o.GroupVersionKind().Kind,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
 	}
 }
 

diff --git a/codegen/testing/golden_generated/go/unversioned/customkind/customkind_object_gen.go.txt b/codegen/testing/golden_generated/go/unversioned/customkind/customkind_object_gen.go.txt
@@ -65,12 +65,13 @@ func (o *CustomKind) SetSubresource(name string, value any) error {
 }
 
 func (o *CustomKind) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
 	return resource.StaticMetadata{
 		Name:      o.ObjectMeta.Name,
 		Namespace: o.ObjectMeta.Namespace,
-		Group:     o.GroupVersionKind().Group,
-		Version:   o.GroupVersionKind().Version,
-		Kind:      o.GroupVersionKind().Kind,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
 	}
 }