feat: improve robustness of the code

Azure · Feb 27, 2025 · b463d21 · b463d21
1 parent 2d02786
commit b463d21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/avm_scripts/run-terraform-test.sh b/avm_scripts/run-terraform-test.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -euo pipefail
 
 # if $1 is not set, exit
 if [ -z "$1" ]; then
@@ -17,15 +18,15 @@ fi
 echo "==> Copy module to temp dir..."
 RND="$RANDOM"
 TMPDIR="/tmp/avmtester$RND"
-cp -r . "$TMPDIR"
+cp -r "$(pwd)" "$TMPDIR"
 cd "$TMPDIR"
 
+# clean up terraform files
 find -type d -name .terraform -print0 | xargs -0 rm -rf
 find -type f -name .terraform.lock.hcl -print0 | xargs -0 rm -rf
 find -type f -name 'terraform.tfstate*' -print0 | xargs -0 rm -rf
 
 echo "==> Running terraform test in $TESTDIR..."
-# clean up terraform files
 
-terraform init -test-directory="$TESTDIR"
+terraform init -test-directory=" -test$TESTDIR"
 terraform test -test-directory="$TESTDIR"
diff --git a/avm_scripts/run-tflint.sh b/avm_scripts/run-tflint.sh
@@ -57,6 +57,7 @@ run_tflint () {
   return 0
 }
 
+set -e
 echo "==> Copy module to temp dir..."
 RND="$RANDOM"
 TMPDIR="/tmp/avmtester$RND"
@@ -67,6 +68,7 @@ cd "$TMPDIR"
 find -type d -name .terraform -print0 | xargs -0 rm -rf
 find -type f -name .terraform.lock.hcl -print0 | xargs -0 rm -rf
 find -type f -name 'terraform.tfstate*' -print0 | xargs -0 rm -rf
+set +e
 
 has_error=false