Rename kosli snyk template name ready for adding code scanning (#149)

cyber-dojo · Feb 29, 2024 · 984fdd4 · 984fdd4
1 parent 8be31bc
commit 984fdd4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -180,18 +180,22 @@ jobs:
       - name: Run Snyk to check Docker image for vulnerabilities
         continue-on-error: true
         run:
+          KOSLI_ATTACHMENTS=/tmp/kosli
+          rm -rf "${KOSLI_ATTACHMENTS}" || true
+          mkdir -p "${KOSLI_ATTACHMENTS}
+          cp .snyk "${KOSLI_ATTACHMENTS}
+
           snyk container test "${IMAGE_NAME}" 
             --file=Dockerfile
             --sarif
-            --sarif-file-output=snyk.json 
-            --policy-path=.snyk
+            --sarif-file-output=snyk.container.scan.json 
+            --policy-path=.snyk | tee "${KOSLI_ATTACHMENTS}/snyk.container.scan.log
 
       - name: Attest Snyk results to Kosli Trail
         run:
           kosli attest snyk "${IMAGE_NAME}" 
-            --attachments=.snyk          
-            --name=dashboard.snyk-scan 
-            --scan-results=snyk.json
+            --name=dashboard.snyk-container-scan 
+            --scan-results=snyk.container.scan.json
 
 
   sdlc-control-gate:

diff --git a/.github/workflows/main_staging.yml b/.github/workflows/main_staging.yml
@@ -170,18 +170,22 @@ jobs:
       - name: Run Snyk to check Docker image for vulnerabilities
         continue-on-error: true
         run:
+          KOSLI_ATTACHMENTS=/tmp/kosli
+          rm -rf "${KOSLI_ATTACHMENTS}" || true
+          mkdir -p "${KOSLI_ATTACHMENTS}
+          cp .snyk "${KOSLI_ATTACHMENTS}
+
           snyk container test "${IMAGE_NAME}" 
             --file=Dockerfile
             --sarif
-            --sarif-file-output=snyk.json 
-            --policy-path=.snyk
+            --sarif-file-output=snyk.container.scan.json 
+            --policy-path=.snyk | tee "${KOSLI_ATTACHMENTS}/snyk.container.scan.log
 
       - name: Attest Snyk results to Kosli Trail
         run:
           kosli attest snyk "${IMAGE_NAME}" 
-            --attachments=.snyk          
-            --name=dashboard.snyk-scan 
-            --scan-results=snyk.json
+            --name=dashboard.snyk-container-scan 
+            --scan-results=snyk.container.scan.json
 
 
   sdlc-control-gate:

diff --git a/.kosli.yml b/.kosli.yml
@@ -8,5 +8,5 @@ trail:
           type: generic
         - name: pull-request
           type: pull_request
-        - name: snyk-scan
+        - name: snyk-container-scan
           type: snyk