Output remote-run-id for remote runs

We must check the backend, the cloud backend can saved plan files now.

Author: dflook

.github/workflows/test-version.yaml

@@ -503,7 +503,7 @@ jobs:
 
       - name: Check the version
         run: |
-          if [[ "${{ steps.terraform-version.outputs.terraform }}" != *"1.6"* ]]; then
+          if [[ "${{ steps.terraform-version.outputs.terraform }}" != *"1.7"* ]]; then
             echo "::error:: Latest version was not used"
             exit 1
           fi

image/entrypoints/apply.sh

@@ -32,7 +32,7 @@ function apply() {
     if [[ -n "$PLAN_OUT" ]]; then
 
         if [[ "$TERRAFORM_BACKEND_TYPE" == "cloud" ]]; then
-            # Using the auto approve flag when applying a saved remote plan makes terraform hang
+            # Using the auto approve flag when applying a saved cloud plan makes terraform hang
             # It does not prompt for approval anyway
             AUTO_APPROVE=""
         fi
@@ -59,6 +59,10 @@ function apply() {
         APPLY_EXIT=${PIPESTATUS[0]}
         >&2 cat "$STEP_TMP_DIR/terraform_apply.stderr"
 
+    fi
+    set -e
+
+    if [[ "$TERRAFORM_BACKEND_TYPE" == "cloud" || "$TERRAFORM_BACKEND_TYPE" == "remote" ]]; then
         if remote-run-id "$STEP_TMP_DIR/terraform_apply.stdout" >"$STEP_TMP_DIR/remote-run-id.stdout" 2>"$STEP_TMP_DIR/remote-run-id.stderr"; then
             RUN_ID="$(<"$STEP_TMP_DIR/remote-run-id.stdout")"
             set_output run_id "$RUN_ID"
@@ -67,7 +71,6 @@ function apply() {
             debug_file "$STEP_TMP_DIR/remote-run-id.stderr"
         fi
     fi
-    set -e
 
     if [[ $APPLY_EXIT -eq 0 ]]; then
         output

tests/workflows/test-cloud/partial/main.tf

@@ -1,5 +1,10 @@
 terraform {
   cloud {
+    organization = "flooktech"
+
+    workspaces {
+      name = "tf-cloud-1-6-cloud-1"
+    }
   }
   required_version = "~> 1.6.0"
 }