Update to trivy version 0.48.0 (#289)

* Update to trivy version 0.48.0 --------- Signed-off-by: Simar <simar@linux.com> Co-authored-by: Simar <simar@linux.com>
aquasecurity · Dec 8, 2023 · 91713af · 91713af
1 parent 22d2755
commit 91713af
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 41 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -1,7 +1,7 @@
 name: "build"
 on: [push, pull_request]
 env:
-  TRIVY_VERSION: 0.45.0
+  TRIVY_VERSION: 0.48.0
   BATS_LIB_PATH: '/usr/lib/'
 jobs:
   build:
@@ -25,4 +25,4 @@ jobs:
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v${{ env.TRIVY_VERSION }}
 
       - name: Test
-        run: BATS_LIB_PATH=${{ env.BATS_LIB_PATH }} bats --recursive --timing .
+        run: BATS_LIB_PATH=${{ env.BATS_LIB_PATH }} bats --recursive --timing .
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/aquasecurity/trivy:0.47.0
+FROM ghcr.io/aquasecurity/trivy:0.48.0
 COPY entrypoint.sh /
 RUN apk --no-cache add bash curl npm
 RUN chmod +x /entrypoint.sh

diff --git a/test/data/config-sarif.test b/test/data/config-sarif.test
diff --git a/test/data/config.test b/test/data/config.test
@@ -1,5 +1,6 @@
 {
   "SchemaVersion": 2,
+  "CreatedAt": "2023-12-08T11:02:54.295987-07:00",
   "ArtifactName": ".",
   "ArtifactType": "filesystem",
   "Metadata": {
@@ -130,6 +131,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[38;5;33mresource\u001b[0m \u001b[38;5;37m\"aws_s3_bucket\"\u001b[0m \u001b[38;5;37m\"bucket\"\u001b[0m {",
                   "FirstCause": true,
                   "LastCause": false
                 },
@@ -139,6 +141,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "  \u001b[38;5;245mbucket\u001b[0m = \u001b[38;5;37m\"trivy-action-bucket\"",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -148,6 +151,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[0m}",
                   "FirstCause": false,
                   "LastCause": true
                 }
@@ -186,6 +190,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[38;5;33mresource\u001b[0m \u001b[38;5;37m\"aws_s3_bucket\"\u001b[0m \u001b[38;5;37m\"bucket\"\u001b[0m {",
                   "FirstCause": true,
                   "LastCause": false
                 },
@@ -195,6 +200,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "  \u001b[38;5;245mbucket\u001b[0m = \u001b[38;5;37m\"trivy-action-bucket\"",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -204,6 +210,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[0m}",
                   "FirstCause": false,
                   "LastCause": true
                 }
@@ -242,6 +249,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[38;5;33mresource\u001b[0m \u001b[38;5;37m\"aws_s3_bucket\"\u001b[0m \u001b[38;5;37m\"bucket\"\u001b[0m {",
                   "FirstCause": true,
                   "LastCause": false
                 },
@@ -251,6 +259,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "  \u001b[38;5;245mbucket\u001b[0m = \u001b[38;5;37m\"trivy-action-bucket\"",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -260,6 +269,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[0m}",
                   "FirstCause": false,
                   "LastCause": true
                 }
@@ -299,6 +309,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[38;5;33mresource\u001b[0m \u001b[38;5;37m\"aws_s3_bucket\"\u001b[0m \u001b[38;5;37m\"bucket\"\u001b[0m {",
                   "FirstCause": true,
                   "LastCause": false
                 },
@@ -308,6 +319,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "  \u001b[38;5;245mbucket\u001b[0m = \u001b[38;5;37m\"trivy-action-bucket\"",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -317,6 +329,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[0m}",
                   "FirstCause": false,
                   "LastCause": true
                 }
@@ -355,6 +368,7 @@
                   "IsCause": false,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[38;5;33mresource\u001b[0m \u001b[38;5;37m\"aws_s3_bucket_versioning\"\u001b[0m \u001b[38;5;37m\"bucket_versioning\"\u001b[0m {",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -364,6 +378,7 @@
                   "IsCause": false,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "  \u001b[38;5;245mbucket\u001b[0m = aws_s3_bucket.bucket.id",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -382,6 +397,7 @@
                   "IsCause": false,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "  versioning_configuration {",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -391,6 +407,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "    \u001b[38;5;245mstatus\u001b[0m = \u001b[38;5;33mvar\u001b[0m.bucket_versioning_enabled",
                   "FirstCause": true,
                   "LastCause": true
                 },
@@ -400,6 +417,7 @@
                   "IsCause": false,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "  }",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -409,6 +427,7 @@
                   "IsCause": false,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "}",
                   "FirstCause": false,
                   "LastCause": false
                 }
@@ -465,6 +484,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[38;5;33mresource\u001b[0m \u001b[38;5;37m\"aws_s3_bucket\"\u001b[0m \u001b[38;5;37m\"bucket\"\u001b[0m {",
                   "FirstCause": true,
                   "LastCause": false
                 },
@@ -474,6 +494,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "  \u001b[38;5;245mbucket\u001b[0m = \u001b[38;5;37m\"trivy-action-bucket\"",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -483,6 +504,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[0m}",
                   "FirstCause": false,
                   "LastCause": true
                 }
@@ -521,6 +543,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[38;5;33mresource\u001b[0m \u001b[38;5;37m\"aws_s3_bucket\"\u001b[0m \u001b[38;5;37m\"bucket\"\u001b[0m {",
                   "FirstCause": true,
                   "LastCause": false
                 },
@@ -530,6 +553,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "  \u001b[38;5;245mbucket\u001b[0m = \u001b[38;5;37m\"trivy-action-bucket\"",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -539,6 +563,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[0m}",
                   "FirstCause": false,
                   "LastCause": true
                 }
@@ -577,6 +602,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[38;5;33mresource\u001b[0m \u001b[38;5;37m\"aws_s3_bucket\"\u001b[0m \u001b[38;5;37m\"bucket\"\u001b[0m {",
                   "FirstCause": true,
                   "LastCause": false
                 },
@@ -586,6 +612,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "  \u001b[38;5;245mbucket\u001b[0m = \u001b[38;5;37m\"trivy-action-bucket\"",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -595,6 +622,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[0m}",
                   "FirstCause": false,
                   "LastCause": true
                 }
@@ -633,6 +661,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[38;5;33mresource\u001b[0m \u001b[38;5;37m\"aws_s3_bucket\"\u001b[0m \u001b[38;5;37m\"bucket\"\u001b[0m {",
                   "FirstCause": true,
                   "LastCause": false
                 },
@@ -642,6 +671,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "  \u001b[38;5;245mbucket\u001b[0m = \u001b[38;5;37m\"trivy-action-bucket\"",
                   "FirstCause": false,
                   "LastCause": false
                 },
@@ -651,6 +681,7 @@
                   "IsCause": true,
                   "Annotation": "",
                   "Truncated": false,
+                  "Highlighted": "\u001b[0m}",
                   "FirstCause": false,
                   "LastCause": true
                 }