fix: account for extra long job names

.github/examples/pr_merge_matrix.yaml

@@ -35,11 +35,11 @@ jobs:
         uses: op5dev/tf-via-pr@v13
         with:
           working-directory: path/to/${{ matrix.deployment }}
+          tool: tofu
           command: ${{ github.event_name == 'merge_group' && 'apply' || 'plan' }}
           arg-refresh: ${{ github.event_name == 'merge_group' && 'false' || 'true' }} # Skip refresh on apply.
           arg-lock: ${{ github.event_name == 'merge_group' }}
           arg-var-file: env/${{ matrix.deployment }}.tfvars
           arg-workspace: ${{ matrix.deployment }}
           plan-encrypt: ${{ secrets.PASSPHRASE }}
           plan-parity: true # Prevents stale apply within merge queue.
-          tool: tofu

.github/workflows/test_aws.yaml

@@ -97,16 +97,14 @@ jobs:
         uses: ./
         with:
           working-directory: tests/aws/targets/${{ matrix.target }}
+          tool: tofu
           command: ${{ github.event_name == 'merge_group' && 'apply' || 'plan' }}
           arg-lock-timeout: 3m
-
           plan-encrypt: secrets.TF_ENCRYPTION
           plan-parity: true
           retention-days: 1
-
           expand-diff: true
           tag-actor: never
-          tool: tofu
 
       - name: Troubleshoot TF
         if: ${{ failure() && github.event_name == 'merge_group' }}
@@ -132,12 +130,11 @@ jobs:
         uses: ./
         with:
           working-directory: tests/aws/targets/${{ matrix.target }}
+          tool: tofu
           command: apply
           arg-auto-approve: true
           arg-lock-timeout: 3m
-
           comment-pr: false
-          tool: tofu
 
   Notify:
     runs-on: [ubuntu-24.04]

.github/workflows/test_ci.yaml

@@ -61,6 +61,7 @@ jobs:
         uses: ./
         with:
           working-directory: tests/${{ matrix.test }}
+          tool: ${{ matrix.tool }}
           command: ${{ github.event.pull_request.merged && 'apply' || 'plan' }}
           arg-lock: ${{ github.event.pull_request.merged }}
           arg-refresh: ${{ github.event.pull_request.merged && 'false' || 'true' }}
@@ -78,7 +79,6 @@ jobs:
           expand-diff: true
           hide-args: detailed-exitcode,lock,out,refresh
           tag-actor: never
-          tool: ${{ matrix.tool }}
 
       - name: Echo TF
         continue-on-error: true

action.yml

@@ -313,7 +313,7 @@ runs:
         else
           # For matrix jobs, join the matrix values with comma separator into a single string and get the ID of the job which contains it.
           matrix=$(echo "$GH_MATRIX" | jq --raw-output 'to_entries | map(if .value | type == "object" then (.value | to_entries[0].value) else .value end) | join(", ")')
-          job_id=$(echo "$workflow_run" | jq --raw-output --arg matrix "$matrix" '.jobs[] | select(.name | contains($matrix)) | .id' | tail -n 1)
+          job_id=$(echo "$workflow_run" | jq --raw-output --arg matrix "$matrix" '.jobs[] | select((.name | split("(")[1]) | rtrimstr(")") | rtrimstr("...") | inside($matrix)) | .id' | tail -n 1)
           # For dynamic matrix jobs, retry with exponential backoff until the job ID is found or a timeout occurs.
           retry_interval=1
           while [[ -z "$job_id" ]]; do
@@ -325,7 +325,7 @@ runs:
             sleep "$retry_interval"
             retry_interval=$((retry_interval * 2))
             workflow_run=$(gh api /repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}/jobs --header "$GH_API" --method GET --paginate)
-            job_id=$(echo "$workflow_run" | jq --raw-output --arg matrix "$matrix" '.jobs[] | select(.name | contains($matrix)) | .id' | tail -n 1)
+            job_id=$(echo "$workflow_run" | jq --raw-output --arg matrix "$matrix" '.jobs[] | select((.name | split("(")[1]) | rtrimstr(")") | rtrimstr("...") | inside($matrix)) | .id' | tail -n 1)
           done
         fi
         echo "job=$job_id" >> "$GITHUB_OUTPUT"