Merge pull request #278 from dxw/fix-run-terraform-command-var-file-p…

…arameters Fix run-terraform-command `-var-file` parameter placement
dxw · May 21, 2024 · 31b9c62 · 31b9c62
2 parents f57f3a7 + 273697a
commit 31b9c62
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/bin/terraform-dependencies/run-terraform-command b/bin/terraform-dependencies/run-terraform-command
@@ -72,13 +72,18 @@ CHECK_COMMANDS=(
   "plan"
   "apply"
   "console"
+  "import"
 )
 if [[
   "${CHECK_COMMANDS[*]}" =~ $(echo "${OPTIONS[0]}" | cut -d' ' -f1 ) &&
   -n "$CURRENT_WORKSPACE" &&
   "$CURRENT_WORKSPACE" != "default"
 ]]
 then
+  FIRST_OPTION=$(echo "${OPTIONS[0]}" | cut -d' ' -f1)
+  POST_OPTIONS=$(echo "${OPTIONS[0]}" | cut -d' ' -f2-)
+  OPTIONS=()
+  OPTIONS+=("$FIRST_OPTION")
   if [ "$TERRAFORM_PROJECT" == "account-bootstrap" ]
   then
     ACCOUNT_NAME=$(echo "$CURRENT_WORKSPACE" | cut -d'-' -f5-)
@@ -114,6 +119,7 @@ then
     OPTIONS+=("-var-file=$CONFIG_TFVARS_DIR/000-terraform.tfvars")
     OPTIONS+=("-var-file=$CONFIG_TFVARS_DIR/200-$CURRENT_WORKSPACE.tfvars")
   fi
+  OPTIONS+=("${POST_OPTIONS[@]}")
 fi
 
 if [ "$QUIET_MODE" == 0 ]