Merge pull request #11 from terraform-google-modules/aaron-lane/remov…

…e-terraform-tfvars Ignore terraform.tfvars
terraform-google-modules · Feb 21, 2019 · 1fc8adc · 1fc8adc
2 parents c6f8f2b + 0403606
commit 1fc8adc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,9 +40,8 @@ crash.log
 # Ignore any .tfvars files that are generated automatically for each Terraform run. Most
 # .tfvars files are managed as part of configuration and so should be included in
 # version control.
-#
-# example.tfvars
-test/fixtures/shared/terraform.tfvars
+
+**/*/terraform.tfvars
 
 credentials.json
 

diff --git a/test/fixtures/automatic_labelling/terraform.tfvars b/test/fixtures/automatic_labelling/terraform.tfvars
diff --git a/test/integration.sh b/test/integration.sh
@@ -28,8 +28,8 @@ if [ -z "${SERVICE_ACCOUNT_JSON}" ]; then
 fi
 
 export TF_VAR_project_id="${PROJECT_ID}"
-export TF_VAR_region="${REGION:-us-east4}"
-export TF_VAR_zone="${ZONE:-us-east4-a}"
+export TF_VAR_region="${REGION:-us-east1}"
+export TF_VAR_zone="${ZONE:-us-east1-b}"
 
 DELETE_AT_EXIT="$(mktemp -d)"
 finish() {