Make BootstrapSharedTestTagKey wait for operation (GoogleCloudPlatform#13650)

Author: trodge

mmv1/third_party/terraform/acctest/bootstrap_test_utils.go.tmpl

@@ -19,6 +19,7 @@ import (
 {{- end }}
 
 	"github.com/hashicorp/terraform-provider-google/google/envvar"
+	"github.com/hashicorp/terraform-provider-google/google/services/tags"
 	tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute"
 	"github.com/hashicorp/terraform-provider-google/google/services/privateca"
 	"github.com/hashicorp/terraform-provider-google/google/services/resourcemanager"
@@ -2087,7 +2088,7 @@ func BootstrapSharedTestTagKey(t *testing.T, testId string) string {
 			"description": "Bootstrapped tag key for Terraform Acceptance testing",
 		}
 
-		_, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config:    config,
 			Method:    "POST",
 			Project:   config.Project,
@@ -2101,6 +2102,15 @@ func BootstrapSharedTestTagKey(t *testing.T, testId string) string {
 		}
 
 		log.Printf("[DEBUG] Waiting for shared tag key creation to finish")
+
+		err = tags.TagsOperationWaitTime(
+			config, res, "Creating TagKey", config.UserAgent,
+			20 * time.Minute)
+
+		if err != nil {
+			// The resource didn't actually create
+			t.Fatalf("Error waiting to create TagKey: %s", err)
+		}
 	}
 
 	_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
@@ -2163,7 +2173,7 @@ func BootstrapSharedTestTagValue(t *testing.T, testId string, tagKey string) str
 			"description": "Bootstrapped tag value for Terraform Acceptance testing",
 		}
 
-		_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config:    config,
 			Method:    "POST",
 			Project:   config.Project,
@@ -2172,11 +2182,21 @@ func BootstrapSharedTestTagValue(t *testing.T, testId string, tagKey string) str
 			Body:      tagKeyObj,
 			Timeout:   10 * time.Minute,
 		})
+
 		if err != nil {
 			t.Fatalf("Error bootstrapping shared tag value %q: %s", sharedTagValue, err)
 		}
 
 		log.Printf("[DEBUG] Waiting for shared tag value creation to finish")
+
+		err = tags.TagsOperationWaitTime(
+			config, res, "Creating TagValue", config.UserAgent,
+			20 * time.Minute)
+
+		if err != nil {
+			// The resource didn't actually create
+			t.Fatalf("Error waiting to create TagValue: %s", err)
+		}
 	}
 
 	_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{