Skip to content

Commit 13e3f6c

Browse files
julienpjulienp
committed
Revert "Fix snyk scanning"
This reverts commit 0defe2e.
1 parent a5206a5 commit 13e3f6c

1 file changed

Lines changed: 6 additions & 22 deletions

File tree

‎.github/workflows/snyk-scan.yml‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,20 @@ jobs:
4646
- name: Set version
4747
run: |
4848
[ -z "${{ env.DISPATCH_REF }}" ] && echo "PULUMI_VERSION=$(curl https://www.pulumi.com/latest-version)" >> $GITHUB_ENV || echo "PULUMI_VERSION=${{ env.DISPATCH_REF }}" >> $GITHUB_ENV
49-
- name: Set image name
50-
run: |
51-
echo "IMAGE_NAME=${{ env.DOCKER_ORG }}/pulumi:${{ env.PULUMI_VERSION }}${{ matrix.suffix }}-${{ matrix.arch }}" >> $GITHUB_ENV
5249
- name: Snyk scan
5350
continue-on-error: true
5451
uses: snyk/actions/docker@master
5552
env:
5653
SNYK_TOKEN: ${{ steps.esc-secrets.outputs.SNYK_TOKEN }}
5754
with:
58-
image: ${{ env.IMAGE_NAME }}
55+
image: ${{ env.DOCKER_ORG }}/pulumi:${{ env.PULUMI_VERSION }}${{ matrix.suffix }}-${{ matrix.arch }}
5956
args: --severity-threshold=high --file=docker/pulumi/Dockerfile
6057
- name: Filter Sarif File
6158
run: python ./.github/scripts/filter-sarif.py
6259
- name: Upload result to GitHub Code Scanning
6360
uses: github/codeql-action/upload-sarif@v3
6461
with:
6562
sarif_file: out.sarif
66-
category: ${{ env.IMAGE_NAME }}
6763

6864
provider-build-environment:
6965
name: Provider Build Environment
@@ -90,24 +86,20 @@ jobs:
9086
- name: Set version
9187
run: |
9288
[ -z "${{ env.DISPATCH_REF }}" ] && echo "PULUMI_VERSION=$(curl https://www.pulumi.com/latest-version)" >> $GITHUB_ENV || echo "PULUMI_VERSION=${{ env.DISPATCH_REF }}" >> $GITHUB_ENV
93-
- name: Set image name
94-
run: |
95-
echo "IMAGE_NAME=${{ env.DOCKER_ORG }}/pulumi-provider-build-environment:${{ env.PULUMI_VERSION }}-${{ matrix.arch }}" >> $GITHUB_ENV
9689
- name: Snyk scan
9790
continue-on-error: true
9891
uses: snyk/actions/docker@master
9992
env:
10093
SNYK_TOKEN: ${{ steps.esc-secrets.outputs.SNYK_TOKEN }}
10194
with:
102-
image: ${{ env.IMAGE_NAME }}
95+
image: ${{ env.DOCKER_ORG }}/pulumi-provider-build-environment:${{ env.PULUMI_VERSION }}-${{ matrix.arch }}
10396
args: --severity-threshold=high --file=docker/pulumi/Dockerfile
10497
- name: Filter Sarif File
10598
run: python ./.github/scripts/filter-sarif.py
10699
- name: Upload result to GitHub Code Scanning
107100
uses: github/codeql-action/upload-sarif@v3
108101
with:
109102
sarif_file: out.sarif
110-
category: ${{ env.IMAGE_NAME }}
111103

112104
base:
113105
name: Base image
@@ -131,24 +123,20 @@ jobs:
131123
- name: Set version
132124
run: |
133125
[ -z "${{ env.DISPATCH_REF }}" ] && echo "PULUMI_VERSION=$(curl https://www.pulumi.com/latest-version)" >> $GITHUB_ENV || echo "PULUMI_VERSION=${{ env.DISPATCH_REF }}" >> $GITHUB_ENV
134-
- name: Set image name
135-
run: |
136-
echo "IMAGE_NAME=${{ env.DOCKER_ORG }}/pulumi-base:${{ env.PULUMI_VERSION }}-${{ matrix.os }}-${{ matrix.arch }}" >> $GITHUB_ENV
137126
- name: Snyk scan
138127
continue-on-error: true
139128
uses: snyk/actions/docker@master
140129
env:
141130
SNYK_TOKEN: ${{ steps.esc-secrets.outputs.SNYK_TOKEN }}
142131
with:
143-
image: ${{ env.IMAGE_NAME }}
132+
image: ${{ env.DOCKER_ORG }}/pulumi-base:${{ env.PULUMI_VERSION }}-${{ matrix.os }}-${{ matrix.arch }}
144133
args: --severity-threshold=high --file=docker/base/Dockerfile.${{ matrix.os }} --platform=linux/${{ matrix.arch }}
145134
- name: Filter Sarif File
146135
run: python ./.github/scripts/filter-sarif.py
147136
- name: Upload result to GitHub Code Scanning
148137
uses: github/codeql-action/upload-sarif@v3
149138
with:
150139
sarif_file: out.sarif
151-
category: ${{ env.IMAGE_NAME }}
152140

153141
define-debian-matrix:
154142
runs-on: ubuntu-latest
@@ -202,7 +190,7 @@ jobs:
202190
uses: github/codeql-action/upload-sarif@v3
203191
with:
204192
sarif_file: out.sarif
205-
category: ${{ env.IMAGE_NAME }}
193+
category: pulumi-${{ matrix.sdk }}${{ matrix.suffix }}-debian-amd64
206194
- name: Set image name - arm64
207195
run: |
208196
echo "IMAGE_NAME=${{ env.DOCKER_ORG }}/pulumi-${{ matrix.sdk }}${{ matrix.suffix }}:${{ env.PULUMI_VERSION }}-debian-arm64" >> $GITHUB_ENV
@@ -220,7 +208,7 @@ jobs:
220208
uses: github/codeql-action/upload-sarif@v3
221209
with:
222210
sarif_file: out.sarif
223-
category: ${{ env.IMAGE_NAME }}
211+
category: pulumi-${{ matrix.sdk }}${{ matrix.suffix }}-debian-arm64
224212

225213
ubi-sdk:
226214
name: UBI SDK images
@@ -243,21 +231,17 @@ jobs:
243231
- name: Set version
244232
run: |
245233
[ -z "${{ env.DISPATCH_REF }}" ] && echo "PULUMI_VERSION=$(curl https://www.pulumi.com/latest-version)" >> $GITHUB_ENV || echo "PULUMI_VERSION=${{ env.DISPATCH_REF }}" >> $GITHUB_ENV
246-
- name: Set image name
247-
run: |
248-
echo "IMAGE_NAME=${{ env.DOCKER_ORG }}/pulumi-${{ matrix.sdk }}:${{ env.PULUMI_VERSION }}-ubi" >> $GITHUB_ENV
249234
- name: Snyk scan
250235
continue-on-error: true
251236
uses: snyk/actions/docker@master
252237
env:
253238
SNYK_TOKEN: ${{ steps.esc-secrets.outputs.SNYK_TOKEN }}
254239
with:
255-
image: ${{ env.IMAGE_NAME }}
240+
image: ${{ env.DOCKER_ORG }}/pulumi-${{ matrix.sdk }}:${{ env.PULUMI_VERSION }}-ubi
256241
args: --severity-threshold=high --file=docker/${{ matrix.sdk }}/Dockerfile.ubi --platform=linux/amd64
257242
- name: Filter Sarif File
258243
run: python ./.github/scripts/filter-sarif.py
259244
- name: Upload result to GitHub Code Scanning
260245
uses: github/codeql-action/upload-sarif@v3
261246
with:
262247
sarif_file: out.sarif
263-
category: ${{ env.IMAGE_NAME }}

0 commit comments

Comments
 (0)