[Terraform]: Require a provider zone to be set in tests (#1087)

Merged PR #1087.
GoogleCloudPlatform · Dec 20, 2018 · a245cf0 · a245cf0
1 parent facff5b
commit a245cf0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/third_party/terraform/utils/provider_test.go b/third_party/terraform/utils/provider_test.go
@@ -35,6 +35,12 @@ var regionEnvVars = []string{
 	"CLOUDSDK_COMPUTE_REGION",
 }
 
+var zoneEnvVars = []string{
+	"GOOGLE_ZONE",
+	"GCLOUD_ZONE",
+	"CLOUDSDK_COMPUTE_ZONE",
+}
+
 var orgEnvVars = []string{
 	"GOOGLE_ORG",
 }
@@ -97,6 +103,10 @@ func testAccPreCheck(t *testing.T) {
 	if v := multiEnvSearch(regionEnvVars); v != "us-central1" {
 		t.Fatalf("One of %s must be set to us-central1 for acceptance tests", strings.Join(regionEnvVars, ", "))
 	}
+
+	if v := multiEnvSearch(zoneEnvVars); v != "us-central1-a" {
+		t.Fatalf("One of %s must be set to us-central1-a for acceptance tests", strings.Join(zoneEnvVars, ", "))
+	}
 }
 
 func TestProvider_getRegionFromZone(t *testing.T) {