Review Fixes for Implement integration testing for Terraform Validator

Added Cloud Build config to build folder and needed resources provisioning to tests folder. It's not very clean option because project already had test folder for go testing. Related PR GoogleCloudPlatform/cloud-foundation-toolkit#376
GoogleCloudPlatform · Oct 25, 2019 · d6248aa · d6248aa
1 parent 4289352
commit d6248aa
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 214 deletions.
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -22,29 +22,15 @@ steps:
   name: 'gcr.io/cloud-builders/go'
   entrypoint: /usr/bin/make
   args: [build]
-- id: prepare
-  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && prepare_environment']
-  env:
-    - 'TF_VAR_org_id=$_ORG_ID'
-    - 'TF_VAR_folder_id=$_FOLDER_ID'
-    - 'TF_VAR_billing_account=$_BILLING_ACCOUNT'
-- id: print_source
-  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'cat test/source.sh']
 - id: test-integration
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source test/source.sh && make test-integration']
-- id: destroy
-  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && cleanup_environment']
+  args: ['/bin/bash', '-c', 'make test-integration']
   env:
-  - 'TF_VAR_org_id=$_ORG_ID'
-  - 'TF_VAR_folder_id=$_FOLDER_ID'
-  - 'TF_VAR_billing_account=$_BILLING_ACCOUNT'
+    - 'TEST_PROJECT=$_TEST_PROJECT'
 tags:
 - 'ci'
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
   _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.1.0'
+
diff --git a/test/setup/.gitignore b/test/setup/.gitignore
diff --git a/test/setup/iam.tf b/test/setup/iam.tf
diff --git a/test/setup/main.tf b/test/setup/main.tf
diff --git a/test/setup/make_source.sh b/test/setup/make_source.sh
diff --git a/test/setup/outputs.tf b/test/setup/outputs.tf
diff --git a/test/setup/variables.tf b/test/setup/variables.tf
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
diff --git a/test/utils.go b/test/utils.go
@@ -108,15 +108,15 @@ func configure(t *testing.T) config {
 	}
 
 	cfg.credentials, ok = os.LookupEnv("TEST_CREDENTIALS")
-	if !ok {
-		t.Fatal("missing required env var TEST_CREDENTIALS")
-	}
-	// Make credentials path relative to repo root rather than
-	// test/ dir if it is a relative path.
-	if !filepath.IsAbs(cfg.credentials) {
-		cfg.credentials = filepath.Join("..", cfg.credentials)
+	if ok {
+		// Make credentials path relative to repo root rather than
+		// test/ dir if it is a relative path.
+		if !filepath.IsAbs(cfg.credentials) {
+			cfg.credentials = filepath.Join("..", cfg.credentials)
+		}
+	} else {
+		t.Log("missing env var TEST_CREDENTIALS, will try to use Application Default Credentials")
 	}
-
 	return cfg
 }