From 14abe6051c6f135b6142bfbb658c20e742917e74 Mon Sep 17 00:00:00 2001 From: Zhenhua Li Date: Tue, 19 Sep 2023 16:33:23 -0700 Subject: [PATCH] Apply new labels model to more resources (part 3) (#9000) * Apply new labels model to more resources (part 3) * Use the same format for labels fields * Ignore labels fileds in import state verify --- mmv1/products/cloudrun/DomainMapping.yaml | 4 +-- mmv1/products/cloudrun/Service.yaml | 8 +++--- mmv1/products/cloudrunv2/Job.yaml | 4 +-- mmv1/products/containerattached/Cluster.yaml | 2 +- mmv1/products/firebasehosting/Channel.yaml | 4 +-- mmv1/products/gkebackup/BackupPlan.yaml | 4 +-- mmv1/products/gkehub2/Feature.yaml | 4 +-- .../gkeonprem/BareMetalAdminCluster.yaml | 6 ++-- mmv1/products/gkeonprem/BareMetalCluster.yaml | 14 +++++----- mmv1/products/gkeonprem/VmwareNodePool.yaml | 4 +-- mmv1/products/healthcare/ConsentStore.yaml | 4 +-- mmv1/products/healthcare/DicomStore.yaml | 4 +-- mmv1/products/healthcare/FhirStore.yaml | 4 +-- mmv1/products/healthcare/Hl7V2Store.yaml | 4 +-- mmv1/products/logging/Metric.yaml | 2 +- mmv1/products/monitoring/AlertPolicy.yaml | 2 +- .../products/monitoring/MetricDescriptor.yaml | 2 +- .../monitoring/NotificationChannel.yaml | 2 +- .../monitoring/UptimeCheckConfig.yaml | 2 +- .../ServiceConnectionPolicies.yaml | 4 +-- .../networksecurity/AddressGroup.yaml | 4 +-- mmv1/products/privateca/CaPool.yaml | 4 +-- .../privateca/CertificateAuthority.yaml | 4 +-- mmv1/products/secretmanager/Secret.yaml | 6 ++-- mmv1/products/vertexai/Endpoint.yaml | 4 +-- .../workstations/WorkstationCluster.yaml | 6 ++-- ...ource_firebase_hosting_channel_test.go.erb | 4 +-- ...esource_gke_backup_backup_plan_test.go.erb | 8 ++++++ .../resource_gke_hub_feature_test.go.erb | 5 ++-- .../resource_healthcare_dicom_store_test.go | 21 ++++++++------ ...resource_healthcare_fhir_store_test.go.erb | 3 ++ ...source_healthcare_hl7_v2_store_test.go.erb | 3 ++ ...tivity_service_connection_policies_test.go | 21 ++++++++------ ...rce_network_security_address_group_test.go | 14 ++++++---- .../resource_privateca_ca_pool_test.go | 10 +++---- ...ce_privateca_certificate_authority_test.go | 6 ++-- .../data_source_secret_manager_secret_test.go | 6 +++- ...resource_secret_manager_secret_test.go.erb | 28 +++++++++---------- ...rkstations_workstation_cluster_test.go.erb | 8 +++--- 39 files changed, 138 insertions(+), 111 deletions(-) diff --git a/mmv1/products/cloudrun/DomainMapping.yaml b/mmv1/products/cloudrun/DomainMapping.yaml index 8eb9730a654c..7f8266c3acf7 100644 --- a/mmv1/products/cloudrun/DomainMapping.yaml +++ b/mmv1/products/cloudrun/DomainMapping.yaml @@ -158,7 +158,7 @@ properties: description: Metadata associated with this DomainMapping. properties: - !ruby/object:Api::Type::KeyValuePairs - name: labels + name: 'labels' description: |- Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers @@ -204,7 +204,7 @@ properties: project ID or project number. custom_flatten: templates/terraform/custom_flatten/set_to_project.go.erb - !ruby/object:Api::Type::KeyValuePairs - name: annotations + name: 'annotations' description: |- Annotations is a key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. More diff --git a/mmv1/products/cloudrun/Service.yaml b/mmv1/products/cloudrun/Service.yaml index 1160362ab594..d234a11ca494 100644 --- a/mmv1/products/cloudrun/Service.yaml +++ b/mmv1/products/cloudrun/Service.yaml @@ -240,7 +240,7 @@ properties: default_from_api: true properties: - !ruby/object:Api::Type::KeyValuePairs - name: labels + name: 'labels' description: |- Map of string keys and values that can be used to organize and categorize (scope and select) objects. @@ -279,7 +279,7 @@ properties: default_from_api: true custom_expand: 'templates/terraform/custom_expand/default_to_project.go.erb' - !ruby/object:Api::Type::KeyValuePairs - name: annotations + name: 'annotations' description: |- Annotations is a key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. More @@ -971,7 +971,7 @@ properties: default_from_api: true properties: - !ruby/object:Api::Type::KeyValuePairs - name: labels + name: 'labels' description: |- Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers @@ -1013,7 +1013,7 @@ properties: custom_flatten: templates/terraform/custom_flatten/set_to_project.go.erb custom_expand: 'templates/terraform/custom_expand/default_to_project.go.erb' - !ruby/object:Api::Type::KeyValuePairs - name: annotations + name: 'annotations' description: |- Annotations is a key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. More diff --git a/mmv1/products/cloudrunv2/Job.yaml b/mmv1/products/cloudrunv2/Job.yaml index 82bd0618fb85..11b047c73150 100644 --- a/mmv1/products/cloudrunv2/Job.yaml +++ b/mmv1/products/cloudrunv2/Job.yaml @@ -138,7 +138,7 @@ properties: Cloud Run API v2 does not support labels with `run.googleapis.com`, `cloud.googleapis.com`, `serving.knative.dev`, or `autoscaling.knative.dev` namespaces, and they will be rejected. All system labels in v1 now have a corresponding field in v2 Job. - !ruby/object:Api::Type::KeyValueAnnotations - name: "annotations" + name: 'annotations' description: |- Unstructured key value map that may be set by external tools to store and arbitrary metadata. They are not queryable and should be preserved when modifying objects. @@ -229,7 +229,7 @@ properties: Cloud Run API v2 does not support labels with `run.googleapis.com`, `cloud.googleapis.com`, `serving.knative.dev`, or `autoscaling.knative.dev` namespaces, and they will be rejected. All system labels in v1 now have a corresponding field in v2 ExecutionTemplate. - !ruby/object:Api::Type::KeyValuePairs - name: "annotations" + name: 'annotations' description: |- Unstructured key value map that may be set by external tools to store and arbitrary metadata. They are not queryable and should be preserved when modifying objects. diff --git a/mmv1/products/containerattached/Cluster.yaml b/mmv1/products/containerattached/Cluster.yaml index e27a70f9edbb..25e24de25699 100644 --- a/mmv1/products/containerattached/Cluster.yaml +++ b/mmv1/products/containerattached/Cluster.yaml @@ -203,7 +203,7 @@ properties: The Kubernetes version of the cluster. output: true - !ruby/object:Api::Type::KeyValueAnnotations - name: annotations + name: 'annotations' description: | Optional. Annotations on the cluster. This field has the same restrictions as Kubernetes annotations. The total size of all keys and diff --git a/mmv1/products/firebasehosting/Channel.yaml b/mmv1/products/firebasehosting/Channel.yaml index d94e4bef481b..5a1cc9648230 100644 --- a/mmv1/products/firebasehosting/Channel.yaml +++ b/mmv1/products/firebasehosting/Channel.yaml @@ -76,8 +76,8 @@ properties: The number of previous releases to retain on the channel for rollback or other purposes. Must be a number between 1-100. Defaults to 10 for new channels. default_from_api: true - - !ruby/object:Api::Type::KeyValuePairs - name: labels + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' description: Text labels used for extra metadata and/or filtering - !ruby/object:Api::Type::Time name: expireTime diff --git a/mmv1/products/gkebackup/BackupPlan.yaml b/mmv1/products/gkebackup/BackupPlan.yaml index 28172b41460f..92fc4ddb57b9 100644 --- a/mmv1/products/gkebackup/BackupPlan.yaml +++ b/mmv1/products/gkebackup/BackupPlan.yaml @@ -138,8 +138,8 @@ properties: If set to True, no further update is allowed on this policy, including the locked field itself. default_from_api: true - - !ruby/object:Api::Type::KeyValuePairs - name: labels + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' description: | Description: A set of custom labels supplied by the user. A list of key->value pairs. diff --git a/mmv1/products/gkehub2/Feature.yaml b/mmv1/products/gkehub2/Feature.yaml index e2621d30a24c..89bdd43b671d 100644 --- a/mmv1/products/gkehub2/Feature.yaml +++ b/mmv1/products/gkehub2/Feature.yaml @@ -105,8 +105,8 @@ properties: diff_suppress_func: 'tpgresource.CompareSelfLinkOrResourceName' custom_expand: templates/terraform/custom_expand/resource_from_self_link.go.erb custom_flatten: templates/terraform/custom_flatten/name_from_self_link.erb - - !ruby/object:Api::Type::KeyValuePairs - name: labels + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' description: GCP labels for this Feature. - !ruby/object:Api::Type::NestedObject name: resourceState diff --git a/mmv1/products/gkeonprem/BareMetalAdminCluster.yaml b/mmv1/products/gkeonprem/BareMetalAdminCluster.yaml index 1d873319ed61..7dc763a8b3a9 100644 --- a/mmv1/products/gkeonprem/BareMetalAdminCluster.yaml +++ b/mmv1/products/gkeonprem/BareMetalAdminCluster.yaml @@ -134,7 +134,7 @@ properties: through optimistic concurrency control. output: true - !ruby/object:Api::Type::KeyValueAnnotations - name: "annotations" + name: 'annotations' description: | Annotations on the Bare Metal Admin Cluster. This field has the same restrictions as Kubernetes annotations. @@ -194,7 +194,7 @@ properties: The default IPv4 address for SSH access and Kubernetes node. Example: 192.168.0.1 - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + name: 'labels' description: | The map of Kubernetes labels (key/value pairs) to be applied to each node. These will added in addition to any default label(s) @@ -233,7 +233,7 @@ properties: - PREFER_NO_SCHEDULE - NO_EXECUTE - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + name: 'labels' description: | The map of Kubernetes labels (key/value pairs) to be applied to each node. These will added in addition to any default label(s) diff --git a/mmv1/products/gkeonprem/BareMetalCluster.yaml b/mmv1/products/gkeonprem/BareMetalCluster.yaml index a2648c7ef029..4aecba4e9b2d 100644 --- a/mmv1/products/gkeonprem/BareMetalCluster.yaml +++ b/mmv1/products/gkeonprem/BareMetalCluster.yaml @@ -86,7 +86,7 @@ properties: description: | A human readable description of this Bare Metal User Cluster. - !ruby/object:Api::Type::KeyValueAnnotations - name: "annotations" + name: 'annotations' description: | Annotations on the Bare Metal User Cluster. This field has the same restrictions as Kubernetes annotations. @@ -176,7 +176,7 @@ properties: The default IPv4 address for SSH access and Kubernetes node. Example: 192.168.0.1 - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + name: 'labels' description: | The map of Kubernetes labels (key/value pairs) to be applied to each node. These will added in addition to any default label(s) @@ -217,7 +217,7 @@ properties: - PREFER_NO_SCHEDULE - NO_EXECUTE - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + name: 'labels' description: | The map of Kubernetes labels (key/value pairs) to be applied to each node. These will added in addition to any default label(s) @@ -340,7 +340,7 @@ properties: The default IPv4 address for SSH access and Kubernetes node. Example: 192.168.0.1 - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + name: 'labels' description: | The map of Kubernetes labels (key/value pairs) to be applied to each node. These will added in addition to any default label(s) @@ -381,7 +381,7 @@ properties: - PREFER_NO_SCHEDULE - NO_EXECUTE - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + name: 'labels' description: | The map of Kubernetes labels (key/value pairs) to be applied to each node. These will added in addition to any default label(s) @@ -504,7 +504,7 @@ properties: The default IPv4 address for SSH access and Kubernetes node. Example: 192.168.0.1 - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + name: 'labels' description: | The map of Kubernetes labels (key/value pairs) to be applied to each node. These will added in addition to any default label(s) @@ -543,7 +543,7 @@ properties: - PREFER_NO_SCHEDULE - NO_EXECUTE - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + name: 'labels' description: | The map of Kubernetes labels (key/value pairs) to be applied to each node. These will added in addition to any default label(s) diff --git a/mmv1/products/gkeonprem/VmwareNodePool.yaml b/mmv1/products/gkeonprem/VmwareNodePool.yaml index 1579c1acff40..5afe0bb7859e 100644 --- a/mmv1/products/gkeonprem/VmwareNodePool.yaml +++ b/mmv1/products/gkeonprem/VmwareNodePool.yaml @@ -72,7 +72,7 @@ properties: name: "displayName" description: The display name for the node pool. - !ruby/object:Api::Type::KeyValueAnnotations - name: "annotations" + name: 'annotations' description: | Annotations on the node Pool. This field has the same restrictions as Kubernetes annotations. @@ -148,7 +148,7 @@ properties: - PREFER_NO_SCHEDULE - NO_EXECUTE - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + name: 'labels' description: | The map of Kubernetes labels (key/value pairs) to be applied to each node. These will added in addition to any default label(s) that diff --git a/mmv1/products/healthcare/ConsentStore.yaml b/mmv1/products/healthcare/ConsentStore.yaml index 7db49d2bcf38..75a56824809b 100644 --- a/mmv1/products/healthcare/ConsentStore.yaml +++ b/mmv1/products/healthcare/ConsentStore.yaml @@ -93,8 +93,8 @@ properties: required: false description: | If true, [consents.patch] [google.cloud.healthcare.v1.consent.UpdateConsent] creates the consent if it does not already exist. - - !ruby/object:Api::Type::KeyValuePairs - name: labels + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' required: false description: | User-supplied key-value pairs used to organize Consent stores. diff --git a/mmv1/products/healthcare/DicomStore.yaml b/mmv1/products/healthcare/DicomStore.yaml index 90ab6b2cbd86..98378ff2998e 100644 --- a/mmv1/products/healthcare/DicomStore.yaml +++ b/mmv1/products/healthcare/DicomStore.yaml @@ -73,8 +73,8 @@ properties: ** Changing this property may recreate the Dicom store (removing all data) ** required: true immutable: true - - !ruby/object:Api::Type::KeyValuePairs - name: labels + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' required: false description: | User-supplied key-value pairs used to organize DICOM stores. diff --git a/mmv1/products/healthcare/FhirStore.yaml b/mmv1/products/healthcare/FhirStore.yaml index d9bebcee2dbc..dc9100591bd7 100644 --- a/mmv1/products/healthcare/FhirStore.yaml +++ b/mmv1/products/healthcare/FhirStore.yaml @@ -166,8 +166,8 @@ properties: ** This property can be changed manually in the Google Cloud Healthcare admin console without recreating the FHIR store ** required: false immutable: true - - !ruby/object:Api::Type::KeyValuePairs - name: labels + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' required: false description: | User-supplied key-value pairs used to organize FHIR stores. diff --git a/mmv1/products/healthcare/Hl7V2Store.yaml b/mmv1/products/healthcare/Hl7V2Store.yaml index 931730c5e672..2c395e9a1338 100644 --- a/mmv1/products/healthcare/Hl7V2Store.yaml +++ b/mmv1/products/healthcare/Hl7V2Store.yaml @@ -129,8 +129,8 @@ properties: - :V1 - :V2 - :V3 - - !ruby/object:Api::Type::KeyValuePairs - name: labels + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' required: false description: | User-supplied key-value pairs used to organize HL7v2 stores. diff --git a/mmv1/products/logging/Metric.yaml b/mmv1/products/logging/Metric.yaml index 98b154070d22..5bcf2eae51bb 100644 --- a/mmv1/products/logging/Metric.yaml +++ b/mmv1/products/logging/Metric.yaml @@ -132,7 +132,7 @@ properties: - :CUMULATIVE required: true - !ruby/object:Api::Type::Array - name: labels + name: 'labels' description: | The set of labels that can be used to describe a specific instance of this metric type. For example, the appengine.googleapis.com/http/server/response_latencies metric type has a label diff --git a/mmv1/products/monitoring/AlertPolicy.yaml b/mmv1/products/monitoring/AlertPolicy.yaml index 6ec4e791e16f..d33ba8bd9764 100644 --- a/mmv1/products/monitoring/AlertPolicy.yaml +++ b/mmv1/products/monitoring/AlertPolicy.yaml @@ -859,7 +859,7 @@ properties: alerting rule, then this value should be taken from the enclosing rule group. - !ruby/object:Api::Type::KeyValuePairs - name: labels + name: 'labels' description: | Labels to add to or overwrite in the PromQL query result. Label names must be valid. diff --git a/mmv1/products/monitoring/MetricDescriptor.yaml b/mmv1/products/monitoring/MetricDescriptor.yaml index d83d04bc820b..b3b8f2c2b431 100644 --- a/mmv1/products/monitoring/MetricDescriptor.yaml +++ b/mmv1/products/monitoring/MetricDescriptor.yaml @@ -69,7 +69,7 @@ properties: the DNS name custom.googleapis.com, external.googleapis.com, or logging.googleapis.com/user/. - !ruby/object:Api::Type::Array - name: labels + name: 'labels' description: The set of labels that can be used to describe a specific instance of this metric type. In order to delete a label, the entire resource must be diff --git a/mmv1/products/monitoring/NotificationChannel.yaml b/mmv1/products/monitoring/NotificationChannel.yaml index fe021aa1ff00..88d7e54fb687 100644 --- a/mmv1/products/monitoring/NotificationChannel.yaml +++ b/mmv1/products/monitoring/NotificationChannel.yaml @@ -79,7 +79,7 @@ custom_diff: [ ] properties: - !ruby/object:Api::Type::KeyValuePairs - name: labels + name: 'labels' description: | Configuration fields that define the channel and its behavior. The permissible and required labels are specified in the diff --git a/mmv1/products/monitoring/UptimeCheckConfig.yaml b/mmv1/products/monitoring/UptimeCheckConfig.yaml index b1d923680ebc..3af431687199 100644 --- a/mmv1/products/monitoring/UptimeCheckConfig.yaml +++ b/mmv1/products/monitoring/UptimeCheckConfig.yaml @@ -402,7 +402,7 @@ properties: resource types (https://cloud.google.com/logging/docs/api/v2/resource-list). - !ruby/object:Api::Type::KeyValuePairs - name: labels + name: 'labels' immutable: true required: true description: diff --git a/mmv1/products/networkconnectivity/ServiceConnectionPolicies.yaml b/mmv1/products/networkconnectivity/ServiceConnectionPolicies.yaml index 174943e84a94..89551984b665 100644 --- a/mmv1/products/networkconnectivity/ServiceConnectionPolicies.yaml +++ b/mmv1/products/networkconnectivity/ServiceConnectionPolicies.yaml @@ -205,7 +205,7 @@ properties: output: true description: | The type of underlying resources used to create the connection. - - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' description: | User-defined labels. diff --git a/mmv1/products/networksecurity/AddressGroup.yaml b/mmv1/products/networksecurity/AddressGroup.yaml index 09177a4a472b..87d2b9a19951 100644 --- a/mmv1/products/networksecurity/AddressGroup.yaml +++ b/mmv1/products/networksecurity/AddressGroup.yaml @@ -95,8 +95,8 @@ properties: A timestamp in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits. Examples: "2014-10-02T15:01:23Z" and "2014-10-02T15:01:23.045123456Z". output: true - - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' description: | Set of label tags associated with the AddressGroup resource. An object containing a list of "key": value pairs. Example: { "name": "wrench", "mass": "1.3kg", "count": "3" }. diff --git a/mmv1/products/privateca/CaPool.yaml b/mmv1/products/privateca/CaPool.yaml index 6886aef18c94..5ffda3b7cacc 100644 --- a/mmv1/products/privateca/CaPool.yaml +++ b/mmv1/products/privateca/CaPool.yaml @@ -480,8 +480,8 @@ properties: values: - :PEM - :DER - - !ruby/object:Api::Type::KeyValuePairs - name: labels + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' description: | Labels with user-defined metadata. diff --git a/mmv1/products/privateca/CertificateAuthority.yaml b/mmv1/products/privateca/CertificateAuthority.yaml index 99d9e118c14f..85e8d98598c2 100644 --- a/mmv1/products/privateca/CertificateAuthority.yaml +++ b/mmv1/products/privateca/CertificateAuthority.yaml @@ -735,8 +735,8 @@ properties: A timestamp in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits. Examples: "2014-10-02T15:01:23Z" and "2014-10-02T15:01:23.045123456Z". output: true - - !ruby/object:Api::Type::KeyValuePairs - name: labels + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' description: | Labels with user-defined metadata. diff --git a/mmv1/products/secretmanager/Secret.yaml b/mmv1/products/secretmanager/Secret.yaml index be039109d7b9..63d6315bf9aa 100644 --- a/mmv1/products/secretmanager/Secret.yaml +++ b/mmv1/products/secretmanager/Secret.yaml @@ -69,8 +69,8 @@ properties: output: true description: | The time at which the Secret was created. - - !ruby/object:Api::Type::KeyValuePairs - name: labels + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' description: | The labels assigned to this Secret. @@ -85,7 +85,7 @@ properties: An object containing a list of "key": value pairs. Example: { "name": "wrench", "mass": "1.3kg", "count": "3" }. - !ruby/object:Api::Type::KeyValueAnnotations - name: annotations + name: 'annotations' description: | Custom metadata about the secret. diff --git a/mmv1/products/vertexai/Endpoint.yaml b/mmv1/products/vertexai/Endpoint.yaml index 900fd90ee5df..9bd52067d4e2 100644 --- a/mmv1/products/vertexai/Endpoint.yaml +++ b/mmv1/products/vertexai/Endpoint.yaml @@ -359,8 +359,8 @@ properties: "overwrite" update happens. output: true ignore_read: true - - !ruby/object:Api::Type::KeyValuePairs - name: labels + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' description: The labels with user-defined metadata to organize your Endpoints. Label keys and values can be no longer than 64 characters (Unicode codepoints), diff --git a/mmv1/products/workstations/WorkstationCluster.yaml b/mmv1/products/workstations/WorkstationCluster.yaml index e6013adaddbf..f06be329f74e 100644 --- a/mmv1/products/workstations/WorkstationCluster.yaml +++ b/mmv1/products/workstations/WorkstationCluster.yaml @@ -89,8 +89,8 @@ properties: output: true description: | The system-generated UID of the resource. - - !ruby/object:Api::Type::KeyValuePairs - name: "labels" + - !ruby/object:Api::Type::KeyValueLabels + name: 'labels' description: "Client-specified labels that are applied to the resource and that are also propagated to the underlying Compute Engine resources." @@ -119,7 +119,7 @@ properties: Details can be found in the conditions field. output: true - !ruby/object:Api::Type::KeyValueAnnotations - name: "annotations" + name: 'annotations' description: "Client-specified annotations. This is distinct from labels." - !ruby/object:Api::Type::Fingerprint name: "etag" diff --git a/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_channel_test.go.erb b/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_channel_test.go.erb index 97dfe64fa86e..93169502da64 100644 --- a/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_channel_test.go.erb +++ b/mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_channel_test.go.erb @@ -75,7 +75,7 @@ func TestAccFirebaseHostingChannel_firebasehostingChannelUpdate(t *testing.T) { ResourceName: "google_firebase_hosting_channel.update", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl", "site_id", "channel_id"}, + ImportStateVerifyIgnore: []string{"ttl", "site_id", "channel_id", "labels", "terraform_labels"}, }, { Config: testAccFirebaseHostingChannel_firebasehostingChannelMultipleFields(context), @@ -84,7 +84,7 @@ func TestAccFirebaseHostingChannel_firebasehostingChannelUpdate(t *testing.T) { ResourceName: "google_firebase_hosting_channel.update", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl", "site_id", "channel_id"}, + ImportStateVerifyIgnore: []string{"ttl", "site_id", "channel_id", "labels", "terraform_labels"}, }, { Config: testAccFirebaseHostingChannel_firebasehostingChannelBasic(context), diff --git a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go.erb b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go.erb index ea1059fd8dac..47650b4288f7 100644 --- a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go.erb +++ b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go.erb @@ -30,6 +30,7 @@ func TestAccGKEBackupBackupPlan_update(t *testing.T) { ResourceName: "google_gke_backup_backup_plan.backupplan", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccGKEBackupBackupPlan_full(context), @@ -38,6 +39,7 @@ func TestAccGKEBackupBackupPlan_update(t *testing.T) { ResourceName: "google_gke_backup_backup_plan.backupplan", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) @@ -68,6 +70,9 @@ resource "google_gke_backup_backup_plan" "backupplan" { include_secrets = false all_namespaces = true } + labels = { + "some-key-1": "some-value-1" + } } `, context) } @@ -113,6 +118,9 @@ resource "google_gke_backup_backup_plan" "backupplan" { } } } + labels = { + "some-key-2": "some-value-2" + } } `, context) } diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb index b9d2dce61ccf..11580f7c3c63 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb @@ -231,7 +231,7 @@ func TestAccGKEHubFeature_gkehubFeatureMciUpdate(t *testing.T) { ResourceName: "google_gke_hub_feature.feature", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"update_time"}, + ImportStateVerifyIgnore: []string{"update_time", "labels", "terraform_labels"}, }, }, }) @@ -366,7 +366,7 @@ func TestAccGKEHubFeature_gkehubFeatureMcsd(t *testing.T) { ResourceName: "google_gke_hub_feature.feature", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"project"}, + ImportStateVerifyIgnore: []string{"project", "labels", "terraform_labels"}, }, { Config: testAccGKEHubFeature_gkehubFeatureMcsdUpdate(context), @@ -375,6 +375,7 @@ func TestAccGKEHubFeature_gkehubFeatureMcsd(t *testing.T) { ResourceName: "google_gke_hub_feature.feature", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dicom_store_test.go b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dicom_store_test.go index 4b7584d72d1a..39dd582532da 100644 --- a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dicom_store_test.go +++ b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_dicom_store_test.go @@ -91,9 +91,10 @@ func TestAccHealthcareDicomStore_basic(t *testing.T) { Config: testGoogleHealthcareDicomStore_basic(dicomStoreName, datasetName), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testGoogleHealthcareDicomStore_update(dicomStoreName, datasetName, pubsubTopic), @@ -102,17 +103,19 @@ func TestAccHealthcareDicomStore_basic(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testGoogleHealthcareDicomStore_basic(dicomStoreName, datasetName), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_fhir_store_test.go.erb b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_fhir_store_test.go.erb index 16fe33421493..470d123a5cde 100644 --- a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_fhir_store_test.go.erb +++ b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_fhir_store_test.go.erb @@ -95,6 +95,7 @@ func TestAccHealthcareFhirStore_basic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testGoogleHealthcareFhirStore_update(fhirStoreName, datasetName, pubsubTopic), @@ -106,6 +107,7 @@ func TestAccHealthcareFhirStore_basic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testGoogleHealthcareFhirStore_basic(fhirStoreName, datasetName), @@ -114,6 +116,7 @@ func TestAccHealthcareFhirStore_basic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_hl7_v2_store_test.go.erb b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_hl7_v2_store_test.go.erb index e3b6468de56f..aec48d059681 100644 --- a/mmv1/third_party/terraform/services/healthcare/resource_healthcare_hl7_v2_store_test.go.erb +++ b/mmv1/third_party/terraform/services/healthcare/resource_healthcare_hl7_v2_store_test.go.erb @@ -95,6 +95,7 @@ func TestAccHealthcareHl7V2Store_basic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testGoogleHealthcareHl7V2Store_update(hl7_v2StoreName, datasetName, pubsubTopic), @@ -106,6 +107,7 @@ func TestAccHealthcareHl7V2Store_basic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testGoogleHealthcareHl7V2Store_basic(hl7_v2StoreName, datasetName), @@ -114,6 +116,7 @@ func TestAccHealthcareHl7V2Store_basic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go index 6344f761585b..0894eeab35d5 100644 --- a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go +++ b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_service_connection_policies_test.go @@ -27,25 +27,28 @@ func TestAccNetworkConnectivityServiceConnectionPolicy_update(t *testing.T) { Config: testAccNetworkConnectivityServiceConnectionPolicy_basic(context), }, { - ResourceName: "google_network_connectivity_service_connection_policy.default", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_network_connectivity_service_connection_policy.default", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkConnectivityServiceConnectionPolicy_update(context), }, { - ResourceName: "google_network_connectivity_service_connection_policy.default", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_network_connectivity_service_connection_policy.default", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkConnectivityServiceConnectionPolicy_basic(context), }, { - ResourceName: "google_network_connectivity_service_connection_policy.default", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_network_connectivity_service_connection_policy.default", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_address_group_test.go b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_address_group_test.go index 106848e01d65..15d35521d161 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_address_group_test.go +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_address_group_test.go @@ -24,17 +24,19 @@ func TestAccNetworkSecurityAddressGroups_update(t *testing.T) { Config: testAccNetworkSecurityAddressGroups_basic(addressGroupsName, projectName), }, { - ResourceName: "google_network_security_address_group.foobar", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_network_security_address_group.foobar", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkSecurityAddressGroups_update(addressGroupsName, projectName), }, { - ResourceName: "google_network_security_address_group.foobar", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_network_security_address_group.foobar", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/privateca/resource_privateca_ca_pool_test.go b/mmv1/third_party/terraform/services/privateca/resource_privateca_ca_pool_test.go index b288d24fb7cb..8466df22a917 100644 --- a/mmv1/third_party/terraform/services/privateca/resource_privateca_ca_pool_test.go +++ b/mmv1/third_party/terraform/services/privateca/resource_privateca_ca_pool_test.go @@ -26,7 +26,7 @@ func TestAccPrivatecaCaPool_privatecaCapoolUpdate(t *testing.T) { ResourceName: "google_privateca_ca_pool.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "location"}, + ImportStateVerifyIgnore: []string{"name", "location", "labels", "terraform_labels"}, }, { Config: testAccPrivatecaCaPool_privatecaCapoolEnd(context), @@ -35,7 +35,7 @@ func TestAccPrivatecaCaPool_privatecaCapoolUpdate(t *testing.T) { ResourceName: "google_privateca_ca_pool.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "location"}, + ImportStateVerifyIgnore: []string{"name", "location", "labels", "terraform_labels"}, }, { Config: testAccPrivatecaCaPool_privatecaCapoolStart(context), @@ -44,7 +44,7 @@ func TestAccPrivatecaCaPool_privatecaCapoolUpdate(t *testing.T) { ResourceName: "google_privateca_ca_pool.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "location"}, + ImportStateVerifyIgnore: []string{"name", "location", "labels", "terraform_labels"}, }, }, }) @@ -233,7 +233,7 @@ func TestAccPrivatecaCaPool_privatecaCapoolEmptyBaseline(t *testing.T) { ResourceName: "google_privateca_ca_pool.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "location"}, + ImportStateVerifyIgnore: []string{"name", "location", "labels", "terraform_labels"}, }, }, }) @@ -297,7 +297,7 @@ func TestAccPrivatecaCaPool_privatecaCapoolEmptyPublishingOptions(t *testing.T) ResourceName: "google_privateca_ca_pool.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "location"}, + ImportStateVerifyIgnore: []string{"name", "location", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_authority_test.go b/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_authority_test.go index b43ca328de94..44dafcc2edd9 100644 --- a/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_authority_test.go +++ b/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_authority_test.go @@ -34,7 +34,7 @@ func TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityUpdate(t ResourceName: "google_privateca_certificate_authority.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period"}, + ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period", "labels", "terraform_labels"}, }, { Config: testAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityEnd(context), @@ -43,7 +43,7 @@ func TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityUpdate(t ResourceName: "google_privateca_certificate_authority.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period"}, + ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period", "labels", "terraform_labels"}, }, { Config: testAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityBasicRoot(context), @@ -52,7 +52,7 @@ func TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityUpdate(t ResourceName: "google_privateca_certificate_authority.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period"}, + ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_test.go b/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_test.go index 413f69d98c7e..839b498ebbfa 100644 --- a/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_test.go +++ b/mmv1/third_party/terraform/services/secretmanager/data_source_secret_manager_secret_test.go @@ -22,7 +22,11 @@ func TestAccDataSourceSecretManagerSecret_basic(t *testing.T) { { Config: testAccDataSourceSecretManagerSecret_basic(context), Check: resource.ComposeTestCheckFunc( - acctest.CheckDataSourceStateMatchesResourceState("data.google_secret_manager_secret.foo", "google_secret_manager_secret.bar"), + acctest.CheckDataSourceStateMatchesResourceStateWithIgnores( + "data.google_secret_manager_secret.foo", + "google_secret_manager_secret.bar", + map[string]struct{}{"zone": {}, "labels.%": {}, "terraform_labels.%": {}}, + ), ), }, }, diff --git a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.erb b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.erb index da8d40853c23..8afa9364d95c 100644 --- a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.erb +++ b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.erb @@ -29,7 +29,7 @@ func TestAccSecretManagerSecret_import(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, }, }) @@ -58,7 +58,7 @@ func TestAccSecretManagerSecret_cmek(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, }, }) @@ -126,7 +126,7 @@ func TestAccSecretManagerSecret_versionAliasesUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretManagerSecret_versionAliasesBasic(context), @@ -135,7 +135,7 @@ func TestAccSecretManagerSecret_versionAliasesUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretManagerSecret_versionAliasesUpdate(context), @@ -144,7 +144,7 @@ func TestAccSecretManagerSecret_versionAliasesUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretManagerSecret_basicWithSecretVersions(context), @@ -153,7 +153,7 @@ func TestAccSecretManagerSecret_versionAliasesUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, }, }) @@ -184,7 +184,7 @@ func TestAccSecretManagerSecret_userManagedCmekUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretMangerSecret_userManagedCmekUpdate(context), @@ -193,7 +193,7 @@ func TestAccSecretManagerSecret_userManagedCmekUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretMangerSecret_userManagedCmekUpdate2(context), @@ -202,7 +202,7 @@ func TestAccSecretManagerSecret_userManagedCmekUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretMangerSecret_userManagedCmekBasic(context), @@ -211,7 +211,7 @@ func TestAccSecretManagerSecret_userManagedCmekUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, }, }) @@ -241,7 +241,7 @@ func TestAccSecretManagerSecret_automaticCmekUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretMangerSecret_automaticCmekUpdate(context), @@ -250,7 +250,7 @@ func TestAccSecretManagerSecret_automaticCmekUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretMangerSecret_automaticCmekUpdate2(context), @@ -259,7 +259,7 @@ func TestAccSecretManagerSecret_automaticCmekUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretMangerSecret_automaticCmekBasic(context), @@ -268,7 +268,7 @@ func TestAccSecretManagerSecret_automaticCmekUpdate(t *testing.T) { ResourceName: "google_secret_manager_secret.secret-basic", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"ttl"}, + ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_cluster_test.go.erb b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_cluster_test.go.erb index e544f9085579..57f5de6e6381 100644 --- a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_cluster_test.go.erb +++ b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_cluster_test.go.erb @@ -28,7 +28,7 @@ func TestAccWorkstationsWorkstationCluster_update(t *testing.T) { ResourceName: "google_workstations_workstation_cluster.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag", "annotations"}, + ImportStateVerifyIgnore: []string{"etag", "annotations", "labels", "terraform_labels"}, }, { Config: testAccWorkstationsWorkstationCluster_update(context), @@ -37,7 +37,7 @@ func TestAccWorkstationsWorkstationCluster_update(t *testing.T) { ResourceName: "google_workstations_workstation_cluster.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag", "annotations"}, + ImportStateVerifyIgnore: []string{"etag", "annotations", "labels", "terraform_labels"}, }, }, }) @@ -62,7 +62,7 @@ func TestAccWorkstationsWorkstationCluster_Private_update(t *testing.T) { ResourceName: "google_workstations_workstation_cluster.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag", "annotations"}, + ImportStateVerifyIgnore: []string{"etag", "annotations", "labels", "terraform_labels"}, }, { Config: testAccWorkstationsWorkstationCluster_private_update(context), @@ -71,7 +71,7 @@ func TestAccWorkstationsWorkstationCluster_Private_update(t *testing.T) { ResourceName: "google_workstations_workstation_cluster.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag", "annotations"}, + ImportStateVerifyIgnore: []string{"etag", "annotations", "labels", "terraform_labels"}, }, }, })