From 6a4849d7ccdc7852accf1bb675d3983d8b178aa0 Mon Sep 17 00:00:00 2001 From: Zhenhua Li Date: Sat, 16 Sep 2023 16:27:43 -0700 Subject: [PATCH 1/3] Apply new labels model to more resources (part 2) --- mmv1/products/compute/Disk.yaml | 2 +- mmv1/products/compute/ExternalVpnGateway.yaml | 2 +- mmv1/products/compute/Image.yaml | 2 +- mmv1/products/compute/Instance.yaml | 2 +- mmv1/products/compute/RegionDisk.yaml | 2 +- mmv1/products/compute/Snapshot.yaml | 2 +- mmv1/products/dialogflowcx/Intent.yaml | 2 +- mmv1/products/dns/ManagedZone.yaml | 2 +- mmv1/products/filestore/Backup.yaml | 2 +- mmv1/products/filestore/Instance.yaml | 2 +- mmv1/products/filestore/Snapshot.yaml | 2 +- mmv1/products/gkehub/Membership.yaml | 2 +- mmv1/products/gkehub2/MembershipBinding.yaml | 2 +- mmv1/products/gkehub2/Namespace.yaml | 2 +- mmv1/products/gkehub2/Scope.yaml | 2 +- .../gkehub2/ScopeRBACRoleBinding.yaml | 2 +- mmv1/products/kms/CryptoKey.yaml | 2 +- mmv1/products/memcache/Instance.yaml | 2 +- mmv1/products/metastore/Federation.yaml | 2 +- mmv1/products/metastore/Service.yaml | 2 +- mmv1/products/mlengine/Model.yaml | 2 +- .../networkmanagement/ConnectivityTest.yaml | 2 +- .../networksecurity/AuthorizationPolicy.yaml | 2 +- .../networksecurity/ClientTlsPolicy.yaml | 2 +- .../networksecurity/ServerTlsPolicy.yaml | 2 +- .../networkservices/EdgeCacheKeyset.yaml | 2 +- .../networkservices/EdgeCacheOrigin.yaml | 2 +- .../networkservices/EdgeCacheService.yaml | 2 +- .../networkservices/EndpointPolicy.yaml | 2 +- mmv1/products/networkservices/Gateway.yaml | 2 +- mmv1/products/networkservices/GrpcRoute.yaml | 2 +- mmv1/products/networkservices/HttpRoute.yaml | 2 +- mmv1/products/networkservices/Mesh.yaml | 2 +- .../networkservices/ServiceBinding.yaml | 2 +- mmv1/products/networkservices/TcpRoute.yaml | 2 +- .../dataproc_metastore_service_basic.tf.erb | 4 ++ .../examples/gkehub_membership_basic.tf.erb | 4 ++ .../examples/memcache_instance_basic.tf.erb | 4 ++ ...agement_connectivity_test_instances.tf.erb | 3 ++ .../only_external_vpn_gateway_full.tf.erb | 1 - ...ata_source_google_compute_snapshot_test.go | 6 +-- .../compute/resource_compute_disk_test.go.erb | 5 ++ ...ource_compute_external_vpn_gateway_test.go | 14 ++--- .../resource_compute_image_test.go.erb | 6 +-- ...urce_compute_instance_template_test.go.erb | 1 - .../resource_compute_region_disk_test.go.erb | 4 ++ ...mpute_region_instance_template_test.go.erb | 1 - .../resource_dialogflowcx_intent_test.go | 14 ++--- .../dns/resource_dns_managed_zone_test.go.erb | 5 ++ .../resource_filestore_backup_test.go | 2 +- .../resource_filestore_instance_test.go | 2 +- ...esource_gke_hub_membership_binding_test.go | 4 +- .../resource_gke_hub_namespace_test.go | 4 +- ...ce_gke_hub_scope_rbac_role_binding_test.go | 4 +- .../gkehub2/resource_gke_hub_scope_test.go | 4 +- .../kms/resource_kms_crypto_key_test.go | 53 +++++++++++-------- ..._security_authorization_policy_test.go.erb | 2 + ...ork_security_client_tls_policy_test.go.erb | 4 +- ...ork_security_server_tls_policy_test.go.erb | 2 + ...network_services_edge_cache_keyset_test.go | 4 +- ...network_services_edge_cache_origin_test.go | 4 +- ...twork_services_endpoint_policy_test.go.erb | 2 + .../resource_network_services_gateway_test.go | 14 ++--- ...ce_network_services_grpc_route_test.go.erb | 2 + ...ce_network_services_http_route_test.go.erb | 2 + ...resource_network_services_mesh_test.go.erb | 2 + ...rce_network_services_tcp_route_test.go.erb | 4 +- .../data/example_compute_disk.tfplan.json | 14 +++++ ...ample_compute_disk_empty_image.tfplan.json | 14 +++++ .../data/example_compute_snapshot.tfplan.json | 28 ++++++++-- 70 files changed, 208 insertions(+), 105 deletions(-) diff --git a/mmv1/products/compute/Disk.yaml b/mmv1/products/compute/Disk.yaml index 58935e9fa227..1a9893cd2d20 100644 --- a/mmv1/products/compute/Disk.yaml +++ b/mmv1/products/compute/Disk.yaml @@ -290,7 +290,7 @@ properties: name: 'lastDetachTimestamp' description: 'Last detach timestamp in RFC3339 text format.' output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Labels to apply to this disk. A list of key->value pairs. diff --git a/mmv1/products/compute/ExternalVpnGateway.yaml b/mmv1/products/compute/ExternalVpnGateway.yaml index 7fd92d7952f3..271b0f23daee 100644 --- a/mmv1/products/compute/ExternalVpnGateway.yaml +++ b/mmv1/products/compute/ExternalVpnGateway.yaml @@ -63,7 +63,7 @@ properties: - !ruby/object:Api::Type::String name: 'description' description: 'An optional description of this resource.' - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: 'Labels for the external VPN gateway resource.' update_verb: :POST diff --git a/mmv1/products/compute/Image.yaml b/mmv1/products/compute/Image.yaml index 2c428d454187..622f1f43d7da 100644 --- a/mmv1/products/compute/Image.yaml +++ b/mmv1/products/compute/Image.yaml @@ -170,7 +170,7 @@ properties: The service account being used for the encryption request for the given KMS key. If absent, the Compute Engine default service account is used. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Labels to apply to this Image. update_verb: :POST diff --git a/mmv1/products/compute/Instance.yaml b/mmv1/products/compute/Instance.yaml index 4d8111c04eae..027578e5e10c 100644 --- a/mmv1/products/compute/Instance.yaml +++ b/mmv1/products/compute/Instance.yaml @@ -295,7 +295,7 @@ properties: internally during updates. update_url: 'projects/{{project}}/zones/{{zone}}/instances/{{name}}/setLabels' update_verb: :POST - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Labels to apply to this instance. A list of key->value pairs. diff --git a/mmv1/products/compute/RegionDisk.yaml b/mmv1/products/compute/RegionDisk.yaml index 94424537f21b..d421a950923f 100644 --- a/mmv1/products/compute/RegionDisk.yaml +++ b/mmv1/products/compute/RegionDisk.yaml @@ -218,7 +218,7 @@ properties: name: 'lastDetachTimestamp' description: 'Last detach timestamp in RFC3339 text format.' output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Labels to apply to this disk. A list of key->value pairs. diff --git a/mmv1/products/compute/Snapshot.yaml b/mmv1/products/compute/Snapshot.yaml index 2f04ab0fb2a1..9d7ad7ffe598 100644 --- a/mmv1/products/compute/Snapshot.yaml +++ b/mmv1/products/compute/Snapshot.yaml @@ -236,7 +236,7 @@ properties: imports: 'selfLink' description: 'A reference to a license associated with this snapshot' custom_expand: 'templates/terraform/custom_expand/array_resourceref_with_validation.go.erb' - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Labels to apply to this Snapshot. update_verb: :POST diff --git a/mmv1/products/dialogflowcx/Intent.yaml b/mmv1/products/dialogflowcx/Intent.yaml index caf8c2dd32d7..479e7756756e 100644 --- a/mmv1/products/dialogflowcx/Intent.yaml +++ b/mmv1/products/dialogflowcx/Intent.yaml @@ -144,7 +144,7 @@ properties: description: | Indicates whether this is a fallback intent. Currently only default fallback intent is allowed in the agent, which is added upon agent creation. Adding training phrases to fallback intent is useful in the case of requests that are mistakenly matched, since training phrases assigned to fallback intents act as negative examples that triggers no-match event. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | The key/value metadata to label an intent. Labels can contain lowercase letters, digits and the symbols '-' and '_'. International characters are allowed, including letters from unicase alphabets. Keys must start with a letter. Keys and values can be no longer than 63 characters and no more than 128 bytes. diff --git a/mmv1/products/dns/ManagedZone.yaml b/mmv1/products/dns/ManagedZone.yaml index 62565124dfad..9c2bf3c3c201 100644 --- a/mmv1/products/dns/ManagedZone.yaml +++ b/mmv1/products/dns/ManagedZone.yaml @@ -247,7 +247,7 @@ properties: The time that this resource was created on the server. This is in RFC3339 text format. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | A set of key/value label pairs to assign to this ManagedZone. diff --git a/mmv1/products/filestore/Backup.yaml b/mmv1/products/filestore/Backup.yaml index 134f6f46e49c..f1e78d7f8722 100644 --- a/mmv1/products/filestore/Backup.yaml +++ b/mmv1/products/filestore/Backup.yaml @@ -78,7 +78,7 @@ properties: description: | The time when the snapshot was created in RFC3339 text format. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Resource labels to represent user-provided metadata. diff --git a/mmv1/products/filestore/Instance.yaml b/mmv1/products/filestore/Instance.yaml index 22f7f161d8b3..319fb22c58f4 100644 --- a/mmv1/products/filestore/Instance.yaml +++ b/mmv1/products/filestore/Instance.yaml @@ -99,7 +99,7 @@ properties: Possible values include: STANDARD, PREMIUM, BASIC_HDD, BASIC_SSD, HIGH_SCALE_SSD and ENTERPRISE required: true immutable: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Resource labels to represent user-provided metadata. diff --git a/mmv1/products/filestore/Snapshot.yaml b/mmv1/products/filestore/Snapshot.yaml index e5390f5445ae..1ce5ea76bb50 100644 --- a/mmv1/products/filestore/Snapshot.yaml +++ b/mmv1/products/filestore/Snapshot.yaml @@ -89,7 +89,7 @@ properties: description: | The time when the snapshot was created in RFC3339 text format. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Resource labels to represent user-provided metadata. diff --git a/mmv1/products/gkehub/Membership.yaml b/mmv1/products/gkehub/Membership.yaml index a73d65715fd6..a828c70a6713 100644 --- a/mmv1/products/gkehub/Membership.yaml +++ b/mmv1/products/gkehub/Membership.yaml @@ -95,7 +95,7 @@ properties: min_version: beta description: | The name of this entity type to be displayed on the console. This field is unavailable in v1 of the API. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Labels to apply to this membership. diff --git a/mmv1/products/gkehub2/MembershipBinding.yaml b/mmv1/products/gkehub2/MembershipBinding.yaml index b3ff846f787f..54126ff200a0 100644 --- a/mmv1/products/gkehub2/MembershipBinding.yaml +++ b/mmv1/products/gkehub2/MembershipBinding.yaml @@ -132,7 +132,7 @@ properties: - :READY - :DELETING - :UPDATING - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Labels for this Membership binding. diff --git a/mmv1/products/gkehub2/Namespace.yaml b/mmv1/products/gkehub2/Namespace.yaml index 8b1901bbbe5e..b96e5e4e65e8 100644 --- a/mmv1/products/gkehub2/Namespace.yaml +++ b/mmv1/products/gkehub2/Namespace.yaml @@ -133,7 +133,7 @@ properties: Scope. Scope-level labels (`namespace_labels` in the Fleet Scope resource) take precedence over Namespace-level labels if they share a key. Keys and values must be Kubernetes-conformant. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Labels for this Namespace. diff --git a/mmv1/products/gkehub2/Scope.yaml b/mmv1/products/gkehub2/Scope.yaml index 86e1a806ac47..70ffbabfdaac 100644 --- a/mmv1/products/gkehub2/Scope.yaml +++ b/mmv1/products/gkehub2/Scope.yaml @@ -115,7 +115,7 @@ properties: - :READY - :DELETING - :UPDATING - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Labels for this Scope. diff --git a/mmv1/products/gkehub2/ScopeRBACRoleBinding.yaml b/mmv1/products/gkehub2/ScopeRBACRoleBinding.yaml index 850df3f36c3e..392699d1024e 100644 --- a/mmv1/products/gkehub2/ScopeRBACRoleBinding.yaml +++ b/mmv1/products/gkehub2/ScopeRBACRoleBinding.yaml @@ -148,7 +148,7 @@ properties: - :ADMIN - :EDIT - :VIEW - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Labels for this ScopeRBACRoleBinding. diff --git a/mmv1/products/kms/CryptoKey.yaml b/mmv1/products/kms/CryptoKey.yaml index bbfc7551db90..efa270a82173 100644 --- a/mmv1/products/kms/CryptoKey.yaml +++ b/mmv1/products/kms/CryptoKey.yaml @@ -80,7 +80,7 @@ properties: immutable: true url_param_only: true ignore_read: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Labels with user-defined metadata to apply to this resource. diff --git a/mmv1/products/memcache/Instance.yaml b/mmv1/products/memcache/Instance.yaml index a3dd514aa13f..fc24167d1212 100644 --- a/mmv1/products/memcache/Instance.yaml +++ b/mmv1/products/memcache/Instance.yaml @@ -99,7 +99,7 @@ properties: name: 'discoveryEndpoint' description: Endpoint for Discovery API output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Resource labels to represent user-provided metadata. diff --git a/mmv1/products/metastore/Federation.yaml b/mmv1/products/metastore/Federation.yaml index b4fadf816107..565f0d9f8077 100644 --- a/mmv1/products/metastore/Federation.yaml +++ b/mmv1/products/metastore/Federation.yaml @@ -92,7 +92,7 @@ properties: output: true description: | The relative resource name of the metastore federation. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: 'User-defined labels for the metastore federation.' - !ruby/object:Api::Type::String diff --git a/mmv1/products/metastore/Service.yaml b/mmv1/products/metastore/Service.yaml index b4097033db09..ec54fa3e782b 100644 --- a/mmv1/products/metastore/Service.yaml +++ b/mmv1/products/metastore/Service.yaml @@ -155,7 +155,7 @@ properties: output: true description: | The relative resource name of the metastore service. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: 'User-defined labels for the metastore service.' # This is an x-product resource reference. diff --git a/mmv1/products/mlengine/Model.yaml b/mmv1/products/mlengine/Model.yaml index 9ea33d2aa9f9..281cc3665f2e 100644 --- a/mmv1/products/mlengine/Model.yaml +++ b/mmv1/products/mlengine/Model.yaml @@ -96,6 +96,6 @@ properties: description: If true, online prediction nodes send stderr and stdout streams to Stackdriver Logging - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: One or more labels that you can add, to organize your models. diff --git a/mmv1/products/networkmanagement/ConnectivityTest.yaml b/mmv1/products/networkmanagement/ConnectivityTest.yaml index b68d0d350f43..35264ff07a99 100644 --- a/mmv1/products/networkmanagement/ConnectivityTest.yaml +++ b/mmv1/products/networkmanagement/ConnectivityTest.yaml @@ -204,7 +204,7 @@ properties: This is applicable to scenarios where a test can cross project boundaries. item_type: Api::Type::String - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Resource labels to represent user-provided metadata. diff --git a/mmv1/products/networksecurity/AuthorizationPolicy.yaml b/mmv1/products/networksecurity/AuthorizationPolicy.yaml index f4af9f533eee..daa0dda1a7fe 100644 --- a/mmv1/products/networksecurity/AuthorizationPolicy.yaml +++ b/mmv1/products/networksecurity/AuthorizationPolicy.yaml @@ -84,7 +84,7 @@ properties: description: | Time the AuthorizationPolicy was updated in UTC. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Set of label tags associated with the AuthorizationPolicy resource. diff --git a/mmv1/products/networksecurity/ClientTlsPolicy.yaml b/mmv1/products/networksecurity/ClientTlsPolicy.yaml index 7773d5354768..0f87404c7b78 100644 --- a/mmv1/products/networksecurity/ClientTlsPolicy.yaml +++ b/mmv1/products/networksecurity/ClientTlsPolicy.yaml @@ -86,7 +86,7 @@ properties: description: | Time the ClientTlsPolicy was updated in UTC. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Set of label tags associated with the ClientTlsPolicy resource. - !ruby/object:Api::Type::String diff --git a/mmv1/products/networksecurity/ServerTlsPolicy.yaml b/mmv1/products/networksecurity/ServerTlsPolicy.yaml index c300f03f5e12..556af18eb7ef 100644 --- a/mmv1/products/networksecurity/ServerTlsPolicy.yaml +++ b/mmv1/products/networksecurity/ServerTlsPolicy.yaml @@ -90,7 +90,7 @@ properties: description: | Time the ServerTlsPolicy was updated in UTC. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Set of label tags associated with the ServerTlsPolicy resource. - !ruby/object:Api::Type::String diff --git a/mmv1/products/networkservices/EdgeCacheKeyset.yaml b/mmv1/products/networkservices/EdgeCacheKeyset.yaml index d8b79ef24b28..b1ec5986023d 100644 --- a/mmv1/products/networkservices/EdgeCacheKeyset.yaml +++ b/mmv1/products/networkservices/EdgeCacheKeyset.yaml @@ -74,7 +74,7 @@ properties: name: 'description' description: | A human-readable description of the resource. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: 'Set of label tags associated with the EdgeCache resource.' - !ruby/object:Api::Type::Array diff --git a/mmv1/products/networkservices/EdgeCacheOrigin.yaml b/mmv1/products/networkservices/EdgeCacheOrigin.yaml index ddd14fe88e2c..3389965ce53d 100644 --- a/mmv1/products/networkservices/EdgeCacheOrigin.yaml +++ b/mmv1/products/networkservices/EdgeCacheOrigin.yaml @@ -82,7 +82,7 @@ properties: name: 'description' description: | A human-readable description of the resource. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: 'Set of label tags associated with the EdgeCache resource.' - !ruby/object:Api::Type::String diff --git a/mmv1/products/networkservices/EdgeCacheService.yaml b/mmv1/products/networkservices/EdgeCacheService.yaml index ff77b8df406e..71cb4feccd73 100644 --- a/mmv1/products/networkservices/EdgeCacheService.yaml +++ b/mmv1/products/networkservices/EdgeCacheService.yaml @@ -85,7 +85,7 @@ properties: name: 'description' description: | A human-readable description of the resource. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: 'Set of label tags associated with the EdgeCache resource.' - !ruby/object:Api::Type::Boolean diff --git a/mmv1/products/networkservices/EndpointPolicy.yaml b/mmv1/products/networkservices/EndpointPolicy.yaml index ff3effffd4cf..8a2088f5a227 100644 --- a/mmv1/products/networkservices/EndpointPolicy.yaml +++ b/mmv1/products/networkservices/EndpointPolicy.yaml @@ -76,7 +76,7 @@ properties: description: | Time the TcpRoute was updated in UTC. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Set of label tags associated with the TcpRoute resource. - !ruby/object:Api::Type::String diff --git a/mmv1/products/networkservices/Gateway.yaml b/mmv1/products/networkservices/Gateway.yaml index 49843a39241c..c04a69be5f5e 100644 --- a/mmv1/products/networkservices/Gateway.yaml +++ b/mmv1/products/networkservices/Gateway.yaml @@ -128,7 +128,7 @@ properties: description: | Time the AccessPolicy was updated in UTC. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Set of label tags associated with the Gateway resource. - !ruby/object:Api::Type::String diff --git a/mmv1/products/networkservices/GrpcRoute.yaml b/mmv1/products/networkservices/GrpcRoute.yaml index c8bd32e506c9..14efbe9ecf17 100644 --- a/mmv1/products/networkservices/GrpcRoute.yaml +++ b/mmv1/products/networkservices/GrpcRoute.yaml @@ -88,7 +88,7 @@ properties: description: | Time the GrpcRoute was updated in UTC. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Set of label tags associated with the GrpcRoute resource. - !ruby/object:Api::Type::String diff --git a/mmv1/products/networkservices/HttpRoute.yaml b/mmv1/products/networkservices/HttpRoute.yaml index 77575f4dcb0f..cb60ad50e730 100644 --- a/mmv1/products/networkservices/HttpRoute.yaml +++ b/mmv1/products/networkservices/HttpRoute.yaml @@ -97,7 +97,7 @@ properties: description: | Time the HttpRoute was updated in UTC. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Set of label tags associated with the HttpRoute resource. - !ruby/object:Api::Type::String diff --git a/mmv1/products/networkservices/Mesh.yaml b/mmv1/products/networkservices/Mesh.yaml index cc61b1d1b7c5..deb7437b985a 100644 --- a/mmv1/products/networkservices/Mesh.yaml +++ b/mmv1/products/networkservices/Mesh.yaml @@ -83,7 +83,7 @@ properties: description: | Time the Mesh was updated in UTC. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Set of label tags associated with the Mesh resource. - !ruby/object:Api::Type::String diff --git a/mmv1/products/networkservices/ServiceBinding.yaml b/mmv1/products/networkservices/ServiceBinding.yaml index ffda6f36d650..c13d23a7c94c 100644 --- a/mmv1/products/networkservices/ServiceBinding.yaml +++ b/mmv1/products/networkservices/ServiceBinding.yaml @@ -72,7 +72,7 @@ properties: description: | Time the ServiceBinding was updated in UTC. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Set of label tags associated with the ServiceBinding resource. - !ruby/object:Api::Type::String diff --git a/mmv1/products/networkservices/TcpRoute.yaml b/mmv1/products/networkservices/TcpRoute.yaml index 27be31a1b54f..7fae44f3f0bc 100644 --- a/mmv1/products/networkservices/TcpRoute.yaml +++ b/mmv1/products/networkservices/TcpRoute.yaml @@ -104,7 +104,7 @@ properties: description: | Time the TcpRoute was updated in UTC. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Set of label tags associated with the TcpRoute resource. - !ruby/object:Api::Type::String diff --git a/mmv1/templates/terraform/examples/dataproc_metastore_service_basic.tf.erb b/mmv1/templates/terraform/examples/dataproc_metastore_service_basic.tf.erb index a95e7607e470..368e76e15bd1 100644 --- a/mmv1/templates/terraform/examples/dataproc_metastore_service_basic.tf.erb +++ b/mmv1/templates/terraform/examples/dataproc_metastore_service_basic.tf.erb @@ -12,4 +12,8 @@ resource "google_dataproc_metastore_service" "<%= ctx[:primary_resource_id] %>" hive_metastore_config { version = "2.3.6" } + + labels = { + env = "test" + } } \ No newline at end of file diff --git a/mmv1/templates/terraform/examples/gkehub_membership_basic.tf.erb b/mmv1/templates/terraform/examples/gkehub_membership_basic.tf.erb index 0cd1916c20eb..382cce899950 100644 --- a/mmv1/templates/terraform/examples/gkehub_membership_basic.tf.erb +++ b/mmv1/templates/terraform/examples/gkehub_membership_basic.tf.erb @@ -11,4 +11,8 @@ resource "google_gke_hub_membership" "membership" { resource_link = "//container.googleapis.com/${google_container_cluster.primary.id}" } } + + labels = { + env = "test" + } } diff --git a/mmv1/templates/terraform/examples/memcache_instance_basic.tf.erb b/mmv1/templates/terraform/examples/memcache_instance_basic.tf.erb index 0ad8d19378fd..2744c21f85b4 100644 --- a/mmv1/templates/terraform/examples/memcache_instance_basic.tf.erb +++ b/mmv1/templates/terraform/examples/memcache_instance_basic.tf.erb @@ -28,6 +28,10 @@ resource "google_memcache_instance" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]["instance_name"] %>" authorized_network = google_service_networking_connection.private_service_connection.network + labels = { + env = "test" + } + node_config { cpu_count = 1 memory_size_mb = 1024 diff --git a/mmv1/templates/terraform/examples/network_management_connectivity_test_instances.tf.erb b/mmv1/templates/terraform/examples/network_management_connectivity_test_instances.tf.erb index 09a5dc0f7c6a..190c4fc40b1e 100644 --- a/mmv1/templates/terraform/examples/network_management_connectivity_test_instances.tf.erb +++ b/mmv1/templates/terraform/examples/network_management_connectivity_test_instances.tf.erb @@ -10,6 +10,9 @@ resource "google_network_management_connectivity_test" "<%= ctx[:primary_resourc } protocol = "TCP" + labels = { + env = "test" + } } resource "google_compute_instance" "source" { diff --git a/mmv1/templates/terraform/examples/only_external_vpn_gateway_full.tf.erb b/mmv1/templates/terraform/examples/only_external_vpn_gateway_full.tf.erb index 6fc73528fdcb..08bde7a9dab8 100644 --- a/mmv1/templates/terraform/examples/only_external_vpn_gateway_full.tf.erb +++ b/mmv1/templates/terraform/examples/only_external_vpn_gateway_full.tf.erb @@ -8,6 +8,5 @@ resource "google_compute_external_vpn_gateway" "<%= ctx[:primary_resource_id] %> } labels = { key = "value" - otherkey = "" } } diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_snapshot_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_snapshot_test.go index 97c0c1111646..2706ad32c8f2 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_snapshot_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_snapshot_test.go @@ -21,7 +21,7 @@ func TestAccSnapshotDatasource_name(t *testing.T) { acctest.CheckDataSourceStateMatchesResourceStateWithIgnores( "data.google_compute_snapshot.default", "google_compute_snapshot.default", - map[string]struct{}{"zone": {}}, + map[string]struct{}{"zone": {}, "labels.%": {}, "terraform_labels.%": {}}, ), ), }, @@ -42,7 +42,7 @@ func TestAccSnapshotDatasource_filter(t *testing.T) { acctest.CheckDataSourceStateMatchesResourceStateWithIgnores( "data.google_compute_snapshot.default", "google_compute_snapshot.c", - map[string]struct{}{"zone": {}}, + map[string]struct{}{"zone": {}, "labels.%": {}, "terraform_labels.%": {}}, ), ), }, @@ -63,7 +63,7 @@ func TestAccSnapshotDatasource_filterMostRecent(t *testing.T) { acctest.CheckDataSourceStateMatchesResourceStateWithIgnores( "data.google_compute_snapshot.default", "google_compute_snapshot.c", - map[string]struct{}{"zone": {}}, + map[string]struct{}{"zone": {}, "labels.%": {}, "terraform_labels.%": {}}, ), ), }, diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.erb index fb144f76c5bf..bfa49ae22ba2 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_disk_test.go.erb @@ -343,6 +343,7 @@ func TestAccComputeDisk_update(t *testing.T) { ResourceName: "google_compute_disk.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccComputeDisk_updated(diskName), @@ -351,6 +352,7 @@ func TestAccComputeDisk_update(t *testing.T) { ResourceName: "google_compute_disk.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) @@ -820,6 +822,7 @@ func TestAccComputeDisk_cloneDisk(t *testing.T) { ResourceName: "google_compute_disk.disk-clone", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) @@ -841,6 +844,7 @@ func TestAccComputeDisk_featuresUpdated(t *testing.T) { ResourceName: "google_compute_disk.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccComputeDisk_featuresUpdated(diskName), @@ -849,6 +853,7 @@ func TestAccComputeDisk_featuresUpdated(t *testing.T) { ResourceName: "google_compute_disk.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_external_vpn_gateway_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_external_vpn_gateway_test.go index 5f34bac1a1d4..808c39b5c08d 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_external_vpn_gateway_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_external_vpn_gateway_test.go @@ -26,9 +26,10 @@ func TestAccComputeExternalVPNGateway_updateLabels(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccComputeExternalVPNGateway_updateLabels(rnd, "test-updated", "test-updated"), @@ -38,9 +39,10 @@ func TestAccComputeExternalVPNGateway_updateLabels(t *testing.T) { ), }, { - 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/compute/resource_compute_image_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_image_test.go.erb index 1bc622d85561..c75321a445c8 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_image_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_image_test.go.erb @@ -34,6 +34,7 @@ func TestAccComputeImage_withLicense(t *testing.T) { ResourceName: "google_compute_image.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) @@ -57,7 +58,6 @@ func TestAccComputeImage_update(t *testing.T) { testAccCheckComputeImageExists( t, "google_compute_image.foobar", &image), testAccCheckComputeImageContainsLabel(&image, "my-label", "my-label-value"), - testAccCheckComputeImageContainsLabel(&image, "empty-label", ""), ), }, { @@ -74,7 +74,7 @@ func TestAccComputeImage_update(t *testing.T) { ResourceName: "google_compute_image.foobar", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"raw_disk"}, + ImportStateVerifyIgnore: []string{"raw_disk", "labels", "terraform_labels"}, }, }, }) @@ -370,7 +370,6 @@ resource "google_compute_image" "foobar" { } labels = { my-label = "my-label-value" - empty-label = "" } } `, name) @@ -396,7 +395,6 @@ resource "google_compute_image" "foobar" { labels = { my-label = "my-label-value" - empty-label = "" } licenses = [ "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/licenses/debian-11-bullseye", diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb index 3c9dc02c177f..eabe9c303cb4 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb @@ -1732,7 +1732,6 @@ resource "google_compute_image" "foobar" { } labels = { my-label = "my-label-value" - empty-label = "" } timeouts { create = "5m" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_disk_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_disk_test.go.erb index 56b630b12777..f59bb99bcd46 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_disk_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_disk_test.go.erb @@ -44,6 +44,7 @@ func TestAccComputeRegionDisk_basic(t *testing.T) { ResourceName: "google_compute_region_disk.regiondisk", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccComputeRegionDisk_basic(diskName, "name"), @@ -56,6 +57,7 @@ func TestAccComputeRegionDisk_basic(t *testing.T) { ResourceName: "google_compute_region_disk.regiondisk", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) @@ -84,6 +86,7 @@ func TestAccComputeRegionDisk_basicUpdate(t *testing.T) { ResourceName: "google_compute_region_disk.regiondisk", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccComputeRegionDisk_basicUpdated(diskName, "self_link"), @@ -100,6 +103,7 @@ func TestAccComputeRegionDisk_basicUpdate(t *testing.T) { ResourceName: "google_compute_region_disk.regiondisk", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb index 1f05349a2411..f53fdba3c3c6 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb @@ -1657,7 +1657,6 @@ resource "google_compute_image" "foobar" { } labels = { my-label = "my-label-value" - empty-label = "" } timeouts { create = "5m" diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_intent_test.go b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_intent_test.go index eba882c85830..e19b497bc825 100644 --- a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_intent_test.go +++ b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_intent_test.go @@ -25,17 +25,19 @@ func TestAccDialogflowCXIntent_update(t *testing.T) { Config: testAccDialogflowCXIntent_basic(context), }, { - ResourceName: "google_dialogflow_cx_intent.my_intent", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_dialogflow_cx_intent.my_intent", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccDialogflowCXIntent_full(context), }, { - ResourceName: "google_dialogflow_cx_intent.my_intent", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_dialogflow_cx_intent.my_intent", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/dns/resource_dns_managed_zone_test.go.erb b/mmv1/third_party/terraform/services/dns/resource_dns_managed_zone_test.go.erb index 5b6fdd6f76ba..a964f5a33b37 100644 --- a/mmv1/third_party/terraform/services/dns/resource_dns_managed_zone_test.go.erb +++ b/mmv1/third_party/terraform/services/dns/resource_dns_managed_zone_test.go.erb @@ -32,6 +32,7 @@ func TestAccDNSManagedZone_update(t *testing.T) { ResourceName: "google_dns_managed_zone.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccDnsManagedZone_basic(zoneSuffix, "description2", map[string]string{"foo": "bar"}), @@ -40,6 +41,7 @@ func TestAccDNSManagedZone_update(t *testing.T) { ResourceName: "google_dns_managed_zone.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) @@ -174,6 +176,7 @@ func TestAccDNSManagedZone_cloudLoggingConfigUpdate(t *testing.T) { ResourceName: "google_dns_managed_zone.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccDnsManagedZone_cloudLoggingConfig_update(zoneSuffix, true), @@ -182,6 +185,7 @@ func TestAccDNSManagedZone_cloudLoggingConfigUpdate(t *testing.T) { ResourceName: "google_dns_managed_zone.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccDnsManagedZone_cloudLoggingConfig_update(zoneSuffix, false), @@ -190,6 +194,7 @@ func TestAccDNSManagedZone_cloudLoggingConfigUpdate(t *testing.T) { ResourceName: "google_dns_managed_zone.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/filestore/resource_filestore_backup_test.go b/mmv1/third_party/terraform/services/filestore/resource_filestore_backup_test.go index fc024f291721..768b61b89f8f 100644 --- a/mmv1/third_party/terraform/services/filestore/resource_filestore_backup_test.go +++ b/mmv1/third_party/terraform/services/filestore/resource_filestore_backup_test.go @@ -35,7 +35,7 @@ func TestAccFilestoreBackup_update(t *testing.T) { ResourceName: "google_filestore_backup.backup", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"labels", "description", "location"}, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels", "description", "location"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/filestore/resource_filestore_instance_test.go b/mmv1/third_party/terraform/services/filestore/resource_filestore_instance_test.go index 96d44c1c8244..6f52889d72ae 100644 --- a/mmv1/third_party/terraform/services/filestore/resource_filestore_instance_test.go +++ b/mmv1/third_party/terraform/services/filestore/resource_filestore_instance_test.go @@ -56,7 +56,7 @@ func TestAccFilestoreInstance_update(t *testing.T) { ResourceName: "google_filestore_instance.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"zone", "location"}, + ImportStateVerifyIgnore: []string{"zone", "location", "labels", "terraform_labels"}, }, { Config: testAccFilestoreInstance_update2(name), diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go index 5834df3cb576..b800f61a99bc 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_membership_binding_test.go @@ -29,7 +29,7 @@ func TestAccGKEHub2MembershipBinding_gkehubMembershipBindingBasicExample_update( ResourceName: "google_gke_hub_membership_binding.example", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"membership_binding_id", "scope", "membership_id", "location"}, + ImportStateVerifyIgnore: []string{"membership_binding_id", "scope", "membership_id", "location", "labels", "terraform_labels"}, }, { Config: testAccGKEHub2MembershipBinding_gkehubMembershipBindingBasicExample_update(context), @@ -38,7 +38,7 @@ func TestAccGKEHub2MembershipBinding_gkehubMembershipBindingBasicExample_update( ResourceName: "google_gke_hub_membership_binding.example", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"membership_binding_id", "scope", "membership_id", "location"}, + ImportStateVerifyIgnore: []string{"membership_binding_id", "scope", "membership_id", "location", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_namespace_test.go b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_namespace_test.go index 5dcc01cd2b83..a80cb1393807 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_namespace_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_namespace_test.go @@ -28,7 +28,7 @@ func TestAccGKEHub2Namespace_gkehubNamespaceBasicExample_update(t *testing.T) { ResourceName: "google_gke_hub_namespace.namespace", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"scope_namespace_id", "scope", "scope_id", "scope"}, + ImportStateVerifyIgnore: []string{"scope_namespace_id", "scope", "scope_id", "scope", "labels", "terraform_labels"}, }, { Config: testAccGKEHub2Namespace_gkehubNamespaceBasicExample_update(context), @@ -37,7 +37,7 @@ func TestAccGKEHub2Namespace_gkehubNamespaceBasicExample_update(t *testing.T) { ResourceName: "google_gke_hub_namespace.namespace", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"scope_namespace_id", "scope", "scope_id", "scope"}, + ImportStateVerifyIgnore: []string{"scope_namespace_id", "scope", "scope_id", "scope", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go index a1f9e6f5742e..5756e6c2a8b3 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_rbac_role_binding_test.go @@ -28,7 +28,7 @@ func TestAccGKEHub2ScopeRBACRoleBinding_gkehubScopeRbacRoleBindingBasicExample_u ResourceName: "google_gke_hub_scope_rbac_role_binding.scoperbacrolebinding", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"scope_rbac_role_binding_id", "scope_id"}, + ImportStateVerifyIgnore: []string{"scope_rbac_role_binding_id", "scope_id", "labels", "terraform_labels"}, }, { Config: testAccGKEHub2ScopeRBACRoleBinding_gkehubScopeRbacRoleBindingBasicExample_update(context), @@ -37,7 +37,7 @@ func TestAccGKEHub2ScopeRBACRoleBinding_gkehubScopeRbacRoleBindingBasicExample_u ResourceName: "google_gke_hub_scope_rbac_role_binding.scoperbacrolebinding", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"scope_rbac_role_binding_id", "scope_id"}, + ImportStateVerifyIgnore: []string{"scope_rbac_role_binding_id", "scope_id", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go index 0c3c84e598ab..967fe08c4bc2 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go @@ -28,7 +28,7 @@ func TestAccGKEHub2Scope_gkehubScopeBasicExample_update(t *testing.T) { ResourceName: "google_gke_hub_scope.scope", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"scope_id"}, + ImportStateVerifyIgnore: []string{"scope_id", "labels", "terraform_labels"}, }, { Config: testAccGKEHub2Scope_gkehubScopeBasicExample_update(context), @@ -37,7 +37,7 @@ func TestAccGKEHub2Scope_gkehubScopeBasicExample_update(t *testing.T) { ResourceName: "google_gke_hub_scope.scope", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"scope_id"}, + ImportStateVerifyIgnore: []string{"scope_id", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go b/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go index 6f84c616dc29..d067dbcdb9af 100644 --- a/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go +++ b/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go @@ -152,16 +152,18 @@ func TestAccKmsCryptoKey_basic(t *testing.T) { Config: testGoogleKmsCryptoKey_basic(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName), }, { - ResourceName: "google_kms_crypto_key.crypto_key", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_kms_crypto_key.crypto_key", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, // Test importing with a short id { - ResourceName: "google_kms_crypto_key.crypto_key", - ImportState: true, - ImportStateId: fmt.Sprintf("%s/%s/%s/%s", projectId, location, keyRingName, cryptoKeyName), - ImportStateVerify: true, + ResourceName: "google_kms_crypto_key.crypto_key", + ImportState: true, + ImportStateId: fmt.Sprintf("%s/%s/%s/%s", projectId, location, keyRingName, cryptoKeyName), + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, // Use a separate TestStep rather than a CheckDestroy because we need the project to still exist. { @@ -294,9 +296,10 @@ func TestAccKmsCryptoKey_destroyDuration(t *testing.T) { Config: testGoogleKmsCryptoKey_destroyDuration(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName), }, { - ResourceName: "google_kms_crypto_key.crypto_key", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_kms_crypto_key.crypto_key", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, // Use a separate TestStep rather than a CheckDestroy because we need the project to still exist. { @@ -332,7 +335,7 @@ func TestAccKmsCryptoKey_importOnly(t *testing.T) { ResourceName: "google_kms_crypto_key.crypto_key", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"skip_initial_version_creation"}, + ImportStateVerifyIgnore: []string{"skip_initial_version_creation", "labels", "terraform_labels"}, }, // Use a separate TestStep rather than a CheckDestroy because we need the project to still exist. { @@ -426,9 +429,10 @@ func TestAccKmsCryptoKeyVersion_basic(t *testing.T) { Config: testGoogleKmsCryptoKeyVersion_basic(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName), }, { - ResourceName: "google_kms_crypto_key_version.crypto_key_version", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_kms_crypto_key_version.crypto_key_version", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testGoogleKmsCryptoKeyVersion_removed(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName), @@ -454,9 +458,10 @@ func TestAccKmsCryptoKeyVersion_skipInitialVersion(t *testing.T) { Config: testGoogleKmsCryptoKeyVersion_skipInitialVersion(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName), }, { - ResourceName: "google_kms_crypto_key_version.crypto_key_version", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_kms_crypto_key_version.crypto_key_version", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) @@ -480,17 +485,19 @@ func TestAccKmsCryptoKeyVersion_patch(t *testing.T) { Config: testGoogleKmsCryptoKeyVersion_patchInitialize(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName), }, { - ResourceName: "google_kms_crypto_key_version.crypto_key_version", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_kms_crypto_key_version.crypto_key_version", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testGoogleKmsCryptoKeyVersion_patch("true", projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName, state), }, { - ResourceName: "google_kms_crypto_key_version.crypto_key_version", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_kms_crypto_key_version.crypto_key_version", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testGoogleKmsCryptoKeyVersion_patch("false", projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName, state), diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_authorization_policy_test.go.erb b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_authorization_policy_test.go.erb index b4993f5084d8..2d1c4af67055 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_authorization_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_authorization_policy_test.go.erb @@ -27,6 +27,7 @@ func TestAccNetworkSecurityAuthorizationPolicy_update(t *testing.T) { ResourceName: "google_network_security_authorization_policy.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkSecurityAuthorizationPolicy_update(authorizationPolicyName), @@ -35,6 +36,7 @@ func TestAccNetworkSecurityAuthorizationPolicy_update(t *testing.T) { ResourceName: "google_network_security_authorization_policy.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.erb b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.erb index 67de18513d1d..d91d8e030965 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.erb @@ -21,12 +21,13 @@ func TestAccNetworkSecurityClientTlsPolicy_update(t *testing.T) { CheckDestroy: testAccCheckNetworkSecurityClientTlsPolicyDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccNetworkSecurityClientTlsPolicy_basic(clientTlsPolicyName), + Config: testAccNetworkSecurityClientTlsPolicy_basic(clientTlsPolicyName), }, { ResourceName: "google_network_security_client_tls_policy.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkSecurityClientTlsPolicy_update(clientTlsPolicyName), @@ -35,6 +36,7 @@ func TestAccNetworkSecurityClientTlsPolicy_update(t *testing.T) { ResourceName: "google_network_security_client_tls_policy.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_server_tls_policy_test.go.erb b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_server_tls_policy_test.go.erb index 00f7755bf324..f1000f4665de 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_server_tls_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_server_tls_policy_test.go.erb @@ -27,6 +27,7 @@ func TestAccNetworkSecurityServerTlsPolicy_update(t *testing.T) { ResourceName: "google_network_security_server_tls_policy.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkSecurityServerTlsPolicy_update(serverTlsPolicyName), @@ -35,6 +36,7 @@ func TestAccNetworkSecurityServerTlsPolicy_update(t *testing.T) { ResourceName: "google_network_security_server_tls_policy.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_keyset_test.go b/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_keyset_test.go index f12e0cec4b04..56b1cd8bfcd3 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_keyset_test.go +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_keyset_test.go @@ -26,7 +26,7 @@ func TestAccNetworkServicesEdgeCacheKeyset_update(t *testing.T) { ResourceName: "google_network_services_edge_cache_keyset.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name"}, + ImportStateVerifyIgnore: []string{"name", "labels", "terraform_labels"}, }, { Config: testAccNetworkServicesEdgeCacheKeyset_update(context), @@ -35,7 +35,7 @@ func TestAccNetworkServicesEdgeCacheKeyset_update(t *testing.T) { ResourceName: "google_network_services_edge_cache_keyset.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name"}, + ImportStateVerifyIgnore: []string{"name", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_origin_test.go b/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_origin_test.go index 9e68d59853d6..6ad86ecb883f 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_origin_test.go +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_edge_cache_origin_test.go @@ -23,7 +23,7 @@ func TestAccNetworkServicesEdgeCacheOrigin_updateAndImport(t *testing.T) { ResourceName: "google_network_services_edge_cache_origin.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name"}, + ImportStateVerifyIgnore: []string{"name", "labels", "terraform_labels"}, }, { Config: testAccNetworkServicesEdgeCacheOrigin_update_1(name), @@ -32,7 +32,7 @@ func TestAccNetworkServicesEdgeCacheOrigin_updateAndImport(t *testing.T) { ResourceName: "google_network_services_edge_cache_origin.instance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name"}, + ImportStateVerifyIgnore: []string{"name", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_endpoint_policy_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_endpoint_policy_test.go.erb index 5ca9e8290821..3369b28dc114 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_endpoint_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_endpoint_policy_test.go.erb @@ -27,6 +27,7 @@ func TestAccNetworkServicesEndpointPolicy_update(t *testing.T) { ResourceName: "google_network_services_endpoint_policy.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkServicesEndpointPolicy_update(endpointPolicyName), @@ -35,6 +36,7 @@ func TestAccNetworkServicesEndpointPolicy_update(t *testing.T) { ResourceName: "google_network_services_endpoint_policy.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_gateway_test.go b/mmv1/third_party/terraform/services/networkservices/resource_network_services_gateway_test.go index 9aae107edfc1..d572021996d1 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_gateway_test.go +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_gateway_test.go @@ -23,17 +23,19 @@ func TestAccNetworkServicesGateway_update(t *testing.T) { Config: testAccNetworkServicesGateway_basic(gatewayName), }, { - ResourceName: "google_network_services_gateway.foobar", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_network_services_gateway.foobar", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkServicesGateway_update(gatewayName), }, { - ResourceName: "google_network_services_gateway.foobar", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_network_services_gateway.foobar", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_grpc_route_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_grpc_route_test.go.erb index 3220d937b433..e2a10dd024e7 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_grpc_route_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_grpc_route_test.go.erb @@ -27,6 +27,7 @@ func TestAccNetworkServicesGrpcRoute_update(t *testing.T) { ResourceName: "google_network_services_grpc_route.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkServicesGrpcRoute_update(grpcRouteName), @@ -35,6 +36,7 @@ func TestAccNetworkServicesGrpcRoute_update(t *testing.T) { ResourceName: "google_network_services_grpc_route.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_http_route_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_http_route_test.go.erb index f94075ec67ee..2f0c54530c64 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_http_route_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_http_route_test.go.erb @@ -27,6 +27,7 @@ func TestAccNetworkServicesHttpRoute_update(t *testing.T) { ResourceName: "google_network_services_http_route.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkServicesHttpRoute_update(httpRouteName), @@ -35,6 +36,7 @@ func TestAccNetworkServicesHttpRoute_update(t *testing.T) { ResourceName: "google_network_services_http_route.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_mesh_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_mesh_test.go.erb index 240f5b94887e..87451e4ee1a0 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_mesh_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_mesh_test.go.erb @@ -27,6 +27,7 @@ func TestAccNetworkServicesMesh_update(t *testing.T) { ResourceName: "google_network_services_mesh.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkServicesMesh_update(meshName), @@ -35,6 +36,7 @@ func TestAccNetworkServicesMesh_update(t *testing.T) { ResourceName: "google_network_services_mesh.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/networkservices/resource_network_services_tcp_route_test.go.erb b/mmv1/third_party/terraform/services/networkservices/resource_network_services_tcp_route_test.go.erb index 0b7aa52cfc9e..27f545faed8a 100644 --- a/mmv1/third_party/terraform/services/networkservices/resource_network_services_tcp_route_test.go.erb +++ b/mmv1/third_party/terraform/services/networkservices/resource_network_services_tcp_route_test.go.erb @@ -23,12 +23,13 @@ func TestAccNetworkServicesTcpRoute_update(t *testing.T) { CheckDestroy: testAccCheckNetworkServicesTcpRouteDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccNetworkServicesTcpRoute_basic(tcpServiceName, tcpHealthCheckName, tcpRouteName), + Config: testAccNetworkServicesTcpRoute_basic(tcpServiceName, tcpHealthCheckName, tcpRouteName), }, { ResourceName: "google_network_services_tcp_route.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccNetworkServicesTcpRoute_update(tcpServiceName, tcpHealthCheckName, tcpRouteName), @@ -37,6 +38,7 @@ func TestAccNetworkServicesTcpRoute_update(t *testing.T) { ResourceName: "google_network_services_tcp_route.foobar", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/tgc/tests/data/example_compute_disk.tfplan.json b/mmv1/third_party/tgc/tests/data/example_compute_disk.tfplan.json index ebc95b4dca87..e80e5b6ee646 100644 --- a/mmv1/third_party/tgc/tests/data/example_compute_disk.tfplan.json +++ b/mmv1/third_party/tgc/tests/data/example_compute_disk.tfplan.json @@ -15,6 +15,9 @@ "description": null, "disk_encryption_key": [], "disk_encryption_key_raw": null, + "effective_labels": { + "environment": "dev" + }, "image": "projects/debian-cloud/global/images/debian-8-jessie-v20170523", "labels": { "environment": "dev" @@ -24,6 +27,9 @@ "snapshot": null, "source_image_encryption_key": [], "source_snapshot_encryption_key": [], + "terraform_labels": { + "environment": "dev" + }, "timeouts": null, "type": "pd-ssd", "zone": "us-central1-a" @@ -48,6 +54,9 @@ "description": null, "disk_encryption_key": [], "disk_encryption_key_raw": null, + "effective_labels": { + "environment": "dev" + }, "image": "projects/debian-cloud/global/images/debian-8-jessie-v20170523", "labels": { "environment": "dev" @@ -57,6 +66,9 @@ "snapshot": null, "source_image_encryption_key": [], "source_snapshot_encryption_key": [], + "terraform_labels": { + "environment": "dev" + }, "timeouts": null, "type": "pd-ssd", "zone": "us-central1-a" @@ -65,6 +77,7 @@ "creation_timestamp": true, "disk_encryption_key": [], "disk_encryption_key_sha256": true, + "effective_labels": {}, "id": true, "label_fingerprint": true, "labels": {}, @@ -77,6 +90,7 @@ "source_image_id": true, "source_snapshot_encryption_key": [], "source_snapshot_id": true, + "terraform_labels": {}, "users": true } } diff --git a/mmv1/third_party/tgc/tests/data/example_compute_disk_empty_image.tfplan.json b/mmv1/third_party/tgc/tests/data/example_compute_disk_empty_image.tfplan.json index e44bdfa8c85c..bd8ebb490d6f 100644 --- a/mmv1/third_party/tgc/tests/data/example_compute_disk_empty_image.tfplan.json +++ b/mmv1/third_party/tgc/tests/data/example_compute_disk_empty_image.tfplan.json @@ -15,6 +15,9 @@ "description": null, "disk_encryption_key": [], "disk_encryption_key_raw": null, + "effective_labels": { + "environment": "dev" + }, "image": "", "labels": { "environment": "dev" @@ -24,6 +27,9 @@ "snapshot": null, "source_image_encryption_key": [], "source_snapshot_encryption_key": [], + "terraform_labels": { + "environment": "dev" + }, "timeouts": null, "type": "pd-ssd", "zone": "us-central1-a" @@ -48,6 +54,9 @@ "description": null, "disk_encryption_key": [], "disk_encryption_key_raw": null, + "effective_labels": { + "environment": "dev" + }, "image": "", "labels": { "environment": "dev" @@ -57,6 +66,9 @@ "snapshot": null, "source_image_encryption_key": [], "source_snapshot_encryption_key": [], + "terraform_labels": { + "environment": "dev" + }, "timeouts": null, "type": "pd-ssd", "zone": "us-central1-a" @@ -65,6 +77,7 @@ "creation_timestamp": true, "disk_encryption_key": [], "disk_encryption_key_sha256": true, + "effective_labels": {}, "id": true, "label_fingerprint": true, "labels": {}, @@ -77,6 +90,7 @@ "source_image_id": true, "source_snapshot_encryption_key": [], "source_snapshot_id": true, + "terraform_labels": {}, "users": true } } diff --git a/mmv1/third_party/tgc/tests/data/example_compute_snapshot.tfplan.json b/mmv1/third_party/tgc/tests/data/example_compute_snapshot.tfplan.json index 18c079b12317..4f1e403b2434 100644 --- a/mmv1/third_party/tgc/tests/data/example_compute_snapshot.tfplan.json +++ b/mmv1/third_party/tgc/tests/data/example_compute_snapshot.tfplan.json @@ -14,6 +14,7 @@ "values": { "description": null, "disk_encryption_key": [], + "effective_labels": null, "image": "projects/debian-cloud/global/images/debian-8-jessie-v20170523", "labels": null, "name": "debian-disk", @@ -22,6 +23,7 @@ "snapshot": null, "source_image_encryption_key": [], "source_snapshot_encryption_key": [], + "terraform_labels": null, "timeouts": null, "type": "pd-ssd", "zone": "us-central1-a" @@ -42,6 +44,9 @@ "schema_version": 0, "values": { "description": null, + "effective_labels": { + "test-name": "test-value" + }, "labels": { "test-name": "test-value" }, @@ -52,17 +57,22 @@ "storage_locations": [ "us-central1" ], + "terraform_labels": { + "test-name": "test-value" + }, "timeouts": null, "zone": "us-central1-a" }, "sensitive_values": { + "effective_labels": {}, "labels": {}, "licenses": [], "snapshot_encryption_key": [], "source_disk_encryption_key": [], "storage_locations": [ false - ] + ], + "terraform_labels": {} } } ] @@ -83,6 +93,7 @@ "after": { "description": null, "disk_encryption_key": [], + "effective_labels": null, "image": "projects/debian-cloud/global/images/debian-8-jessie-v20170523", "labels": null, "name": "debian-disk", @@ -91,6 +102,7 @@ "snapshot": null, "source_image_encryption_key": [], "source_snapshot_encryption_key": [], + "terraform_labels": null, "timeouts": null, "type": "pd-ssd", "zone": "us-central1-a" @@ -133,6 +145,9 @@ "before": null, "after": { "description": null, + "effective_labels": { + "test-name": "test-value" + }, "labels": { "test-name": "test-value" }, @@ -143,12 +158,16 @@ "storage_locations": [ "us-central1" ], + "terraform_labels": { + "test-name": "test-value" + }, "timeouts": null, "zone": "us-central1-a" }, "after_unknown": { "creation_timestamp": true, "disk_size_gb": true, + "effective_labels": {}, "id": true, "label_fingerprint": true, "labels": {}, @@ -161,17 +180,20 @@ "storage_bytes": true, "storage_locations": [ false - ] + ], + "terraform_labels": {} }, "before_sensitive": false, "after_sensitive": { + "effective_labels": {}, "labels": {}, "licenses": [], "snapshot_encryption_key": [], "source_disk_encryption_key": [], "storage_locations": [ false - ] + ], + "terraform_labels": {} } } } From ced30ad36259ae14a812bb348b69f309cce9a947 Mon Sep 17 00:00:00 2001 From: Zhenhua Li Date: Sun, 17 Sep 2023 15:06:43 -0700 Subject: [PATCH 2/3] Apply new labels model to more resources (part 3) --- mmv1/products/privateca/Certificate.yaml | 2 +- mmv1/products/pubsub/Subscription.yaml | 2 +- mmv1/products/pubsub/Topic.yaml | 2 +- mmv1/products/redis/Instance.yaml | 2 +- mmv1/products/servicedirectory/Namespace.yaml | 2 +- mmv1/products/spanner/Instance.yaml | 2 +- mmv1/products/storage/Bucket.yaml | 2 +- mmv1/products/tpu/Node.yaml | 2 +- mmv1/products/vertexai/Dataset.yaml | 3 +- mmv1/products/vertexai/Featurestore.yaml | 2 +- .../vertexai/FeaturestoreEntitytype.yaml | 2 +- .../FeaturestoreEntitytypeFeature.yaml | 2 +- mmv1/products/vertexai/Index.yaml | 2 +- mmv1/products/vertexai/IndexEndpoint.yaml | 2 +- mmv1/products/vertexai/Tensorboard.yaml | 2 +- mmv1/products/workflows/Workflow.yaml | 2 +- mmv1/products/workstations/Workstation.yaml | 2 +- .../workstations/WorkstationConfig.yaml | 2 +- .../examples/vertex_ai_dataset.tf.erb | 4 +++ .../terraform/examples/workflow_basic.tf.erb | 3 ++ .../examples/workstation_config_basic.tf.erb | 4 +++ .../resource_privateca_certificate_test.go | 2 +- .../resource_pubsub_subscription_test.go | 27 +++++++++------- .../pubsub/resource_pubsub_topic_test.go | 18 ++++++----- .../redis/resource_redis_instance_test.go | 14 ++++---- ...ce_service_directory_namespace_test.go.erb | 1 + .../spanner/resource_spanner_instance_test.go | 14 ++++---- .../data_source_vertex_ai_index_test.go | 2 ++ .../resource_vertex_ai_endpoint_test.go | 4 +-- .../vertexai/resource_vertex_ai_index_test.go | 4 +-- .../resource_vertex_ai_tensorboard_test.go | 12 +++---- ...orkstations_workstation_config_test.go.erb | 14 ++++---- ...ource_workstations_workstation_test.go.erb | 4 +-- .../example_pubsub_subscription.tfplan.json | 32 +++++++++++++++++-- ...ubsub_subscription_iam_binding.tfplan.json | 20 ++++++++++-- ...pubsub_subscription_iam_member.tfplan.json | 20 ++++++++++-- ...pubsub_subscription_iam_policy.tfplan.json | 20 ++++++++++-- .../data/example_pubsub_topic.tfplan.json | 16 +++++++++- .../data/full_spanner_instance.tfplan.json | 24 +++++++++++++- 39 files changed, 215 insertions(+), 81 deletions(-) diff --git a/mmv1/products/privateca/Certificate.yaml b/mmv1/products/privateca/Certificate.yaml index 67f04352cd18..aed9215977fb 100644 --- a/mmv1/products/privateca/Certificate.yaml +++ b/mmv1/products/privateca/Certificate.yaml @@ -638,7 +638,7 @@ properties: omitted, no template will be used. This template must be in the same location as the Certificate. diff_suppress_func: 'tpgresource.CompareResourceNames' - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Labels with user-defined metadata to apply to this resource. diff --git a/mmv1/products/pubsub/Subscription.yaml b/mmv1/products/pubsub/Subscription.yaml index 2f40689d689c..1def915ef94c 100644 --- a/mmv1/products/pubsub/Subscription.yaml +++ b/mmv1/products/pubsub/Subscription.yaml @@ -107,7 +107,7 @@ properties: pattern: 'projects/{{project}}/topics/{{topic}}' diff_suppress_func: 'tpgresource.CompareSelfLinkOrResourceName' custom_expand: templates/terraform/custom_expand/computed_subscription_topic.erb - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | A set of key/value label pairs to assign to this Subscription. diff --git a/mmv1/products/pubsub/Topic.yaml b/mmv1/products/pubsub/Topic.yaml index 6bb9290a058f..16f25f459596 100644 --- a/mmv1/products/pubsub/Topic.yaml +++ b/mmv1/products/pubsub/Topic.yaml @@ -93,7 +93,7 @@ properties: (`service-{{PROJECT_NUMBER}}@gcp-sa-pubsub.iam.gserviceaccount.com`) must have `roles/cloudkms.cryptoKeyEncrypterDecrypter` to use this feature. The expected format is `projects/*/locations/*/keyRings/*/cryptoKeys/*` - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | A set of key/value label pairs to assign to this Topic. diff --git a/mmv1/products/redis/Instance.yaml b/mmv1/products/redis/Instance.yaml index e49c6e3ee36c..3aa6a3a8d434 100644 --- a/mmv1/products/redis/Instance.yaml +++ b/mmv1/products/redis/Instance.yaml @@ -156,7 +156,7 @@ properties: Hostname or IP address of the exposed Redis endpoint used by clients to connect to the service. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: Resource labels to represent user provided metadata. - !ruby/object:Api::Type::KeyValuePairs diff --git a/mmv1/products/servicedirectory/Namespace.yaml b/mmv1/products/servicedirectory/Namespace.yaml index 8224784f9dd1..8d76947730ef 100644 --- a/mmv1/products/servicedirectory/Namespace.yaml +++ b/mmv1/products/servicedirectory/Namespace.yaml @@ -72,7 +72,7 @@ properties: The resource name for the namespace in the format `projects/*/locations/*/namespaces/*`. output: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Resource labels associated with this Namespace. No more than 64 user diff --git a/mmv1/products/spanner/Instance.yaml b/mmv1/products/spanner/Instance.yaml index bbc63c307ff6..6903c10a4416 100644 --- a/mmv1/products/spanner/Instance.yaml +++ b/mmv1/products/spanner/Instance.yaml @@ -143,7 +143,7 @@ properties: - num_nodes - processing_units default_from_api: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | An object containing a list of "key": value pairs. diff --git a/mmv1/products/storage/Bucket.yaml b/mmv1/products/storage/Bucket.yaml index bbf776e2f8df..979c5716bd58 100644 --- a/mmv1/products/storage/Bucket.yaml +++ b/mmv1/products/storage/Bucket.yaml @@ -464,7 +464,7 @@ properties: object is missing, if applicable, the service will return the named object from this bucket as the content for a 404 Not Found result. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | Labels applied to this bucket. A list of key->value pairs. diff --git a/mmv1/products/tpu/Node.yaml b/mmv1/products/tpu/Node.yaml index e3d1ac84fdc5..c1d08907589e 100644 --- a/mmv1/products/tpu/Node.yaml +++ b/mmv1/products/tpu/Node.yaml @@ -153,7 +153,7 @@ properties: output: true description: | The port of this network endpoint. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' immutable: true description: Resource labels to represent user provided metadata. diff --git a/mmv1/products/vertexai/Dataset.yaml b/mmv1/products/vertexai/Dataset.yaml index 6f27a6d908e7..71f4bfad9ad3 100644 --- a/mmv1/products/vertexai/Dataset.yaml +++ b/mmv1/products/vertexai/Dataset.yaml @@ -81,11 +81,10 @@ properties: output: true description: | The timestamp of when the dataset was last updated in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | A set of key/value label pairs to assign to this Workflow. - default_from_api: true - !ruby/object:Api::Type::NestedObject name: 'encryptionSpec' immutable: true diff --git a/mmv1/products/vertexai/Featurestore.yaml b/mmv1/products/vertexai/Featurestore.yaml index d8ce854c04d3..40bb998ec75f 100644 --- a/mmv1/products/vertexai/Featurestore.yaml +++ b/mmv1/products/vertexai/Featurestore.yaml @@ -145,7 +145,7 @@ properties: output: true description: | The timestamp of when the featurestore was last updated in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | A set of key/value label pairs to assign to this Featurestore. diff --git a/mmv1/products/vertexai/FeaturestoreEntitytype.yaml b/mmv1/products/vertexai/FeaturestoreEntitytype.yaml index c7f097d95a1b..53fefc21ecfa 100644 --- a/mmv1/products/vertexai/FeaturestoreEntitytype.yaml +++ b/mmv1/products/vertexai/FeaturestoreEntitytype.yaml @@ -132,7 +132,7 @@ properties: output: true description: | The timestamp of when the featurestore was last updated in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | A set of key/value label pairs to assign to this EntityType. diff --git a/mmv1/products/vertexai/FeaturestoreEntitytypeFeature.yaml b/mmv1/products/vertexai/FeaturestoreEntitytypeFeature.yaml index 4152ab0e6327..b2379118329e 100644 --- a/mmv1/products/vertexai/FeaturestoreEntitytypeFeature.yaml +++ b/mmv1/products/vertexai/FeaturestoreEntitytypeFeature.yaml @@ -105,7 +105,7 @@ properties: output: true description: | The timestamp when the entity type was most recently updated in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | A set of key/value label pairs to assign to the feature. diff --git a/mmv1/products/vertexai/Index.yaml b/mmv1/products/vertexai/Index.yaml index 938893755581..b74896689f08 100644 --- a/mmv1/products/vertexai/Index.yaml +++ b/mmv1/products/vertexai/Index.yaml @@ -222,7 +222,7 @@ properties: description: Used to perform consistent read-modify-write updates. output: true ignore_read: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: The labels with user-defined metadata to organize your Indexes. - !ruby/object:Api::Type::String diff --git a/mmv1/products/vertexai/IndexEndpoint.yaml b/mmv1/products/vertexai/IndexEndpoint.yaml index 465147a362ed..ff10d04347eb 100644 --- a/mmv1/products/vertexai/IndexEndpoint.yaml +++ b/mmv1/products/vertexai/IndexEndpoint.yaml @@ -83,7 +83,7 @@ properties: description: Used to perform consistent read-modify-write updates. output: true ignore_read: true - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: The labels with user-defined metadata to organize your Indexes. - !ruby/object:Api::Type::String diff --git a/mmv1/products/vertexai/Tensorboard.yaml b/mmv1/products/vertexai/Tensorboard.yaml index 99c2895a1e1c..3d341ba2328e 100644 --- a/mmv1/products/vertexai/Tensorboard.yaml +++ b/mmv1/products/vertexai/Tensorboard.yaml @@ -113,7 +113,7 @@ properties: output: true description: | The timestamp of when the Tensorboard was last updated in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | The labels with user-defined metadata to organize your Tensorboards. diff --git a/mmv1/products/workflows/Workflow.yaml b/mmv1/products/workflows/Workflow.yaml index 80d80a05e276..3c7a4baad876 100644 --- a/mmv1/products/workflows/Workflow.yaml +++ b/mmv1/products/workflows/Workflow.yaml @@ -77,7 +77,7 @@ properties: name: 'state' output: true description: State of the workflow deployment. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: | A set of key/value label pairs to assign to this Workflow. diff --git a/mmv1/products/workstations/Workstation.yaml b/mmv1/products/workstations/Workstation.yaml index 8edfa75b85e7..9bac34f941aa 100644 --- a/mmv1/products/workstations/Workstation.yaml +++ b/mmv1/products/workstations/Workstation.yaml @@ -117,7 +117,7 @@ properties: name: 'displayName' description: | Human-readable name for this resource. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: 'Client-specified labels that are applied to the resource and that are diff --git a/mmv1/products/workstations/WorkstationConfig.yaml b/mmv1/products/workstations/WorkstationConfig.yaml index aafeee3a5d9a..91ab07d5b811 100644 --- a/mmv1/products/workstations/WorkstationConfig.yaml +++ b/mmv1/products/workstations/WorkstationConfig.yaml @@ -153,7 +153,7 @@ properties: name: 'displayName' description: | Human-readable name for this resource. - - !ruby/object:Api::Type::KeyValuePairs + - !ruby/object:Api::Type::KeyValueLabels name: 'labels' description: 'Client-specified labels that are applied to the resource and that are diff --git a/mmv1/templates/terraform/examples/vertex_ai_dataset.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_dataset.tf.erb index e5a5828cf0a2..17b7440b4288 100644 --- a/mmv1/templates/terraform/examples/vertex_ai_dataset.tf.erb +++ b/mmv1/templates/terraform/examples/vertex_ai_dataset.tf.erb @@ -2,4 +2,8 @@ resource "google_vertex_ai_dataset" "dataset" { display_name = "<%= ctx[:vars]['display_name'] %>" metadata_schema_uri = "gs://google-cloud-aiplatform/schema/dataset/metadata/image_1.0.0.yaml" region = "us-central1" + + labels = { + env = "test" + } } diff --git a/mmv1/templates/terraform/examples/workflow_basic.tf.erb b/mmv1/templates/terraform/examples/workflow_basic.tf.erb index 3369b4985048..1ec0cc3b67ca 100644 --- a/mmv1/templates/terraform/examples/workflow_basic.tf.erb +++ b/mmv1/templates/terraform/examples/workflow_basic.tf.erb @@ -8,6 +8,9 @@ resource "google_workflows_workflow" "<%= ctx[:primary_resource_id] %>" { region = "us-central1" description = "Magic" service_account = google_service_account.test_account.id + labels = { + env = "test" + } source_contents = <<-EOF # This is a sample workflow. You can replace it with your source code. # diff --git a/mmv1/templates/terraform/examples/workstation_config_basic.tf.erb b/mmv1/templates/terraform/examples/workstation_config_basic.tf.erb index 987413cb6199..60e2dc5ce0d9 100644 --- a/mmv1/templates/terraform/examples/workstation_config_basic.tf.erb +++ b/mmv1/templates/terraform/examples/workstation_config_basic.tf.erb @@ -41,6 +41,10 @@ resource "google_workstations_workstation_config" "<%= ctx[:primary_resource_id] label-one = "value-one" } + labels = { + "label" = "key" + } + host { gce_instance { machine_type = "e2-standard-4" diff --git a/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_test.go b/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_test.go index 0e955d5ed745..e6c0c5f76c36 100644 --- a/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_test.go +++ b/mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_test.go @@ -36,7 +36,7 @@ func TestAccPrivatecaCertificate_privatecaCertificateUpdate(t *testing.T) { ResourceName: "google_privateca_certificate.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"pool", "name", "location", "certificate_authority"}, + ImportStateVerifyIgnore: []string{"pool", "name", "location", "certificate_authority", "labels", "terraform_labels"}, }, { Config: testAccPrivatecaCertificate_privatecaCertificateStart(context), diff --git a/mmv1/third_party/terraform/services/pubsub/resource_pubsub_subscription_test.go b/mmv1/third_party/terraform/services/pubsub/resource_pubsub_subscription_test.go index 5ac29b2b44b3..19f15a66fd45 100644 --- a/mmv1/third_party/terraform/services/pubsub/resource_pubsub_subscription_test.go +++ b/mmv1/third_party/terraform/services/pubsub/resource_pubsub_subscription_test.go @@ -51,10 +51,11 @@ func TestAccPubsubSubscription_basic(t *testing.T) { Config: testAccPubsubSubscription_basic(topic, subscription, "bar", 20, false), }, { - ResourceName: "google_pubsub_subscription.foo", - ImportStateId: subscription, - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_pubsub_subscription.foo", + ImportStateId: subscription, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) @@ -75,19 +76,21 @@ func TestAccPubsubSubscription_update(t *testing.T) { Config: testAccPubsubSubscription_basic(topic, subscriptionShort, "bar", 20, false), }, { - ResourceName: "google_pubsub_subscription.foo", - ImportStateId: subscriptionShort, - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_pubsub_subscription.foo", + ImportStateId: subscriptionShort, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccPubsubSubscription_basic(topic, subscriptionShort, "baz", 30, true), }, { - ResourceName: "google_pubsub_subscription.foo", - ImportStateId: subscriptionShort, - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_pubsub_subscription.foo", + ImportStateId: subscriptionShort, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/pubsub/resource_pubsub_topic_test.go b/mmv1/third_party/terraform/services/pubsub/resource_pubsub_topic_test.go index 059eee101f5f..41d8e7a58182 100644 --- a/mmv1/third_party/terraform/services/pubsub/resource_pubsub_topic_test.go +++ b/mmv1/third_party/terraform/services/pubsub/resource_pubsub_topic_test.go @@ -22,19 +22,21 @@ func TestAccPubsubTopic_update(t *testing.T) { Config: testAccPubsubTopic_update(topic, "foo", "bar"), }, { - ResourceName: "google_pubsub_topic.foo", - ImportStateId: topic, - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_pubsub_topic.foo", + ImportStateId: topic, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccPubsubTopic_updateWithRegion(topic, "wibble", "wobble", "us-central1"), }, { - ResourceName: "google_pubsub_topic.foo", - ImportStateId: topic, - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_pubsub_topic.foo", + ImportStateId: topic, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/redis/resource_redis_instance_test.go b/mmv1/third_party/terraform/services/redis/resource_redis_instance_test.go index f5f4e9fe8821..dd5579c54cf2 100644 --- a/mmv1/third_party/terraform/services/redis/resource_redis_instance_test.go +++ b/mmv1/third_party/terraform/services/redis/resource_redis_instance_test.go @@ -23,17 +23,19 @@ func TestAccRedisInstance_update(t *testing.T) { Config: testAccRedisInstance_update(name, true), }, { - ResourceName: "google_redis_instance.test", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_redis_instance.test", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccRedisInstance_update2(name, true), }, { - ResourceName: "google_redis_instance.test", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_redis_instance.test", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccRedisInstance_update2(name, false), diff --git a/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_namespace_test.go.erb b/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_namespace_test.go.erb index d056b18d33e7..5bf8e8868df9 100644 --- a/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_namespace_test.go.erb +++ b/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_namespace_test.go.erb @@ -53,6 +53,7 @@ func TestAccServiceDirectoryNamespace_serviceDirectoryNamespaceUpdateExample(t * ResourceName: "google_service_directory_namespace.example", ImportState: true, ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_test.go b/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_test.go index 53a531ed99e4..9d753eaf7e79 100644 --- a/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_test.go +++ b/mmv1/third_party/terraform/services/spanner/resource_spanner_instance_test.go @@ -95,17 +95,19 @@ func TestAccSpannerInstance_update(t *testing.T) { Config: testAccSpannerInstance_update(dName1, 1, false), }, { - ResourceName: "google_spanner_instance.updater", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_spanner_instance.updater", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccSpannerInstance_update(dName2, 2, true), }, { - ResourceName: "google_spanner_instance.updater", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_spanner_instance.updater", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go b/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go index a1e4b56bfd6e..c7077f761e02 100644 --- a/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go +++ b/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go @@ -31,6 +31,8 @@ func TestAccDataSourceVertexAIIndex_basic(t *testing.T) { map[string]struct{}{ "metadata.0.contents_delta_uri": {}, "metadata.0.is_complete_overwrite": {}, + "labels.%": {}, + "terraform_labels.%": {} }, ), ), diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_endpoint_test.go b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_endpoint_test.go index 2cde7c0a6862..e781551aa541 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_endpoint_test.go +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_endpoint_test.go @@ -34,7 +34,7 @@ func TestAccVertexAIEndpoint_vertexAiEndpointNetwork(t *testing.T) { ResourceName: "google_vertex_ai_endpoint.endpoint", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag", "location", "region"}, + ImportStateVerifyIgnore: []string{"etag", "location", "region", "labels", "terraform_labels"}, }, { Config: testAccVertexAIEndpoint_vertexAiEndpointNetworkUpdate(context), @@ -43,7 +43,7 @@ func TestAccVertexAIEndpoint_vertexAiEndpointNetwork(t *testing.T) { ResourceName: "google_vertex_ai_endpoint.endpoint", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag", "location", "region"}, + ImportStateVerifyIgnore: []string{"etag", "location", "region", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_test.go b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_test.go index 09964869d97a..bd8f8d7e005c 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_test.go +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_index_test.go @@ -34,7 +34,7 @@ func TestAccVertexAIIndex_updated(t *testing.T) { ResourceName: "google_vertex_ai_index.index", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag", "region", "metadata.0.contents_delta_uri", "metadata.0.is_complete_overwrite"}, + ImportStateVerifyIgnore: []string{"etag", "region", "metadata.0.contents_delta_uri", "metadata.0.is_complete_overwrite", "labels", "terraform_labels"}, }, { Config: testAccVertexAIIndex_updated(context), @@ -43,7 +43,7 @@ func TestAccVertexAIIndex_updated(t *testing.T) { ResourceName: "google_vertex_ai_index.index", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag", "region", "metadata.0.contents_delta_uri", "metadata.0.is_complete_overwrite"}, + ImportStateVerifyIgnore: []string{"etag", "region", "metadata.0.contents_delta_uri", "metadata.0.is_complete_overwrite", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_tensorboard_test.go b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_tensorboard_test.go index d620fdfdeee7..a684ba95b623 100644 --- a/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_tensorboard_test.go +++ b/mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_tensorboard_test.go @@ -25,7 +25,7 @@ func TestAccVertexAITensorboard_Update(t *testing.T) { ResourceName: "google_vertex_ai_tensorboard.tensorboard", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"region", "project"}, + ImportStateVerifyIgnore: []string{"region", "project", "labels", "terraform_labels"}, }, { Config: testAccVertexAITensorboard_Update(random_suffix+"new", random_suffix, random_suffix, random_suffix), @@ -34,7 +34,7 @@ func TestAccVertexAITensorboard_Update(t *testing.T) { ResourceName: "google_vertex_ai_tensorboard.tensorboard", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"region", "project"}, + ImportStateVerifyIgnore: []string{"region", "project", "labels", "terraform_labels"}, }, { Config: testAccVertexAITensorboard_Update(random_suffix+"new", random_suffix+"new", random_suffix, random_suffix), @@ -43,7 +43,7 @@ func TestAccVertexAITensorboard_Update(t *testing.T) { ResourceName: "google_vertex_ai_tensorboard.tensorboard", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"region", "project"}, + ImportStateVerifyIgnore: []string{"region", "project", "labels", "terraform_labels"}, }, { Config: testAccVertexAITensorboard_Update(random_suffix+"new", random_suffix+"new", random_suffix+"new", random_suffix), @@ -52,7 +52,7 @@ func TestAccVertexAITensorboard_Update(t *testing.T) { ResourceName: "google_vertex_ai_tensorboard.tensorboard", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"region", "project"}, + ImportStateVerifyIgnore: []string{"region", "project", "labels", "terraform_labels"}, }, { Config: testAccVertexAITensorboard_Update(random_suffix+"new", random_suffix+"new", random_suffix+"new", random_suffix+"new"), @@ -61,7 +61,7 @@ func TestAccVertexAITensorboard_Update(t *testing.T) { ResourceName: "google_vertex_ai_tensorboard.tensorboard", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"region", "project"}, + ImportStateVerifyIgnore: []string{"region", "project", "labels", "terraform_labels"}, }, { Config: testAccVertexAITensorboard_Update(random_suffix, random_suffix, random_suffix, random_suffix), @@ -70,7 +70,7 @@ func TestAccVertexAITensorboard_Update(t *testing.T) { ResourceName: "google_vertex_ai_tensorboard.tensorboard", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"region", "project"}, + ImportStateVerifyIgnore: []string{"region", "project", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_config_test.go.erb b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_config_test.go.erb index 4a4984fae0d1..fa858b9ba2ad 100644 --- a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_config_test.go.erb +++ b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_config_test.go.erb @@ -28,7 +28,7 @@ func TestAccWorkstationsWorkstationConfig_basic(t *testing.T) { ResourceName: "google_workstations_workstation_cluster.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag"}, + ImportStateVerifyIgnore: []string{"etag", "labels", "terraform_labels"}, }, }, }) @@ -95,7 +95,7 @@ func TestAccWorkstationsWorkstationConfig_displayName(t *testing.T) { ResourceName: "google_workstations_workstation_cluster.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag"}, + ImportStateVerifyIgnore: []string{"etag", "labels", "terraform_labels"}, }, { Config: testAccWorkstationsWorkstationConfig_displayName(context, "2"), @@ -104,7 +104,7 @@ func TestAccWorkstationsWorkstationConfig_displayName(t *testing.T) { ResourceName: "google_workstations_workstation_cluster.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag"}, + ImportStateVerifyIgnore: []string{"etag", "labels", "terraform_labels"}, }, }, }) @@ -172,7 +172,7 @@ func TestAccWorkstationsWorkstationConfig_persistentDirectories(t *testing.T) { ResourceName: "google_workstations_workstation_cluster.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag"}, + ImportStateVerifyIgnore: []string{"etag", "labels", "terraform_labels"}, }, }, }) @@ -242,7 +242,7 @@ func TestAccWorkstationsWorkstationConfig_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: testAccWorkstationsWorkstationConfig_update(context), @@ -251,7 +251,7 @@ func TestAccWorkstationsWorkstationConfig_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: testAccWorkstationsWorkstationConfig_workstationConfigBasicExample(context), @@ -260,7 +260,7 @@ func TestAccWorkstationsWorkstationConfig_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"}, }, }, }) diff --git a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_test.go.erb b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_test.go.erb index 9e06368ceb1a..f1de41975189 100644 --- a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_test.go.erb +++ b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_test.go.erb @@ -28,7 +28,7 @@ func TestAccWorkstationsWorkstation_update(t *testing.T) { ResourceName: "google_workstations_workstation_cluster.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag"}, + ImportStateVerifyIgnore: []string{"etag", "labels", "terraform_labels"}, }, { Config: testAccWorkstationsWorkstation_modified(context), @@ -37,7 +37,7 @@ func TestAccWorkstationsWorkstation_update(t *testing.T) { ResourceName: "google_workstations_workstation_cluster.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"etag"}, + ImportStateVerifyIgnore: []string{"etag", "labels", "terraform_labels"}, }, }, }) diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription.tfplan.json b/mmv1/third_party/tgc/tests/data/example_pubsub_subscription.tfplan.json index 28b2fa772da3..16cacd39e9bb 100644 --- a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription.tfplan.json +++ b/mmv1/third_party/tgc/tests/data/example_pubsub_subscription.tfplan.json @@ -14,6 +14,9 @@ "values": { "ack_deadline_seconds": 20, "dead_letter_policy": [], + "effective_labels": { + "test-label2": "test-value2" + }, "enable_message_ordering": false, "expiration_policy": [ { @@ -33,6 +36,9 @@ "minimum_backoff": "10s" } ], + "terraform_labels": { + "test-label2": "test-value2" + }, "timeouts": null, "topic": "example-pubsub-topic" } @@ -47,6 +53,9 @@ "values": { "ack_deadline_seconds": 20, "dead_letter_policy": [], + "effective_labels": { + "test-label1": "test-value1" + }, "enable_message_ordering": null, "filter": null, "labels": { @@ -63,6 +72,9 @@ ], "retain_acked_messages": null, "retry_policy": [], + "terraform_labels": { + "test-label1": "test-value1" + }, "timeouts": null, "topic": "example-pubsub-topic" } @@ -85,6 +97,9 @@ "after": { "ack_deadline_seconds": 20, "dead_letter_policy": [], + "effective_labels": { + "test-label2": "test-value2" + }, "enable_message_ordering": false, "expiration_policy": [ { @@ -104,11 +119,15 @@ "minimum_backoff": "10s" } ], + "terraform_labels": { + "test-label2": "test-value2" + }, "timeouts": null, "topic": "example-pubsub-topic" }, "after_unknown": { "dead_letter_policy": [], + "effective_labels": {}, "expiration_policy": [ {} ], @@ -121,7 +140,8 @@ { "maximum_backoff": true } - ] + ], + "terraform_labels": {} } } }, @@ -139,6 +159,9 @@ "after": { "ack_deadline_seconds": 20, "dead_letter_policy": [], + "effective_labels": { + "test-label1": "test-value1" + }, "enable_message_ordering": null, "filter": null, "labels": { @@ -155,11 +178,15 @@ ], "retain_acked_messages": null, "retry_policy": [], + "terraform_labels": { + "test-label2": "test-value2" + }, "timeouts": null, "topic": "example-pubsub-topic" }, "after_unknown": { "dead_letter_policy": [], + "effective_labels": {}, "expiration_policy": true, "id": true, "labels": {}, @@ -170,7 +197,8 @@ "oidc_token": [] } ], - "retry_policy": [] + "retry_policy": [], + "terraform_labels": {} } } } diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_binding.tfplan.json b/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_binding.tfplan.json index 0a730e6b809e..2de05102765e 100644 --- a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_binding.tfplan.json +++ b/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_binding.tfplan.json @@ -14,6 +14,9 @@ "values": { "ack_deadline_seconds": 20, "dead_letter_policy": [], + "effective_labels": { + "test-label1": "test-value1" + }, "enable_message_ordering": null, "filter": null, "labels": { @@ -30,6 +33,9 @@ ], "retain_acked_messages": null, "retry_policy": [], + "terraform_labels": { + "test-label1": "test-value1" + }, "timeouts": null, "topic": "example-pubsub-topic" }, @@ -85,6 +91,9 @@ "after": { "ack_deadline_seconds": 20, "dead_letter_policy": [], + "effective_labels": { + "test-label1": "test-value1" + }, "enable_message_ordering": null, "filter": null, "labels": { @@ -101,11 +110,15 @@ ], "retain_acked_messages": null, "retry_policy": [], + "terraform_labels": { + "test-label1": "test-value1" + }, "timeouts": null, "topic": "example-pubsub-topic" }, "after_unknown": { "dead_letter_policy": [], + "effective_labels": {}, "expiration_policy": true, "id": true, "labels": {}, @@ -115,11 +128,13 @@ "oidc_token": [] } ], - "retry_policy": [] + "retry_policy": [], + "terraform_labels": {} }, "before_sensitive": false, "after_sensitive": { "dead_letter_policy": [], + "effective_labels": {}, "expiration_policy": [], "labels": {}, "push_config": [ @@ -127,7 +142,8 @@ "oidc_token": [] } ], - "retry_policy": [] + "retry_policy": [], + "terraform_labels": {} } } }, diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_member.tfplan.json b/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_member.tfplan.json index 691e23ba6c4c..292f2c542161 100644 --- a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_member.tfplan.json +++ b/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_member.tfplan.json @@ -14,6 +14,9 @@ "values": { "ack_deadline_seconds": 20, "dead_letter_policy": [], + "effective_labels": { + "test-label1": "test-value1" + }, "enable_message_ordering": null, "filter": null, "labels": { @@ -30,6 +33,9 @@ ], "retain_acked_messages": null, "retry_policy": [], + "terraform_labels": { + "test-label1": "test-value1" + }, "timeouts": null, "topic": "example-pubsub-topic" }, @@ -80,6 +86,9 @@ "after": { "ack_deadline_seconds": 20, "dead_letter_policy": [], + "effective_labels": { + "test-label1": "test-value1" + }, "enable_message_ordering": null, "filter": null, "labels": { @@ -96,11 +105,15 @@ ], "retain_acked_messages": null, "retry_policy": [], + "terraform_labels": { + "test-label1": "test-value1" + }, "timeouts": null, "topic": "example-pubsub-topic" }, "after_unknown": { "dead_letter_policy": [], + "effective_labels": {}, "expiration_policy": true, "id": true, "labels": {}, @@ -110,11 +123,13 @@ "oidc_token": [] } ], - "retry_policy": [] + "retry_policy": [], + "terraform_labels": {} }, "before_sensitive": false, "after_sensitive": { "dead_letter_policy": [], + "effective_labels": {}, "expiration_policy": [], "labels": {}, "push_config": [ @@ -122,7 +137,8 @@ "oidc_token": [] } ], - "retry_policy": [] + "retry_policy": [], + "terraform_labels": {} } } }, diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_policy.tfplan.json b/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_policy.tfplan.json index 281258b9501e..94478b15fee2 100644 --- a/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_policy.tfplan.json +++ b/mmv1/third_party/tgc/tests/data/example_pubsub_subscription_iam_policy.tfplan.json @@ -14,6 +14,9 @@ "values": { "ack_deadline_seconds": 20, "dead_letter_policy": [], + "effective_labels": { + "test-label1": "test-value1" + }, "enable_message_ordering": null, "filter": null, "labels": { @@ -30,6 +33,9 @@ ], "retain_acked_messages": null, "retry_policy": [], + "terraform_labels": { + "test-label1": "test-value1" + }, "timeouts": null, "topic": "example-pubsub-topic" }, @@ -76,6 +82,9 @@ "after": { "ack_deadline_seconds": 20, "dead_letter_policy": [], + "effective_labels": { + "test-label1": "test-value1" + }, "enable_message_ordering": null, "filter": null, "labels": { @@ -92,11 +101,15 @@ ], "retain_acked_messages": null, "retry_policy": [], + "terraform_labels": { + "test-label1": "test-value1" + }, "timeouts": null, "topic": "example-pubsub-topic" }, "after_unknown": { "dead_letter_policy": [], + "effective_labels": {}, "expiration_policy": true, "id": true, "labels": {}, @@ -106,11 +119,13 @@ "oidc_token": [] } ], - "retry_policy": [] + "retry_policy": [], + "terraform_labels": {} }, "before_sensitive": false, "after_sensitive": { "dead_letter_policy": [], + "effective_labels": {}, "expiration_policy": [], "labels": {}, "push_config": [ @@ -118,7 +133,8 @@ "oidc_token": [] } ], - "retry_policy": [] + "retry_policy": [], + "terraform_labels": {} } } }, diff --git a/mmv1/third_party/tgc/tests/data/example_pubsub_topic.tfplan.json b/mmv1/third_party/tgc/tests/data/example_pubsub_topic.tfplan.json index ec75e9e92203..740f394fc1b9 100644 --- a/mmv1/third_party/tgc/tests/data/example_pubsub_topic.tfplan.json +++ b/mmv1/third_party/tgc/tests/data/example_pubsub_topic.tfplan.json @@ -12,6 +12,9 @@ "provider_name": "registry.terraform.io/hashicorp/google", "schema_version": 0, "values": { + "effective_labels": { + "test-key": "test-value" + }, "kms_key_name": "projects/{{.Provider.project}}/locations/australia-southeast1/keyRings/default_kms_keyring_name/cryptoKeys/default_kms_key_name", "labels": { "test-key": "test-value" @@ -25,6 +28,9 @@ ], "name": "test", "project": "{{.Provider.project}}", + "terraform_labels": { + "test-key": "test-value" + }, "timeouts": null } } @@ -44,6 +50,9 @@ ], "before": null, "after": { + "effective_labels": { + "test-key": "test-value" + }, "kms_key_name": "projects/{{.Provider.project}}/locations/australia-southeast1/keyRings/default_kms_keyring_name/cryptoKeys/default_kms_key_name", "labels": { "test-key": "test-value" @@ -57,9 +66,13 @@ ], "name": "test", "project": "{{.Provider.project}}", + "terraform_labels": { + "test-key": "test-value" + }, "timeouts": null }, "after_unknown": { + "effective_labels": {}, "id": true, "labels": {}, "message_storage_policy": [ @@ -68,7 +81,8 @@ false ] } - ] + ], + "terraform_labels": {} } } } diff --git a/mmv1/third_party/tgc/tests/data/full_spanner_instance.tfplan.json b/mmv1/third_party/tgc/tests/data/full_spanner_instance.tfplan.json index ead499d7a4eb..ba82885d114d 100644 --- a/mmv1/third_party/tgc/tests/data/full_spanner_instance.tfplan.json +++ b/mmv1/third_party/tgc/tests/data/full_spanner_instance.tfplan.json @@ -14,6 +14,11 @@ "values": { "config": "regional-us-central1", "display_name": "spanner-instance", + "effective_labels": { + "label1": "value1", + "label2": "value2", + "label3": "value3" + }, "force_destroy": false, "labels": { "label1": "value1", @@ -22,6 +27,11 @@ }, "name": "spanner-instance", "num_nodes": 1, + "terraform_labels": { + "label1": "value1", + "label2": "value2", + "label3": "value3" + }, "timeouts": null } } @@ -43,6 +53,11 @@ "after": { "config": "regional-us-central1", "display_name": "spanner-instance", + "effective_labels": { + "label1": "value1", + "label2": "value2", + "label3": "value3" + }, "force_destroy": false, "labels": { "label1": "value1", @@ -51,13 +66,20 @@ }, "name": "spanner-instance", "num_nodes": 1, + "terraform_labels": { + "label1": "value1", + "label2": "value2", + "label3": "value3" + }, "timeouts": null }, "after_unknown": { + "effective_labels": {}, "id": true, "labels": {}, "project": true, - "state": true + "state": true, + "terraform_labels": {} } } } From 03d0a815f57f4049cea4b94791f19f6f1778e567 Mon Sep 17 00:00:00 2001 From: Zhenhua Li Date: Sun, 17 Sep 2023 22:24:35 -0700 Subject: [PATCH 3/3] Fix unit test --- .../services/vertexai/data_source_vertex_ai_index_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go b/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go index c7077f761e02..5813d9adfc7b 100644 --- a/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go +++ b/mmv1/third_party/terraform/services/vertexai/data_source_vertex_ai_index_test.go @@ -31,8 +31,8 @@ func TestAccDataSourceVertexAIIndex_basic(t *testing.T) { map[string]struct{}{ "metadata.0.contents_delta_uri": {}, "metadata.0.is_complete_overwrite": {}, - "labels.%": {}, - "terraform_labels.%": {} + "labels.%": {}, + "terraform_labels.%": {}, }, ), ),