Skip to content

Commit 6d7efc3

Browse files
authored
Make use of cc-utils trusted checkout (#1596)
* Make use of cc-utils trusted checkout * Make use of .ci/verify * Fix .ci/verify * Fix sast report job
1 parent a3f3b9c commit 6d7efc3

2 files changed

Lines changed: 20 additions & 36 deletions

File tree

.ci/verify

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,4 @@ cd "$(dirname $0)/.."
99
git config --global user.email "gardener@sap.com"
1010
git config --global user.name "Gardener CI/CD"
1111

12-
# Required due to https://github.com/kubernetes/kubernetes/issues/86753 - can be removed once the issue is fixed.
13-
mkdir -p /go/src/github.com/gardener/gardener-extension-provider-aws
14-
cp -r . /go/src/github.com/gardener/gardener-extension-provider-aws
15-
cd /go/src/github.com/gardener/gardener-extension-provider-aws
16-
1712
make verify-extended

.github/workflows/build.yaml

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,47 +28,36 @@ jobs:
2828
- uses: actions/setup-go@v5
2929
with:
3030
go-version: '1.25'
31-
- uses: actions/checkout@v5
32-
- uses: gardener/cc-utils/.github/actions/setup-git-identity@master
31+
- uses: gardener/cc-utils/.github/actions/trusted-checkout@master
3332
with:
3433
remove-trusted-label: false
35-
- name: verify
34+
- name: run-verify
3635
run: |
3736
set -euo pipefail
37+
.ci/verify
38+
# verify calls `make sast-report`, which generates `gosec-report.sarif`
3839
mkdir /tmp/blobs.d
39-
make verify-extended |& tee /tmp/blobs.d/verify-log.txt
40-
tar czf /tmp/blobs.d/verify-log.tar.gz -C/tmp/blobs.d verify-log.txt
4140
tar czf /tmp/blobs.d/gosec-report.tar.gz gosec-report.sarif
42-
- name: add-reports-to-component-descriptor
41+
- name: add-sast-report-to-component-descriptor
4342
uses: gardener/cc-utils/.github/actions/export-ocm-fragments@master
4443
with:
4544
blobs-directory: /tmp/blobs.d
4645
ocm-resources: |
47-
- name: gosec-report
48-
relation: local
49-
access:
50-
type: localBlob
51-
localReference: gosec-report.tar.gz
52-
labels:
53-
- name: gardener.cloud/purposes
54-
value:
55-
- lint
56-
- sast
57-
- pybandit
58-
- name: gardener.cloud/comment
59-
value: |
60-
we use gosec (linter) for SAST Scans.
61-
see: https://github.com/securego/gosec
62-
enabled by: https://github.com/gardener/gardener-extension-provider-aws/pull/112
63-
- name: test-results
64-
relation: local
65-
access:
66-
type: localBlob
67-
localReference: verify-log.tar.gz
68-
labels:
69-
- name: gardener.cloud/purposes
70-
value:
71-
- test
46+
name: gosec-report
47+
relation: local
48+
access:
49+
type: localBlob
50+
localReference: gosec-report.tar.gz
51+
labels:
52+
- name: gardener.cloud/purposes
53+
value:
54+
- lint
55+
- sast
56+
- gosec
57+
- name: gardener.cloud/comment
58+
value: |
59+
we use gosec (linter) for SAST scans
60+
see: https://github.com/securego/gosec
7261
7362
oci-images:
7463
name: Build OCI-Images

0 commit comments

Comments
 (0)