Merge feature branch major release 7.0.0 (#14962)

Author: c2thorn

mmv1/products/alloydb/Cluster.yaml

@@ -67,6 +67,8 @@ examples:
     primary_resource_id: 'default'
     vars:
       alloydb_cluster_name: 'alloydb-cluster'
+    ignore_read_extra:
+      - 'deletion_protection'
   - name: 'alloydb_cluster_before_upgrade'
     primary_resource_id: 'default'
     vars:
@@ -75,6 +77,8 @@ examples:
       network_name: 'alloydb-network'
     test_vars_overrides:
       'network_name': 'acctest.BootstrapSharedTestNetwork(t, "alloydb-1")'
+    ignore_read_extra:
+      - 'deletion_protection'
   - name: 'alloydb_cluster_after_upgrade'
     primary_resource_id: 'default'
     vars:
@@ -83,10 +87,14 @@ examples:
       network_name: 'alloydb-network'
     test_vars_overrides:
       'network_name': 'acctest.BootstrapSharedTestNetwork(t, "alloydb-1")'
+    ignore_read_extra:
+      - 'deletion_protection'
   - name: 'alloydb_cluster_full'
     primary_resource_id: 'full'
     vars:
       alloydb_cluster_name: 'alloydb-cluster-full'
+    ignore_read_extra:
+      - 'deletion_protection'
   - name: 'alloydb_cluster_restore'
     primary_resource_id: 'source'
     vars:
@@ -99,6 +107,7 @@ examples:
     test_vars_overrides:
       'network_name': 'acctest.BootstrapSharedTestNetwork(t, "alloydb-instance-basic")'
     ignore_read_extra:
+      - 'deletion_protection'
       - 'reconciling'
       - 'update_time'
     exclude_test: true
@@ -108,6 +117,8 @@ examples:
       alloydb_primary_cluster_name: 'alloydb-primary-cluster'
       alloydb_primary_instance_name: 'alloydb-primary-instance'
       alloydb_secondary_cluster_name: 'alloydb-secondary-cluster'
+    ignore_read_extra:
+      - 'deletion_protection'
     exclude_test: true
   - name: 'alloydb_secondary_cluster_basic_test'
     primary_resource_id: 'secondary'
@@ -118,6 +129,8 @@ examples:
       network_name: 'alloydb-network'
     test_vars_overrides:
       'network_name': 'acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1")'
+    ignore_read_extra:
+      - 'deletion_protection'
     exclude_docs: true
 virtual_fields:
   - name: 'deletion_policy'
@@ -128,6 +141,14 @@ virtual_fields:
       Possible values: DEFAULT, FORCE
     type: String
     default_value: "DEFAULT"
+  - name: 'deletion_protection'
+    description: |
+      Whether Terraform will be prevented from destroying the cluster.
+      When the field is set to true or unset in Terraform state, a `terraform apply`
+      or `terraform destroy` that would delete the cluster will fail.
+      When the field is set to false, deleting the cluster is allowed.
+    type: Boolean
+    default_value: true
   - name: 'skip_await_major_version_upgrade'
     type: Boolean
     default_value: true

mmv1/products/artifactregistry/Repository.yaml

@@ -53,7 +53,6 @@ iam_policy:
 custom_code:
   constants: 'templates/terraform/constants/artifact_registry_repository.go.tmpl'
   encoder: 'templates/terraform/encoders/location_from_region.go.tmpl'
-  pre_create: 'templates/terraform/pre_create/artifact_registry_remote_repository.go.tmpl'
 sweeper:
   url_substitutions:
     - region: "us-central1"
@@ -517,9 +516,6 @@ properties:
             immutable: true
             conflicts:
               - remoteRepositoryConfig.0.docker_repository.0.custom_repository
-            custom_flatten: 'templates/terraform/custom_flatten/default_if_empty.tmpl'
-            # Eventually lets delete default_value and custom_flatten in a major release
-            default_value: "DOCKER_HUB"
             enum_values:
               - 'DOCKER_HUB'
           - name: 'customRepository'
@@ -556,9 +552,6 @@ properties:
             immutable: true
             conflicts:
               - remoteRepositoryConfig.0.maven_repository.0.custom_repository
-            custom_flatten: 'templates/terraform/custom_flatten/default_if_empty.tmpl'
-            # Eventually lets delete default_value and custom_flatten in a major release
-            default_value: "MAVEN_CENTRAL"
             enum_values:
               - 'MAVEN_CENTRAL'
           - name: 'customRepository'
@@ -595,9 +588,6 @@ properties:
             immutable: true
             conflicts:
               - remoteRepositoryConfig.0.npm_repository.0.custom_repository
-            custom_flatten: 'templates/terraform/custom_flatten/default_if_empty.tmpl'
-            # Eventually lets delete default_value and custom_flatten in a major release
-            default_value: "NPMJS"
             enum_values:
               - 'NPMJS'
           - name: 'customRepository'
@@ -634,9 +624,6 @@ properties:
             immutable: true
             conflicts:
               - remoteRepositoryConfig.0.python_repository.0.custom_repository
-            custom_flatten: 'templates/terraform/custom_flatten/default_if_empty.tmpl'
-            # Eventually lets delete default_value and custom_flatten in a major release
-            default_value: "PYPI"
             enum_values:
               - 'PYPI'
           - name: 'customRepository'

mmv1/products/beyondcorp/Application.yaml

@@ -213,9 +213,6 @@ properties:
           Optional. If creditTypesTreatment is INCLUDE_SPECIFIED_CREDITS,
           this is a list of credit types to be subtracted from gross cost to determine the spend for threshold calculations. See a list of acceptable credit type values.
           If creditTypesTreatment is not INCLUDE_SPECIFIED_CREDITS, this field must be empty.
-
-          **Note:** If the field has a value in the config and needs to be removed, the field has to be an empty array in the config.
-        default_from_api: true
         at_least_one_of:
           - 'budget_filter.0.projects'
           - 'budget_filter.0.resource_ancestors'
@@ -236,9 +233,6 @@ properties:
           the parent account, usage from the parent account will be included.
           If the field is omitted, the report will include usage from the parent
           account and all subaccounts, if they exist.
-
-          **Note:** If the field has a value in the config and needs to be removed, the field has to be an empty array in the config.
-        default_from_api: true
         at_least_one_of:
           - 'budget_filter.0.projects'
           - 'budget_filter.0.resource_ancestors'

mmv1/products/billingbudget/Budget.yaml

@@ -503,7 +503,7 @@ properties:
         type: String
         description: |
           Name of the service associated with a Function.
-        default_from_api: true
+        output: true
       - name: 'timeoutSeconds'
         type: Integer
         description: |
@@ -678,6 +678,7 @@ properties:
         default_from_api: true
       - name: 'eventType'
         type: String
+        required: true
         description: 'Required. The type of event to observe.'
       - name: 'eventFilters'
         type: Array

mmv1/products/cloudfunctions2/Function.yaml

@@ -478,12 +478,6 @@ properties:
               type: String
               description: |-
                 Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image.
-            - name: 'dependsOn'
-              type: Array
-              description: |-
-                Containers which should be started before this container. If specified the container will wait to start until all containers with the listed names are healthy.
-              item_type:
-                type: String
       - name: 'volumes'
         type: Array
         description: |-

mmv1/products/cloudrunv2/WorkerPool.yaml

@@ -209,21 +209,3 @@ properties:
                             If a variable cannot be resolved, the reference in the input string will be unchanged.
                             The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped
                             references will never be expanded, regardless of whether the variable exists or not.'
-      - name: 'postStartupScriptConfig'
-        deprecation_message: '`post_startup_script_config` is deprecated and will be removed in a future major release. New resource creation with this field is unavailable at this time.'
-        type: NestedObject
-        description: 'Post startup script config.'
-        properties:
-          - name: 'postStartupScript'
-            type: String
-            description: 'Post startup script to run after runtime is started.'
-          - name: 'postStartupScriptUrl'
-            type: String
-            description: 'Post startup script url to download. Example: https://bucket/script.sh.'
-          - name: 'postStartupScriptBehavior'
-            type: Enum
-            description: 'Post startup script behavior that defines download and execution behavior.'
-            enum_values:
-              - 'RUN_ONCE'
-              - 'RUN_EVERY_START'
-              - 'DOWNLOAD_AND_RUN_EVERY_START'

mmv1/products/colab/RuntimeTemplate.yaml

@@ -144,6 +144,8 @@ properties:
     properties:
       - name: 'subnetworks'
         type: Array
+        is_set: true
+        set_hash_func: tpgresource.NestedUrlSetHashFunc
         description: |
           All instances in one of these subnetworks will be mirrored.
         at_least_one_of:
@@ -161,10 +163,13 @@ properties:
                 The URL of the subnetwork where this rule should be active.
               required: true
               custom_expand: 'templates/terraform/custom_expand/resourceref_with_validation.go.tmpl'
+              diff_suppress_func: 'tpgresource.CompareSelfLinkRelativePaths'
               resource: 'Subnetwork'
               imports: 'selfLink'
       - name: 'instances'
         type: Array
+        is_set: true
+        set_hash_func: tpgresource.NestedUrlSetHashFunc
         description: |
           All the listed instances will be mirrored.  Specify at most 50.
         at_least_one_of:
@@ -181,6 +186,7 @@ properties:
                 The URL of the instances where this rule should be active.
               required: true
               custom_expand: 'templates/terraform/custom_expand/resourceref_with_validation.go.tmpl'
+              diff_suppress_func: 'tpgresource.CompareSelfLinkRelativePaths'
               resource: 'Instance'
               imports: 'selfLink'
       - name: 'tags'

mmv1/products/compute/PacketMirroring.yaml

@@ -171,7 +171,7 @@ properties:
           ranges will be advertised in addition to any specified groups.
           Leave this field blank to advertise no custom IP ranges.
         send_empty_value: true
-        custom_flatten: 'templates/terraform/custom_flatten/compute_router_range.go.tmpl'
+        is_set: true
         item_type:
           type: NestedObject
           properties: