diff --git a/apis/bigquery/v1beta1/bigquerydataset_types.go b/apis/bigquery/v1beta1/dataset_types.go similarity index 100% rename from apis/bigquery/v1beta1/bigquerydataset_types.go rename to apis/bigquery/v1beta1/dataset_types.go diff --git a/apis/bigquerydatatransfer/v1alpha1/bigquerydatatransferconfig_types.go b/apis/bigquerydatatransfer/v1alpha1/config_types.go similarity index 100% rename from apis/bigquerydatatransfer/v1alpha1/bigquerydatatransferconfig_types.go rename to apis/bigquerydatatransfer/v1alpha1/config_types.go diff --git a/apis/bigtable/v1beta1/bigtableinstance_types.go b/apis/bigtable/v1beta1/instance_types.go similarity index 100% rename from apis/bigtable/v1beta1/bigtableinstance_types.go rename to apis/bigtable/v1beta1/instance_types.go diff --git a/apis/certificatemanager/v1alpha1/certificatemanagerdnsauthorization_types.go b/apis/certificatemanager/v1alpha1/dnsauthorization_types.go similarity index 100% rename from apis/certificatemanager/v1alpha1/certificatemanagerdnsauthorization_types.go rename to apis/certificatemanager/v1alpha1/dnsauthorization_types.go diff --git a/apis/certificatemanager/v1beta1/certificatemanagerdnsauthorization_types.go b/apis/certificatemanager/v1beta1/dnsauthorization_types.go similarity index 100% rename from apis/certificatemanager/v1beta1/certificatemanagerdnsauthorization_types.go rename to apis/certificatemanager/v1beta1/dnsauthorization_types.go diff --git a/apis/compute/v1beta1/computefirewallpolicyrule_types.go b/apis/compute/v1beta1/firewallpolicyrule_types.go similarity index 100% rename from apis/compute/v1beta1/computefirewallpolicyrule_types.go rename to apis/compute/v1beta1/firewallpolicyrule_types.go diff --git a/apis/compute/v1beta1/computeforwardingrule_types.go b/apis/compute/v1beta1/forwardingrule_types.go similarity index 100% rename from apis/compute/v1beta1/computeforwardingrule_types.go rename to apis/compute/v1beta1/forwardingrule_types.go diff --git a/apis/containerattached/v1beta1/containerattachedcluster_types.go b/apis/containerattached/v1beta1/cluster_types.go similarity index 100% rename from apis/containerattached/v1beta1/containerattachedcluster_types.go rename to apis/containerattached/v1beta1/cluster_types.go diff --git a/apis/dataflow/v1beta1/dataflowflextemplatejob_types.go b/apis/dataflow/v1beta1/flextemplatejob_types.go similarity index 100% rename from apis/dataflow/v1beta1/dataflowflextemplatejob_types.go rename to apis/dataflow/v1beta1/flextemplatejob_types.go diff --git a/apis/firestore/v1alpha1/firestoredatabase_types.go b/apis/firestore/v1alpha1/database_types.go similarity index 100% rename from apis/firestore/v1alpha1/firestoredatabase_types.go rename to apis/firestore/v1alpha1/database_types.go diff --git a/apis/gkehub/v1beta1/gkehubfeaturemembership_types.go b/apis/gkehub/v1beta1/featuremembership_types.go similarity index 100% rename from apis/gkehub/v1beta1/gkehubfeaturemembership_types.go rename to apis/gkehub/v1beta1/featuremembership_types.go diff --git a/apis/kms/v1alpha1/kmsautokeyconfig_types.go b/apis/kms/v1alpha1/autokeyconfig_types.go similarity index 100% rename from apis/kms/v1alpha1/kmsautokeyconfig_types.go rename to apis/kms/v1alpha1/autokeyconfig_types.go diff --git a/apis/kms/v1beta1/kmskeyring.go b/apis/kms/v1beta1/keyring.go similarity index 100% rename from apis/kms/v1beta1/kmskeyring.go rename to apis/kms/v1beta1/keyring.go diff --git a/apis/monitoring/v1beta1/monitoringdashboard_types.go b/apis/monitoring/v1beta1/dashboard_types.go similarity index 100% rename from apis/monitoring/v1beta1/monitoringdashboard_types.go rename to apis/monitoring/v1beta1/dashboard_types.go diff --git a/apis/networkconnectivity/v1alpha1/networkconnectivityserviceconnectionpolicy_types.go b/apis/networkconnectivity/v1alpha1/serviceconnectionpolicy_types.go similarity index 100% rename from apis/networkconnectivity/v1alpha1/networkconnectivityserviceconnectionpolicy_types.go rename to apis/networkconnectivity/v1alpha1/serviceconnectionpolicy_types.go diff --git a/apis/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement_types.go b/apis/privilegedaccessmanager/v1alpha1/entitlement_types.go similarity index 100% rename from apis/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement_types.go rename to apis/privilegedaccessmanager/v1alpha1/entitlement_types.go diff --git a/apis/redis/v1alpha1/rediscluster_types.go b/apis/redis/v1alpha1/cluster_types.go similarity index 100% rename from apis/redis/v1alpha1/rediscluster_types.go rename to apis/redis/v1alpha1/cluster_types.go diff --git a/apis/redis/v1beta1/rediscluster_types.go b/apis/redis/v1beta1/cluster_types.go similarity index 100% rename from apis/redis/v1beta1/rediscluster_types.go rename to apis/redis/v1beta1/cluster_types.go diff --git a/apis/secretmanager/v1beta1/secretmanagersecret_types.go b/apis/secretmanager/v1beta1/secret_types.go similarity index 100% rename from apis/secretmanager/v1beta1/secretmanagersecret_types.go rename to apis/secretmanager/v1beta1/secret_types.go diff --git a/apis/securesourcemanager/v1alpha1/securesourcemanagerinstance_types.go b/apis/securesourcemanager/v1alpha1/instance_types.go similarity index 100% rename from apis/securesourcemanager/v1alpha1/securesourcemanagerinstance_types.go rename to apis/securesourcemanager/v1alpha1/instance_types.go diff --git a/apis/sql/v1beta1/sqlinstance_types.go b/apis/sql/v1beta1/instance_types.go similarity index 100% rename from apis/sql/v1beta1/sqlinstance_types.go rename to apis/sql/v1beta1/instance_types.go diff --git a/apis/workstations/v1alpha1/workstationcluster_types.go b/apis/workstations/v1alpha1/cluster_types.go similarity index 100% rename from apis/workstations/v1alpha1/workstationcluster_types.go rename to 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 index efec131940..15953ef7c6 100644 --- 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 index 54dbab7e8e..0e108585d8 100644 --- a/dev/tools/controllerbuilder/scaffold/apis.go +++ b/dev/tools/controllerbuilder/scaffold/apis.go @@ -80,8 +80,8 @@ 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 @@ -89,20 +89,20 @@ func (a *APIScaffolder) TypeFileNotExist(kind string) bool { 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) }