Make labels field have all labels in data sources (#9037) (#15957)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Sep 22, 2023 · 5f9b077 · 5f9b077
1 parent a6b5429
commit 5f9b077
Show file tree

Hide file tree

Showing 55 changed files with 222 additions and 18 deletions.
diff --git a/.changelog/9037.txt b/.changelog/9037.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google/services/artifactregistry/data_source_artifact_registry_repository.go b/google/services/artifactregistry/data_source_artifact_registry_repository.go
@@ -48,6 +48,10 @@ func dataSourceArtifactRegistryRepositoryRead(d *schema.ResourceData, meta inter
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/artifactregistry/data_source_artifact_registry_repository_test.go b/google/services/artifactregistry/data_source_artifact_registry_repository_test.go
@@ -25,8 +25,8 @@ func TestAccDataSourceGoogleArtifactRegistryRepositoryConfig(t *testing.T) {
 			{
 				Config: testAccDataSourceGoogleArtifactRegistryRepositoryConfig(context),
 				Check: resource.ComposeTestCheckFunc(
-					acctest.CheckDataSourceStateMatchesResourceStateWithIgnores(funcDataName,
-						"google_artifact_registry_repository.my-repo", map[string]struct{}{"labels.%": {}, "terraform_labels.%": {}}),
+					acctest.CheckDataSourceStateMatchesResourceState(funcDataName,
+						"google_artifact_registry_repository.my-repo"),
 				),
 			},
 		},

diff --git a/google/services/beyondcorp/data_source_google_beyondcorp_app_connection.go b/google/services/beyondcorp/data_source_google_beyondcorp_app_connection.go
@@ -48,6 +48,10 @@ func dataSourceGoogleBeyondcorpAppConnectionRead(d *schema.ResourceData, meta in
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/beyondcorp/data_source_google_beyondcorp_app_connection_test.go b/google/services/beyondcorp/data_source_google_beyondcorp_app_connection_test.go
@@ -78,6 +78,9 @@ resource "google_beyondcorp_app_connection" "foo" {
 		port = 8080
 	}
 	connectors = [google_beyondcorp_app_connector.app_connector.id]
+	labels = {
+		my-label = "my-label-value"
+	}
 }
 
 data "google_beyondcorp_app_connection" "foo" {

diff --git a/google/services/beyondcorp/data_source_google_beyondcorp_app_connector.go b/google/services/beyondcorp/data_source_google_beyondcorp_app_connector.go
@@ -48,6 +48,10 @@ func dataSourceGoogleBeyondcorpAppConnectorRead(d *schema.ResourceData, meta int
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/beyondcorp/data_source_google_beyondcorp_app_connector_test.go b/google/services/beyondcorp/data_source_google_beyondcorp_app_connector_test.go
@@ -181,6 +181,9 @@ resource "google_beyondcorp_app_connector" "foo" {
 			email = google_service_account.service_account.email
 		}
 	}
+	labels = {
+		my-label = "my-label-value"
+	}
 }
 
 data "google_beyondcorp_app_connector" "foo" {

diff --git a/google/services/beyondcorp/data_source_google_beyondcorp_app_gateway.go b/google/services/beyondcorp/data_source_google_beyondcorp_app_gateway.go
@@ -48,6 +48,10 @@ func dataSourceGoogleBeyondcorpAppGatewayRead(d *schema.ResourceData, meta inter
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/beyondcorp/data_source_google_beyondcorp_app_gateway_test.go b/google/services/beyondcorp/data_source_google_beyondcorp_app_gateway_test.go
@@ -103,6 +103,9 @@ resource "google_beyondcorp_app_gateway" "foo" {
 	name      = "tf-test-appgateway-%{random_suffix}"
 	type      = "TCP_PROXY"
 	host_type = "GCP_REGIONAL_MIG"
+	labels = {
+		my-label = "my-label-value"
+	}
 }
 
 data "google_beyondcorp_app_gateway" "foo" {

diff --git a/google/services/cloudfunctions/data_source_google_cloudfunctions_function.go b/google/services/cloudfunctions/data_source_google_cloudfunctions_function.go
@@ -52,6 +52,10 @@ func dataSourceGoogleCloudFunctionsFunctionRead(d *schema.ResourceData, meta int
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", cloudFuncId.CloudFunctionId())
 	}

diff --git a/google/services/cloudfunctions/data_source_google_cloudfunctions_function_test.go b/google/services/cloudfunctions/data_source_google_cloudfunctions_function_test.go
@@ -63,6 +63,9 @@ resource "google_cloudfunctions_function" "function_http" {
   trigger_http          = true
   timeout               = 61
   entry_point           = "helloGET"
+  labels = {
+    my-label = "my-label-value"
+  }
 }
 
 data "google_cloudfunctions_function" "function_http" {

diff --git a/google/services/cloudfunctions2/data_source_google_cloudfunctions2_function.go b/google/services/cloudfunctions2/data_source_google_cloudfunctions2_function.go
@@ -42,6 +42,10 @@ func dataSourceGoogleCloudFunctions2FunctionRead(d *schema.ResourceData, meta in
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/cloudfunctions2/data_source_google_cloudfunctions2_function_test.go b/google/services/cloudfunctions2/data_source_google_cloudfunctions2_function_test.go
@@ -26,8 +26,8 @@ func TestAccDataSourceGoogleCloudFunctions2Function_basic(t *testing.T) {
 			{
 				Config: testAccDataSourceGoogleCloudFunctions2FunctionConfig(functionName,
 					bucketName, zipFilePath),
-				// As the value of "labels" and "terraform_labels" in the state is dependent on the configuration,
-				// and these fields are not set in the configuration of the data source, so these fields are empty in the state of the data source.
+				// As the value of "labels" and "terraform_labels" in the state of the data source are all labels,
+				// but the "labels" field in resource are user defined labels, which is the reason for the mismatch.
 				Check: resource.ComposeTestCheckFunc(
 					acctest.CheckDataSourceStateMatchesResourceStateWithIgnores(funcDataNameHttp,
 						"google_cloudfunctions2_function.function_http_v2", map[string]struct{}{"build_config.0.source.0.storage_source.0.bucket": {}, "build_config.0.source.0.storage_source.0.object": {}, "labels.%": {}, "terraform_labels.%": {}}),

diff --git a/google/services/composer/data_source_google_composer_environment.go b/google/services/composer/data_source_google_composer_environment.go
@@ -44,6 +44,10 @@ func dataSourceGoogleComposerEnvironmentRead(d *schema.ResourceData, meta interf
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/composer/data_source_google_composer_environment_test.go b/google/services/composer/data_source_google_composer_environment_test.go
@@ -27,6 +27,8 @@ func TestAccDataSourceComposerEnvironment_basic(t *testing.T) {
 			{
 				Config: testAccDataSourceComposerEnvironment_basic(context),
 				Check: resource.ComposeTestCheckFunc(
+					acctest.CheckDataSourceStateMatchesResourceState("data.google_composer_environment.test",
+						"google_composer_environment.test"),
 					testAccCheckGoogleComposerEnvironmentMeta("data.google_composer_environment.test"),
 				),
 			},
@@ -93,6 +95,9 @@ resource "google_composer_environment" "test" {
 			image_version = "composer-1-airflow-2"
 		}
 	}
+	labels = {
+		my-label = "my-label-value"
+	}
 }
 
 // use a separate network to avoid conflicts with other tests running in parallel

diff --git a/google/services/compute/data_source_google_compute_disk.go b/google/services/compute/data_source_google_compute_disk.go
@@ -36,6 +36,10 @@ func dataSourceGoogleComputeDiskRead(d *schema.ResourceData, meta interface{}) e
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/compute/data_source_google_compute_disk_test.go b/google/services/compute/data_source_google_compute_disk_test.go
@@ -34,7 +34,10 @@ func TestAccDataSourceGoogleComputeDisk_basic(t *testing.T) {
 func testAccDataSourceGoogleComputeDisk_basic(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_compute_disk" "foo" {
-  name     = "tf-test-compute-disk-%{random_suffix}"
+  name   = "tf-test-compute-disk-%{random_suffix}"
+  labels = {
+    my-label = "my-label-value"
+  }
 }
 
 data "google_compute_disk" "foo" {

diff --git a/google/services/compute/data_source_google_compute_forwarding_rule.go b/google/services/compute/data_source_google_compute_forwarding_rule.go
@@ -49,6 +49,10 @@ func dataSourceGoogleComputeForwardingRuleRead(d *schema.ResourceData, meta inte
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/compute/data_source_google_compute_forwarding_rule_test.go b/google/services/compute/data_source_google_compute_forwarding_rule_test.go
@@ -42,6 +42,9 @@ resource "google_compute_forwarding_rule" "foobar-fr" {
   name        = "%s"
   port_range  = "80-81"
   target      = google_compute_target_pool.foobar-tp.self_link
+  labels      = {
+    my-label  = "my-label-value"
+  }
 }
 
 data "google_compute_forwarding_rule" "my_forwarding_rule" {

diff --git a/google/services/compute/data_source_google_compute_instance.go b/google/services/compute/data_source_google_compute_instance.go
@@ -99,6 +99,10 @@ func dataSourceGoogleComputeInstanceRead(d *schema.ResourceData, meta interface{
 		return err
 	}
 
+	if err := d.Set("terraform_labels", instance.Labels); err != nil {
+		return err
+	}
+
 	if instance.LabelFingerprint != "" {
 		if err := d.Set("label_fingerprint", instance.LabelFingerprint); err != nil {
 			return fmt.Errorf("Error setting label_fingerprint: %s", err)

diff --git a/google/services/compute/data_source_google_compute_snapshot.go b/google/services/compute/data_source_google_compute_snapshot.go
@@ -104,7 +104,10 @@ func dataSourceGoogleComputeSnapshotRead(d *schema.ResourceData, meta interface{
 func retrieveSnapshot(d *schema.ResourceData, meta interface{}, project, name string) error {
 	d.SetId("projects/" + project + "/global/snapshots/" + name)
 	d.Set("name", name)
-	return resourceComputeSnapshotRead(d, meta)
+	if err := resourceComputeSnapshotRead(d, meta); err != nil {
+		return err
+	}
+	return tpgresource.SetDataSourceLabels(d)
 }
 
 // ByCreationTimestamp implements sort.Interface for []*Snapshot based on

diff --git a/google/services/compute/data_source_google_compute_snapshot_test.go b/google/services/compute/data_source_google_compute_snapshot_test.go
@@ -23,7 +23,7 @@ func TestAccSnapshotDatasource_name(t *testing.T) {
 					acctest.CheckDataSourceStateMatchesResourceStateWithIgnores(
 						"data.google_compute_snapshot.default",
 						"google_compute_snapshot.default",
-						map[string]struct{}{"zone": {}, "labels.%": {}, "terraform_labels.%": {}},
+						map[string]struct{}{"zone": {}},
 					),
 				),
 			},
@@ -44,7 +44,7 @@ func TestAccSnapshotDatasource_filter(t *testing.T) {
 					acctest.CheckDataSourceStateMatchesResourceStateWithIgnores(
 						"data.google_compute_snapshot.default",
 						"google_compute_snapshot.c",
-						map[string]struct{}{"zone": {}, "labels.%": {}, "terraform_labels.%": {}},
+						map[string]struct{}{"zone": {}},
 					),
 				),
 			},
@@ -65,7 +65,7 @@ func TestAccSnapshotDatasource_filterMostRecent(t *testing.T) {
 					acctest.CheckDataSourceStateMatchesResourceStateWithIgnores(
 						"data.google_compute_snapshot.default",
 						"google_compute_snapshot.c",
-						map[string]struct{}{"zone": {}, "labels.%": {}, "terraform_labels.%": {}},
+						map[string]struct{}{"zone": {}},
 					),
 				),
 			},

diff --git a/google/services/compute/data_source_google_global_compute_forwarding_rule.go b/google/services/compute/data_source_google_global_compute_forwarding_rule.go
@@ -43,6 +43,10 @@ func dataSourceGoogleComputeGlobalForwardingRuleRead(d *schema.ResourceData, met
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/compute/data_source_google_global_compute_forwarding_rule_test.go b/google/services/compute/data_source_google_global_compute_forwarding_rule_test.go
@@ -34,6 +34,9 @@ resource "google_compute_global_forwarding_rule" "foobar-fr" {
   name       = "%s"
   target     = google_compute_target_http_proxy.default.id
   port_range = "80"
+  labels     = {
+    my-label = "my-label-value"
+  }
 }
 
 resource "google_compute_target_http_proxy" "default" {

diff --git a/google/services/dataprocmetastore/data_source_dataproc_metastore_service.go b/google/services/dataprocmetastore/data_source_dataproc_metastore_service.go
@@ -34,6 +34,10 @@ func dataSourceDataprocMetastoreServiceRead(d *schema.ResourceData, meta interfa
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go b/google/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go
@@ -39,6 +39,10 @@ resource "google_dataproc_metastore_service" "my_metastore" {
 	hive_metastore_config {
 		version = "2.3.6"
 	}
+
+	labels = {
+		env = "test"
+	}
 }
 
 data "google_dataproc_metastore_service" "my_metastore" {

diff --git a/google/services/kms/data_source_google_kms_crypto_key.go b/google/services/kms/data_source_google_kms_crypto_key.go
@@ -43,6 +43,10 @@ func dataSourceGoogleKmsCryptoKeyRead(d *schema.ResourceData, meta interface{})
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/privateca/data_source_certificate_authority.go b/google/services/privateca/data_source_certificate_authority.go
@@ -47,6 +47,10 @@ func dataSourcePrivatecaCertificateAuthorityRead(d *schema.ResourceData, meta in
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	// pem_csr is only applicable for SUBORDINATE CertificateAuthorities when their state is AWAITING_USER_ACTIVATION
 	if d.Get("type") == "SUBORDINATE" && d.Get("state") == "AWAITING_USER_ACTIVATION" {
 		url, err := tpgresource.ReplaceVars(d, config, "{{PrivatecaBasePath}}projects/{{project}}/locations/{{location}}/caPools/{{pool}}/certificateAuthorities/{{certificate_authority_id}}:fetch")

diff --git a/google/services/privateca/data_source_certificate_authority_test.go b/google/services/privateca/data_source_certificate_authority_test.go
@@ -83,6 +83,9 @@ resource "google_privateca_certificate_authority" "default" {
   key_spec {
     algorithm = "RSA_PKCS1_4096_SHA256"
   }
+  labels = {
+    my-label = "my-label-value"
+  }
 }
 
 data "google_privateca_certificate_authority" "default" {

diff --git a/google/services/pubsub/data_source_pubsub_subscription.go b/google/services/pubsub/data_source_pubsub_subscription.go
@@ -35,6 +35,10 @@ func dataSourceGooglePubsubSubscriptionRead(d *schema.ResourceData, meta interfa
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/pubsub/data_source_pubsub_subscription_test.go b/google/services/pubsub/data_source_pubsub_subscription_test.go
@@ -62,6 +62,9 @@ resource "google_pubsub_topic" "foo" {
 resource "google_pubsub_subscription" "foo" {
   name     = "tf-test-pubsub-subscription-%{random_suffix}"
   topic    = google_pubsub_topic.foo.name
+  labels   = {
+    my-label = "my-label-value"
+  }
 }
 
 data "google_pubsub_subscription" "foo" {

diff --git a/google/services/pubsub/data_source_pubsub_topic.go b/google/services/pubsub/data_source_pubsub_topic.go
@@ -35,6 +35,10 @@ func dataSourceGooglePubsubTopicRead(d *schema.ResourceData, meta interface{}) e
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/pubsub/data_source_pubsub_topic_test.go b/google/services/pubsub/data_source_pubsub_topic_test.go
@@ -57,6 +57,9 @@ func testAccDataSourceGooglePubsubTopic_basic(context map[string]interface{}) st
 	return acctest.Nprintf(`
 resource "google_pubsub_topic" "foo" {
   name     = "tf-test-pubsub-%{random_suffix}"
+  labels   = {
+    my-label = "my-label-value"
+  }
 }
 
 data "google_pubsub_topic" "foo" {

diff --git a/google/services/redis/data_source_redis_instance.go b/google/services/redis/data_source_redis_instance.go
@@ -38,6 +38,10 @@ func dataSourceGoogleRedisInstanceRead(d *schema.ResourceData, meta interface{})
 		return err
 	}
 
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
 	if d.Id() == "" {
 		return fmt.Errorf("%s not found", id)
 	}

diff --git a/google/services/redis/data_source_redis_instance_test.go b/google/services/redis/data_source_redis_instance_test.go
@@ -32,6 +32,10 @@ func testAccRedisInstanceDatasourceConfig(suffix string) string {
 resource "google_redis_instance" "redis" {
   name               = "redis-test-%s"
   memory_size_gb     = 1
+
+  labels   = {
+    my-label = "my-label-value"
+  }
 }
 
 data "google_redis_instance" "redis" {