From 28dab96f516c2f78711e3d63e6dee6b45873eac2 Mon Sep 17 00:00:00 2001 From: Chris Koehnke Date: Tue, 17 Mar 2020 13:56:16 -0400 Subject: [PATCH] A few dev environment tweaks Add venv to .gitignore. Add a `make clean`. Add checks for required vault environment variables and make `in-docker` pass `shellcheck`. --- .gitignore | 1 + helpers/terraform/Makefile | 5 +++++ helpers/terraform/in-docker | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index beeb2f712..a917d1fa5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ elastic-certificates.p12 index.yaml *.tgz .idea/ +/venv diff --git a/helpers/terraform/Makefile b/helpers/terraform/Makefile index 58f786056..aa8646956 100644 --- a/helpers/terraform/Makefile +++ b/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\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" \ diff --git a/helpers/terraform/in-docker b/helpers/terraform/in-docker index 7b2f6cf1a..dba0aa1c7 100755 --- a/helpers/terraform/in-docker +++ b/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)" \