Run AccessContextManager tests serially in CI (hashicorp#259)

modular-magician · rileykarson · commit 1f9a0b7023b2 · 2018-12-19T10:54:19.000-08:00
diff --git a/google-beta/resource_access_context_manager_access_level_test.go b/google-beta/resource_access_context_manager_access_level_test.go
@@ -8,8 +8,10 @@ import (
 	"github.com/hashicorp/terraform/terraform"
 )
 
-// Access Context Manager tests need to run serially
-func TestAccAccessContextManagerAccessLevel_basic(t *testing.T) {
+// Since each test here is acting on the same organization and only one AccessPolicy
+// can exist, they need to be ran serially. See AccessPolicy for the test runner.
+
+func testAccAccessContextManagerAccessLevel_basicTest(t *testing.T) {
 	org := getTestOrgFromEnv(t)
 
 	resource.Test(t, resource.TestCase{
@@ -37,7 +39,7 @@ func TestAccAccessContextManagerAccessLevel_basic(t *testing.T) {
 	})
 }
 
-func TestAccAccessContextManagerAccessLevel_full(t *testing.T) {
+func testAccAccessContextManagerAccessLevel_fullTest(t *testing.T) {
 	org := getTestOrgFromEnv(t)
 
 	resource.Test(t, resource.TestCase{
diff --git a/google-beta/resource_access_context_manager_access_policy_test.go b/google-beta/resource_access_context_manager_access_policy_test.go
@@ -8,8 +8,30 @@ import (
 	"github.com/hashicorp/terraform/terraform"
 )
 
-// Access Context Manager tests need to run serially
-func TestAccAccessContextManagerAccessPolicy_basic(t *testing.T) {
+// Since each test here is acting on the same organization and only one AccessPolicy
+// can exist, they need to be ran serially
+func TestAccAccessContextManager(t *testing.T) {
+	testCases := map[string]func(t *testing.T){
+		"access_policy":            testAccAccessContextManagerAccessPolicy_basicTest,
+		"service_perimeter":        testAccAccessContextManagerServicePerimeter_basicTest,
+		"service_perimeter_update": testAccAccessContextManagerServicePerimeter_updateTest,
+		"access_level":             testAccAccessContextManagerAccessLevel_basicTest,
+		"access_level_full":        testAccAccessContextManagerAccessLevel_fullTest,
+	}
+
+	for name, tc := range testCases {
+		// shadow the tc variable into scope so that when
+		// the loop continues, if t.Run hasn't executed tc(t)
+		// yet, we don't have a race condition
+		// see https://github.com/golang/go/wiki/CommonMistakes#using-goroutines-on-loop-iterator-variables
+		tc := tc
+		t.Run(name, func(t *testing.T) {
+			tc(t)
+		})
+	}
+}
+
+func testAccAccessContextManagerAccessPolicy_basicTest(t *testing.T) {
 	org := getTestOrgFromEnv(t)
 
 	resource.Test(t, resource.TestCase{
diff --git a/google-beta/resource_access_context_manager_service_perimeter_test.go b/google-beta/resource_access_context_manager_service_perimeter_test.go
@@ -8,8 +8,9 @@ import (
 	"github.com/hashicorp/terraform/terraform"
 )
 
-// Access Context Manager tests need to run serially
-func TestAccAccessContextManagerServicePerimeter_basic(t *testing.T) {
+// Since each test here is acting on the same organization and only one AccessPolicy
+// can exist, they need to be ran serially. See AccessPolicy for the test runner.
+func testAccAccessContextManagerServicePerimeter_basicTest(t *testing.T) {
 	org := getTestOrgFromEnv(t)
 
 	resource.Test(t, resource.TestCase{
@@ -29,7 +30,7 @@ func TestAccAccessContextManagerServicePerimeter_basic(t *testing.T) {
 	})
 }
 
-func TestAccAccessContextManagerServicePerimeter_update(t *testing.T) {
+func testAccAccessContextManagerServicePerimeter_updateTest(t *testing.T) {
 	org := getTestOrgFromEnv(t)
 
 	resource.Test(t, resource.TestCase{
diff --git a/website/docs/r/accesscontextmanager_access_level.html.markdown b/website/docs/r/accesscontextmanager_access_level.html.markdown
@@ -206,5 +206,5 @@ AccessLevel can be imported using any of these accepted formats:
 $ terraform import -provider=google-beta google_access_context_manager_access_level.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/accesscontextmanager_access_policy.html.markdown b/website/docs/r/accesscontextmanager_access_policy.html.markdown
@@ -99,5 +99,5 @@ AccessPolicy can be imported using any of these accepted formats:
 $ terraform import -provider=google-beta google_access_context_manager_access_policy.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/accesscontextmanager_service_perimeter.html.markdown b/website/docs/r/accesscontextmanager_service_perimeter.html.markdown
@@ -210,5 +210,5 @@ ServicePerimeter can be imported using any of these accepted formats:
 $ terraform import -provider=google-beta google_access_context_manager_service_perimeter.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/binaryauthorization_attestor.html.markdown b/website/docs/r/binaryauthorization_attestor.html.markdown
@@ -169,5 +169,5 @@ $ terraform import -provider=google-beta google_binary_authorization_attestor.de
 $ terraform import -provider=google-beta google_binary_authorization_attestor.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/binaryauthorization_policy.html.markdown b/website/docs/r/binaryauthorization_policy.html.markdown
@@ -182,5 +182,5 @@ $ terraform import -provider=google-beta google_binary_authorization_policy.defa
 $ terraform import -provider=google-beta google_binary_authorization_policy.default {{project}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_address.html.markdown b/website/docs/r/compute_address.html.markdown
@@ -219,5 +219,5 @@ $ terraform import google_compute_address.default {{project}}/{{region}}/{{name}
 $ terraform import google_compute_address.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_autoscaler.html.markdown b/website/docs/r/compute_autoscaler.html.markdown
@@ -299,5 +299,5 @@ $ terraform import google_compute_autoscaler.default {{project}}/{{zone}}/{{name
 $ terraform import google_compute_autoscaler.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_backend_bucket.html.markdown b/website/docs/r/compute_backend_bucket.html.markdown
@@ -123,5 +123,5 @@ $ terraform import google_compute_backend_bucket.default {{project}}/{{name}}
 $ terraform import google_compute_backend_bucket.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_disk.html.markdown b/website/docs/r/compute_disk.html.markdown
@@ -276,5 +276,5 @@ $ terraform import google_compute_disk.default {{project}}/{{zone}}/{{name}}
 $ terraform import google_compute_disk.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_firewall.html.markdown b/website/docs/r/compute_firewall.html.markdown
@@ -267,5 +267,5 @@ $ terraform import google_compute_firewall.default {{project}}/{{name}}
 $ terraform import google_compute_firewall.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_forwarding_rule.html.markdown b/website/docs/r/compute_forwarding_rule.html.markdown
@@ -254,5 +254,5 @@ $ terraform import google_compute_forwarding_rule.default {{project}}/{{region}}
 $ terraform import google_compute_forwarding_rule.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_global_address.html.markdown b/website/docs/r/compute_global_address.html.markdown
@@ -143,5 +143,5 @@ $ terraform import google_compute_global_address.default {{project}}/{{name}}
 $ terraform import google_compute_global_address.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_health_check.html.markdown b/website/docs/r/compute_health_check.html.markdown
@@ -265,5 +265,5 @@ $ terraform import google_compute_health_check.default {{project}}/{{name}}
 $ terraform import google_compute_health_check.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_http_health_check.html.markdown b/website/docs/r/compute_http_health_check.html.markdown
@@ -149,5 +149,5 @@ $ terraform import google_compute_http_health_check.default {{project}}/{{name}}
 $ terraform import google_compute_http_health_check.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_https_health_check.html.markdown b/website/docs/r/compute_https_health_check.html.markdown
@@ -149,5 +149,5 @@ $ terraform import google_compute_https_health_check.default {{project}}/{{name}
 $ terraform import google_compute_https_health_check.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_interconnect_attachment.html.markdown b/website/docs/r/compute_interconnect_attachment.html.markdown
@@ -132,5 +132,5 @@ $ terraform import google_compute_interconnect_attachment.default {{project}}/{{
 $ terraform import google_compute_interconnect_attachment.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_region_autoscaler.html.markdown b/website/docs/r/compute_region_autoscaler.html.markdown
@@ -299,5 +299,5 @@ $ terraform import google_compute_region_autoscaler.default {{project}}/{{region
 $ terraform import google_compute_region_autoscaler.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_region_disk.html.markdown b/website/docs/r/compute_region_disk.html.markdown
@@ -245,5 +245,5 @@ $ terraform import google_compute_region_disk.default {{project}}/{{region}}/{{n
 $ terraform import google_compute_region_disk.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_route.html.markdown b/website/docs/r/compute_route.html.markdown
@@ -180,5 +180,5 @@ $ terraform import google_compute_route.default {{project}}/{{name}}
 $ terraform import google_compute_route.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_router.html.markdown b/website/docs/r/compute_router.html.markdown
@@ -171,5 +171,5 @@ $ terraform import google_compute_router.default {{project}}/{{region}}/{{name}}
 $ terraform import google_compute_router.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_snapshot.html.markdown b/website/docs/r/compute_snapshot.html.markdown
@@ -190,5 +190,5 @@ $ terraform import google_compute_snapshot.default {{project}}/{{name}}
 $ terraform import google_compute_snapshot.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_ssl_certificate.html.markdown b/website/docs/r/compute_ssl_certificate.html.markdown
@@ -229,5 +229,5 @@ $ terraform import google_compute_ssl_certificate.default {{project}}/{{name}}
 $ terraform import google_compute_ssl_certificate.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_ssl_policy.html.markdown b/website/docs/r/compute_ssl_policy.html.markdown
@@ -152,5 +152,5 @@ $ terraform import google_compute_ssl_policy.default {{project}}/{{name}}
 $ terraform import google_compute_ssl_policy.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_subnetwork.html.markdown b/website/docs/r/compute_subnetwork.html.markdown
@@ -193,5 +193,5 @@ $ terraform import google_compute_subnetwork.default {{project}}/{{region}}/{{na
 $ terraform import google_compute_subnetwork.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_target_http_proxy.html.markdown b/website/docs/r/compute_target_http_proxy.html.markdown
@@ -146,5 +146,5 @@ $ terraform import google_compute_target_http_proxy.default {{project}}/{{name}}
 $ terraform import google_compute_target_http_proxy.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_target_https_proxy.html.markdown b/website/docs/r/compute_target_https_proxy.html.markdown
@@ -176,5 +176,5 @@ $ terraform import google_compute_target_https_proxy.default {{project}}/{{name}
 $ terraform import google_compute_target_https_proxy.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_target_ssl_proxy.html.markdown b/website/docs/r/compute_target_ssl_proxy.html.markdown
@@ -150,5 +150,5 @@ $ terraform import google_compute_target_ssl_proxy.default {{project}}/{{name}}
 $ terraform import google_compute_target_ssl_proxy.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_target_tcp_proxy.html.markdown b/website/docs/r/compute_target_tcp_proxy.html.markdown
@@ -134,5 +134,5 @@ $ terraform import google_compute_target_tcp_proxy.default {{project}}/{{name}}
 $ terraform import google_compute_target_tcp_proxy.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_url_map.html.markdown b/website/docs/r/compute_url_map.html.markdown
@@ -261,5 +261,5 @@ $ terraform import google_compute_url_map.default {{project}}/{{name}}
 $ terraform import google_compute_url_map.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_vpn_gateway.html.markdown b/website/docs/r/compute_vpn_gateway.html.markdown
@@ -160,5 +160,5 @@ $ terraform import google_compute_vpn_gateway.default {{project}}/{{region}}/{{n
 $ terraform import google_compute_vpn_gateway.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/compute_vpn_tunnel.html.markdown b/website/docs/r/compute_vpn_tunnel.html.markdown
@@ -215,5 +215,5 @@ $ terraform import google_compute_vpn_tunnel.default {{project}}/{{region}}/{{na
 $ terraform import google_compute_vpn_tunnel.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/containeranalysis_note.html.markdown b/website/docs/r/containeranalysis_note.html.markdown
@@ -120,5 +120,5 @@ $ terraform import -provider=google-beta google_container_analysis_note.default
 $ terraform import -provider=google-beta google_container_analysis_note.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/dns_managed_zone.html.markdown b/website/docs/r/dns_managed_zone.html.markdown
@@ -114,5 +114,5 @@ $ terraform import google_dns_managed_zone.default {{project}}/{{name}}
 $ terraform import google_dns_managed_zone.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/filestore_instance.html.markdown b/website/docs/r/filestore_instance.html.markdown
@@ -164,5 +164,5 @@ $ terraform import -provider=google-beta google_filestore_instance.default {{pro
 $ terraform import -provider=google-beta google_filestore_instance.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/monitoring_alert_policy.html.markdown b/website/docs/r/monitoring_alert_policy.html.markdown
@@ -651,5 +651,5 @@ AlertPolicy can be imported using any of these accepted formats:
 $ terraform import google_monitoring_alert_policy.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/monitoring_group.html.markdown b/website/docs/r/monitoring_group.html.markdown
@@ -130,5 +130,5 @@ Group can be imported using any of these accepted formats:
 $ terraform import google_monitoring_group.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/monitoring_notification_channel.html.markdown b/website/docs/r/monitoring_notification_channel.html.markdown
@@ -119,5 +119,5 @@ NotificationChannel can be imported using any of these accepted formats:
 $ terraform import google_monitoring_notification_channel.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/monitoring_uptime_check_config.html.markdown b/website/docs/r/monitoring_uptime_check_config.html.markdown
@@ -264,5 +264,5 @@ UptimeCheckConfig can be imported using any of these accepted formats:
 $ terraform import google_monitoring_uptime_check_config.default {{name}}
 ```
 
--> If you're importing a resource with beta features, make sure to include `provider=google-beta"
+-> If you're importing a resource with beta features, make sure to include `-provider=google-beta"
 as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/website/docs/r/redis_instance.html.markdown b/website/docs/r/redis_instance.html.markdown
diff --git a/website/docs/r/resourcemanager_lien.html.markdown b/website/docs/r/resourcemanager_lien.html.markdown
diff --git a/website/docs/r/storage_default_object_access_control.html.markdown b/website/docs/r/storage_default_object_access_control.html.markdown
diff --git a/website/docs/r/storage_object_access_control.html.markdown b/website/docs/r/storage_object_access_control.html.markdown
