From 24ac37c3584d9e946a22ee85e080f8aed035e1dd Mon Sep 17 00:00:00 2001
From: Derek Nola <derek.nola@suse.com>
Date: Wed, 25 Sep 2024 14:27:32 -0700
Subject: [PATCH] Breakup trivy scan into isolated jobs

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 .github/workflows/trivy.yaml | 103 ++++++++++++++++++++++-------------
 1 file changed, 65 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml
index 9267064d65..fe39a67366 100644
--- a/.github/workflows/trivy.yaml
+++ b/.github/workflows/trivy.yaml
@@ -6,40 +6,35 @@ on:
 
 jobs:
   trivy_scan:
-    if: github.event.issue.pull_request && github.event.comment.body == '/trivy' && github.event.issue.state == 'open'
+    if: github.event.issue.pull_request && github.event.comment.body == '/trivy'
     runs-on: runs-on,runner=8cpu-linux-x64,run-id=${{ github.run_id }}
     permissions:
-      pull-requests: write
-    env:
-      GH_TOKEN: ${{ github.token }}
+      pull-requests: read
     steps:
-    - name: Check if comment author is a member of k3s team
+    - name: Check if comment author is a public member of rancher organization
       uses: actions/github-script@v7
       with:
+        # Catch 404 errors if user is not a member of the organization
+        # 302 is expected as the GHA is not a member of the organization
+        # Users must be set their membership to public for this to work
+        # https://github.com/orgs/k3s-io/people
         script: |
           const org = context.repo.owner;
-          const team_slug = 'k3s';
           const username = context.payload.comment.user.login;
-
-          const { data: membership } = await github.teams.getMembershipForUserInOrg({
-            org,
-            team_slug,
-            username
-          });
-
-          if (membership.state !== 'active') {
-            core.setFailed(`User ${username} is not an active member of the ${team_slug} team`);
+          try {
+            const result = await github.rest.orgs.checkMembershipForUser({
+              org,
+              username,
+            });
+          } catch (error) {
+            core.setFailed(`User ${username} is not an public member of the ${org} organization`);
           }
+    
     - name: Checkout PR code
       uses: actions/checkout@v4
       with:
         ref: refs/pull/${{ github.event.issue.number }}/head
-    
-    - name: Comment Status on PR
-      run: |
-        gh repo set-default ${{ github.repository }}
-        gh pr comment ${{ github.event.issue.number }} -b ":construction: Running Trivy scan on PR :construction: "
-    
+
     # We don't care about the go version, as we only use it to capture ENV vars
     - name: Install Go
       uses: ./.github/actions/setup-go
@@ -70,20 +65,52 @@ jobs:
         severity: "HIGH,CRITICAL"
         output: "trivy-fs-report.txt"
     
-    - name: Add Trivy Report to PR
-      run: |
-        sudo chown runner:runner trivy-image-report.txt trivy-fs-report.txt
-        cat trivy-image-report.txt trivy-fs-report.txt > trivy-report.txt
-        if [ -s trivy-report.txt ] && [ -n "$(grep -v '^\s*$' trivy-report.txt)" ]; then
-          echo '```' | cat - trivy-report.txt > temp && mv temp trivy-report.txt
-          echo '```' >> trivy-report.txt
-          gh issue comment ${{ github.event.issue.number }} --edit-last -F trivy-report.txt
-        else
-          echo ':star2: No High or Critical CVEs Found :star2:' > trivy-report.txt
-          gh issue comment ${{ github.event.issue.number }} --edit-last -F trivy-report.txt
-        fi
-    
-    - name: Report Failure
-      if: ${{ failure() }}
-      run: |
-        gh issue comment ${{ github.event.issue.number }} --edit-last -b ":x: Trivy scan action failed, check logs :x:"
\ No newline at end of file
+    - name: Upload Trivy Reports
+      uses: actions/upload-artifact@v4
+      with:
+        name: trivy-report
+        path: |
+          trivy-image-report.txt
+          trivy-fs-report.txt
+        retention-days: 2
+        if-no-files-found: error
+
+  trivy_report:
+    needs: trivy_scan
+    runs-on: runs-on,runner=8cpu-linux-x64,run-id=${{ github.run_id }}
+    permissions:
+      pull-requests: write
+    env:
+      GH_TOKEN: ${{ github.token }}
+      GH_REPO: ${{ github.repository }}
+    steps:
+      - name: Download Trivy Report
+        uses: actions/download-artifact@v4
+        with:
+          name: trivy-report
+      
+      - name: Add Trivy Report to PR
+        run: |
+          cat trivy-image-report.txt trivy-fs-report.txt > trivy-report.txt
+          if [ -s trivy-report.txt ] && [ -n "$(grep -v '^\s*$' trivy-report.txt)" ]; then
+            echo '```' | cat - trivy-report.txt > temp && mv temp trivy-report.txt
+            echo '```' >> trivy-report.txt
+            gh issue comment ${{ github.event.issue.number }} -F trivy-report.txt
+          else
+            echo ':star2: No High or Critical CVEs Found :star2:' > trivy-report.txt
+            gh issue comment ${{ github.event.issue.number }} -F trivy-report.txt
+          fi
+  
+  trivy_failure:
+    needs: trivy_scan
+    runs-on: runs-on,runner=8cpu-linux-x64,run-id=${{ github.run_id }}
+    if: always() && needs.trivy_scan.result == 'failure'
+    permissions:
+      pull-requests: write
+    env:
+      GH_TOKEN: ${{ github.token }}
+      GH_REPO: ${{ github.repository }}
+    steps:
+      - name: Report Failure
+        run: |
+          gh issue comment ${{ github.event.issue.number }} -b ":x: Trivy scan action failed, check logs :x:"
\ No newline at end of file