|
25 | 25 | ${{ inputs.zizmor_result_bucket != '' && inputs.zizmor_result_bucket || 'zizmor-7165' }} |
26 | 26 | ZIZMOR_CONFIG_BUCKET: >- |
27 | 27 | ${{ inputs.zizmor_config_bucket != '' && inputs.zizmor_config_bucket || 'zizmor-configs-cc63' }} |
28 | | - WIF_PROVIDER: 'projects/102295818544/locations/global/workloadIdentityPools/gitsec-gha-artifacts/providers/gitsec-gha-artifacts-provider' |
| 28 | + WIF_PROVIDER: >- |
| 29 | + ${{ inputs.wif_provider != '' && inputs.wif_provider || 'projects/102295818544/locations/global/workloadIdentityPools/gitsec-gha-artifacts/providers/gitsec-gha-artifacts-provider' }} |
29 | 30 |
|
30 | 31 | jobs: |
31 | 32 | check-changes: |
@@ -70,15 +71,13 @@ jobs: |
70 | 71 | uses: 'google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed' # ratchet:google-github-actions/auth@v2 |
71 | 72 | id: 'gcp-auth' |
72 | 73 | with: |
73 | | - token_format: 'access_token' |
74 | | - workload_identity_provider: >- |
75 | | - ${{ inputs.wif_provider != '' && inputs.wif_provider || env.WIF_PROVIDER }} |
| 74 | + workload_identity_provider: '${{ env.WIF_PROVIDER }}' |
76 | 75 | - name: 'Download zizmor config' |
77 | 76 | shell: 'bash' |
78 | 77 | env: |
79 | 78 | REPO_PATH: '${{ github.repository }}' |
80 | 79 | ORG_PATH: '${{ github.repository_owner }}' |
81 | | - GOOGLE_ACCESS_TOKEN: '${{ steps.gcp-auth.outputs.access_token }}' |
| 80 | + GOOGLE_ACCESS_TOKEN: '${{ steps.gcp-auth.outputs.auth_token }}' |
82 | 81 | run: | |
83 | 82 | if [ -z "${ZIZMOR_CONFIG_BUCKET}" ]; then |
84 | 83 | echo "::error::No config bucket configured. Config bucket is required." |
@@ -262,14 +261,12 @@ jobs: |
262 | 261 | id: 'gcp-auth' |
263 | 262 | uses: 'google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed' # ratchet:google-github-actions/auth@v2 |
264 | 263 | with: |
265 | | - token_format: 'access_token' |
266 | | - workload_identity_provider: >- |
267 | | - ${{ inputs.wif_provider != '' && inputs.wif_provider || env.WIF_PROVIDER }} |
| 264 | + workload_identity_provider: '${{ env.WIF_PROVIDER }}' |
268 | 265 | - name: 'Upload result' |
269 | 266 | shell: 'bash' |
270 | 267 | env: |
271 | 268 | GITHUB_PULL_REQUEST_NUMBER: '${{ github.event.pull_request.number }}' |
272 | | - GOOGLE_ACCESS_TOKEN: '${{ steps.gcp-auth.outputs.access_token }}' |
| 269 | + GOOGLE_ACCESS_TOKEN: '${{ steps.gcp-auth.outputs.auth_token }}' |
273 | 270 | run: | |
274 | 271 | gcs_upload() { |
275 | 272 | local src_path="$1" |
|
0 commit comments