Merge pull request GoogleCloudPlatform#3011 from yuwenma/chore-name

chore: change type-generators to give shorter api _types.go file name
gemmahou · Oct 29, 2024 · db632f4 · db632f4
2 parents 1b77c54 + 9b29e59
commit db632f4
Show file tree

Hide file tree

Showing 24 changed files with 12 additions and 12 deletions.
diff --git a/...bigquery/v1beta1/bigquerydataset_types.go → apis/bigquery/v1beta1/dataset_types.go b/...bigquery/v1beta1/bigquerydataset_types.go → apis/bigquery/v1beta1/dataset_types.go
diff --git a/...lpha1/bigquerydatatransferconfig_types.go → ...uerydatatransfer/v1alpha1/config_types.go b/...lpha1/bigquerydatatransferconfig_types.go → ...uerydatatransfer/v1alpha1/config_types.go
diff --git a/...igtable/v1beta1/bigtableinstance_types.go → apis/bigtable/v1beta1/instance_types.go b/...igtable/v1beta1/bigtableinstance_types.go → apis/bigtable/v1beta1/instance_types.go
diff --git a/...rtificatemanagerdnsauthorization_types.go → ...anager/v1alpha1/dnsauthorization_types.go b/...rtificatemanagerdnsauthorization_types.go → ...anager/v1alpha1/dnsauthorization_types.go
diff --git a/...rtificatemanagerdnsauthorization_types.go → ...manager/v1beta1/dnsauthorization_types.go b/...rtificatemanagerdnsauthorization_types.go → ...manager/v1beta1/dnsauthorization_types.go
diff --git a/...1beta1/computefirewallpolicyrule_types.go → ...mpute/v1beta1/firewallpolicyrule_types.go b/...1beta1/computefirewallpolicyrule_types.go → ...mpute/v1beta1/firewallpolicyrule_types.go
diff --git a/...te/v1beta1/computeforwardingrule_types.go → apis/compute/v1beta1/forwardingrule_types.go b/...te/v1beta1/computeforwardingrule_types.go → apis/compute/v1beta1/forwardingrule_types.go
diff --git a/...v1beta1/containerattachedcluster_types.go → ...ontainerattached/v1beta1/cluster_types.go b/...v1beta1/containerattachedcluster_types.go → ...ontainerattached/v1beta1/cluster_types.go
diff --git a/.../v1beta1/dataflowflextemplatejob_types.go → ...dataflow/v1beta1/flextemplatejob_types.go b/.../v1beta1/dataflowflextemplatejob_types.go → ...dataflow/v1beta1/flextemplatejob_types.go
diff --git a/...store/v1alpha1/firestoredatabase_types.go → apis/firestore/v1alpha1/database_types.go b/...store/v1alpha1/firestoredatabase_types.go → apis/firestore/v1alpha1/database_types.go
diff --git a/.../v1beta1/gkehubfeaturemembership_types.go → ...gkehub/v1beta1/featuremembership_types.go b/.../v1beta1/gkehubfeaturemembership_types.go → ...gkehub/v1beta1/featuremembership_types.go
diff --git a/apis/kms/v1alpha1/kmsautokeyconfig_types.go → apis/kms/v1alpha1/autokeyconfig_types.go b/apis/kms/v1alpha1/kmsautokeyconfig_types.go → apis/kms/v1alpha1/autokeyconfig_types.go
diff --git a/apis/kms/v1beta1/kmskeyring.go → apis/kms/v1beta1/keyring.go b/apis/kms/v1beta1/kmskeyring.go → apis/kms/v1beta1/keyring.go
diff --git a/...ring/v1beta1/monitoringdashboard_types.go → apis/monitoring/v1beta1/dashboard_types.go b/...ring/v1beta1/monitoringdashboard_types.go → apis/monitoring/v1beta1/dashboard_types.go
diff --git a/...nectivityserviceconnectionpolicy_types.go → ...v1alpha1/serviceconnectionpolicy_types.go b/...nectivityserviceconnectionpolicy_types.go → ...v1alpha1/serviceconnectionpolicy_types.go
diff --git a/...ivilegedaccessmanagerentitlement_types.go → ...cessmanager/v1alpha1/entitlement_types.go b/...ivilegedaccessmanagerentitlement_types.go → ...cessmanager/v1alpha1/entitlement_types.go
diff --git a/apis/redis/v1alpha1/rediscluster_types.go → apis/redis/v1alpha1/cluster_types.go b/apis/redis/v1alpha1/rediscluster_types.go → apis/redis/v1alpha1/cluster_types.go
diff --git a/apis/redis/v1beta1/rediscluster_types.go → apis/redis/v1beta1/cluster_types.go b/apis/redis/v1beta1/rediscluster_types.go → apis/redis/v1beta1/cluster_types.go
diff --git a/...ager/v1beta1/secretmanagersecret_types.go → apis/secretmanager/v1beta1/secret_types.go b/...ager/v1beta1/secretmanagersecret_types.go → apis/secretmanager/v1beta1/secret_types.go
diff --git a/...pha1/securesourcemanagerinstance_types.go → ...esourcemanager/v1alpha1/instance_types.go b/...pha1/securesourcemanagerinstance_types.go → ...esourcemanager/v1alpha1/instance_types.go
diff --git a/apis/sql/v1beta1/sqlinstance_types.go → apis/sql/v1beta1/instance_types.go b/apis/sql/v1beta1/sqlinstance_types.go → apis/sql/v1beta1/instance_types.go
diff --git a/...ions/v1alpha1/workstationcluster_types.go → apis/workstations/v1alpha1/cluster_types.go b/...ions/v1alpha1/workstationcluster_types.go → apis/workstations/v1alpha1/cluster_types.go
diff --git a/dev/tools/controllerbuilder/pkg/commands/generatetypes/generatetypescommand.go b/dev/tools/controllerbuilder/pkg/commands/generatetypes/generatetypescommand.go
@@ -141,12 +141,12 @@ func RunGenerateCRD(ctx context.Context, o *GenerateCRDOptions) error {
 	}
 
 	kind := o.ResourceKindName
-	if !scaffolder.TypeFileNotExist(kind) {
-		fmt.Printf("file %s already exists, skipping\n", scaffolder.PathToTypeFile(kind))
+	if !scaffolder.TypeFileNotExist(o.ResourceProtoName) {
+		fmt.Printf("file %s already exists, skipping\n", scaffolder.PathToTypeFile(o.ResourceProtoName))
 	} else {
-		err := scaffolder.AddTypeFile(kind, o.ResourceProtoName)
+		err := scaffolder.AddTypeFile(o.ResourceProtoName, kind)
 		if err != nil {
-			return fmt.Errorf("add type file %s: %w", scaffolder.PathToTypeFile(kind), err)
+			return fmt.Errorf("add type file %s: %w", scaffolder.PathToTypeFile(o.ResourceProtoName), err)
 		}
 	}
 	if scaffolder.RefsFileExist(kind, o.ResourceProtoName) {

diff --git a/dev/tools/controllerbuilder/scaffold/apis.go b/dev/tools/controllerbuilder/scaffold/apis.go
@@ -80,29 +80,29 @@ func scaffoldRefsFile(path string, cArgs *apis.APIArgs) error {
 	return nil
 }
 
-func (a *APIScaffolder) TypeFileNotExist(kind string) bool {
-	typeFilePath := a.PathToTypeFile(kind)
+func (a *APIScaffolder) TypeFileNotExist(resourceProtoName string) bool {
+	typeFilePath := a.PathToTypeFile(resourceProtoName)
 	_, err := os.Stat(typeFilePath)
 	if err == nil {
 		return false
 	}
 	return errors.Is(err, os.ErrNotExist)
 }
 
-func (a *APIScaffolder) PathToTypeFile(kind string) string {
-	fileName := strings.ToLower(kind) + "_types.go"
+func (a *APIScaffolder) PathToTypeFile(resourceProtoName string) string {
+	fileName := strings.ToLower(resourceProtoName) + "_reference.go"
 	return filepath.Join(a.BaseDir, a.GoPackage, fileName)
 }
 
-func (a *APIScaffolder) AddTypeFile(kind, proto string) error {
-	typeFilePath := a.PathToTypeFile(kind)
+func (a *APIScaffolder) AddTypeFile(resourceProtoName, kind string) error {
+	typeFilePath := a.PathToTypeFile(resourceProtoName)
 	cArgs := &apis.APIArgs{
 		Group:           a.Group,
 		Version:         a.Version,
 		Kind:            kind,
 		PackageProtoTag: a.PackageProtoTag,
-		KindProtoTag:    a.PackageProtoTag + "." + proto,
-		ProtoResource:   proto,
+		KindProtoTag:    a.PackageProtoTag + "." + resourceProtoName,
+		ProtoResource:   resourceProtoName,
 	}
 	return scaffoldTypeFile(typeFilePath, cArgs)
 }