From 9431538a8f57eca464db133b9474198c7371b537 Mon Sep 17 00:00:00 2001
From: Modular Magician <magic-modules@google.com>
Date: Mon, 18 Sep 2023 23:47:10 +0000
Subject: [PATCH] Apply new labels model to more resources (part 2) (#8980)

* Apply new labels model to more resources (part 2)

* Apply new labels model to more resources (part 3)

* Fix unit test

Signed-off-by: Modular Magician <magic-modules@google.com>
---
 dataproc_metastore_service_basic/main.tf               | 4 ++++
 gkehub_membership_basic/main.tf                        | 4 ++++
 memcache_instance_basic/main.tf                        | 4 ++++
 network_management_connectivity_test_instances/main.tf | 3 +++
 only_external_vpn_gateway_full/main.tf                 | 1 -
 vertex_ai_dataset/main.tf                              | 4 ++++
 workflow_basic/main.tf                                 | 3 +++
 workstation_config_basic/main.tf                       | 4 ++++
 8 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/dataproc_metastore_service_basic/main.tf b/dataproc_metastore_service_basic/main.tf
index e11d4b2f..03238c0c 100644
--- a/dataproc_metastore_service_basic/main.tf
+++ b/dataproc_metastore_service_basic/main.tf
@@ -12,4 +12,8 @@ resource "google_dataproc_metastore_service" "default" {
   hive_metastore_config {
     version = "2.3.6"
   }
+
+  labels = {
+    env = "test"
+  }
 }
diff --git a/gkehub_membership_basic/main.tf b/gkehub_membership_basic/main.tf
index 4fafcb70..ab147f00 100644
--- a/gkehub_membership_basic/main.tf
+++ b/gkehub_membership_basic/main.tf
@@ -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/memcache_instance_basic/main.tf b/memcache_instance_basic/main.tf
index b31830db..3b00126e 100644
--- a/memcache_instance_basic/main.tf
+++ b/memcache_instance_basic/main.tf
@@ -28,6 +28,10 @@ resource "google_memcache_instance" "instance" {
   name = "test-instance-${local.name_suffix}"
   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/network_management_connectivity_test_instances/main.tf b/network_management_connectivity_test_instances/main.tf
index 1e5a6679..6c297de6 100644
--- a/network_management_connectivity_test_instances/main.tf
+++ b/network_management_connectivity_test_instances/main.tf
@@ -9,6 +9,9 @@ resource "google_network_management_connectivity_test" "instance-test" {
   }
 
   protocol = "TCP"
+  labels = {
+    env = "test"
+  }
 }
 
 resource "google_compute_instance" "source" {
diff --git a/only_external_vpn_gateway_full/main.tf b/only_external_vpn_gateway_full/main.tf
index 20e3c357..5090a88e 100644
--- a/only_external_vpn_gateway_full/main.tf
+++ b/only_external_vpn_gateway_full/main.tf
@@ -8,6 +8,5 @@ resource "google_compute_external_vpn_gateway" "external_gateway" {
   }
   labels = {
     key = "value"
-    otherkey = ""
   }
 }
diff --git a/vertex_ai_dataset/main.tf b/vertex_ai_dataset/main.tf
index ddff8d6d..d467296b 100644
--- a/vertex_ai_dataset/main.tf
+++ b/vertex_ai_dataset/main.tf
@@ -2,4 +2,8 @@ resource "google_vertex_ai_dataset" "dataset" {
   display_name          = "terraform-${local.name_suffix}"
   metadata_schema_uri   = "gs://google-cloud-aiplatform/schema/dataset/metadata/image_1.0.0.yaml"
   region                = "us-central1"
+
+  labels = {
+    env = "test"
+  }
 }
diff --git a/workflow_basic/main.tf b/workflow_basic/main.tf
index 47af119c..662a1620 100644
--- a/workflow_basic/main.tf
+++ b/workflow_basic/main.tf
@@ -8,6 +8,9 @@ resource "google_workflows_workflow" "example" {
   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/workstation_config_basic/main.tf b/workstation_config_basic/main.tf
index 59c54e3a..6e400406 100644
--- a/workstation_config_basic/main.tf
+++ b/workstation_config_basic/main.tf
@@ -41,6 +41,10 @@ resource "google_workstations_workstation_config" "default" {
     label-one = "value-one"
   }
 
+  labels = {
+    "label" = "key"
+  }
+
   host {
     gce_instance {
       machine_type                = "e2-standard-4"