revert extraneous changes

Signed-off-by: Rishav Dhar <19497993+rdhar@users.noreply.github.com>
OP5dev · Apr 3, 2024 · 66fee40 · 66fee40
1 parent e9d35ca
commit 66fee40
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/examples/tf_via_pr_comments.yml b/.github/examples/tf_via_pr_comments.yml
@@ -29,7 +29,7 @@ jobs:
         uses: hashicorp/setup-terraform@a1502cd9e758c50496cc9ac5308c4843bcd56d36 # v3.0.0
 
       - name: Provision TF
-        uses: devsectop/tf-via-pr-comments@069fd20e039d1ee5fba48b8a319752e44451782a # v10
+        uses: devsectop/tf-via-pr-comments@dc6ce4481c36f83bd8a5110040499da17df6cb1a # v9.1.0
         env:
           TF_VAR_PLACEHOLDER: value
         with:

diff --git a/.github/examples/tf_via_pr_comments_or_input.yml b/.github/examples/tf_via_pr_comments_or_input.yml
@@ -26,10 +26,10 @@ jobs:
           ref: ${{ github.event.issue && format('refs/pull/{0}/merge', github.event.issue.number) }}
 
       - name: Setup TF
-        uses: opentofu/setup-opentofu@ae80d4ecaab946d8f5ff18397fbf6d0686c6d46a # v1.0.3
+        uses: hashicorp/setup-terraform@a1502cd9e758c50496cc9ac5308c4843bcd56d36 # v3.0.0
 
       - name: Provision TF
-        uses: devsectop/tf-via-pr-comments@069fd20e039d1ee5fba48b8a319752e44451782a # v10
+        uses: devsectop/tf-via-pr-comments@dc6ce4481c36f83bd8a5110040499da17df6cb1a # v9.1.0
         env:
           TF_VAR_PLACEHOLDER: value
         with:

diff --git a/.github/examples/tf_via_pr_input.yml b/.github/examples/tf_via_pr_input.yml
@@ -30,7 +30,7 @@ jobs:
         uses: hashicorp/setup-terraform@a1502cd9e758c50496cc9ac5308c4843bcd56d36 # v3.0.0
 
       - name: Provision TF
-        uses: devsectop/tf-via-pr-comments@069fd20e039d1ee5fba48b8a319752e44451782a # v10
+        uses: devsectop/tf-via-pr-comments@dc6ce4481c36f83bd8a5110040499da17df6cb1a # v9.1.0
         env:
           TF_VAR_PLACEHOLDER: value
         with:

diff --git a/.github/examples/tf_via_pr_input_matrix.yml b/.github/examples/tf_via_pr_input_matrix.yml
@@ -25,11 +25,11 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Setup TF
-        uses: opentofu/setup-opentofu@ae80d4ecaab946d8f5ff18397fbf6d0686c6d46a # v1.0.3
+        uses: hashicorp/setup-terraform@a1502cd9e758c50496cc9ac5308c4843bcd56d36 # v3.0.0
 
       - name: Provision TF
         id: tf
-        uses: devsectop/tf-via-pr-comments@069fd20e039d1ee5fba48b8a319752e44451782a # v10
+        uses: devsectop/tf-via-pr-comments@dc6ce4481c36f83bd8a5110040499da17df6cb1a # v9.1.0
         env:
           TF_VAR_PLACEHOLDER: value
         with:

diff --git a/action.yml b/action.yml
@@ -152,7 +152,7 @@ runs:
         arg_replace: ${{ fromJSON(steps.parsed.outputs.command)['replace'] }}
         arg_target: ${{ fromJSON(steps.parsed.outputs.command)['target'] }}
         arg_test_directory: ${{ fromJSON(steps.parsed.outputs.command)['test-directory'] }}
-        arg_tf_cli: ${{ inputs.cli_uses || (env.TOFU_CLI_PATH && 'tofu') || (env.TERRAFORM_CLI_PATH && 'terraform') }}
+        arg_tf_cli: ${{ inputs.cli_uses || (env.TOFU_CLI_PATH && 'tofu') || 'terraform' }}
         arg_tf: ${{ fromJSON(steps.parsed.outputs.command)['tf'] }}
         arg_upgrade: ${{ fromJSON(steps.parsed.outputs.command)['upgrade'] }}
         arg_var_file: ${{ inputs.var_file_from_workspace == 'true' && fromJSON(steps.parsed.outputs.command)['workspace'] || fromJSON(steps.parsed.outputs.command)['var-file'] }}
@@ -302,7 +302,7 @@ runs:
         # Remove lines related to fetching the state of resources and truncate
         # before the last 66000 characters to capture the final change summary.
         tf_output_raw=$(cat <<'EOTF'
-        ${{ steps.apply.outputs.stderr || steps.apply.outputs.stdout || steps.plan.outputs.stderr || steps.plan.outputs.stdout || steps.force_unlock.outputs.stderr || steps.force_unlock.outputs.stdout || steps.workspace.outputs.stderr || steps.fmt.outputs.stdout || steps.validate.outputs.stderr || steps.init.outputs.stderr }}
+        ${{ steps.apply.outputs.stderr || steps.apply.outputs.stdout || steps.plan.outputs.stderr || steps.plan.outputs.stdout || steps.force_unlock.outputs.stderr || steps.force_unlock.outputs.stdout || steps.workspace.outputs.stderr || steps.validate.outputs.stderr || steps.init.outputs.stderr }}
         EOTF
         )
         echo 'tf_output<<EOTF' >> $GITHUB_OUTPUT