Skip to content

Commit 4cfa6a2

Browse files
ci: remove pull_request_target trigger (#2277)
1 parent fc9bb64 commit 4cfa6a2

5 files changed

Lines changed: 67 additions & 147 deletions

File tree

.github/trusted-contribution.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/codeql.yml

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,18 @@ name: "CodeQL"
1616

1717
on:
1818
push:
19-
branches: [ "main" ]
19+
branches: ["main"]
2020
pull_request:
21-
branches: [ "main" ]
21+
branches: ["main"]
2222
paths-ignore:
23-
- '**/*.md'
24-
- '**/*.txt'
25-
pull_request_target:
26-
types: [labeled]
27-
paths-ignore:
28-
- '**/*.md'
29-
- '**/*.txt'
23+
- "**/*.md"
24+
- "**/*.txt"
3025

3126
# Declare default permissions as read only.
3227
permissions: read-all
3328

3429
jobs:
3530
analyze:
36-
if: "${{ github.event.action != 'labeled' || github.event.label.name == 'tests: run' }}"
3731
name: Analyze
3832
runs-on: ubuntu-latest
3933
permissions:
@@ -44,33 +38,30 @@ jobs:
4438
strategy:
4539
fail-fast: false
4640
matrix:
47-
language: [ 'go' ]
41+
language: ["go"]
4842

4943
steps:
50-
- name: Checkout repository
51-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
52-
with:
53-
ref: ${{ github.event.pull_request.head.sha }}
54-
repository: ${{ github.event.pull_request.head.repo.full_name }}
44+
- name: Checkout repository
45+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
5546

56-
- name: Setup Go
57-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
58-
with:
59-
go-version: "1.22"
60-
if: ${{ matrix.language == 'go' }}
47+
- name: Setup Go
48+
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
49+
with:
50+
go-version: "1.22"
51+
if: ${{ matrix.language == 'go' }}
6152

62-
# Initializes the CodeQL tools for scanning.
63-
- name: Initialize CodeQL
64-
uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
65-
with:
66-
languages: ${{ matrix.language }}
53+
# Initializes the CodeQL tools for scanning.
54+
- name: Initialize CodeQL
55+
uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
56+
with:
57+
languages: ${{ matrix.language }}
6758

68-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
69-
# If this step fails, then you should remove it and run the build manually
70-
- name: Autobuild
71-
uses: github/codeql-action/autobuild@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
59+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
60+
# If this step fails, then you should remove it and run the build manually
61+
- name: Autobuild
62+
uses: github/codeql-action/autobuild@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
7263

73-
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
75-
with:
76-
category: "/language:${{matrix.language}}"
64+
- name: Perform CodeQL Analysis
65+
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
66+
with:
67+
category: "/language:${{matrix.language}}"

.github/workflows/govulncheck.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ permissions: read-all
2020
on:
2121
push:
2222
branches:
23-
- 'main'
24-
- 'v1'
23+
- "main"
24+
- "v1"
2525
pull_request:
2626
branches:
27-
- 'main'
28-
- 'v1'
29-
pull_request_target:
30-
types: [labeled]
27+
- "main"
28+
- "v1"
3129
schedule:
32-
- cron: '0 2 * * *'
30+
- cron: "0 2 * * *"
3331

3432
jobs:
3533
govulncheck_job:

.github/workflows/lint.yaml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,21 @@
1515
name: lint
1616
on:
1717
pull_request:
18-
pull_request_target:
19-
types: [labeled]
2018

2119
# Declare default permissions as read only.
2220
permissions: read-all
2321

2422
jobs:
2523
lint:
26-
if: "${{ github.event.action != 'labeled' || github.event.label.name == 'tests: run' }}"
2724
name: run lint
2825
runs-on: ubuntu-latest
29-
permissions:
30-
issues: write
31-
pull-requests: write
3226
steps:
33-
- name: Remove PR Label
34-
if: "${{ github.event.action == 'labeled' && github.event.label.name == 'tests: run' }}"
35-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
36-
with:
37-
github-token: ${{ secrets.GITHUB_TOKEN }}
38-
script: |
39-
try {
40-
await github.rest.issues.removeLabel({
41-
name: 'tests: run',
42-
owner: context.repo.owner,
43-
repo: context.repo.repo,
44-
issue_number: context.payload.pull_request.number
45-
});
46-
} catch (e) {
47-
console.log('Failed to remove label. Another job may have already removed it!');
48-
}
4927
- name: Setup Go
5028
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
5129
with:
5230
go-version: "1.22"
5331
- name: Checkout code
5432
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
55-
with:
56-
ref: ${{ github.event.pull_request.head.sha }}
57-
repository: ${{ github.event.pull_request.head.repo.full_name }}
5833
- name: >
5934
Verify go mod tidy. If you're reading this and the check has
6035
failed, run `goimports -w . && go mod tidy && golangci-lint run`

.github/workflows/tests.yaml

Lines changed: 37 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@ name: tests
1616
on:
1717
push:
1818
branches:
19-
- 'main'
20-
- 'v1'
19+
- "main"
20+
- "v1"
2121
pull_request:
22-
pull_request_target:
23-
types: [labeled]
2422
schedule:
25-
- cron: '0 2 * * *'
23+
- cron: "0 2 * * *"
2624

2725
# Declare default permissions as read only.
2826
permissions: read-all
@@ -45,51 +43,28 @@ jobs:
4543
CGO_ENABLED=0 GOOS=freebsd go build
4644
CGO_ENABLED=0 GOOS=openbsd go build
4745
48-
4946
integration:
50-
# run job on proper workflow event triggers (skip job for pull_request event from forks and only run pull_request_target for "tests: run" label)
51-
if: "${{ (github.event.action != 'labeled' && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) || github.event.label.name == 'tests: run' }}"
5247
name: integration tests
5348
runs-on: ${{ matrix.os }}
5449
strategy:
5550
matrix:
5651
os: [macos-latest, windows-latest, ubuntu-latest]
5752
fail-fast: false
5853
permissions:
59-
contents: 'read'
60-
id-token: 'write'
54+
contents: read
55+
id-token: write
6156
issues: write
6257
pull-requests: write
6358
steps:
64-
- name: Remove PR label
65-
if: "${{ github.event.action == 'labeled' && github.event.label.name == 'tests: run' }}"
66-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
67-
with:
68-
github-token: ${{ secrets.GITHUB_TOKEN }}
69-
script: |
70-
try {
71-
await github.rest.issues.removeLabel({
72-
name: 'tests: run',
73-
owner: context.repo.owner,
74-
repo: context.repo.repo,
75-
issue_number: context.payload.pull_request.number
76-
});
77-
} catch (e) {
78-
console.log('Failed to remove label. Another job may have already removed it!');
79-
}
80-
8159
- name: Checkout code
8260
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
83-
with:
84-
ref: ${{ github.event.pull_request.head.sha }}
85-
repository: ${{ github.event.pull_request.head.repo.full_name }}
8661

8762
- name: Setup Go
8863
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
8964
with:
9065
go-version: "1.22"
9166

92-
- id: 'auth'
67+
- id: auth
9368
name: Authenticate to Google Cloud
9469
uses: google-github-actions/auth@71fee32a0bb7e97b4d33d548e7d957010649d8fa # v2.1.3
9570
with:
@@ -100,25 +75,25 @@ jobs:
10075
- name: Set up Cloud SDK
10176
uses: google-github-actions/setup-gcloud@98ddc00a17442e89a24bbf282954a3b65ce6d200 # v2.1.0
10277

103-
- id: 'secrets'
78+
- id: secrets
10479
name: Get secrets
10580
uses: google-github-actions/get-secretmanager-secrets@dc4a1392bad0fd60aee00bb2097e30ef07a1caae # v2.1.3
10681
with:
10782
secrets: |-
108-
MYSQL_CONNECTION_NAME:${{ secrets.GOOGLE_CLOUD_PROJECT }}/MYSQL_CONNECTION_NAME
109-
MYSQL_USER:${{ secrets.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER
110-
MYSQL_PASS:${{ secrets.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS
111-
MYSQL_DB:${{ secrets.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB
112-
POSTGRES_CONNECTION_NAME:${{ secrets.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CONNECTION_NAME
113-
POSTGRES_USER:${{ secrets.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER
114-
POSTGRES_USER_IAM:${{ secrets.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM
115-
POSTGRES_PASS:${{ secrets.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS
116-
POSTGRES_DB:${{ secrets.GOOGLE_CLOUD_PROJECT }}/POSTGRES_DB
117-
SQLSERVER_CONNECTION_NAME:${{ secrets.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_CONNECTION_NAME
118-
SQLSERVER_USER:${{ secrets.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_USER
119-
SQLSERVER_PASS:${{ secrets.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_PASS
120-
SQLSERVER_DB:${{ secrets.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_DB
121-
IMPERSONATED_USER:${{ secrets.GOOGLE_CLOUD_PROJECT }}/IMPERSONATED_USER
83+
MYSQL_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_CONNECTION_NAME
84+
MYSQL_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER
85+
MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS
86+
MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB
87+
POSTGRES_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CONNECTION_NAME
88+
POSTGRES_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER
89+
POSTGRES_USER_IAM:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM
90+
POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS
91+
POSTGRES_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_DB
92+
SQLSERVER_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_CONNECTION_NAME
93+
SQLSERVER_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_USER
94+
SQLSERVER_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_PASS
95+
SQLSERVER_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_DB
96+
IMPERSONATED_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/IMPERSONATED_USER
12297
12398
- name: Enable fuse config (Linux)
12499
if: runner.os == 'Linux'
@@ -127,23 +102,23 @@ jobs:
127102
128103
- name: Run tests
129104
env:
130-
GOOGLE_CLOUD_PROJECT: '${{ secrets.GOOGLE_CLOUD_PROJECT }}'
131-
MYSQL_CONNECTION_NAME: '${{ steps.secrets.outputs.MYSQL_CONNECTION_NAME }}'
132-
MYSQL_USER: '${{ steps.secrets.outputs.MYSQL_USER }}'
133-
MYSQL_PASS: '${{ steps.secrets.outputs.MYSQL_PASS }}'
134-
MYSQL_DB: '${{ steps.secrets.outputs.MYSQL_DB }}'
135-
POSTGRES_CONNECTION_NAME: '${{ steps.secrets.outputs.POSTGRES_CONNECTION_NAME }}'
136-
POSTGRES_USER: '${{ steps.secrets.outputs.POSTGRES_USER }}'
137-
POSTGRES_USER_IAM: '${{ steps.secrets.outputs.POSTGRES_USER_IAM }}'
138-
POSTGRES_PASS: '${{ steps.secrets.outputs.POSTGRES_PASS }}'
139-
POSTGRES_DB: '${{ steps.secrets.outputs.POSTGRES_DB }}'
140-
SQLSERVER_CONNECTION_NAME: '${{ steps.secrets.outputs.SQLSERVER_CONNECTION_NAME }}'
141-
SQLSERVER_USER: '${{ steps.secrets.outputs.SQLSERVER_USER }}'
142-
SQLSERVER_PASS: '${{ steps.secrets.outputs.SQLSERVER_PASS }}'
143-
SQLSERVER_DB: '${{ steps.secrets.outputs.SQLSERVER_DB }}'
144-
IMPERSONATED_USER: '${{ steps.secrets.outputs.IMPERSONATED_USER }}'
105+
GOOGLE_CLOUD_PROJECT: "${{ vars.GOOGLE_CLOUD_PROJECT }}"
106+
MYSQL_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_CONNECTION_NAME }}"
107+
MYSQL_USER: "${{ steps.secrets.outputs.MYSQL_USER }}"
108+
MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}"
109+
MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}"
110+
POSTGRES_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_CONNECTION_NAME }}"
111+
POSTGRES_USER: "${{ steps.secrets.outputs.POSTGRES_USER }}"
112+
POSTGRES_USER_IAM: "${{ steps.secrets.outputs.POSTGRES_USER_IAM }}"
113+
POSTGRES_PASS: "${{ steps.secrets.outputs.POSTGRES_PASS }}"
114+
POSTGRES_DB: "${{ steps.secrets.outputs.POSTGRES_DB }}"
115+
SQLSERVER_CONNECTION_NAME: "${{ steps.secrets.outputs.SQLSERVER_CONNECTION_NAME }}"
116+
SQLSERVER_USER: "${{ steps.secrets.outputs.SQLSERVER_USER }}"
117+
SQLSERVER_PASS: "${{ steps.secrets.outputs.SQLSERVER_PASS }}"
118+
SQLSERVER_DB: "${{ steps.secrets.outputs.SQLSERVER_DB }}"
119+
IMPERSONATED_USER: "${{ steps.secrets.outputs.IMPERSONATED_USER }}"
145120
TMPDIR: "/tmp"
146-
TMP: '${{ runner.temp }}'
121+
TMP: "${{ runner.temp }}"
147122
# specifying bash shell ensures a failure in a piped process isn't lost by using `set -eo pipefail`
148123
shell: bash
149124
run: |

0 commit comments

Comments
 (0)