Update id formats for generated resources in:

compute, containeranalysis, filestore, healthcare, pubsub, redis, runtimeconfig, securityscanner, sourcerepo, spanner, sql, tpu

products/compute/terraform.yaml

@@ -14,7 +14,6 @@
 --- !ruby/object:Provider::Terraform::Config
 overrides: !ruby/object:Overrides::ResourceOverrides
   Address: !ruby/object:Overrides::Terraform::ResourceOverride
-    id_format: "{{project}}/{{region}}/{{name}}"
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "address_basic"
@@ -71,7 +70,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       post_create: templates/terraform/post_create/labels.erb
   Autoscaler: !ruby/object:Overrides::Terraform::ResourceOverride
-    id_format: "{{zone}}/{{name}}"
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "autoscaler_single_instance"
@@ -1019,7 +1017,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
   Region: !ruby/object:Overrides::Terraform::ResourceOverride
     exclude: true
   RegionAutoscaler: !ruby/object:Overrides::Terraform::ResourceOverride
-    id_format: "{{region}}/{{name}}"
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "region_autoscaler_beta"
@@ -1332,7 +1329,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
             `next_hop_instance`.  Omit if `next_hop_instance` is specified as
             a URL.
   Router: !ruby/object:Overrides::Terraform::ResourceOverride
-    id_format: "{{region}}/{{name}}"
     mutex: router/{{region}}/{{name}}
     examples:
       - !ruby/object:Provider::Terraform::Examples
@@ -1642,7 +1638,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       insert_minutes: 6
       update_minutes: 6
       delete_minutes: 6
-    id_format: "{{region}}/{{name}}"
     properties:
       id: !ruby/object:Overrides::Terraform::PropertyOverride
         exclude: true

products/containeranalysis/terraform.yaml

@@ -14,7 +14,6 @@
 --- !ruby/object:Provider::Terraform::Config
 overrides: !ruby/object:Overrides::ResourceOverrides
   Note: !ruby/object:Overrides::Terraform::ResourceOverride
-    import_format: ["projects/{{project}}/notes/{{name}}"]
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       pre_update: 'templates/terraform/pre_update/containeranalysis_note.erb'
       encoder: templates/terraform/encoders/containeranalysis_attestation_field_name.go.erb

products/filestore/terraform.yaml

@@ -19,8 +19,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       update_minutes: 6
       delete_minutes: 6
     autogen_async: true
-    id_format: "{{project}}/{{zone}}/{{name}}"
-    import_format: ["projects/{{project}}/locations/{{zone}}/instances/{{name}}"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "filestore_instance_basic"

products/healthcare/terraform.yaml

@@ -16,8 +16,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
   Dataset: !ruby/object:Overrides::Terraform::ResourceOverride
     description: |
       {{description}}
-    id_format: "projects/{{project}}/locations/{{location}}/datasets/{{name}}"
-    import_format: ["projects/{{project}}/locations/{{location}}/datasets/{{name}}"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "healthcare_dataset_basic"

products/pubsub/terraform.yaml

@@ -14,7 +14,6 @@
 --- !ruby/object:Provider::Terraform::Config
 overrides: !ruby/object:Overrides::ResourceOverrides
   Topic: !ruby/object:Overrides::Terraform::ResourceOverride
-    id_format: "projects/{{project}}/topics/{{name}}"
     error_retry_predicates: ["pubsubTopicProjectNotReady"]
     iam_policy: !ruby/object:Api::Resource::IamPolicy
       parent_resource_attribute: 'topic'
@@ -48,7 +47,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       encoder: templates/terraform/encoders/no_send_name.go.erb
       update_encoder: templates/terraform/update_encoder/pubsub_topic.erb
   Subscription: !ruby/object:Overrides::Terraform::ResourceOverride
-    id_format: "projects/{{project}}/subscriptions/{{name}}"
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "pubsub_subscription_push"

products/redis/terraform.yaml

@@ -19,8 +19,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       update_minutes: 10
       delete_minutes: 10
     autogen_async: true
-    id_format: "{{project}}/{{region}}/{{name}}"
-    import_format: ["projects/{{project}}/locations/{{region}}/instances/{{name}}"]
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       encoder: templates/terraform/encoders/redis_location_id_for_fallback_zone.go.erb
     examples:

products/runtimeconfig/terraform.yaml

@@ -16,8 +16,6 @@ legacy_name: runtimeconfig
 overrides: !ruby/object:Overrides::ResourceOverrides
   Config: !ruby/object:Overrides::Terraform::ResourceOverride
     exclude_resource: true
-    id_format: 'projects/{{project}}/configs/{{config}}'
-    import_format: ["projects/{{project}}/configs/{{config}}"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "runtimeconfig_config_basic"

products/securityscanner/terraform.yaml

@@ -13,7 +13,6 @@
 --- !ruby/object:Provider::Terraform::Config
 overrides: !ruby/object:Overrides::ResourceOverrides
   ScanConfig: !ruby/object:Overrides::Terraform::ResourceOverride
-    import_format: ["{{name}}"]
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "scan_config_basic"

products/sourcerepo/terraform.yaml

@@ -19,7 +19,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       exclude: false
       method_name_separator: ':'
       parent_resource_attribute: 'repository'
-    id_format: '{{project}}/{{name}}'
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "sourcerepo_repository_basic"

products/spanner/terraform.yaml

@@ -15,7 +15,6 @@
 overrides: !ruby/object:Overrides::ResourceOverrides
   Database: !ruby/object:Overrides::Terraform::ResourceOverride
     autogen_async: true
-    id_format: "{{project}}/{{instance}}/{{name}}"
     import_format:
       - "projects/{{project}}/instances/{{instance}}/databases/{{name}}"
       - "instances/{{instance}}/databases/{{name}}"

products/sql/terraform.yaml

@@ -16,12 +16,9 @@ client_name: 'SqlAdmin'
 overrides: !ruby/object:Overrides::ResourceOverrides
   Database: !ruby/object:Overrides::Terraform::ResourceOverride
     mutex: "google-sql-database-instance-{{project}}-{{instance}}"
-    id_format: "{{instance}}:{{name}}"
     import_format: ["projects/{{project}}/instances/{{instance}}/databases/{{name}}",
                     "{{project}}/{{instance}}/{{name}}",
                     "instances/{{instance}}/databases/{{name}}",
-                    # support for a legacy import format
-                    "{{instance}}:{{name}}",
                     "{{instance}}/{{name}}",
                     "{{name}}"]
     examples:

products/tpu/terraform.yaml

@@ -18,8 +18,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       insert_minutes: 15
       update_minutes: 15
       delete_minutes: 15
-    id_format: "{{project}}/{{zone}}/{{name}}"
-    import_format: ["projects/{{project}}/locations/{{zone}}/nodes/{{name}}"]
     autogen_async: true
     examples:
       - !ruby/object:Provider::Terraform::Examples