Fix TestAccContainerNodePool_resourceManagerTags (#13994) (#22951)

[upstream:c722c3acb2e53f0d0c7b2aa4f1568504c27d2d9b]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

google/acctest/bootstrap_test_utils.go

@@ -1753,11 +1753,30 @@ func BootstrapSharedCodeRepositoryIndex(t *testing.T, codeRepositoryIndexId, loc
 }
 
 const sharedTagKeyPrefix = "tf-bootstrap-tagkey"
+const sharedTagKeyParentErr = "Parent %q is not valid. Should be in format: 'organizations/123' OR 'projects/123'."
 
-func BootstrapSharedTestTagKey(t *testing.T, testId string) string {
+func BootstrapSharedTestProjectTagKey(t *testing.T, testId string, obj map[string]interface{}) string {
+	pid := envvar.GetTestProjectFromEnv()
+	return bootstrapSharedTestTagKey(t, testId, "projects/"+pid, obj)
+}
+
+func BootstrapSharedTestOrganizationTagKey(t *testing.T, testId string, obj map[string]interface{}) string {
 	org := envvar.GetTestOrgFromEnv(t)
+	return bootstrapSharedTestTagKey(t, testId, "organizations/"+org, obj)
+}
+
+// parent should be in format: {"organization" OR "projects"}/{id}
+func bootstrapSharedTestTagKey(t *testing.T, testId, parent string, obj map[string]interface{}) string {
 	sharedTagKey := fmt.Sprintf("%s-%s", sharedTagKeyPrefix, testId)
-	tagKeyName := fmt.Sprintf("%s/%s", org, sharedTagKey)
+
+	parentSplit := strings.Split(parent, "/")
+	if len(parentSplit) < 2 || (parentSplit[0] != "organizations" && parentSplit[0] != "projects") {
+		parentErr := fmt.Sprintf(sharedTagKeyParentErr, parent)
+		t.Fatalf("Error bootstrapping shared tag key %q: %s", sharedTagKey, parentErr)
+	}
+
+	parentId := parentSplit[1]
+	tagKeyName := fmt.Sprintf("%s/%s", parentId, sharedTagKey)
 
 	config := BootstrapConfig(t)
 	if config == nil {
@@ -1777,10 +1796,13 @@ func BootstrapSharedTestTagKey(t *testing.T, testId string) string {
 	if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 403) {
 		log.Printf("[DEBUG] TagKey %q not found, bootstrapping", sharedTagKey)
 		tagKeyObj := map[string]interface{}{
-			"parent":      "organizations/" + org,
+			"parent":      parent,
 			"shortName":   sharedTagKey,
 			"description": "Bootstrapped tag key for Terraform Acceptance testing",
 		}
+		if obj != nil {
+			maps.Insert(tagKeyObj, maps.All(obj))
+		}
 
 		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config:    config,
@@ -1825,10 +1847,19 @@ func BootstrapSharedTestTagKey(t *testing.T, testId string) string {
 
 const sharedTagValuePrefix = "tf-bootstrap-tagvalue"
 
-func BootstrapSharedTestTagValue(t *testing.T, testId string, tagKey string) string {
+func BootstrapSharedTestProjectTagValue(t *testing.T, testId string, tagKey string) string {
+	pid := envvar.GetTestProjectFromEnv()
+	return BootstrapSharedTestTagValue(t, testId, tagKey, pid)
+}
+
+func BootstrapSharedTestOrganizationTagValue(t *testing.T, testId string, tagKey string) string {
 	org := envvar.GetTestOrgFromEnv(t)
+	return BootstrapSharedTestTagValue(t, testId, tagKey, org)
+}
+
+func BootstrapSharedTestTagValue(t *testing.T, testId string, tagKey, parentId string) string {
 	sharedTagValue := fmt.Sprintf("%s-%s", sharedTagValuePrefix, testId)
-	tagKeyName := fmt.Sprintf("%s/%s", org, tagKey)
+	tagKeyName := fmt.Sprintf("%s/%s", parentId, tagKey)
 	tagValueName := fmt.Sprintf("%s/%s", tagKeyName, sharedTagValue)
 
 	config := BootstrapConfig(t)

google/services/container/resource_container_node_pool_test.go

@@ -57,11 +57,27 @@ func TestAccContainerNodePool_resourceManagerTags(t *testing.T) {
 	t.Parallel()
 	pid := envvar.GetTestProjectFromEnv()
 
-	randomSuffix := acctest.RandString(t, 10)
-	clusterName := fmt.Sprintf("tf-test-cluster-%s", randomSuffix)
-
 	networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster")
-	subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName)
+	tagData := map[string]interface{}{
+		"purpose": "GCE_FIREWALL",
+		"purpose_data": map[string]interface{}{
+			"network": pid + "/" + networkName,
+		},
+	}
+	tagKey1 := acctest.BootstrapSharedTestProjectTagKey(t, "resourceManagerTags1", tagData)
+	tagKey2 := acctest.BootstrapSharedTestProjectTagKey(t, "resourceManagerTags2", tagData)
+
+	context := map[string]interface{}{
+		"pid":           pid,
+		"org":           envvar.GetTestOrgFromEnv(t),
+		"network":       networkName,
+		"subnet":        acctest.BootstrapSubnet(t, "gke-cluster", networkName),
+		"tagKey1":       tagKey1,
+		"tagValue1":     acctest.BootstrapSharedTestProjectTagValue(t, "resourceManagerTags1", tagKey1),
+		"tagKey2":       tagKey2,
+		"tagValue2":     acctest.BootstrapSharedTestProjectTagValue(t, "resourceManagerTags2", tagKey2),
+		"random_suffix": acctest.RandString(t, 10),
+	}
 
 	bootstrapGkeTagManagerServiceAgents(t)
 
@@ -74,7 +90,7 @@ func TestAccContainerNodePool_resourceManagerTags(t *testing.T) {
 		CheckDestroy: testAccCheckContainerClusterDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccContainerNodePool_resourceManagerTags(pid, clusterName, networkName, subnetworkName, randomSuffix),
+				Config: testAccContainerNodePool_resourceManagerTags(context),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("google_container_node_pool.primary_nodes", "node_config.0.resource_manager_tags.%"),
 				),
@@ -86,7 +102,7 @@ func TestAccContainerNodePool_resourceManagerTags(t *testing.T) {
 				ImportStateVerifyIgnore: []string{"min_master_version", "cluster"},
 			},
 			{
-				Config: testAccContainerNodePool_resourceManagerTagsUpdate1(pid, clusterName, networkName, subnetworkName, randomSuffix),
+				Config: testAccContainerNodePool_resourceManagerTagsUpdate1(context),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("google_container_node_pool.primary_nodes", "node_config.0.resource_manager_tags.%"),
 				),
@@ -98,7 +114,7 @@ func TestAccContainerNodePool_resourceManagerTags(t *testing.T) {
 				ImportStateVerifyIgnore: []string{"min_master_version", "cluster"},
 			},
 			{
-				Config: testAccContainerNodePool_resourceManagerTagsUpdate2(pid, clusterName, networkName, subnetworkName, randomSuffix),
+				Config: testAccContainerNodePool_resourceManagerTagsUpdate2(context),
 			},
 			{
 				ResourceName:            "google_container_node_pool.primary_nodes",
@@ -4653,52 +4669,18 @@ resource "google_container_node_pool" "without_confidential_boot_disk" {
 `, cluster, networkName, subnetworkName, np)
 }
 
-func testAccContainerNodePool_resourceManagerTags(projectID, clusterName, networkName, subnetworkName, randomSuffix string) string {
-	return fmt.Sprintf(`
+func testAccContainerNodePool_resourceManagerTags(context map[string]interface{}) string {
+	return acctest.Nprintf(`
 data "google_project" "project" {
-  project_id = "%[1]s"
-}
-
-resource "google_tags_tag_key" "key1" {
-  parent      = "projects/%[1]s"
-  short_name  = "foobarbaz1-%[2]s"
-  description = "For foo/bar1 resources"
-  purpose     = "GCE_FIREWALL"
-  purpose_data = {
-    network = "%[1]s/%[4]s"
-  }
-}
-
-resource "google_tags_tag_value" "value1" {
-  parent      = google_tags_tag_key.key1.id
-  short_name  = "foo1-%[2]s"
-  description = "For foo1 resources"
-}
-
-resource "google_tags_tag_key" "key2" {
-  parent      = "projects/%[1]s"
-  short_name  = "foobarbaz2-%[2]s"
-  description = "For foo/bar2 resources"
-  purpose     = "GCE_FIREWALL"
-  purpose_data = {
-    network = "%[1]s/%[4]s"
-  }
-
-  depends_on = [google_tags_tag_key.key1]
-}
-
-resource "google_tags_tag_value" "value2" {
-  parent      = google_tags_tag_key.key2.id
-  short_name  = "foo2-%[2]s"
-  description = "For foo2 resources"
+  project_id = "%{pid}"
 }
 
 data "google_container_engine_versions" "uscentral1a" {
   location = "us-central1-a"
 }
 
 resource "google_container_cluster" "primary" {
-  name               = "%[3]s"
+  name               = "tf-test-cluster-%{random_suffix}"
   location           = "us-central1-a"
   min_master_version = data.google_container_engine_versions.uscentral1a.release_channel_latest_version["STABLE"]
 
@@ -4709,8 +4691,8 @@ resource "google_container_cluster" "primary" {
   initial_node_count       = 1
 
   deletion_protection = false
-  network             = "%[4]s"
-  subnetwork          = "%[5]s"
+  network             = "%{network}"
+  subnetwork          = "%{subnet}"
 
   timeouts {
     create = "30m"
@@ -4732,59 +4714,25 @@ resource "google_container_node_pool" "primary_nodes" {
     disk_size_gb = 15
 
     resource_manager_tags = {
-      (google_tags_tag_key.key1.id) = google_tags_tag_value.value1.id
+      "%{pid}/%{tagKey1}" = "%{tagValue1}"
     }
   }
 }
-`, projectID, randomSuffix, clusterName, networkName, subnetworkName)
+`, context)
 }
 
-func testAccContainerNodePool_resourceManagerTagsUpdate1(projectID, clusterName, networkName, subnetworkName, randomSuffix string) string {
-	return fmt.Sprintf(`
+func testAccContainerNodePool_resourceManagerTagsUpdate1(context map[string]interface{}) string {
+	return acctest.Nprintf(`
 data "google_project" "project" {
-  project_id = "%[1]s"
-}
-
-resource "google_tags_tag_key" "key1" {
-  parent      = "projects/%[1]s"
-  short_name  = "foobarbaz1-%[2]s"
-  description = "For foo/bar1 resources"
-  purpose     = "GCE_FIREWALL"
-  purpose_data = {
-    network = "%[1]s/%[4]s"
-  }
-}
-
-resource "google_tags_tag_value" "value1" {
-  parent      = google_tags_tag_key.key1.id
-  short_name  = "foo1-%[2]s"
-  description = "For foo1 resources"
-}
-
-resource "google_tags_tag_key" "key2" {
-  parent      = "projects/%[1]s"
-  short_name  = "foobarbaz2-%[2]s"
-  description = "For foo/bar2 resources"
-  purpose     = "GCE_FIREWALL"
-  purpose_data = {
-    network = "%[1]s/%[4]s"
-  }
-
-  depends_on = [google_tags_tag_key.key1]
-}
-
-resource "google_tags_tag_value" "value2" {
-  parent      = google_tags_tag_key.key2.id
-  short_name  = "foo2-%[2]s"
-  description = "For foo2 resources"
+  project_id = "%{pid}"
 }
 
 data "google_container_engine_versions" "uscentral1a" {
   location = "us-central1-a"
 }
 
 resource "google_container_cluster" "primary" {
-  name               = "%[3]s"
+  name               = "tf-test-cluster-%{random_suffix}"
   location           = "us-central1-a"
   min_master_version = data.google_container_engine_versions.uscentral1a.release_channel_latest_version["STABLE"]
 
@@ -4795,8 +4743,8 @@ resource "google_container_cluster" "primary" {
   initial_node_count       = 1
 
   deletion_protection = false
-  network             = "%[4]s"
-  subnetwork          = "%[5]s"
+  network             = "%{network}"
+  subnetwork          = "%{subnet}"
 
   timeouts {
     create = "30m"
@@ -4818,60 +4766,26 @@ resource "google_container_node_pool" "primary_nodes" {
     disk_size_gb = 15
 
     resource_manager_tags = {
-      (google_tags_tag_key.key1.id) = google_tags_tag_value.value1.id
-      (google_tags_tag_key.key2.id) = google_tags_tag_value.value2.id
+      "%{pid}/%{tagKey1}" = "%{tagValue1}"
+	  "%{pid}/%{tagKey2}" = "%{tagValue2}"
     }
   }
 }
-`, projectID, randomSuffix, clusterName, networkName, subnetworkName)
+`, context)
 }
 
-func testAccContainerNodePool_resourceManagerTagsUpdate2(projectID, clusterName, networkName, subnetworkName, randomSuffix string) string {
-	return fmt.Sprintf(`
+func testAccContainerNodePool_resourceManagerTagsUpdate2(context map[string]interface{}) string {
+	return acctest.Nprintf(`
 data "google_project" "project" {
-  project_id = "%[1]s"
-}
-
-resource "google_tags_tag_key" "key1" {
-  parent      = "projects/%[1]s"
-  short_name  = "foobarbaz1-%[2]s"
-  description = "For foo/bar1 resources"
-  purpose     = "GCE_FIREWALL"
-  purpose_data = {
-    network = "%[1]s/%[4]s"
-  }
-}
-
-resource "google_tags_tag_value" "value1" {
-  parent      = google_tags_tag_key.key1.id
-  short_name  = "foo1-%[2]s"
-  description = "For foo1 resources"
-}
-
-resource "google_tags_tag_key" "key2" {
-  parent      = "projects/%[1]s"
-  short_name  = "foobarbaz2-%[2]s"
-  description = "For foo/bar2 resources"
-  purpose     = "GCE_FIREWALL"
-  purpose_data = {
-    network = "%[1]s/%[4]s"
-  }
-
-  depends_on = [google_tags_tag_key.key1]
-}
-
-resource "google_tags_tag_value" "value2" {
-  parent      = google_tags_tag_key.key2.id
-  short_name  = "foo2-%[2]s"
-  description = "For foo2 resources"
+  project_id = "%{pid}"
 }
 
 data "google_container_engine_versions" "uscentral1a" {
   location = "us-central1-a"
 }
 
 resource "google_container_cluster" "primary" {
-  name               = "%[3]s"
+  name               = "tf-test-cluster-%{random_suffix}"
   location           = "us-central1-a"
   min_master_version = data.google_container_engine_versions.uscentral1a.release_channel_latest_version["STABLE"]
 
@@ -4882,8 +4796,8 @@ resource "google_container_cluster" "primary" {
   initial_node_count       = 1
 
   deletion_protection = false
-  network             = "%[4]s"
-  subnetwork          = "%[5]s"
+  network             = "%{network}"
+  subnetwork          = "%{subnet}"
 
   timeouts {
     create = "30m"
@@ -4905,7 +4819,7 @@ resource "google_container_node_pool" "primary_nodes" {
     disk_size_gb = 15
   }
 }
-`, projectID, randomSuffix, clusterName, networkName, subnetworkName)
+`, context)
 }
 
 func TestAccContainerNodePool_privateRegistry(t *testing.T) {

google/services/datafusion/resource_data_fusion_instance_test.go

@@ -173,11 +173,11 @@ resource "google_data_fusion_instance" "foobar" {
 func TestAccDatafusionInstance_tags(t *testing.T) {
 	t.Parallel()
 
-	tagKey := acctest.BootstrapSharedTestTagKey(t, "datafusion-instances-tagkey")
+	tagKey := acctest.BootstrapSharedTestOrganizationTagKey(t, "datafusion-instances-tagkey", nil)
 	context := map[string]interface{}{
 		"org":           envvar.GetTestOrgFromEnv(t),
 		"tagKey":        tagKey,
-		"tagValue":      acctest.BootstrapSharedTestTagValue(t, "datafusion-instances-tagvalue", tagKey),
+		"tagValue":      acctest.BootstrapSharedTestOrganizationTagValue(t, "datafusion-instances-tagvalue", tagKey),
 		"random_suffix": acctest.RandString(t, 10),
 	}
 

google/services/filestore/resource_filestore_backup_test.go

@@ -134,11 +134,11 @@ resource "google_filestore_backup" "backup" {
 func TestAccFilestoreBackup_tags(t *testing.T) {
 	t.Parallel()
 
-	tagKey := acctest.BootstrapSharedTestTagKey(t, "filestore-backups-tagkey")
+	tagKey := acctest.BootstrapSharedTestOrganizationTagKey(t, "filestore-backups-tagkey", nil)
 	context := map[string]interface{}{
 		"org":           envvar.GetTestOrgFromEnv(t),
 		"tagKey":        tagKey,
-		"tagValue":      acctest.BootstrapSharedTestTagValue(t, "filestore-backups-tagvalue", tagKey),
+		"tagValue":      acctest.BootstrapSharedTestOrganizationTagValue(t, "filestore-backups-tagvalue", tagKey),
 		"random_suffix": acctest.RandString(t, 10),
 	}