Skip to content

Commit 93a0b46

Browse files
rdharrdhar
authored
chore: github variable substitution (#423)
* chore: github variable substitution * Update job ID retrieval and action version
1 parent 281950a commit 93a0b46

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

‎action.yml

+22-22
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ runs:
7878
# Get PR number using GitHub API for different event triggers.
7979
if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
8080
# List PRs associated with the commit, then get the PR number from the head ref or the latest PR.
81-
associated_prs=$(gh api /repos/{owner}/{repo}/commits/${GITHUB_SHA}/pulls --header "$GH_API" --method GET --field per_page=100)
82-
pr_number=$(echo "$associated_prs" | jq --raw-output '(.[] | select(.head.ref == env.GITHUB_REF_NAME) | .number) // .[0].number // 0')
81+
associated_prs=$(gh api /repos/${{ github.repository }}/commits/${{ github.event.pull_request.head.sha || github.sha }}/pulls --header "$GH_API" --method GET --field per_page=100)
82+
pr_number=$(echo "$associated_prs" | jq --raw-output '(.[] | select(.head.ref == ${{ github.ref_name }}) | .number) // .[0].number // 0')
8383
elif [[ "$GITHUB_EVENT_NAME" == "merge_group" ]]; then
8484
# Get the PR number by parsing the ref name.
85-
pr_number=$(echo "${GITHUB_REF_NAME}" | sed -n 's/.*pr-\([0-9]*\)-.*/\1/p')
85+
pr_number=$(echo "${{ github.ref_name }}" | sed -n 's/.*pr-\([0-9]*\)-.*/\1/p')
8686
else
8787
# Get the PR number from branch name, otherwise fallback on 0 if the PR number is not found.
88-
pr_number=${{ github.event.number || github.event.issue.number }} || $(gh api /repos/{owner}/{repo}/pulls --header "$GH_API" --method GET --field per_page=100 --field head="${{ github.ref_name || github.head_ref || github.ref || '0' }}" | jq '.[0].number // 0')
88+
pr_number=${{ github.event.number || github.event.issue.number }} || $(gh api /repos/${{ github.repository }}/pulls --header "$GH_API" --method GET --field per_page=100 --field head="${{ github.ref_name || github.head_ref || github.ref || '0' }}" | jq '.[0].number // 0')
8989
fi
9090
echo "pr=$pr_number" >> "$GITHUB_OUTPUT"
9191
@@ -95,13 +95,13 @@ runs:
9595
echo "name=${{ inputs.tool }}-${pr_number}-${identifier}.tfplan" >> "$GITHUB_OUTPUT"
9696
9797
# List jobs from the current workflow run.
98-
workflow_run=$(gh api /repos/{owner}/{repo}/actions/runs/${GITHUB_RUN_ID}/attempts/${GITHUB_RUN_ATTEMPT}/jobs --header "$GH_API" --method GET --field per_page=100)
98+
workflow_run=$(gh api /repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}/jobs --header "$GH_API" --method GET --field per_page=100)
9999
100100
# Get the current job ID from the workflow run using different query methods for matrix and regular jobs.
101101
if [[ "$GH_MATRIX" == "null" ]]; then
102-
# For regular jobs, get the ID of the job with the same name as $GITHUB_JOB (lowercase and '-' or '_' replaced with ' ').
102+
# For regular jobs, get the ID of the job with the same name as job_id (lowercase and '-' or '_' replaced with ' ').
103103
# Otherwise, get the ID of the first job in the list as a fallback.
104-
job_id=$(echo "$workflow_run" | jq --raw-output '(.jobs[] | select((.name | ascii_downcase | gsub("-|_"; " ")) == (env.GITHUB_JOB | ascii_downcase | gsub("-|_"; " "))) | .id) // .jobs[0].id' | tail -n 1)
104+
job_id=$(echo "$workflow_run" | jq --raw-output '(.jobs[] | select((.name | ascii_downcase | gsub("-|_"; " ")) == (${{ github.job }} | ascii_downcase | gsub("-|_"; " "))) | .id) // .jobs[0].id' | tail -n 1)
105105
else
106106
# For matrix jobs, join the matrix values with comma separator into a single string and get the ID of the job which contains it.
107107
matrix=$(echo "$GH_MATRIX" | jq --raw-output 'to_entries | map(.value) | join(", ")')
@@ -159,9 +159,9 @@ runs:
159159
run: |
160160
# Label PR.
161161
# If the label does not exist, create it before adding it to the PR in the format 'tf:${{ inputs.command }}'.
162-
gh api /repos/{owner}/{repo}/labels/tf:${{ inputs.command }} --header "$GH_API" --method GET || \
163-
gh api /repos/{owner}/{repo}/labels --header "$GH_API" --method POST --field "name=tf:${{ inputs.command }}" --field "description=Pull requests that ${{ inputs.command }} TF code." --field "color=5C4EE5"
164-
gh api /repos/{owner}/{repo}/issues/${{ steps.identifier.outputs.pr }}/labels --header "$GH_API" --method POST --field "labels[]=tf:${{ inputs.command }}"
162+
gh api /repos/${{ github.repository }}/labels/tf:${{ inputs.command }} --header "$GH_API" --method GET || \
163+
gh api /repos/${{ github.repository }}/labels --header "$GH_API" --method POST --field "name=tf:${{ inputs.command }}" --field "description=Pull requests that ${{ inputs.command }} TF code." --field "color=5C4EE5"
164+
gh api /repos/${{ github.repository }}/issues/${{ steps.identifier.outputs.pr }}/labels --header "$GH_API" --method POST --field "labels[]=tf:${{ inputs.command }}"
165165
166166
- if: ${{ inputs.command == 'plan' }}
167167
id: plan
@@ -179,8 +179,8 @@ runs:
179179
run: |
180180
# Download plan file.
181181
# Get the artifact ID of the latest matching plan files for download.
182-
artifact_id=$(gh api /repos/{owner}/{repo}/actions/artifacts --header "$GH_API" --method GET --field "name=${{ steps.identifier.outputs.name }}" --jq '.artifacts[0].id')
183-
gh api /repos/{owner}/{repo}/actions/artifacts/${artifact_id}/zip --header "$GH_API" --method GET > "${{ steps.identifier.outputs.name }}.zip"
182+
artifact_id=$(gh api /repos/${{ github.repository }}/actions/artifacts --header "$GH_API" --method GET --field "name=${{ steps.identifier.outputs.name }}" --jq '.artifacts[0].id')
183+
gh api /repos/${{ github.repository }}/actions/artifacts/${artifact_id}/zip --header "$GH_API" --method GET > "${{ steps.identifier.outputs.name }}.zip"
184184
185185
# Unzip the plan file to the working directory, then clean up the zip file.
186186
unzip "${{ steps.identifier.outputs.name }}.zip" -d "${{ inputs.arg-chdir || inputs.working-directory }}"
@@ -316,7 +316,7 @@ runs:
316316
if [[ "${{ steps.format.outcome }}" == "failure" ]]; then syntax="diff"; fi
317317
318318
# Add summary to the job status.
319-
check_run=$(gh api /repos/{owner}/{repo}/check-runs/${{ steps.identifier.outputs.job }} --header "$GH_API" --method PATCH --field "output[title]=${summary}" --field "output[summary]=${summary}")
319+
check_run=$(gh api /repos/${{ github.repository }}/check-runs/${{ steps.identifier.outputs.job }} --header "$GH_API" --method PATCH --field "output[title]=${summary}" --field "output[summary]=${summary}")
320320
321321
# From check_run, echo html_url.
322322
check_url=$(echo "$check_run" | jq --raw-output '.html_url')
@@ -369,7 +369,7 @@ runs:
369369
<details><summary>${summary}</br>
370370
371371
<!-- placeholder-4 -->
372-
###### By ${handle}${GITHUB_TRIGGERING_ACTOR} at ${{ github.event.pull_request.updated_at || github.event.comment.created_at || github.event.head_commit.timestamp || github.event.merge_group.head_commit.timestamp }} [(view log)](${run_url}).
372+
###### By ${handle}${{ github.triggering_actor }} at ${{ github.event.pull_request.updated_at || github.event.comment.created_at || github.event.head_commit.timestamp || github.event.merge_group.head_commit.timestamp }} [(view log)](${run_url}).
373373
</summary>
374374
375375
\`\`\`${syntax}
@@ -389,32 +389,32 @@ runs:
389389
# Post PR comment if configured and PR exists.
390390
if [[ "$create_comment" == "true" && "${{ steps.identifier.outputs.pr }}" != "0" ]]; then
391391
# Check if the PR contains a bot comment with the same identifier.
392-
list_comments=$(gh api /repos/{owner}/{repo}/issues/${{ steps.identifier.outputs.pr }}/comments --header "$GH_API" --method GET --field per_page=100)
392+
list_comments=$(gh api /repos/${{ github.repository }}/issues/${{ steps.identifier.outputs.pr }}/comments --header "$GH_API" --method GET --field per_page=100)
393393
bot_comment=$(echo "$list_comments" | jq --raw-output --arg identifier "${{ steps.identifier.outputs.name }}" '.[] | select(.user.type == "Bot") | select(.body | contains($identifier)) | .id' | tail -n 1)
394394
395395
if [[ -n "$bot_comment" ]]; then
396396
if [[ "${{ inputs.comment-method }}" == "recreate" ]]; then
397397
# Delete previous comment before posting a new one.
398-
gh api /repos/{owner}/{repo}/issues/comments/${bot_comment} --header "$GH_API" --method DELETE
399-
pr_comment=$(gh api /repos/{owner}/{repo}/issues/${{ steps.identifier.outputs.pr }}/comments --header "$GH_API" --method POST --field "body=${body}")
398+
gh api /repos/${{ github.repository }}/issues/comments/${bot_comment} --header "$GH_API" --method DELETE
399+
pr_comment=$(gh api /repos/${{ github.repository }}/issues/${{ steps.identifier.outputs.pr }}/comments --header "$GH_API" --method POST --field "body=${body}")
400400
echo "comment_id=$(echo "$pr_comment" | jq --raw-output '.id')" >> "$GITHUB_OUTPUT"
401401
elif [[ "${{ inputs.comment-method }}" == "update" ]]; then
402402
# Update existing comment.
403-
pr_comment=$(gh api /repos/{owner}/{repo}/issues/comments/${bot_comment} --header "$GH_API" --method PATCH --field "body=${body}")
403+
pr_comment=$(gh api /repos/${{ github.repository }}/issues/comments/${bot_comment} --header "$GH_API" --method PATCH --field "body=${body}")
404404
echo "comment_id=$(echo "$pr_comment" | jq --raw-output '.id')" >> "$GITHUB_OUTPUT"
405405
fi
406406
else
407407
# Post new comment.
408-
pr_comment=$(gh api /repos/{owner}/{repo}/issues/${{ steps.identifier.outputs.pr }}/comments --header "$GH_API" --method POST --field "body=${body}")
408+
pr_comment=$(gh api /repos/${{ github.repository }}/issues/${{ steps.identifier.outputs.pr }}/comments --header "$GH_API" --method POST --field "body=${body}")
409409
echo "comment_id=$(echo "$pr_comment" | jq --raw-output '.id')" >> "$GITHUB_OUTPUT"
410410
fi
411-
elif [[ "${{ inputs.comment-pr}}" == "on-change" && "${{ steps.identifier.outputs.pr }}" != "0" ]]; then
411+
elif [[ "${{ inputs.comment-pr }}" == "on-change" && "${{ steps.identifier.outputs.pr }}" != "0" ]]; then
412412
# Delete previous comment due to no changes.
413-
list_comments=$(gh api /repos/{owner}/{repo}/issues/${{ steps.identifier.outputs.pr }}/comments --header "$GH_API" --method GET --field per_page=100)
413+
list_comments=$(gh api /repos/${{ github.repository }}/issues/${{ steps.identifier.outputs.pr }}/comments --header "$GH_API" --method GET --field per_page=100)
414414
bot_comment=$(echo "$list_comments" | jq --raw-output --arg identifier "${{ steps.identifier.outputs.name }}" '.[] | select(.user.type == "Bot") | select(.body | contains($identifier)) | .id' | tail -n 1)
415415
416416
if [[ -n "$bot_comment" ]]; then
417-
gh api /repos/{owner}/{repo}/issues/comments/${bot_comment} --header "$GH_API" --method DELETE
417+
gh api /repos/${{ github.repository }}/issues/comments/${bot_comment} --header "$GH_API" --method DELETE
418418
fi
419419
fi
420420

0 commit comments

Comments
 (0)