Skip to content

Commit 7c75162

Browse files
rishabh6788wangdongyu.danny
authored and
wangdongyu.danny
committed
Security fixes and updates (opensearch-project#14928)
Signed-off-by: Rishabh Singh <sngri@amazon.com>
1 parent 980cf20 commit 7c75162

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

.github/workflows/add-performance-comment.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ on:
66

77
jobs:
88
add-comment:
9-
if: github.event.label.name == 'Performance'
9+
if: |
10+
github.event.label.name == 'Performance' ||
11+
github.event.label.name == 'Search:Performance' ||
12+
github.event.label.name == 'Indexing:Performance'
1013
runs-on: ubuntu-latest
1114
permissions:
1215
pull-requests: write

.github/workflows/benchmark-pull-request.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,6 @@ jobs:
7777
run: |
7878
echo "Invalid comment format detected. Failing the workflow."
7979
exit 1
80-
- id: get_approvers
81-
run: |
82-
echo "approvers=$(cat .github/CODEOWNERS | grep '^\*' | tr -d '* ' | sed 's/@/,/g' | sed 's/,//1')" >> $GITHUB_OUTPUT
83-
- uses: trstringer/manual-approval@v1
84-
if: (!contains(steps.get_approvers.outputs.approvers, github.event.comment.user.login))
85-
with:
86-
secret: ${{ github.TOKEN }}
87-
approvers: ${{ steps.get_approvers.outputs.approvers }}
88-
minimum-approvals: 1
89-
issue-title: 'Request to approve/deny benchmark run for PR #${{ env.PR_NUMBER }}'
90-
issue-body: "Please approve or deny the benchmark run for PR #${{ env.PR_NUMBER }}"
91-
exclude-workflow-initiator-as-approver: false
9280
- name: Get PR Details
9381
id: get_pr
9482
uses: actions/github-script@v7
@@ -106,21 +94,33 @@ jobs:
10694
10795
return {
10896
"headRepoFullName": pull_request.head.repo.full_name,
109-
"headRef": pull_request.head.ref
97+
"headRefSha": pull_request.head.sha
11098
};
11199
- name: Set pr details env vars
112100
run: |
113101
echo '${{ steps.get_pr.outputs.result }}' | jq -r '.headRepoFullName'
114-
echo '${{ steps.get_pr.outputs.result }}' | jq -r '.headRef'
102+
echo '${{ steps.get_pr.outputs.result }}' | jq -r '.headRefSha'
115103
headRepo=$(echo '${{ steps.get_pr.outputs.result }}' | jq -r '.headRepoFullName')
116-
headRef=$(echo '${{ steps.get_pr.outputs.result }}' | jq -r '.headRef')
104+
headRefSha=$(echo '${{ steps.get_pr.outputs.result }}' | jq -r '.headRefSha')
117105
echo "prHeadRepo=$headRepo" >> $GITHUB_ENV
118-
echo "prHeadRef=$headRef" >> $GITHUB_ENV
106+
echo "prHeadRefSha=$headRefSha" >> $GITHUB_ENV
107+
- id: get_approvers
108+
run: |
109+
echo "approvers=$(cat .github/CODEOWNERS | grep '^\*' | tr -d '* ' | sed 's/@/,/g' | sed 's/,//1')" >> $GITHUB_OUTPUT
110+
- uses: trstringer/manual-approval@v1
111+
if: (!contains(steps.get_approvers.outputs.approvers, github.event.comment.user.login))
112+
with:
113+
secret: ${{ github.TOKEN }}
114+
approvers: ${{ steps.get_approvers.outputs.approvers }}
115+
minimum-approvals: 1
116+
issue-title: 'Request to approve/deny benchmark run for PR #${{ env.PR_NUMBER }}'
117+
issue-body: "Please approve or deny the benchmark run for PR #${{ env.PR_NUMBER }}"
118+
exclude-workflow-initiator-as-approver: false
119119
- name: Checkout PR Repo
120120
uses: actions/checkout@v4
121121
with:
122122
repository: ${{ env.prHeadRepo }}
123-
ref: ${{ env.prHeadRef }}
123+
ref: ${{ env.prHeadRefSha }}
124124
token: ${{ secrets.GITHUB_TOKEN }}
125125
- name: Setup Java
126126
uses: actions/setup-java@v1

0 commit comments

Comments
 (0)