Merge branch 'dflook:main' into main

Author: naveenOnarayanan

.github/actionlint.yaml

@@ -30,6 +30,7 @@ paths:
       - 'property "git_https" is not defined in object type'
       - 'property "awkward_.*" is not defined in object type'
       - 'property "word" is not defined in object type'
+      - 'property "all_vars" is not defined in object type'
   .github/workflows/test-target-replace-exclude.yaml:
     ignore:
       - 'property "count" is not defined in object type'

.github/workflows/base-image.yaml

@@ -36,7 +36,7 @@ jobs:
           echo "$DOCKER_TOKEN" | docker login --username danielflook --password-stdin
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
 
       - name: Base image
         id: build-and-push

.github/workflows/pull_request_target.yaml

@@ -3,36 +3,43 @@ name: Test pull_request_target event
 on:
   - pull_request_target  # zizmor: ignore[dangerous-triggers]
 
-permissions:
-  contents: read
+permissions: {}
 
 jobs:
   apply:
     runs-on: ubuntu-24.04
     name: Apply approved changes on pull_request_target
+    if: github.repository == 'dflook/terraform-github-actions' && github.event.pull_request.head.repo.full_name == github.repository
     permissions:
-      contents: read
       pull-requests: write
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      - name: Create test module
+        run: |
+          mkdir -p test-module
+          cat > test-module/main.tf << 'EOF'
+          resource "random_string" "my_string" {
+            length = 11
+          }
+
+          output "output_string" {
+            value = "the_string"
+          }
+          EOF
 
       - name: Plan
-        uses: ./terraform-plan
+        uses: dflook/terraform-plan@v1
         with:
           label: pull_request_target
-          path: tests/workflows/pull_request_target
+          path: test-module
 
       - name: Apply
-        uses: ./terraform-apply
+        uses: dflook/terraform-apply@v1
         id: output
         with:
           label: pull_request_target
-          path: tests/workflows/pull_request_target
+          path: test-module
 
       - name: Verify outputs
         env:

.github/workflows/release.yaml

@@ -43,7 +43,7 @@ jobs:
           echo "$DOCKER_TOKEN" | docker login --username danielflook --password-stdin
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
 
       - name: Build action image
         id: image_build
@@ -206,7 +206,7 @@ jobs:
           echo "$DOCKER_TOKEN" | docker login --username danielflook --password-stdin
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
 
       - name: Tag and push base image with release version
         env:

.github/workflows/test-apply.yaml

@@ -1506,3 +1506,40 @@ jobs:
             echo "Apply did not fail correctly"
             exit 1
           fi
+
+  apply_multiple_var_files:
+    runs-on: ubuntu-24.04
+    name: Apply with multiple var files
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Apply
+        uses: ./terraform-apply
+        id: apply
+        with:
+          auto_approve: true
+          path: tests/workflows/test-apply/multiple_var_files
+          var_file: |
+            tests/workflows/test-apply/multiple_var_files/var1.tfvars
+            tests/workflows/test-apply/multiple_var_files/var2.tfvars
+            tests/workflows/test-apply/multiple_var_files/var3.tfvars
+            tests/workflows/test-apply/multiple_var_files/var4.tfvars
+            tests/workflows/test-apply/multiple_var_files/var5.tfvars
+            tests/workflows/test-apply/multiple_var_files/var6.tfvars
+            tests/workflows/test-apply/multiple_var_files/var7.tfvars
+            tests/workflows/test-apply/multiple_var_files/var8.tfvars
+            tests/workflows/test-apply/multiple_var_files/var9.tfvars
+          variables: |
+            var_from_input = "ten"
+
+      - name: Verify outputs
+        env:
+          ALL_VARS: ${{ steps.apply.outputs.all_vars }}
+        run: |
+          if [[ "$ALL_VARS" != "one-two-three-four-five-six-seven-eight-nine-ten" ]]; then
+            echo "Expected all_vars output to be 'one-two-three-four-five-six-seven-eight-nine-ten', got '$ALL_VARS'"
+            exit 1
+          fi

.github/workflows/test-plan.yaml

@@ -887,7 +887,6 @@ jobs:
           variables: |
             my_sensitive_string = "password123"
 
-
   plan_sensitive_variables:
     runs-on: ubuntu-24.04
     name: Plan variables some which are sensitive

.github/workflows/test-version.yaml

@@ -611,7 +611,7 @@ jobs:
         run: |
           echo "The terraform version was $DETECTED_TERRAFORM_VERSION"
 
-          if [[ "$DETECTED_TERRAFORM_VERSION" != *"1.12"* ]]; then
+          if [[ "$DETECTED_TERRAFORM_VERSION" != *"1.14"* ]]; then
             echo "::error:: Latest version was not used"
             exit 1
           fi
@@ -632,7 +632,7 @@ jobs:
         run: |
           echo "The terraform version was $DETECTED_TERRAFORM_VERSION"
 
-          if [[ "$DETECTED_TERRAFORM_VERSION" != *"1.12"* ]]; then
+          if [[ "$DETECTED_TERRAFORM_VERSION" != *"1.14"* ]]; then
             echo "::error:: Latest version was not used"
             exit 1
           fi

.github/workflows/test.yaml

@@ -142,6 +142,6 @@ jobs:
 
           V8R_CONFIG_FILE=.config/.v8rrc.yaml npx v8r --ignore-errors
 
-      - uses: astral-sh/ruff-action@9828f49eb4cadf267b40eaa330295c412c68c1f9 # v3
+      - uses: astral-sh/ruff-action@57714a7c8a2e59f32539362ba31877a1957dded1 # v3.5.1
         with:
           args: --config=.config/ruff.toml check

CHANGELOG.md

@@ -11,10 +11,16 @@ The actions are versioned as a suite. Some actions may have no change in behavio
 
 When using an action you can specify the version as:
 
-- `@v2.2.2` to use an exact release
+- `@v2.2.3` to use an exact release
 - `@v2.2` to use the latest patch release for the specific minor version
 - `@v2` to use the latest patch release for the specific major version
 
+## [2.2.3] - 2026-01-13
+
+### Fixed
+- Fixed an issue where specifying more than 8 var files would cause the action to fail an error.
+  Thanks to [cdsre](https://github.com/cdsre) for reporting and fixing this issue.
+
 ## [2.2.2] - 2025-08-08
 
 ### Fixed
@@ -797,6 +803,7 @@ First release of the GitHub Actions:
 - [dflook/terraform-new-workspace](terraform-new-workspace)
 - [dflook/terraform-destroy-workspace](terraform-destroy-workspace)
 
+[2.2.3]: https://github.com/dflook/terraform-github-actions/compare/v2.2.2...v2.2.3
 [2.2.2]: https://github.com/dflook/terraform-github-actions/compare/v2.2.1...v2.2.2
 [2.2.1]: https://github.com/dflook/terraform-github-actions/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/dflook/terraform-github-actions/compare/v2.1.0...v2.2.0

image/actions.sh

@@ -423,7 +423,7 @@ function create-auto-tfvars() {
 
             debug_log "Creating autoloading tfvars file for $file_path: $link_name"
             cp "$file_path" "$INPUT_PATH/$link_name"
-            AUTO_TFVARS_COUNTER=$(printf "%02d\n" "$((AUTO_TFVARS_COUNTER + 1))")
+            AUTO_TFVARS_COUNTER=$(printf "%02d\n" "$((10#${AUTO_TFVARS_COUNTER} + 1))")
         done
     fi