From 9ab57d3e8b02350dd6fe45691d3e3d84fe2a604e Mon Sep 17 00:00:00 2001 From: Daniel Flook Date: Sun, 29 Dec 2024 17:07:25 +0000 Subject: [PATCH] pass variables to workspace select --- image/actions.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/image/actions.sh b/image/actions.sh index c5ca421d..2ba276c7 100644 --- a/image/actions.sh +++ b/image/actions.sh @@ -217,9 +217,10 @@ function set-init-args() { done fi + set-variable-args + if [[ -v OPENTOFU && $TERRAFORM_VER_MINOR -ge 8 ]]; then debug "Preparing variables for early evaluation" - set-variable-args INIT_ARGS="$INIT_ARGS $VARIABLE_ARGS" fi @@ -305,9 +306,9 @@ function init-backend-default-workspace() { function select-workspace() { local WORKSPACE_EXIT - debug_log $TOOL_COMMAND_NAME workspace select '$VARIABLE_ARGS' "$INPUT_WORKSPACE" # don't expand VARIABLE_ARGS + debug_log $TOOL_COMMAND_NAME '$VARIABLE_ARGS' workspace select "$INPUT_WORKSPACE" # don't expand VARIABLE_ARGS set +e - (cd "$INPUT_PATH" && $TOOL_COMMAND_NAME workspace select "$VARIABLE_ARGS" "$INPUT_WORKSPACE") >"$STEP_TMP_DIR/workspace_select" 2>&1 + (cd "$INPUT_PATH" && $TOOL_COMMAND_NAME "$VARIABLE_ARGS" workspace select "$INPUT_WORKSPACE") >"$STEP_TMP_DIR/workspace_select" 2>&1 WORKSPACE_EXIT=$? set -e