Remove the deprecated var input

Author: dflook

.github/workflows/test-apply.yaml

@@ -928,7 +928,7 @@ jobs:
 
   apply_vars:
     runs-on: ubuntu-24.04
-    name: Apply approved changes with deprecated vars
+    name: Apply changes with deprecated var
     permissions:
       contents: read
       pull-requests: write
@@ -940,45 +940,22 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Plan
-        uses: ./terraform-plan
-        with:
-          path: tests/workflows/test-apply/deprecated_var
-          var: my_var=hello
-          var_file: tests/workflows/test-apply/test.tfvars
-
       - name: Apply
         uses: ./terraform-apply
-        id: output
+        id: apply
         with:
           path: tests/workflows/test-apply/deprecated_var
           var: my_var=hello
           var_file: tests/workflows/test-apply/test.tfvars
+          auto_approve: true
 
-      - name: Verify outputs
+      - name: Check invalid
         env:
-          OUTPUT_STRING: ${{ steps.output.outputs.output_string }}
-          FROM_VAR: ${{ steps.output.outputs.from_var }}
-          FROM_VARFILE: ${{ steps.output.outputs.from_varfile }}
-          RUN_ID: ${{ steps.output.outputs.run_id }}
+          APPLY_OUTCOME: ${{ steps.plan.outcome }}
         run: |
-          if [[ "$OUTPUT_STRING" != "the_string" ]]; then
-            echo "::error:: output s not set correctly"
-            exit 1
-          fi
-          if [[ "$FROM_VAR" != "this should be overridden" ]]; then
-            echo "::error:: output from_var not set correctly"
-            exit 1
-          fi
-          if [[ "$FROM_VARFILE" != "monkey" ]]; then
-            echo "::error:: output from_varfile not set correctly"
-            exit 1
-          fi
-
-          if [[ -n "$RUN_ID" ]]; then
-            echo "::error:: run_id should not be set"
-            exit 1
-          fi
+          if [[ "$APPLY_OUTCOME" != "failure" ]]; then
+            echo "Using removed var input did not fail correctly."
+          exit 1
 
   apply_refresh:
     runs-on: ubuntu-24.04

.github/workflows/test-plan.yaml

@@ -922,10 +922,20 @@ jobs:
 
       - name: Plan
         uses: ./terraform-plan
+        id: plan
+        continue-on-error: true
         with:
           path: tests/workflows/test-plan/sensitive_var
           var: my_sensitive_var=hello
 
+      - name: Check invalid
+        env:
+          PLAN_OUTCOME: ${{ steps.plan.outcome }}
+        run: |
+          if [[ "$PLAN_OUTCOME" != "failure" ]]; then
+            echo "Using removed var input did not fail correctly."
+          exit 1
+
   plan_change_run_commands:
     runs-on: ubuntu-24.04
     name: Change with shell init commands

docs-gen/inputs/var.py

@@ -5,7 +5,7 @@
     type='string',
     description='''
 Comma separated list of $ProductName vars to set.
-This is deprecated due to the following limitations:
+This has been removed due to the following limitations:
 - Only primitive types can be set with `var` - number, bool and string.
 - String values may not contain a comma.
 - Values set with `var` will be overridden by values contained in `var_file`s

image/actions.sh

@@ -81,8 +81,6 @@ function detect-tfmask() {
     if ! hash tfmask 2>/dev/null; then
         TFMASK="cat"
     fi
-
-    export TFMASK
 }
 
 function execute_run_commands() {
@@ -185,8 +183,6 @@ function set-init-args() {
     fi
 
     create-auto-tfvars
-
-    export INIT_ARGS
 }
 
 ##
@@ -383,29 +379,13 @@ function set-common-plan-args() {
     fi
 }
 
-function set-deprecated-var-args() {
-    DEPRECATED_VAR_ARGS=""
-
-    if [[ -n "$INPUT_VAR" ]]; then
-        for var in $(echo "$INPUT_VAR" | tr ',' '\n'); do
-            DEPRECATED_VAR_ARGS="$DEPRECATED_VAR_ARGS -var $var"
-        done
-    fi
-}
-
-function masked-deprecated-vars() {
-  if [[ -n "$DEPRECATED_VAR_ARGS" ]]; then
-    echo "-var <masked>"
-  else
-    echo ""
-  fi
-}
-
 function set-plan-args() {
     set-common-plan-args
-    set-deprecated-var-args
 
-    export PLAN_ARGS
+    if [[ -n "${INPUT_VAR:-}" ]]; then
+        error_log "The var input has been removed. Use the variables input instead."
+        exit 1
+    fi
 }
 
 function create-auto-tfvars() {
@@ -490,11 +470,11 @@ function plan() {
     fi
 
     # shellcheck disable=SC2086
-    debug_log $TOOL_COMMAND_NAME plan -input=false -no-color -detailed-exitcode -lock-timeout=300s $PARALLEL_ARG $PLAN_OUT_ARG $PLAN_ARGS "$(masked-deprecated-vars)"
+    debug_log $TOOL_COMMAND_NAME plan -input=false -no-color -detailed-exitcode -lock-timeout=300s $PARALLEL_ARG $PLAN_OUT_ARG $PLAN_ARGS
 
     set +e
     # shellcheck disable=SC2086
-    (cd "$INPUT_PATH" && $TOOL_COMMAND_NAME plan -input=false -no-color -detailed-exitcode -lock-timeout=300s $PARALLEL_ARG $PLAN_OUT_ARG $PLAN_ARGS $DEPRECATED_VAR_ARGS ) \
+    (cd "$INPUT_PATH" && $TOOL_COMMAND_NAME plan -input=false -no-color -detailed-exitcode -lock-timeout=300s $PARALLEL_ARG $PLAN_OUT_ARG $PLAN_ARGS) \
         2>"$STEP_TMP_DIR/terraform_plan.stderr" \
         | $TFMASK \
         | tee /dev/fd/3 "$STEP_TMP_DIR/terraform_plan.stdout" \
@@ -518,11 +498,11 @@ function plan() {
 
 function destroy() {
     # shellcheck disable=SC2086
-    debug_log $TOOL_COMMAND_NAME destroy -input=false -no-color -auto-approve -lock-timeout=300s $PARALLEL_ARG $PLAN_ARGS "$(masked-deprecated-vars)"
+    debug_log $TOOL_COMMAND_NAME destroy -input=false -no-color -auto-approve -lock-timeout=300s $PARALLEL_ARG $PLAN_ARGS
 
     set +e
     # shellcheck disable=SC2086
-    (cd "$INPUT_PATH" && $TOOL_COMMAND_NAME destroy -input=false -no-color -auto-approve -lock-timeout=300s $PARALLEL_ARG $PLAN_ARGS $DEPRECATED_VAR_ARGS) \
+    (cd "$INPUT_PATH" && $TOOL_COMMAND_NAME destroy -input=false -no-color -auto-approve -lock-timeout=300s $PARALLEL_ARG $PLAN_ARGS) \
         2>"$STEP_TMP_DIR/terraform_destroy.stderr" \
         | tee /dev/fd/3 \
             >"$STEP_TMP_DIR/terraform_destroy.stdout"

image/entrypoints/apply.sh

@@ -50,9 +50,9 @@ function apply() {
 
         set +e
         # shellcheck disable=SC2086,SC2016
-        debug_log $TOOL_COMMAND_NAME apply -input=false -no-color -auto-approve -lock-timeout=300s $PARALLEL_ARG $PLAN_ARGS "$(masked-deprecated-vars)"
+        debug_log $TOOL_COMMAND_NAME apply -input=false -no-color -auto-approve -lock-timeout=300s $PARALLEL_ARG $PLAN_ARGS
         # shellcheck disable=SC2086
-        (cd "$INPUT_PATH" && $TOOL_COMMAND_NAME apply -input=false -no-color -auto-approve -lock-timeout=300s $PARALLEL_ARG $PLAN_ARGS $DEPRECATED_VAR_ARGS) \
+        (cd "$INPUT_PATH" && $TOOL_COMMAND_NAME apply -input=false -no-color -auto-approve -lock-timeout=300s $PARALLEL_ARG $PLAN_ARGS) \
             2>"$STEP_TMP_DIR/terraform_apply.stderr" \
             | $TFMASK \
             | tee "$STEP_TMP_DIR/terraform_apply.stdout"