chore(generators): make file naming uniform zz_generated.* (#882)

Kong · Nov 25, 2024 · e0a760f · e0a760f
1 parent 31fcd67
commit e0a760f
Show file tree

Hide file tree

Showing 22 changed files with 12 additions and 758 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,3 @@
-**/zz_generated*.go linguist-generated=true
+**/zz_generated.*.go linguist-generated=true
 pkg/clientset/** linguist-generated=true
 controller/konnect/ops/*_mock_test.go linguist-generated=true
diff --git a/Makefile b/Makefile
@@ -466,7 +466,7 @@ generate.gateway-api-urls:
 		CRDS_EXPERIMENTAL_URL="$(GATEWAY_API_CRDS_EXPERIMENTAL_URL)" \
 		RAW_REPO_URL="$(GATEWAY_API_RAW_REPO_URL)" \
 		INPUT=$(shell pwd)/internal/utils/cmd/generate-gateway-api-urls/gateway_consts.tmpl \
-		OUTPUT=$(shell pwd)/pkg/utils/test/zz_generated_gateway_api.go \
+		OUTPUT=$(shell pwd)/pkg/utils/test/zz_generated.gateway_api.go \
 		go generate -tags=generate_gateway_api_urls ./internal/utils/cmd/generate-gateway-api-urls
 
 .PHONY: go-mod-download-gateway-api

diff --git a/hack/generators/kic/role-generator/main.go b/hack/generators/kic/role-generator/main.go
@@ -25,12 +25,12 @@ var clusterRoleRelativePaths = []string{
 
 const (
 	controllerRBACPath       = "./pkg/utils/kubernetes/resources/clusterroles/"
-	controllerRBACFilePrefix = "zz_generated_kong_ingress_controller_rbac"
+	controllerRBACFilePrefix = "zz_generated.kong_ingress_controller_rbac"
 
 	kicRBACPath       = "./pkg/utils/kubernetes/resources/clusterroles"
-	kicRBACFIlePrefix = "zz_generated_controlplane_clusterrole"
+	kicRBACFIlePrefix = "zz_generated.controlplane_clusterrole"
 
-	kicRBACHelperFileName = "./pkg/utils/kubernetes/resources/zz_generated_clusterrole_helpers.go"
+	kicRBACHelperFileName = "./pkg/utils/kubernetes/resources/zz_generated.clusterrole_helpers.go"
 
 	docFileName = controllerRBACPath + "doc.go"
 )

diff --git a/hack/generators/kic/role-generator/templates.go b/hack/generators/kic/role-generator/templates.go
@@ -24,10 +24,10 @@ const (
 // Controller) ClusterRoles.
 //
 // It contains 2 types of files:
-// - zz_generated_kong_ingress_controller_rbac_*.go: contains kubebuilder code
+// - zz_generated.kong_ingress_controller_rbac_*.go: contains kubebuilder code
 //   markers for Kong Ingress Controller's ClusterRoles. Those are retrieved from
 //   Kong Ingress Controller's repository for each supported version.
-// - zz_generated_controlplane_clusterrole_*.go: contains the generated Go code with
+// - zz_generated.controlplane_clusterrole_*.go: contains the generated Go code with
 //   ClusterRoles for each supported version of Kong Ingress Controller.
 //
 package clusterroles

diff --git a/hack/generators/kic/webhook-config-generator/main.go b/hack/generators/kic/webhook-config-generator/main.go
@@ -21,8 +21,8 @@ import (
 const (
 	validatingWebhookConfigurationPath                          = "config/webhook/manifests.yaml"
 	validatingWebhookConfigurationKustomizeURL                  = "https://github.com/kong/kubernetes-ingress-controller/config/webhook"
-	validatingWebhookConfigurationGeneratorForVersionOutputPath = "pkg/utils/kubernetes/resources/validatingwebhookconfig/zz_generated_kic_%s.go"
-	validatingWebhookConfigurationGeneratorMasterOutputPath     = "pkg/utils/kubernetes/resources/zz_generated_kic_validatingwebhookconfig.go"
+	validatingWebhookConfigurationGeneratorForVersionOutputPath = "pkg/utils/kubernetes/resources/validatingwebhookconfig/zz_generated.kic_%s.go"
+	validatingWebhookConfigurationGeneratorMasterOutputPath     = "pkg/utils/kubernetes/resources/zz_generated.kic_validatingwebhookconfig.go"
 )
 
 func main() {

diff --git a/hack/generators/testcases-registration/main.go b/hack/generators/testcases-registration/main.go
@@ -15,7 +15,7 @@ import (
 
 const (
 	integrationTestsPackage   = "test/integration"
-	generatedRegistrationFile = "test/integration/zz_generated_registered_testcases.go"
+	generatedRegistrationFile = "test/integration/zz_generated.registered_testcases.go"
 )
 
 func main() {

diff --git a/pkg/utils/kubernetes/resources/clusterroles/doc.go b/pkg/utils/kubernetes/resources/clusterroles/doc.go
@@ -3,10 +3,10 @@
 // Controller) ClusterRoles.
 //
 // It contains 2 types of files:
-// - zz_generated_kong_ingress_controller_rbac_*.go: contains kubebuilder code
+// - zz_generated.kong_ingress_controller_rbac_*.go: contains kubebuilder code
 //   markers for Kong Ingress Controller's ClusterRoles. Those are retrieved from
 //   Kong Ingress Controller's repository for each supported version.
-// - zz_generated_controlplane_clusterrole_*.go: contains the generated Go code with
+// - zz_generated.controlplane_clusterrole_*.go: contains the generated Go code with
 //   ClusterRoles for each supported version of Kong Ingress Controller.
 //
 package clusterroles
diff --git a/...d_controlplane_clusterrole_ge3_1_lt3_2.go → ...d.controlplane_clusterrole_ge3_1_lt3_2.go b/...d_controlplane_clusterrole_ge3_1_lt3_2.go → ...d.controlplane_clusterrole_ge3_1_lt3_2.go
diff --git a/...d_controlplane_clusterrole_ge3_2_lt3_3.go → ...d.controlplane_clusterrole_ge3_2_lt3_3.go b/...d_controlplane_clusterrole_ge3_2_lt3_3.go → ...d.controlplane_clusterrole_ge3_2_lt3_3.go
diff --git a/...nerated_controlplane_clusterrole_ge3_3.go → ...nerated.controlplane_clusterrole_ge3_3.go b/...nerated_controlplane_clusterrole_ge3_3.go → ...nerated.controlplane_clusterrole_ge3_3.go
diff --git a/...ng_ingress_controller_rbac_ge3_1_lt3_2.go → ...ng_ingress_controller_rbac_ge3_1_lt3_2.go b/...ng_ingress_controller_rbac_ge3_1_lt3_2.go → ...ng_ingress_controller_rbac_ge3_1_lt3_2.go
diff --git a/...ng_ingress_controller_rbac_ge3_2_lt3_3.go → ...ng_ingress_controller_rbac_ge3_2_lt3_3.go b/...ng_ingress_controller_rbac_ge3_2_lt3_3.go → ...ng_ingress_controller_rbac_ge3_2_lt3_3.go
diff --git a/...ted_kong_ingress_controller_rbac_ge3_3.go → ...ted.kong_ingress_controller_rbac_ge3_3.go b/...ted_kong_ingress_controller_rbac_ge3_3.go → ...ted.kong_ingress_controller_rbac_ge3_3.go
diff --git a/...ookconfig/zz_generated_kic_ge3_1_lt3_2.go → ...ookconfig/zz_generated.kic_ge3_1_lt3_2.go b/...ookconfig/zz_generated_kic_ge3_1_lt3_2.go → ...ookconfig/zz_generated.kic_ge3_1_lt3_2.go
diff --git a/...ookconfig/zz_generated_kic_ge3_2_lt3_3.go → ...ookconfig/zz_generated.kic_ge3_2_lt3_3.go b/...ookconfig/zz_generated_kic_ge3_2_lt3_3.go → ...ookconfig/zz_generated.kic_ge3_2_lt3_3.go
diff --git a/...ngwebhookconfig/zz_generated_kic_ge3_3.go → ...ngwebhookconfig/zz_generated.kic_ge3_3.go b/...ngwebhookconfig/zz_generated_kic_ge3_3.go → ...ngwebhookconfig/zz_generated.kic_ge3_3.go