Pass local AWS env vars to Terraform, tf fmt

Also rearrange the order of the validation scripts to fmt first

Author: obscurerichard

bin/common.sh

@@ -29,6 +29,7 @@ function get_env_tmpfile() {
     local TMPFILE
     TMPFILE="$(mktemp)"
     grep ^export "$DIR/../env.sh" | cut -c8- > "$TMPFILE"
+    printenv | grep '^AWS' >> "$TMPFILE"
     echo "$TMPFILE"
 }
 

bin/validate.sh

@@ -27,22 +27,22 @@ echo "Linting packer files"
 $DOCKER_PACKER validate app/packer/machines/web-server.json
 
 # Ensure that `terraform fmt` comes up clean
-if [[ "$SKIP_TERRAFORM" == "false" ]]; then
-    echo "Linting terraform files for correctness"
+if [[ "${SKIP_TERRAFORM:-false}" == "false" ]]; then
     DOCKER_TERRAFORM=$(get_docker_terraform)
-    init_terraform
-    $DOCKER_TERRAFORM validate \
-        -var 'newrelic_license_key=ZZZZ' \
-        -var 'newrelic_api_key=ZZZZ' \
-        -var '[email protected]' \
-    echo "Linting terraform files for formatting"
     fmt=$($DOCKER_TERRAFORM fmt)
     if [[ -n "$fmt" ]]; then
         echo 'ERROR: these files are not formatted correctly. Run "terraform fmt"'
         echo "$fmt"
         git diff
         exit 1
     fi
+    echo "Linting terraform files for correctness"
+    init_terraform
+    $DOCKER_TERRAFORM validate \
+        -var 'newrelic_license_key=ZZZZ' \
+        -var 'newrelic_api_key=ZZZZ' \
+        -var '[email protected]' \
+    echo "Linting terraform files for formatting"
 fi
 
 echo "Linting shell scripts"

terraform/aws.tf

@@ -4,6 +4,7 @@
 provider "aws" {
   region  = "${var.aws_region}"
   version = "~> 1.57"
+
   assume_role = {
     role_arn = "arn:aws:iam::587267277416:role/terraform_sandbox_backend_admin"
   }