ensure scan results directory is unique (#6050)

nginx · Jul 24, 2024 · 35e4110 · 35e4110
1 parent 03467f9
commit 35e4110
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/.github/workflows/image-promotion.yml b/.github/workflows/image-promotion.yml
@@ -342,7 +342,7 @@ jobs:
           pyxis_token: ${{ secrets.PYXIS_API_TOKEN }}
 
   scan-docker-oss:
-    name: Scan Docker OSS
+    name: Scan ${{ matrix.image }}-${{ matrix.target }}
     runs-on: ubuntu-22.04
     needs: [checks]
     permissions:
@@ -432,7 +432,7 @@ jobs:
           sarif_file: "${{ steps.directory.outputs.directory }}/"
 
   scan-docker-plus:
-    name: Scan Docker Plus
+    name: Scan ${{ matrix.image }}-${{ matrix.target }}
     runs-on: ubuntu-22.04
     needs: [checks]
     permissions:
@@ -522,7 +522,7 @@ jobs:
           sarif_file: "${{ steps.directory.outputs.directory }}/"
 
   scan-docker-nap:
-    name: Scan Docker Plus + NAP WAF/DOS
+    name: Scan ${{ matrix.image }}-${{ matrix.target }}-${{ matrix.nap_modules }}
     runs-on: ubuntu-22.04
     needs: [checks]
     permissions:
@@ -537,10 +537,17 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
+      - name: NAP modules
+        id: nap_modules
+        run: |
+          [[ "${{ matrix.nap_modules }}" == "waf,dos" ]] && modules="waf-dos" || name="${{ matrix.nap_modules }}"
+          echo "name=${name}" >> $GITHUB_OUTPUT
+        if: ${{ matrix.nap_modules != '' }}
+
       - name: Make directory for security scan results
         id: directory
         run: |
-          directory=${{ matrix.image }}-${{ matrix.target }}-results
+          directory=${{ matrix.image }}-${{ matrix.target }}-${{ steps.nap_modules.outputs.name }}-results
           echo "directory=${directory}" >> $GITHUB_OUTPUT
           mkdir -p "${directory}"