Merge pull request #12 from terraform-google-modules/feature/change-test-org

Add cleanup command and fix CI slightly

Author: aaron-lane

CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to
 
 ## [Unreleased]
 
+### Added
+
+- Added continuous integration using Cloud Build. [#11]
+
 ## [1.0.0] - 2019-07-19
 
 ### Changed
@@ -26,3 +30,4 @@ and this project adheres to
 [1.0.0]: https://github.com/terraform-google-modules/terraform-google-kms/releases/tag/v1.0.0
 
 [#3]: https://github.com/terraform-google-modules/terraform-google-kms/pull/3
+[#11]: https://github.com/terraform-google-modules/terraform-google-kms/pull/11

CONTRIBUTING.md

@@ -32,7 +32,7 @@ The integration tests are run using [Kitchen][kitchen],
 tools are packaged within a Docker image for convenience.
 
 The general strategy for these tests is to verify the behaviour of the
-[example modules](./examples), thus ensuring that the root module,
+[example modules](./examples/), thus ensuring that the root module,
 submodules, and example modules are all functionally correct.
 
 ### Test Environment

Makefile

@@ -41,6 +41,18 @@ docker_test_prepare:
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/usr/local/bin/execute_with_credentials.sh prepare_environment
 
+# Cleanup tests within the docker container
+.PHONY: docker_test_cleanup
+docker_test_cleanup:
+	docker run --rm -it \
+		-e SERVICE_ACCOUNT_JSON \
+		-e TF_VAR_org_id \
+		-e TF_VAR_folder_id \
+		-e TF_VAR_billing_account \
+		-v $(CURDIR):/workspace \
+		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
+		/usr/local/bin/execute_with_credentials.sh cleanup_environment
+
  # Execute integration tests within the docker container
 .PHONY: docker_test_integration
 docker_test_integration:

test/task_helper_functions.sh

@@ -16,7 +16,13 @@
 
 # Prepare the setup environment
 prepare_environment() {
-  init_credentials
+  set -eu
+
+  if [[ -z "${SERVICE_ACCOUNT_JSON:-}" ]]; then
+    echo "Proceeding using application default credentials"
+  else
+    init_credentials
+  fi
 
   cd test/setup/ || exit
   terraform init
@@ -27,6 +33,25 @@ prepare_environment() {
   cd - || return
 }
 
+# Destroy the setup environment
+cleanup_environment() {
+  set -eu
+
+  if [[ -z "${SERVICE_ACCOUNT_JSON:-}" ]]; then
+    echo "Proceeding using application default credentials"
+  else
+    init_credentials
+  fi
+
+  cd test/setup/ || exit
+  terraform init
+  terraform destroy -auto-approve
+  ./make_source.sh
+  # shellcheck disable=SC1091
+  source ../source.sh
+  cd - || return
+}
+
 # Run kitchen tasks with sourced credentials
 kitchen_do() {
   # shellcheck disable=SC1091