Merge pull request #521 from Conky5/a-few-tweaks

A few dev environment tweaks

.gitignore

@@ -5,3 +5,4 @@ elastic-certificates.p12
 index.yaml
 *.tgz
 .idea/
+/venv

helpers/terraform/Makefile

@@ -15,6 +15,11 @@ export TF_VAR_kubernetes_version=$(KUBERNETES_VERSION)
 help: ## Display this help
 	@awk 'BEGIN {FS = ":.*##"; printf "Usage: make \033[36m<target>\033[0m\n\nTargets:\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-10s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST)
 
+.PHONY: clean
+clean: ## Delete terraform working directory and local state files
+	rm credentials.json
+	rm -rf .terraform/
+
 credentials.json:
 	vault read -field=value \
 		"secret/devops-ci/helm-charts/gce/service-account" \

helpers/terraform/in-docker

@@ -2,12 +2,24 @@
 
 [[ -n $DEBUG ]] && set -o xtrace
 
+if [[ -z $VAULT_ADDR ]]
+then
+  echo "VAULT_ADDR must be set."
+  exit 1
+fi
+
+if [[ -z $VAULT_TOKEN ]]
+then
+  echo "VAULT_TOKEN must be set."
+  exit 1
+fi
+
 make build
 
 docker run --rm --interactive \
 	--env GOOGLE_CREDENTIALS='credentials.json' \
-	--env VAULT_TOKEN=${VAULT_TOKEN} \
-	--env VAULT_ADDR=${VAULT_ADDR} \
+	--env VAULT_TOKEN="${VAULT_TOKEN}" \
+	--env VAULT_ADDR="${VAULT_ADDR}" \
 	--env HOME=/app \
 	--volume "${PWD}/../../:/app" \
 	--user "$(id -u):$(id -g)" \