fixed working dir

getsentry · Apr 11, 2024 · de52de6 · de52de6
1 parent ae17c2d
commit de52de6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/tacos_unlock.yml b/.github/workflows/tacos_unlock.yml
@@ -127,7 +127,7 @@ jobs:
         id: main
         run: |
           # release all tfstate locks currently held 
-          echo "$SLICES" | jq -r '.[]' | ./tacos-gha/lib/ci/unlock
+          jq <<< "$SLICES" -r '.[]' | ./tacos-gha/lib/ci/unlock
       - name: update PR
         if: always()
         uses: thollander/actions-comment-pull-request@v2.4.3

diff --git a/lib/tf_lock/TESTING.md b/lib/tf_lock/TESTING.md
@@ -2,8 +2,8 @@ FIXME: automated testing for lib/tf_lock
 
 ```console
 cd slice-0-project
-alias sudo-plan='sudo-gcp -u tacos-gha-tf-plan@sac-dev-sa.iam.gserviceaccount.com'
-alias sudo-apply='sudo-gcp -u tacos-gha-tf-apply@sac-dev-sa.iam.gserviceaccount.com'
+alias sudo-plan='env GETSENTRY_SAC_VERB=plan sudo-gcp'
+alias sudo-apply='env GETSENTRY_SAC_VERB=apply sudo-gcp'
 
 sudo-plan tf-lock-info
 > {"lock": false}

diff --git a/lib/tf_lock/lib/env.sh b/lib/tf_lock/lib/env.sh
@@ -14,15 +14,16 @@ export PATH="$TACOS_GHA_HOME/lib/tf_lock/bin:$TACOS_GHA_HOME/bin${PATH:+:$PATH}}
 
 tf_working_dir() {
   set -eEuo pipefail
-
   root_module="$1"
   if [[ -e "$root_module/terragrunt.hcl" ]]; then
     ( cd "$root_module"
       # validate-inputs makes terragrunt generate its templates
       terragrunt  --terragrunt-no-auto-init=false validate-inputs
 
-      terragrunt  --terragrunt-no-auto-init=false terragrunt-info |
-        jq -r .WorkingDir
+      working_dir=$(terragrunt  --terragrunt-no-auto-init=false terragrunt-info |
+        jq -r .WorkingDir)
+      cd "$working_dir"
+      pwd
     )
   else
     echo "$root_module"