don't allow zone and location to be required toplevel properties

GoogleCloudPlatform · Feb 3, 2025 · 32f6aaf · 32f6aaf
1 parent 4036e33
commit 32f6aaf
Show file tree

Hide file tree

Showing 161 changed files with 3 additions and 165 deletions.
diff --git a/mmv1/api/resource.go b/mmv1/api/resource.go
@@ -450,6 +450,9 @@ func (r *Resource) Validate() {
 
 	for _, property := range r.AllProperties() {
 		property.Validate(r.Name)
+		if (property.Name == "zone" || property.Name == "location") && property.Required {
+			log.Fatalf("Property %s in resource %s cannot be marked as required", property.Name, r.Name)
+		}
 	}
 
 	if r.IamPolicy != nil {

diff --git a/mmv1/products/alloydb/Backup.yaml b/mmv1/products/alloydb/Backup.yaml
@@ -103,7 +103,6 @@ parameters:
     description: |
       The location where the alloydb backup should reside.
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/alloydb/Cluster.yaml b/mmv1/products/alloydb/Cluster.yaml
@@ -130,7 +130,6 @@ parameters:
     description: |
       The location where the alloydb cluster should reside.
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/apigee/EndpointAttachment.yaml b/mmv1/products/apigee/EndpointAttachment.yaml
@@ -70,7 +70,6 @@ properties:
     type: String
     description: |
       Location of the endpoint attachment.
-    required: true
   - name: 'host'
     type: String
     description: |

diff --git a/mmv1/products/apigee/Instance.yaml b/mmv1/products/apigee/Instance.yaml
@@ -139,7 +139,6 @@ properties:
     type: String
     description: |
       Required. Compute Engine location where the instance resides.
-    required: true
     immutable: true
   - name: 'peeringCidrRange'
     type: String

diff --git a/mmv1/products/apphub/Application.yaml b/mmv1/products/apphub/Application.yaml
@@ -77,7 +77,6 @@ parameters:
     type: String
     description: 'Part of `parent`. See documentation of `projectsId`.'
     url_param_only: true
-    required: true
     immutable: true
   - name: 'applicationId'
     type: String

diff --git a/mmv1/products/apphub/Service.yaml b/mmv1/products/apphub/Service.yaml
@@ -79,7 +79,6 @@ parameters:
     type: String
     description: 'Part of `parent`.  Full resource name of a parent Application. Example: projects/{HOST_PROJECT_ID}/locations/{LOCATION}/applications/{APPLICATION_ID}'
     url_param_only: true
-    required: true
     immutable: true
   - name: 'applicationId'
     type: String

diff --git a/mmv1/products/apphub/Workload.yaml b/mmv1/products/apphub/Workload.yaml
@@ -77,7 +77,6 @@ parameters:
     type: String
     description: 'Part of `parent`.  Full resource name of a parent Application. Example: projects/{HOST_PROJECT_ID}/locations/{LOCATION}/applications/{APPLICATION_ID}'
     url_param_only: true
-    required: true
     immutable: true
   - name: 'applicationId'
     type: String

diff --git a/mmv1/products/backupdr/BackupPlan.yaml b/mmv1/products/backupdr/BackupPlan.yaml
@@ -40,7 +40,6 @@ examples:
 parameters:
   - name: 'location'
     type: String
-    required: true
     url_param_only: true
     description: |
       The location for the backup plan

diff --git a/mmv1/products/backupdr/BackupPlanAssociation.yaml b/mmv1/products/backupdr/BackupPlanAssociation.yaml
@@ -44,7 +44,6 @@ examples:
 parameters:
   - name: 'location'
     type: String
-    required: true
     url_param_only: true
     description: |
       The location for the backupplan association

diff --git a/mmv1/products/backupdr/BackupVault.yaml b/mmv1/products/backupdr/BackupVault.yaml
@@ -51,7 +51,6 @@ parameters:
     type: String
     description: "The GCP location for the backup vault. "
     url_param_only: true
-    required: true
     immutable: true
   - name: 'backupVaultId'
     type: String

diff --git a/mmv1/products/backupdr/ManagementServer.yaml b/mmv1/products/backupdr/ManagementServer.yaml
@@ -55,7 +55,6 @@ parameters:
       The location for the management server (management console)
     min_version: 'beta'
     url_param_only: true
-    required: true
   - name: 'name'
     type: String
     description: |-

diff --git a/mmv1/products/biglake/Catalog.yaml b/mmv1/products/biglake/Catalog.yaml
@@ -40,7 +40,6 @@ parameters:
     description: |
       The geographic location where the Catalog should reside.
     url_param_only: true
-    required: true
     immutable: true
   - name: 'name'
     type: String

diff --git a/mmv1/products/bigqueryanalyticshub/DataExchange.yaml b/mmv1/products/bigqueryanalyticshub/DataExchange.yaml
@@ -76,7 +76,6 @@ properties:
     description: |
       The name of the location this data exchange.
     url_param_only: true
-    required: true
     immutable: true
   - name: 'displayName'
     type: String

diff --git a/mmv1/products/bigqueryanalyticshub/Listing.yaml b/mmv1/products/bigqueryanalyticshub/Listing.yaml
@@ -93,7 +93,6 @@ properties:
     description: |
       The name of the location this data exchange listing.
     url_param_only: true
-    required: true
     immutable: true
   - name: 'displayName'
     type: String

diff --git a/mmv1/products/bigqueryanalyticshub/ListingSubscription.yaml b/mmv1/products/bigqueryanalyticshub/ListingSubscription.yaml
@@ -59,7 +59,6 @@ parameters:
     description: |
       The name of the location for this subscription.
     url_param_only: true
-    required: true
     custom_flatten: 'templates/terraform/custom_flatten/bigquery_dataset_location.go.tmpl'
     diff_suppress_func: 'tpgresource.CaseDiffSuppress'
 properties:
@@ -75,7 +74,6 @@ properties:
         description: |
           The geographic location where the dataset should reside.
           See https://cloud.google.com/bigquery/docs/locations for supported locations.
-        required: true
         custom_flatten: 'templates/terraform/custom_flatten/bigquery_dataset_location.go.tmpl'
         diff_suppress_func: 'tpgresource.CaseDiffSuppress'
       - name: 'datasetReference'

diff --git a/mmv1/products/bigquerydatapolicy/DataPolicy.yaml b/mmv1/products/bigquerydatapolicy/DataPolicy.yaml
@@ -74,7 +74,6 @@ properties:
     description: |
       The name of the location of the data policy.
     url_param_only: true
-    required: true
     immutable: true
   - name: 'policyTag'
     type: String

diff --git a/mmv1/products/bigqueryreservation/BiReservation.yaml b/mmv1/products/bigqueryreservation/BiReservation.yaml
@@ -51,7 +51,6 @@ parameters:
     description: |
       LOCATION_DESCRIPTION
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/blockchainnodeengine/BlockchainNodes.yaml b/mmv1/products/blockchainnodeengine/BlockchainNodes.yaml
@@ -54,7 +54,6 @@ parameters:
     description: |
       Location of Blockchain Node being created.
     url_param_only: true
-    required: true
     immutable: true
   - name: 'blockchainNodeId'
     type: String

diff --git a/mmv1/products/certificatemanager/TrustConfig.yaml b/mmv1/products/certificatemanager/TrustConfig.yaml
@@ -62,7 +62,6 @@ parameters:
     description: |
       The trust config location.
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'createTime'

diff --git a/mmv1/products/cloudbuild/BitbucketServerConfig.yaml b/mmv1/products/cloudbuild/BitbucketServerConfig.yaml
@@ -74,7 +74,6 @@ parameters:
     description: |
       The location of this bitbucket server config.
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/cloudbuildv2/Connection.yaml b/mmv1/products/cloudbuildv2/Connection.yaml
@@ -70,7 +70,6 @@ parameters:
     type: String
     description: The location for the resource
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'createTime'

diff --git a/mmv1/products/clouddeploy/Automation.yaml b/mmv1/products/clouddeploy/Automation.yaml
@@ -61,7 +61,6 @@ parameters:
     type: String
     description: "The location for the resource"
     url_param_only: true
-    required: true
     immutable: true
   - name: 'delivery_pipeline'
     type: String

diff --git a/mmv1/products/clouddeploy/CustomTargetType.yaml b/mmv1/products/clouddeploy/CustomTargetType.yaml
@@ -76,7 +76,6 @@ parameters:
     type: String
     description: "The location of the source."
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/clouddomains/Registration.yaml b/mmv1/products/clouddomains/Registration.yaml
@@ -69,7 +69,6 @@ parameters:
     type: String
     description: "The location for the resource"
     url_param_only: true
-    required: true
   - name: 'domainName'
     type: String
     description: "Required. The domain name. Unicode domain names must be expressed in Punycode format."

diff --git a/mmv1/products/cloudfunctions2/Function.yaml b/mmv1/products/cloudfunctions2/Function.yaml
@@ -302,7 +302,6 @@ parameters:
     type: String
     description: The location of this cloud function.
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/cloudids/Endpoint.yaml b/mmv1/products/cloudids/Endpoint.yaml
@@ -52,7 +52,6 @@ parameters:
     description: |
       The location for the endpoint.
     url_param_only: true
-    required: true
     immutable: true
     ignore_read: true
 properties:

diff --git a/mmv1/products/cloudrun/DomainMapping.yaml b/mmv1/products/cloudrun/DomainMapping.yaml
@@ -61,7 +61,6 @@ parameters:
     type: String
     description: The location of the cloud run instance. eg us-central1
     url_param_only: true
-    required: true
 properties:
   - name: 'name'
     type: String

diff --git a/mmv1/products/cloudrun/Service.yaml b/mmv1/products/cloudrun/Service.yaml
@@ -156,7 +156,6 @@ parameters:
     type: String
     description: The location of the cloud run instance. eg us-central1
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/cloudrunv2/Job.yaml b/mmv1/products/cloudrunv2/Job.yaml
@@ -134,7 +134,6 @@ parameters:
     type: String
     description: The location of the cloud run job
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/cloudrunv2/Service.yaml b/mmv1/products/cloudrunv2/Service.yaml
@@ -189,7 +189,6 @@ parameters:
     type: String
     description: The location of the cloud run service
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/cloudtasks/Queue.yaml b/mmv1/products/cloudtasks/Queue.yaml
@@ -61,7 +61,6 @@ parameters:
     type: String
     description: The location of the queue
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/colab/NotebookExecution.yaml b/mmv1/products/colab/NotebookExecution.yaml
@@ -73,7 +73,6 @@ examples:
 parameters:
   - name: 'location'
     type: String
-    required: true
     url_param_only: true
     description: 'The location for the resource: https://cloud.google.com/colab/docs/locations'
   - name: 'notebookExecutionJobId'

diff --git a/mmv1/products/colab/Runtime.yaml b/mmv1/products/colab/Runtime.yaml
@@ -69,7 +69,6 @@ virtual_fields:
 parameters:
   - name: 'location'
     type: String
-    required: true
     url_param_only: true
     description: 'The location for the resource: https://cloud.google.com/colab/docs/locations'
     immutable: true

diff --git a/mmv1/products/colab/RuntimeTemplate.yaml b/mmv1/products/colab/RuntimeTemplate.yaml
@@ -63,7 +63,6 @@ examples:
 parameters:
   - name: 'location'
     type: String
-    required: true
     url_param_only: true
     description: 'The location for the resource: https://cloud.google.com/colab/docs/locations'
 properties:

diff --git a/mmv1/products/compute/DiskType.yaml b/mmv1/products/compute/DiskType.yaml
@@ -40,7 +40,6 @@ parameters:
   - name: 'zone'
     type: ResourceRef
     description: 'A reference to the zone where the disk type resides.'
-    required: true
     custom_expand: 'templates/terraform/custom_expand/resourceref_with_validation.go.tmpl'
     resource: 'Zone'
     imports: 'name'

diff --git a/mmv1/products/compute/Instance.yaml b/mmv1/products/compute/Instance.yaml
@@ -49,7 +49,6 @@ parameters:
   - name: 'zone'
     type: ResourceRef
     description: 'A reference to the zone where the machine resides.'
-    required: true
     custom_expand: 'templates/terraform/custom_expand/resourceref_with_validation.go.tmpl'
     resource: 'Zone'
     imports: 'name'

diff --git a/mmv1/products/compute/InstanceGroup.yaml b/mmv1/products/compute/InstanceGroup.yaml
@@ -41,7 +41,6 @@ parameters:
   - name: 'zone'
     type: ResourceRef
     description: 'A reference to the zone where the instance group resides.'
-    required: true
     custom_expand: 'templates/terraform/custom_expand/resourceref_with_validation.go.tmpl'
     resource: 'Zone'
     imports: 'name'

diff --git a/mmv1/products/compute/InstanceGroupManager.yaml b/mmv1/products/compute/InstanceGroupManager.yaml
@@ -45,7 +45,6 @@ parameters:
   - name: 'zone'
     type: ResourceRef
     description: 'The zone the managed instance group resides.'
-    required: true
     custom_expand: 'templates/terraform/custom_expand/resourceref_with_validation.go.tmpl'
     resource: 'Zone'
     imports: 'name'

diff --git a/mmv1/products/compute/InstanceSettings.yaml b/mmv1/products/compute/InstanceSettings.yaml
@@ -50,7 +50,6 @@ parameters:
   - name: 'zone'
     type: ResourceRef
     description: 'A reference to the zone where the machine resides.'
-    required: true
     custom_expand: 'templates/terraform/custom_expand/resourceref_with_validation.go.tmpl'
     resource: 'Zone'
     imports: 'name'

diff --git a/mmv1/products/compute/MachineType.yaml b/mmv1/products/compute/MachineType.yaml
@@ -124,7 +124,6 @@ properties:
   - name: 'zone'
     type: ResourceRef
     description: 'The zone the machine type is defined.'
-    required: true
     custom_expand: 'templates/terraform/custom_expand/resourceref_with_validation.go.tmpl'
     resource: 'Zone'
     imports: 'name'
diff --git a/mmv1/products/compute/Reservation.yaml b/mmv1/products/compute/Reservation.yaml
@@ -68,7 +68,6 @@ parameters:
     type: ResourceRef
     description: |
       The zone where the reservation is made.
-    required: true
     immutable: true
     custom_expand: 'templates/terraform/custom_expand/resourceref_with_validation.go.tmpl'
     resource: 'Zone'

diff --git a/mmv1/products/compute/ResizeRequest.yaml b/mmv1/products/compute/ResizeRequest.yaml
@@ -65,7 +65,6 @@ parameters:
     description: |
       The reference of the compute zone scoping this request.
     url_param_only: true
-    required: true
     resource: 'Zone'
     imports: 'name'
   - name: 'instanceGroupManager'

diff --git a/mmv1/products/containerattached/Cluster.yaml b/mmv1/products/containerattached/Cluster.yaml
@@ -77,7 +77,6 @@ properties:
     description: |
       The location for the resource
     url_param_only: true
-    required: true
     immutable: true
   - name: 'name'
     type: String

diff --git a/mmv1/products/databasemigrationservice/PrivateConnection.yaml b/mmv1/products/databasemigrationservice/PrivateConnection.yaml
@@ -59,7 +59,6 @@ parameters:
     description: |
       The name of the location this private connection is located in.
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/dataplex/Datascan.yaml b/mmv1/products/dataplex/Datascan.yaml
@@ -90,7 +90,6 @@ parameters:
     description: |
       The location where the data scan should reside.
     url_param_only: true
-    required: true
     immutable: true
   - name: 'dataScanId'
     type: String

diff --git a/mmv1/products/datastream/ConnectionProfile.yaml b/mmv1/products/datastream/ConnectionProfile.yaml
@@ -118,7 +118,6 @@ parameters:
     description: |
       The name of the location this connection profile is located in.
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'

diff --git a/mmv1/products/datastream/PrivateConnection.yaml b/mmv1/products/datastream/PrivateConnection.yaml
@@ -74,7 +74,6 @@ parameters:
     description: |
       The name of the location this private connection is located in.
     url_param_only: true
-    required: true
     immutable: true
 properties:
   - name: 'name'