Merge branch 'GoogleCloudPlatform:main' into magic-module-fork

Author: shuang2018g

mmv1/third_party/terraform/.teamcity/USE_CONFIG_WITH_TEAMCITY.md

@@ -51,7 +51,7 @@ The next step is provide some input values that the configuration needs to fully
 * Click on the `Context Parameters` tab at the top of the page
     * On this page you can add key:value pairs, which are used as input to the configuration in `.teamcity/settings.kts`
 * First, we need to enter credentials information in a special way that keeps the values secure. Here is the process for the credentials to the GA nightly test project:
-    * Find the credentials JSON file for that project, ensure that the value has no newlines
+    * Find the credentials JSON file for that project, ensure that the value has no newlines (Running `cat CREDENTIALS.json | tr -s '\n' ' '` will remove newline characters from your JSON key file)
     * Click the dropdown menu next to `Actions` in the top right and click `Generate token for a secure value...`
     * Paste the credentials JSON string into the `Secure value` field nd click `Generate Token`.
     * Copy the value shown below the field, which should look like `credentialsJSON:<uuid>`
@@ -145,4 +145,4 @@ In scenarios liek this, you will see an error shown at the bottom of the `Versio
 To avoid bugs reaching TeamCity, validate all changes to the TeamCity configuration files locally before merging a PR:
 * Generate the GA provider from Magic Modules
 * In the GA provider repo, run `cd .teamcity`
-* Validate the configuration using `make validate`
+* Validate the configuration using `make validate`

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{

mmv1/third_party/terraform/services/dns/resource_dns_record_set_test.go.tmpl

@@ -320,7 +320,7 @@ func TestAccDNSRecordSet_routingPolicy(t *testing.T) {
 				ImportStateVerify: true,
 			},
 			{
-				Config: testAccDnsRecordSet_routingPolicyRegionalL7PrimaryBackup(networkName, proxySubnetName, httpHealthCheckName, backendName, urlMapName, httpProxyName, forwardingRuleName, zoneName, 300),
+				Config: testAccDnsRecordSet_routingPolicyRegionalL7PrimaryBackup(networkName, proxySubnetName+"-reg-l7", httpHealthCheckName, backendName, urlMapName, httpProxyName, forwardingRuleName+"-reg-l7", zoneName, 300),
 			},
 			{
 				ResourceName:  "google_dns_record_set.foobar",
@@ -329,7 +329,7 @@ func TestAccDNSRecordSet_routingPolicy(t *testing.T) {
 				ImportStateVerify: true,
 			},
 			{
-				Config: testAccDnsRecordSet_routingPolicyRegionalL7PrimaryBackupMultipleNoLbType(networkName, proxySubnetName, httpHealthCheckName, backendName, urlMapName, httpProxyName, forwardingRuleName, zoneName, 300),
+				Config: testAccDnsRecordSet_routingPolicyRegionalL7PrimaryBackupMultipleNoLbType(networkName, proxySubnetName+"-reg-l7-nolbtype", httpHealthCheckName, backendName, urlMapName, httpProxyName, forwardingRuleName+"-reg-l7-nolbtype", zoneName, 300),
 			},
 			{
 				ResourceName:  "google_dns_record_set.foobar",
@@ -338,7 +338,7 @@ func TestAccDNSRecordSet_routingPolicy(t *testing.T) {
 				ImportStateVerify: true,
 			},
 			{
-				Config: testAccDnsRecordSet_routingPolicyCrossRegionL7PrimaryBackup(networkName, backendSubnetName, proxySubnetName, httpHealthCheckName, backendName, urlMapName, httpProxyName, forwardingRuleName, zoneName, 300),
+				Config: testAccDnsRecordSet_routingPolicyCrossRegionL7PrimaryBackup(networkName, backendSubnetName, proxySubnetName+"-cross-reg-l7", httpHealthCheckName, backendName, urlMapName, httpProxyName, forwardingRuleName+"-cross-reg-l7", zoneName, 300),
 			},
 			{
 				ResourceName:  "google_dns_record_set.foobar",
@@ -347,7 +347,7 @@ func TestAccDNSRecordSet_routingPolicy(t *testing.T) {
 				ImportStateVerify: true,
 			},
 			{
-				Config: testAccDnsRecordSet_routingPolicyRegionalL7XLBPrimaryBackup(networkName, proxySubnetName, httpHealthCheckName, backendName, urlMapName, httpProxyName, forwardingRuleName, zoneName, 300),
+				Config: testAccDnsRecordSet_routingPolicyRegionalL7XLBPrimaryBackup(networkName, proxySubnetName+"-reg-l7x", httpHealthCheckName, backendName, urlMapName, httpProxyName, forwardingRuleName+"-reg-l7x", zoneName, 300),
 			},
 		},
 	})