Apply new labels model to more resources (part 3)

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.

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.

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.

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

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

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.

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.

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.

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

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.

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.

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.

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

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

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.

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.

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

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

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"
+  }
 }

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.
   #

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"

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),

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"},
 			},
 		},
 	})

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"},
 			},
 		},
 	})

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),

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"},
 			},
 		},
 	})

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"},
 			},
 		},
 	})

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.%": {}
 						},
 					),
 				),

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"},
 			},
 		},
 	})

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"},
 			},
 		},
 	})