From cb360125910371ad72dc55dafc38b7745f32b14e Mon Sep 17 00:00:00 2001
From: Aaron Lane <aarondrewlane@gmail.com>
Date: Thu, 21 Feb 2019 10:59:45 -0500
Subject: [PATCH 1/2] Ignore terraform.tfvars

---
 .gitignore                                         | 5 ++---
 test/fixtures/automatic_labelling/terraform.tfvars | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 test/fixtures/automatic_labelling/terraform.tfvars

diff --git a/.gitignore b/.gitignore
index 425a1eb..9cf6d0e 100644
--- 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
deleted file mode 100644
index 6cfa1b0..0000000
--- a/test/fixtures/automatic_labelling/terraform.tfvars
+++ /dev/null
@@ -1,5 +0,0 @@
-project_id = "aaronlane-event-function-test"
-
-region = "us-east1"
-
-zone = "us-east1-b"

From 04036061b76e571a79de2ca5e357ca58d6e2f112 Mon Sep 17 00:00:00 2001
From: Aaron Lane <aarondrewlane@gmail.com>
Date: Thu, 21 Feb 2019 11:05:51 -0500
Subject: [PATCH 2/2] Set default integration region to us-east1

us-east4 is not supported by Cloud Functions
---
 test/integration.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration.sh b/test/integration.sh
index 5aa3a70..7e780c7 100755
--- 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() {