Amended Docker run and gen-env script

An issue in which the environment variables which were not explicitly TF_VAR_ or ENV would not be available to the Docker container's environment when running was discovered.

By changing how we source the whole .env file and run various commands the environment variables are fully availible for the environemt for both terraform and scripting purposes.

Makefile

@@ -8,20 +8,16 @@ TERRAFORM_VERSION := `cat versions.tf 2> /dev/null | grep required_version | cut
 LOCAL_IMAGE := ministryofjustice/nvvs/terraforms:latest
 DOCKER_IMAGE := ghcr.io/ministryofjustice/nvvs/terraforms:v0.2.0
 
-DOCKER_RUN := @docker run --rm \
+DOCKER_RUN_GEN_ENV := @docker run --rm -it \
 				--env-file <(aws-vault exec $$AWS_PROFILE -- env | grep ^AWS_) \
-				--env-file <(env | grep ^TF_VAR_) \
-				--env-file <(env | grep ^ENV) \
-				-e TFENV_TERRAFORM_VERSION=$(TERRAFORM_VERSION) \
 				-v `pwd`:/data \
 				--workdir /data \
 				--platform linux/amd64 \
 				$(DOCKER_IMAGE)
 
-DOCKER_RUN_IT := @docker run --rm -it \
+DOCKER_RUN := @docker run --rm -it \
 				--env-file <(aws-vault exec $$AWS_PROFILE -- env | grep ^AWS_) \
-				--env-file <(env | grep ^TF_VAR_) \
-				--env-file <(env | grep ^ENV) \
+				--env-file ./.env \
 				-e TFENV_TERRAFORM_VERSION=$(TERRAFORM_VERSION) \
 				-v `pwd`:/data \
 				--workdir /data \
@@ -32,29 +28,27 @@ export DOCKER_DEFAULT_PLATFORM=linux/amd64
 
 .PHONY: debug
 debug:  ## debug
-	@echo "debug"
 	$(info target is $@)
-	echo "$$SHELL"
+	@echo "debug"
 
 .PHONY: aws
 aws:  ## provide aws cli command as an arg e.g. (make aws AWSCLI_ARGUMENT="s3 ls")
 	$(DOCKER_RUN) /bin/bash -c "aws $$AWSCLI_ARGUMENT"
 
 .PHONY: shell
 shell: ## Run Docker container with interactive terminal
-	$(DOCKER_RUN_IT) /bin/bash
+	$(DOCKER_RUN) /bin/bash
 
 .PHONY: fmt
 fmt: ## terraform fmt
-	$(DOCKER_RUN) terraform fmt --recursive
+	$(DOCKER_RUN) /bin/bash -c "terraform fmt --recursive"
 
 .PHONY: init
 init: ## terraform init (make init ENV_ARGUMENT=pre-production) NOTE: Will also select the env's workspace.
 
 ## INFO: Do not indent the conditional below, make stops with an error.
 ifneq ("$(wildcard .env)","")
 $(info Using config file ".env")
-include .env
 init: -init
 else
 $(info Config file ".env" does not exist.)
@@ -68,75 +62,75 @@ endif
 
 .PHONY: -init
 -init:
-	$(DOCKER_RUN) terraform init --backend-config="key=terraform.$$ENV.state"
+	$(DOCKER_RUN) /bin/bash -c "terraform init --backend-config=\"key=terraform.${ENV}.state\""
 	$(MAKE) workspace-select
 
 .PHONY: init-upgrade
 init-upgrade: ## terraform init -upgrade
-	$(DOCKER_RUN) terraform init -upgrade --backend-config="key=terraform.$$ENV.state"
+	$(DOCKER_RUN) /bin/bash -c "terraform init -upgrade --backend-config=\"key=terraform.${ENV}.state\""
 
 .PHONY: import
 import: ## terraform import e.g. (make import IMPORT_ARGUMENT=module.foo.bar some_resource)
-	$(DOCKER_RUN) terraform import $$IMPORT_ARGUMENT
+	$(DOCKER_RUN) /bin/bash -c "terraform import ${IMPORT_ARGUMENT}"
 
 .PHONY: workspace-list
 workspace-list: ## terraform workspace list
-	$(DOCKER_RUN) terraform workspace list
+	$(DOCKER_RUN) /bin/bash -c "terraform workspace list"
 
 .PHONY: workspace-select
 workspace-select: ## terraform workspace select
-	$(DOCKER_RUN) terraform workspace select $$ENV || \
-	$(DOCKER_RUN) terraform workspace new $$ENV
+	$(DOCKER_RUN) /bin/bash -c "terraform workspace select ${ENV}" || \
+	$(DOCKER_RUN) /bin/bash -c "terraform workspace new ${ENV}"
 
 .PHONY: validate
 validate: ## terraform validate
-	$(DOCKER_RUN) terraform validate
+	$(DOCKER_RUN) /bin/bash -c "terraform validate"
 
 .PHONY: plan-out
 plan-out: ## terraform plan - output to timestamped file
-	$(DOCKER_RUN) terraform plan -no-color > $$ENV.$(CURRENT_TIME).tfplan
+	$(DOCKER_RUN) /bin/bash -c "terraform plan -no-color > ${ENV}.$(CURRENT_TIME).tfplan"
 
 .PHONY: plan
 plan: ## terraform plan
-	$(DOCKER_RUN) terraform plan
+	$(DOCKER_RUN) /bin/bash -c "terraform plan"
 
 .PHONY: refresh
 refresh: ## terraform refresh
-	$(DOCKER_RUN) terraform refresh
+	$(DOCKER_RUN) /bin/bash -c "terraform refresh"
 
 .PHONY: output
 output: ## terraform output (make output OUTPUT_ARGUMENT='--raw dns_dhcp_vpc_id')
-	$(DOCKER_RUN) terraform output -no-color $$OUTPUT_ARGUMENT
+	$(DOCKER_RUN) /bin/bash -c "terraform output -no-color ${OUTPUT_ARGUMENT}"
 
 .PHONY: apply
 apply: ## terraform apply
-	$(DOCKER_RUN_IT) terraform apply
+	$(DOCKER_RUN) /bin/bash -c "terraform apply"
 	$(DOCKER_RUN) /bin/bash -c "./scripts/publish_terraform_outputs.sh"
 
 .PHONY: state-list
 state-list: ## terraform state list
-	$(DOCKER_RUN) terraform state list
+	$(DOCKER_RUN) /bin/bash -c "terraform state list"
 
 .PHONY: show
 show: ## terraform show
-	$(DOCKER_RUN) terraform show -no-color
+	$(DOCKER_RUN)/bin/bash -c " terraform show -no-color"
 
 .PHONY: destroy
 destroy: ## terraform destroy
-	$(DOCKER_RUN) terraform destroy
+	$(DOCKER_RUN) /bin/bash -c "terraform destroy"
 
 .PHONY: lock
 lock: ## terraform providers lock (reset hashes after upgrades prior to commit)
 	rm .terraform.lock.hcl
-	$(DOCKER_RUN) terraform providers lock -platform=windows_amd64 -platform=darwin_amd64 -platform=linux_amd64
+	$(DOCKER_RUN) /bin/bash -c "terraform providers lock -platform=windows_amd64 -platform=darwin_amd64 -platform=linux_amd64"
 
 .PHONY: clean
 clean: ## clean terraform cached providers etc
-	rm -rf .terraform/ terraform.tfstate* .env
+	rm -rf .terraform/ terraform.tfstate* .env #&& echo "" > ./.env
 
 .PHONY: gen-env
 gen-env: ## generate a ".env" file with the correct TF_VARS for the environment e.g. (make gen-env ENV_ARGUMENT=pre-production)
-	$(DOCKER_RUN) /bin/bash -c "./scripts/generate-env-file.sh $$ENV_ARGUMENT"
+	$(DOCKER_RUN_GEN_ENV) /bin/bash -c "./scripts/generate-env-file.sh ${ENV_ARGUMENT}"
 
 .PHONY: tfenv
 tfenv: ## tfenv pin - terraform version from versions.tf
@@ -150,4 +144,4 @@ help:
 ############ Repository unique targets ############
 .PHONY: authorise-performance-test-clients
 authorise-performance-test-clients: ## Update a config file with IPs for test clients
-	$(DOCKER_RUN_IT) /bin/bash -c "./scripts/authorise_performance_test_clients.sh"
+	$(DOCKER_RUN) /bin/bash -c "./scripts/authorise_performance_test_clients.sh"

scripts/generate-env-file.sh

@@ -60,11 +60,11 @@ cat << EOF > ./.env
 # then run "make init"
 
 
-export AWS_PROFILE=mojo-shared-services-cli
-export AWS_VAULT_PROFILE=mojo-shared-services-cli
+AWS_PROFILE=mojo-shared-services-cli
+AWS_VAULT_PROFILE=mojo-shared-services-cli
 
 ### ${ENV} ###
-export ENV=${ENV}
+ENV=${ENV}
 
 
 ## buildspec defaults
@@ -75,27 +75,27 @@ export ENV=${ENV}
 
 ## This value has been applied to the envs via AWS CodePipeline CI.
 ## We don't want to use the default variable's value here.
-export [email protected]
+[email protected]
 
 ## This value has been applied to the envs via AWS CodePipeline CI.
 ## There is no default value set in the variables.tf.
-export TF_VAR_enable_authentication=true
+TF_VAR_enable_authentication=true
 
 ## This value has been applied to the envs via AWS CodePipeline CI.
-export TF_VAR_enable_hosted_zone=true
+TF_VAR_enable_hosted_zone=true
 
 ## This value has been applied to the envs via AWS CodePipeline CI.
-export TF_VAR_enable_nac_transit_gateway_attachment=true
+TF_VAR_enable_nac_transit_gateway_attachment=true
 
 EOF
 
 for key in "${!parameters[@]}"
 do
     ## uppercase key do not prefix with TF_VAR
     if [[ "${key}" =~ [A-Z] ]]; then
-        echo "export ${key}=${parameters[${key}]}"  >> ./.env
+        echo "${key}=${parameters[${key}]}"  >> ./.env
     else
-        echo "export TF_VAR_${key}=${parameters[${key}]}"  >> ./.env
+        echo "TF_VAR_${key}=${parameters[${key}]}"  >> ./.env
     fi
 done