update jq

Signed-off-by: Sertac Ozercan <[email protected]>
project-copacetic · Jan 16, 2024 · 9c12050 · 9c12050
1 parent 070364a
commit 9c12050
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -32,7 +32,7 @@ jobs:
         id: vuln_count
         run: |
           report_file="report.json"
-          vuln_count=$(jq '[.Results[] | select(.Class=="os-pkgs") | .Vulnerabilities[]] | length' "$report_file")
+          vuln_count=$(jq '[.Results[] | select(.Class=="os-pkgs" and .Vulnerabilities!=null) | .Vulnerabilities[]] | length' "$report_file")
           echo "vuln_count=$vuln_count" >> $GITHUB_OUTPUT
 
         # copa action will only run if there are vulnerabilities

diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ jobs:
           id: vuln_count
           run: |
             report_file="report.json"
-            vuln_count=$(jq '[.Results[] | select(.Class=="os-pkgs") | .Vulnerabilities[]] | length' "$report_file")
+            vuln_count=$(jq '[.Results[] | select(.Class=="os-pkgs" and .Vulnerabilities!=null) | .Vulnerabilities[]] | length' "$report_file")
             echo "vuln_count=$vuln_count" >> $GITHUB_OUTPUT
 
           # copa action will only run if there are vulnerabilities

diff --git a/test/test.bats b/test/test.bats
@@ -15,6 +15,6 @@ teardown_file() {
 @test "Run trivy on patched image" {
     run trivy image --exit-code 1 --vuln-type os --ignore-unfixed -f json -o nginx.1.21.6-patched.json 'docker.io/library/nginx:1.21.6-patched'
     [ "$status" -eq 0 ]
-    vulns=$(jq '[.Results[] | select(.Class=="os-pkgs") | .Vulnerabilities[]] | length' nginx.1.21.6-patched.json)
+    vulns=$(jq '[.Results[] | select(.Class=="os-pkgs" and .Vulnerabilities!=null) | .Vulnerabilities[]] | length' nginx.1.21.6-patched.json)
     assert_equal "$vulns" "0"
 }