CCM-11029: revert things

Author: harrim91

infrastructure/terraform/bin/terraform.sh

@@ -391,7 +391,7 @@ rm -rf ${component_path}/.terraform;
 
 # Run global pre.sh
 if [ -f "pre.sh" ]; then
-  bash pre.sh "${region}" "${environment}" "${action}" \
+  source pre.sh "${region}" "${environment}" "${action}" \
     || error_and_die "Global pre script execution failed with exit code ${?}";
 fi;
 
@@ -427,12 +427,10 @@ fi;
 
 # Run pre.sh
 if [ -f "pre.sh" ]; then
-  bash pre.sh "${region}" "${environment}" "${action}" \
+  source pre.sh "${region}" "${environment}" "${action}" \
     || error_and_die "Component pre script execution failed with exit code ${?}";
 fi;
 
-echo "component pre.sh completed"
-
 # Pull down secret TFVAR file from S3
 # Anti-pattern and security warning: This secrets mechanism provides very little additional security.
 # It permits you to inject secrets directly into terraform without storing them in source control or unencrypted in S3.

infrastructure/terraform/components/app/pre.sh

@@ -1,10 +1,6 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
 echo "Running app pre.sh"
 
-cd $(git rev-parse --show-toplevel)
+pushd $(git rev-parse --show-toplevel)
 
 make dependencies
 
@@ -13,3 +9,5 @@ npm run generate-dependencies --workspaces --if-present
 npm run lambda-build --workspaces --if-present
 
 $(git rev-parse --show-toplevel)/lambdas/layers/pdfjs/build.sh
+
+popd

infrastructure/terraform/components/sandbox/pre.sh

@@ -1,21 +1,18 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
 REGION=$1
 ENVIRONMENT=$2
 ACTION=$3
 
-echo "Running pre.sh latest version"
+echo "Running pre.sh latestest version"
 echo "REGION=$REGION"
 echo "ENVIRONMENT=$ENVIRONMENT"
 echo "ACTION=$ACTION"
 
+pushd $(git rev-parse --show-toplevel)
+
 if [ "${ACTION}" == "apply" ]; then
-    cd $(git rev-parse --show-toplevel)
     echo "Building lambdas for distribution"
 
-    if [[ -z "${SKIP_SANDBOX_INSTALL:-}" ]]; then
+    if [[ -z $SKIP_SANDBOX_INSTALL ]]; then
       echo "Installing dependencies"
       make dependencies;
     else
@@ -32,4 +29,4 @@ else
     echo "Skipping lambda build for action $ACTION"
 fi
 
-exit 0
+popd