From f1c6af31212990cf920d967b30f2fd7cf942b0c5 Mon Sep 17 00:00:00 2001 From: Teppei Fukuda Date: Tue, 7 Jun 2022 13:50:32 +0300 Subject: [PATCH] test: use images in GHCR (#2275) Co-authored-by: AMF --- Makefile | 21 +++++--- integration/client_server_test.go | 4 +- integration/docker_engine_test.go | 54 +++++++++---------- integration/integration_test.go | 18 ++++--- integration/scripts/download-images.sh | 19 +++++++ integration/standalone_tar_test.go | 4 +- integration/testdata/almalinux-8.json.golden | 1 + integration/testdata/alpine-310.json.golden | 4 ++ .../alpine-39-high-critical.json.golden | 2 + .../alpine-39-ignore-cveids.json.golden | 2 + integration/testdata/alpine-39.json.golden | 8 ++- .../testdata/alpine-distroless.json.golden | 1 + integration/testdata/amazon-1.json.golden | 1 + integration/testdata/amazon-2.json.golden | 2 + .../busybox-with-lockfile.json.golden | 25 ++++----- integration/testdata/centos-6.json.golden | 23 ++++---- .../centos-7-ignore-unfixed.json.golden | 30 ++++++----- .../testdata/centos-7-medium.json.golden | 27 +++++----- integration/testdata/centos-7.json.golden | 33 ++++++------ .../debian-buster-ignore-unfixed.json.golden | 1 + .../testdata/debian-buster.json.golden | 2 + .../testdata/debian-stretch.json.golden | 5 ++ .../testdata/distroless-base.json.golden | 4 ++ .../testdata/distroless-python27.json.golden | 4 ++ integration/testdata/fluentd-gems.json.golden | 4 +- integration/testdata/mariner-1.0.json.golden | 2 + .../testdata/opensuse-leap-151.json.golden | 2 + ....json.golden => oraclelinux-8.json.golden} | 28 +++++----- integration/testdata/photon-30.json.golden | 3 ++ integration/testdata/rockylinux-8.json.golden | 1 + integration/testdata/ubi-7.json.golden | 1 + .../ubuntu-1804-ignore-unfixed.json.golden | 6 ++- integration/testdata/ubuntu-1804.json.golden | 5 ++ 33 files changed, 221 insertions(+), 126 deletions(-) create mode 100755 integration/scripts/download-images.sh rename integration/testdata/{oraclelinux-8-slim.json.golden => oraclelinux-8.json.golden} (85%) diff --git a/Makefile b/Makefile index 71c5617f3b..03c98cf938 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,16 @@ MKDOCS_PORT := 8000 u := $(if $(update),-u) $(GOBIN)/wire: - GO111MODULE=off go get github.com/google/wire/cmd/wire + go install github.com/google/wire/cmd/wire@v0.5.0 + +$(GOBIN)/crane: + go install github.com/google/go-containerregistry/cmd/crane@v0.9.0 + +$(GOBIN)/golangci-lint: + curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOBIN) v1.45.2 + +$(GOBIN)/labeler: + go install github.com/knqyf263/labeler@latest .PHONY: wire wire: $(GOBIN)/wire @@ -26,15 +35,14 @@ deps: go get ${u} -d go mod tidy -$(GOBIN)/golangci-lint: - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOBIN) v1.45.2 .PHONY: test test: go test -v -short -coverprofile=coverage.txt -covermode=atomic ./... -integration/testdata/fixtures/images/*.tar.gz: - git clone https://github.com/aquasecurity/trivy-test-images.git integration/testdata/fixtures/images +integration/testdata/fixtures/images/*.tar.gz: $(GOBIN)/crane + mkdir -p integration/testdata/fixtures/images/ + integration/scripts/download-images.sh .PHONY: test-integration test-integration: integration/testdata/fixtures/images/*.tar.gz @@ -70,9 +78,6 @@ install: clean: rm -rf integration/testdata/fixtures/images -$(GOBIN)/labeler: - go install github.com/knqyf263/labeler@latest - .PHONY: label label: $(GOBIN)/labeler labeler apply misc/triage/labels.yaml -r aquasecurity/trivy -l 5 diff --git a/integration/client_server_test.go b/integration/client_server_test.go index ef6ff5e902..00cae2611c 100644 --- a/integration/client_server_test.go +++ b/integration/client_server_test.go @@ -199,9 +199,9 @@ func TestClientServer(t *testing.T) { { name: "oracle 8", args: csArgs{ - Input: "testdata/fixtures/images/oraclelinux-8-slim.tar.gz", + Input: "testdata/fixtures/images/oraclelinux-8.tar.gz", }, - golden: "testdata/oraclelinux-8-slim.json.golden", + golden: "testdata/oraclelinux-8.json.golden", }, { name: "opensuse leap 15.1", diff --git a/integration/docker_engine_test.go b/integration/docker_engine_test.go index 67bedf7924..fd2ab12e76 100644 --- a/integration/docker_engine_test.go +++ b/integration/docker_engine_test.go @@ -33,76 +33,76 @@ func TestDockerEngine(t *testing.T) { }{ { name: "alpine:3.9", - imageTag: "alpine:3.9", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:alpine-39", input: "testdata/fixtures/images/alpine-39.tar.gz", golden: "testdata/alpine-39.json.golden", }, { name: "alpine:3.9, with high and critical severity", severity: []string{"HIGH", "CRITICAL"}, - imageTag: "alpine:3.9", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:alpine-39", input: "testdata/fixtures/images/alpine-39.tar.gz", golden: "testdata/alpine-39-high-critical.json.golden", }, { name: "alpine:3.9, with .trivyignore", - imageTag: "alpine:3.9", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:alpine-39", ignoreIDs: []string{"CVE-2019-1549", "CVE-2019-14697"}, input: "testdata/fixtures/images/alpine-39.tar.gz", golden: "testdata/alpine-39-ignore-cveids.json.golden", }, { name: "alpine:3.10", - imageTag: "alpine:3.10", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:alpine-310", input: "testdata/fixtures/images/alpine-310.tar.gz", golden: "testdata/alpine-310.json.golden", }, { name: "amazonlinux:1", - imageTag: "amazonlinux:1", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:amazon-1", input: "testdata/fixtures/images/amazon-1.tar.gz", golden: "testdata/amazon-1.json.golden", }, { name: "amazonlinux:2", - imageTag: "amazonlinux:2", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:amazon-2", input: "testdata/fixtures/images/amazon-2.tar.gz", golden: "testdata/amazon-2.json.golden", }, { name: "almalinux 8", - imageTag: "almalinux:8", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:almalinux-8", input: "testdata/fixtures/images/almalinux-8.tar.gz", golden: "testdata/almalinux-8.json.golden", }, { name: "rocky linux 8", - imageTag: "rockylinux:8", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:rockylinux-8", input: "testdata/fixtures/images/rockylinux-8.tar.gz", golden: "testdata/rockylinux-8.json.golden", }, { name: "centos 6", - imageTag: "centos:6", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:centos-6", input: "testdata/fixtures/images/centos-6.tar.gz", golden: "testdata/centos-6.json.golden", }, { name: "centos 7", - imageTag: "centos:7", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:centos-7", input: "testdata/fixtures/images/centos-7.tar.gz", golden: "testdata/centos-7.json.golden", }, { name: "centos 7, with --ignore-unfixed option", - imageTag: "centos:7", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:centos-7", ignoreUnfixed: true, input: "testdata/fixtures/images/centos-7.tar.gz", golden: "testdata/centos-7-ignore-unfixed.json.golden", }, { name: "centos 7, with --ignore-unfixed option, with medium severity", - imageTag: "centos:7", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:centos-7", ignoreUnfixed: true, severity: []string{"MEDIUM"}, input: "testdata/fixtures/images/centos-7.tar.gz", @@ -110,81 +110,81 @@ func TestDockerEngine(t *testing.T) { }, { name: "registry.redhat.io/ubi7", - imageTag: "registry.redhat.io/ubi7", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:ubi-7", input: "testdata/fixtures/images/ubi-7.tar.gz", golden: "testdata/ubi-7.json.golden", }, { name: "debian buster/10", - imageTag: "debian:buster", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:debian-buster", input: "testdata/fixtures/images/debian-buster.tar.gz", golden: "testdata/debian-buster.json.golden", }, { name: "debian buster/10, with --ignore-unfixed option", ignoreUnfixed: true, - imageTag: "debian:buster", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:debian-buster", input: "testdata/fixtures/images/debian-buster.tar.gz", golden: "testdata/debian-buster-ignore-unfixed.json.golden", }, { name: "debian stretch/9", - imageTag: "debian:stretch", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:debian-stretch", input: "testdata/fixtures/images/debian-stretch.tar.gz", golden: "testdata/debian-stretch.json.golden", }, { name: "distroless base", - imageTag: "gcr.io/distroless/base:latest", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:distroless-base", input: "testdata/fixtures/images/distroless-base.tar.gz", golden: "testdata/distroless-base.json.golden", }, { name: "distroless python2.7", - imageTag: "gcr.io/distroless/python2.7:latest", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:distroless-python27", input: "testdata/fixtures/images/distroless-python27.tar.gz", golden: "testdata/distroless-python27.json.golden", }, { name: "oracle linux 8", - imageTag: "oraclelinux:8-slim", - input: "testdata/fixtures/images/oraclelinux-8-slim.tar.gz", - golden: "testdata/oraclelinux-8-slim.json.golden", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:oraclelinux-8", + input: "testdata/fixtures/images/oraclelinux-8.tar.gz", + golden: "testdata/oraclelinux-8.json.golden", }, { name: "ubuntu 18.04", - imageTag: "ubuntu:18.04", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:ubuntu-1804", input: "testdata/fixtures/images/ubuntu-1804.tar.gz", golden: "testdata/ubuntu-1804.json.golden", }, { name: "ubuntu 18.04, with --ignore-unfixed option", - imageTag: "ubuntu:18.04", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:ubuntu-1804", ignoreUnfixed: true, input: "testdata/fixtures/images/ubuntu-1804.tar.gz", golden: "testdata/ubuntu-1804-ignore-unfixed.json.golden", }, { name: "opensuse leap 15.1", - imageTag: "opensuse/leap:latest", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:opensuse-leap-151", input: "testdata/fixtures/images/opensuse-leap-151.tar.gz", golden: "testdata/opensuse-leap-151.json.golden", }, { name: "photon 3.0", - imageTag: "photon:3.0-20190823", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:photon-30", input: "testdata/fixtures/images/photon-30.tar.gz", golden: "testdata/photon-30.json.golden", }, { name: "CBL-Mariner 1.0", - imageTag: "cblmariner.azurecr.io/base/core:1.0", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:mariner-1.0", input: "testdata/fixtures/images/mariner-1.0.tar.gz", golden: "testdata/mariner-1.0.json.golden", }, { name: "busybox with Cargo.lock", - imageTag: "busy-cargo:latest", + imageTag: "ghcr.io/aquasecurity/trivy-test-images:busybox-with-lockfile", input: "testdata/fixtures/images/busybox-with-lockfile.tar.gz", golden: "testdata/busybox-with-lockfile.json.golden", }, diff --git a/integration/integration_test.go b/integration/integration_test.go index 18ab29dd7c..8f08469eb6 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -92,19 +92,25 @@ func readReport(t *testing.T, filePath string) types.Report { require.NoError(t, err, filePath) defer f.Close() - var res types.Report - err = json.NewDecoder(f).Decode(&res) + var report types.Report + err = json.NewDecoder(f).Decode(&report) require.NoError(t, err, filePath) // We don't compare history because the nano-seconds in "created" don't match - res.Metadata.ImageConfig.History = nil + report.Metadata.ImageConfig.History = nil // We don't compare repo tags because the archive doesn't support it - res.Metadata.RepoTags = nil + report.Metadata.RepoTags = nil - res.Metadata.RepoDigests = nil + report.Metadata.RepoDigests = nil - return res + for i, result := range report.Results { + for j := range result.Vulnerabilities { + report.Results[i].Vulnerabilities[j].Layer.Digest = "" + } + } + + return report } func compareReports(t *testing.T, wantFile, gotFile string) { diff --git a/integration/scripts/download-images.sh b/integration/scripts/download-images.sh new file mode 100755 index 0000000000..1939bb32cb --- /dev/null +++ b/integration/scripts/download-images.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +TEST_IMAGE=ghcr.io/aquasecurity/trivy-test-images + +CURRENT=$(cd $(dirname $0);pwd) + +# List the tags +TAGS=$(crane ls ${TEST_IMAGE}) + +# Download missing images +for tag in $TAGS +do + dir=${CURRENT}/../testdata/fixtures/images/ + if [ ! -e "${dir}/${tag}.tar.gz" ]; then + echo "Downloading $tag..." + crane pull "${TEST_IMAGE}:${tag}" "${dir}/${tag}.tar" + gzip "${dir}/${tag}.tar" + fi +done diff --git a/integration/standalone_tar_test.go b/integration/standalone_tar_test.go index 927eff30c9..93d2d60f53 100644 --- a/integration/standalone_tar_test.go +++ b/integration/standalone_tar_test.go @@ -211,9 +211,9 @@ func TestTar(t *testing.T) { name: "oracle linux 8", testArgs: args{ Format: "json", - Input: "testdata/fixtures/images/oraclelinux-8-slim.tar.gz", + Input: "testdata/fixtures/images/oraclelinux-8.tar.gz", }, - golden: "testdata/oraclelinux-8-slim.json.golden", + golden: "testdata/oraclelinux-8.json.golden", }, { name: "opensuse leap 15.1", diff --git a/integration/testdata/almalinux-8.json.golden b/integration/testdata/almalinux-8.json.golden index 809ead3f6e..0d7080df0e 100644 --- a/integration/testdata/almalinux-8.json.golden +++ b/integration/testdata/almalinux-8.json.golden @@ -57,6 +57,7 @@ "InstalledVersion": "1:1.1.1k-4.el8", "FixedVersion": "1:1.1.1k-5.el8_5", "Layer": { + "Digest": "sha256:a1f18d9dc5496c63197eb9a4f1d4bf5cc88c6a34f64f0fe11ea233070392ce48", "DiffID": "sha256:124d41c237c5e823577dda97e87cebaecce62d585c725d07e709ce410681de4d" }, "SeveritySource": "alma", diff --git a/integration/testdata/alpine-310.json.golden b/integration/testdata/alpine-310.json.golden index ad9343ed04..3be3ef5228 100644 --- a/integration/testdata/alpine-310.json.golden +++ b/integration/testdata/alpine-310.json.golden @@ -59,6 +59,7 @@ "InstalledVersion": "1.1.1c-r0", "FixedVersion": "1.1.1d-r0", "Layer": { + "Digest": "sha256:9d48c3bd43c520dc2784e868a780e976b207cbf493eaff8c6596eb871cbd9609", "DiffID": "sha256:03901b4a2ea88eeaad62dbe59b072b28b6efa00491962b8741081c5df50c65e0" }, "SeveritySource": "nvd", @@ -117,6 +118,7 @@ "InstalledVersion": "1.1.1c-r0", "FixedVersion": "1.1.1d-r2", "Layer": { + "Digest": "sha256:9d48c3bd43c520dc2784e868a780e976b207cbf493eaff8c6596eb871cbd9609", "DiffID": "sha256:03901b4a2ea88eeaad62dbe59b072b28b6efa00491962b8741081c5df50c65e0" }, "SeveritySource": "nvd", @@ -185,6 +187,7 @@ "InstalledVersion": "1.1.1c-r0", "FixedVersion": "1.1.1d-r0", "Layer": { + "Digest": "sha256:9d48c3bd43c520dc2784e868a780e976b207cbf493eaff8c6596eb871cbd9609", "DiffID": "sha256:03901b4a2ea88eeaad62dbe59b072b28b6efa00491962b8741081c5df50c65e0" }, "SeveritySource": "nvd", @@ -243,6 +246,7 @@ "InstalledVersion": "1.1.1c-r0", "FixedVersion": "1.1.1d-r2", "Layer": { + "Digest": "sha256:9d48c3bd43c520dc2784e868a780e976b207cbf493eaff8c6596eb871cbd9609", "DiffID": "sha256:03901b4a2ea88eeaad62dbe59b072b28b6efa00491962b8741081c5df50c65e0" }, "SeveritySource": "nvd", diff --git a/integration/testdata/alpine-39-high-critical.json.golden b/integration/testdata/alpine-39-high-critical.json.golden index 4bb09f76af..9d201ded77 100644 --- a/integration/testdata/alpine-39-high-critical.json.golden +++ b/integration/testdata/alpine-39-high-critical.json.golden @@ -59,6 +59,7 @@ "InstalledVersion": "1.1.20-r4", "FixedVersion": "1.1.20-r5", "Layer": { + "Digest": "sha256:e7c96db7181be991f19a9fb6975cdbbd73c65f4a2681348e63a141a2192a5f10", "DiffID": "sha256:f1b5933fe4b5f49bbe8258745cf396afe07e625bdab3168e364daf7c956b6b81" }, "SeveritySource": "nvd", @@ -95,6 +96,7 @@ "InstalledVersion": "1.1.20-r4", "FixedVersion": "1.1.20-r5", "Layer": { + "Digest": "sha256:e7c96db7181be991f19a9fb6975cdbbd73c65f4a2681348e63a141a2192a5f10", "DiffID": "sha256:f1b5933fe4b5f49bbe8258745cf396afe07e625bdab3168e364daf7c956b6b81" }, "SeveritySource": "nvd", diff --git a/integration/testdata/alpine-39-ignore-cveids.json.golden b/integration/testdata/alpine-39-ignore-cveids.json.golden index 3505bb203e..0c827332a6 100644 --- a/integration/testdata/alpine-39-ignore-cveids.json.golden +++ b/integration/testdata/alpine-39-ignore-cveids.json.golden @@ -59,6 +59,7 @@ "InstalledVersion": "1.1.1b-r1", "FixedVersion": "1.1.1d-r2", "Layer": { + "Digest": "sha256:e7c96db7181be991f19a9fb6975cdbbd73c65f4a2681348e63a141a2192a5f10", "DiffID": "sha256:f1b5933fe4b5f49bbe8258745cf396afe07e625bdab3168e364daf7c956b6b81" }, "SeveritySource": "nvd", @@ -127,6 +128,7 @@ "InstalledVersion": "1.1.1b-r1", "FixedVersion": "1.1.1d-r2", "Layer": { + "Digest": "sha256:e7c96db7181be991f19a9fb6975cdbbd73c65f4a2681348e63a141a2192a5f10", "DiffID": "sha256:f1b5933fe4b5f49bbe8258745cf396afe07e625bdab3168e364daf7c956b6b81" }, "SeveritySource": "nvd", diff --git a/integration/testdata/alpine-39.json.golden b/integration/testdata/alpine-39.json.golden index cc6d343db5..2a79fe6ec8 100644 --- a/integration/testdata/alpine-39.json.golden +++ b/integration/testdata/alpine-39.json.golden @@ -59,6 +59,7 @@ "InstalledVersion": "1.1.1b-r1", "FixedVersion": "1.1.1d-r0", "Layer": { + "Digest": "sha256:e7c96db7181be991f19a9fb6975cdbbd73c65f4a2681348e63a141a2192a5f10", "DiffID": "sha256:f1b5933fe4b5f49bbe8258745cf396afe07e625bdab3168e364daf7c956b6b81" }, "SeveritySource": "nvd", @@ -117,6 +118,7 @@ "InstalledVersion": "1.1.1b-r1", "FixedVersion": "1.1.1d-r2", "Layer": { + "Digest": "sha256:e7c96db7181be991f19a9fb6975cdbbd73c65f4a2681348e63a141a2192a5f10", "DiffID": "sha256:f1b5933fe4b5f49bbe8258745cf396afe07e625bdab3168e364daf7c956b6b81" }, "SeveritySource": "nvd", @@ -185,6 +187,7 @@ "InstalledVersion": "1.1.1b-r1", "FixedVersion": "1.1.1d-r0", "Layer": { + "Digest": "sha256:e7c96db7181be991f19a9fb6975cdbbd73c65f4a2681348e63a141a2192a5f10", "DiffID": "sha256:f1b5933fe4b5f49bbe8258745cf396afe07e625bdab3168e364daf7c956b6b81" }, "SeveritySource": "nvd", @@ -243,6 +246,7 @@ "InstalledVersion": "1.1.1b-r1", "FixedVersion": "1.1.1d-r2", "Layer": { + "Digest": "sha256:e7c96db7181be991f19a9fb6975cdbbd73c65f4a2681348e63a141a2192a5f10", "DiffID": "sha256:f1b5933fe4b5f49bbe8258745cf396afe07e625bdab3168e364daf7c956b6b81" }, "SeveritySource": "nvd", @@ -311,6 +315,7 @@ "InstalledVersion": "1.1.20-r4", "FixedVersion": "1.1.20-r5", "Layer": { + "Digest": "sha256:e7c96db7181be991f19a9fb6975cdbbd73c65f4a2681348e63a141a2192a5f10", "DiffID": "sha256:f1b5933fe4b5f49bbe8258745cf396afe07e625bdab3168e364daf7c956b6b81" }, "SeveritySource": "nvd", @@ -347,6 +352,7 @@ "InstalledVersion": "1.1.20-r4", "FixedVersion": "1.1.20-r5", "Layer": { + "Digest": "sha256:e7c96db7181be991f19a9fb6975cdbbd73c65f4a2681348e63a141a2192a5f10", "DiffID": "sha256:f1b5933fe4b5f49bbe8258745cf396afe07e625bdab3168e364daf7c956b6b81" }, "SeveritySource": "nvd", @@ -380,4 +386,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/integration/testdata/alpine-distroless.json.golden b/integration/testdata/alpine-distroless.json.golden index 7dc7631f9c..7e2b5826d6 100644 --- a/integration/testdata/alpine-distroless.json.golden +++ b/integration/testdata/alpine-distroless.json.golden @@ -54,6 +54,7 @@ "InstalledVersion": "2.35.1-r2", "FixedVersion": "2.35.2-r0", "Layer": { + "Digest": "sha256:6c6f69aa25501b090c54c62a9c17e978064c2f1328f67a7ef88c81ce5f2d7983", "DiffID": "sha256:89da7cc836da4b53ab1ceb572576458c005e7e444b8bb79abda196668a2f0c92" }, "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2022-24765", diff --git a/integration/testdata/amazon-1.json.golden b/integration/testdata/amazon-1.json.golden index 7ddc215155..3dbc73fed4 100644 --- a/integration/testdata/amazon-1.json.golden +++ b/integration/testdata/amazon-1.json.golden @@ -58,6 +58,7 @@ "InstalledVersion": "7.61.1-11.91.amzn1", "FixedVersion": "7.61.1-12.93.amzn1", "Layer": { + "Digest": "sha256:105ff6bf468b1422ad7c47ea9d63eae82f875c93310cb8d34551951e754ef43b", "DiffID": "sha256:984fe1509738f6f00f34d9be7398b07ebeb8b98dda077ff6be2cdb87111b73cf" }, "SeveritySource": "amazon", diff --git a/integration/testdata/amazon-2.json.golden b/integration/testdata/amazon-2.json.golden index d26b2cc99a..8a809c9daf 100644 --- a/integration/testdata/amazon-2.json.golden +++ b/integration/testdata/amazon-2.json.golden @@ -58,6 +58,7 @@ "InstalledVersion": "7.61.1-9.amzn2.0.1", "FixedVersion": "7.61.1-12.amzn2.0.1", "Layer": { + "Digest": "sha256:72d97abdfae3b3c933ff41e39779cc72853d7bd9dc1e4800c5294d6715257799", "DiffID": "sha256:f387c8b346c85cae37abd1f1a63015acb69f593dc425d0269f57d1012c3a81f6" }, "SeveritySource": "amazon", @@ -114,6 +115,7 @@ "InstalledVersion": "7.61.1-9.amzn2.0.1", "FixedVersion": "7.61.1-11.amzn2.0.2", "Layer": { + "Digest": "sha256:72d97abdfae3b3c933ff41e39779cc72853d7bd9dc1e4800c5294d6715257799", "DiffID": "sha256:f387c8b346c85cae37abd1f1a63015acb69f593dc425d0269f57d1012c3a81f6" }, "SeveritySource": "amazon", diff --git a/integration/testdata/busybox-with-lockfile.json.golden b/integration/testdata/busybox-with-lockfile.json.golden index c182697276..6c07a60bae 100644 --- a/integration/testdata/busybox-with-lockfile.json.golden +++ b/integration/testdata/busybox-with-lockfile.json.golden @@ -3,35 +3,35 @@ "ArtifactName": "testdata/fixtures/images/busybox-with-lockfile.tar.gz", "ArtifactType": "container_image", "Metadata": { - "ImageID": "sha256:17c82adee8b5ffec7d6e30dba333bb37986add86afeb4a07754407bb049faedb", + "ImageID": "sha256:88702f6b6133bf06cc46af48437d0c0fc661239155548757c65916504a0e5eee", "DiffIDs": [ - "sha256:a6d503001157aedc826853f9b67f26d35966221b158bff03849868ae4a821116", + "sha256:797ac4999b67d8c38a596919efa5b7b6a4a8fd5814cb8564efa482c5d8403e6d", "sha256:ea6f6933da66090da8bfe233d68f083792a68f944cd2d8f9fbb52da795813a4f" ], "ImageConfig": { "architecture": "amd64", - "created": "2020-04-26T16:23:28.996276377Z", - "docker_version": "19.03.8", + "created": "2022-06-07T04:24:40.230164Z", + "docker_version": "20.10.14", "history": [ { - "created": "2020-03-10T00:19:32.83969331Z", - "created_by": "/bin/sh -c #(nop) ADD file:450bea8cddb743ed282cb1ade3d1614033172b93ef531c69a4e49fda3016cef0 in / " + "created": "2022-03-11T20:19:46.778911455Z", + "created_by": "/bin/sh -c #(nop) ADD file:39f6523fbc03f554a59461a34850d68c31cd5822e5a6fddf2d0ea198ed9a11c4 in / " }, { - "created": "2020-03-10T00:19:33.019716493Z", + "created": "2022-03-11T20:19:46.866228701Z", "created_by": "/bin/sh -c #(nop) CMD [\"sh\"]", "empty_layer": true }, { - "created": "2020-04-26T16:23:28.996276377Z", - "created_by": "/bin/sh -c #(nop) ADD 343df0159abcc51b06b4e56bfd4c06d2003b88947ed93b0cec6214ae5985669e in . " + "created": "2022-06-07T04:24:40.230164Z", + "created_by": "/bin/sh -c #(nop) COPY file:343df0159abcc51b06b4e56bfd4c06d2003b88947ed93b0cec6214ae5985669e in . " } ], "os": "linux", "rootfs": { "type": "layers", "diff_ids": [ - "sha256:a6d503001157aedc826853f9b67f26d35966221b158bff03849868ae4a821116", + "sha256:797ac4999b67d8c38a596919efa5b7b6a4a8fd5814cb8564efa482c5d8403e6d", "sha256:ea6f6933da66090da8bfe233d68f083792a68f944cd2d8f9fbb52da795813a4f" ] }, @@ -42,8 +42,7 @@ "Env": [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ], - "Image": "sha256:83aa35aa1c79e4b6957e018da6e322bfca92bf3b4696a211b42502543c242d6f", - "ArgsEscaped": true + "Image": "sha256:2fb6fc2d97e10c79983aa10e013824cc7fc8bae50630e32159821197dda95fe3" } } }, @@ -59,6 +58,7 @@ "InstalledVersion": "1.9.0", "FixedVersion": "\u003e= 2.1.0", "Layer": { + "Digest": "sha256:fd2e3bc9bccc9c677572a542d020998389de94f127ca2c252ae627fc7c241cee", "DiffID": "sha256:ea6f6933da66090da8bfe233d68f083792a68f944cd2d8f9fbb52da795813a4f" }, "SeveritySource": "nvd", @@ -95,6 +95,7 @@ "InstalledVersion": "1.9.0", "FixedVersion": "\u003e= 3.1.0, \u003e= 2.1.3, \u003c 3.0.0", "Layer": { + "Digest": "sha256:fd2e3bc9bccc9c677572a542d020998389de94f127ca2c252ae627fc7c241cee", "DiffID": "sha256:ea6f6933da66090da8bfe233d68f083792a68f944cd2d8f9fbb52da795813a4f" }, "SeveritySource": "nvd", diff --git a/integration/testdata/centos-6.json.golden b/integration/testdata/centos-6.json.golden index 92ee56bb24..287a56247f 100644 --- a/integration/testdata/centos-6.json.golden +++ b/integration/testdata/centos-6.json.golden @@ -8,37 +8,37 @@ "Name": "6.10", "EOSL": true }, - "ImageID": "sha256:d0957ffdf8a2ea8c8925903862b65a1b6850dbb019f88d45e927d3d5a3fa0c31", + "ImageID": "sha256:5bf9684f472089d6d5cb636041d3d6dc748dbde39f1aefc374bbd367bd2aabbf", "DiffIDs": [ "sha256:af6bf1987c2eb07d73f33836b0d8fd825d7c785273526b077e46780e8b4b2ae9" ], "ImageConfig": { "architecture": "amd64", "author": "https://github.com/CentOS/sig-cloud-instance-images", - "container": "d519f3e5c41d16388d3fba0dac626427b21deb98cce150dee80c180b9baf9435", - "created": "2019-03-14T21:20:11.486358099Z", - "docker_version": "18.06.1-ce", + "container": "39f18700e994db8cbf9769e400afd93f3e9d0b00e06d44fe31f5e81513204d42", + "created": "2021-09-15T18:20:39.183628076Z", + "docker_version": "20.10.7", "history": [ { "author": "https://github.com/CentOS/sig-cloud-instance-images", - "created": "2018-10-09T18:20:03.816986835Z", + "created": "2021-09-15T18:20:32.237976425Z", "created_by": "/bin/sh -c #(nop) MAINTAINER https://github.com/CentOS/sig-cloud-instance-images", "empty_layer": true }, { "author": "https://github.com/CentOS/sig-cloud-instance-images", - "created": "2019-03-14T21:20:10.936939354Z", + "created": "2021-09-15T18:20:38.186052996Z", "created_by": "/bin/sh -c #(nop) ADD file:0065316a41144e95bcb133567cc86816b8368a823cc067d741e06ded59849fd8 in / " }, { "author": "https://github.com/CentOS/sig-cloud-instance-images", - "created": "2019-03-14T21:20:11.322700622Z", + "created": "2021-09-15T18:20:38.990977879Z", "created_by": "/bin/sh -c #(nop) LABEL org.label-schema.schema-version=1.0 org.label-schema.name=CentOS Base Image org.label-schema.vendor=CentOS org.label-schema.license=GPLv2 org.label-schema.build-date=20181006", "empty_layer": true }, { "author": "https://github.com/CentOS/sig-cloud-instance-images", - "created": "2019-03-14T21:20:11.486358099Z", + "created": "2021-09-15T18:20:39.183628076Z", "created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]", "empty_layer": true } @@ -57,15 +57,14 @@ "Env": [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ], - "Image": "sha256:143abcd43bce45f4fd9ba51c7361051d7ea9e9e1eadb66e5c94a9c1b7754524f", + "Image": "sha256:60e456a7493aee808844ffd1e87bffc99b84bb095366bfd68b8843e0328f9e20", "Labels": { "org.label-schema.build-date": "20181006", "org.label-schema.license": "GPLv2", "org.label-schema.name": "CentOS Base Image", "org.label-schema.schema-version": "1.0", "org.label-schema.vendor": "CentOS" - }, - "ArgsEscaped": true + } } } }, @@ -80,6 +79,7 @@ "PkgName": "glibc", "InstalledVersion": "2.12-1.212.el6", "Layer": { + "Digest": "sha256:ff50d722b38227ec8f2bbf0cdbce428b66745077c173d8117d91376128fa532e", "DiffID": "sha256:af6bf1987c2eb07d73f33836b0d8fd825d7c785273526b077e46780e8b4b2ae9" }, "SeveritySource": "redhat", @@ -123,6 +123,7 @@ "InstalledVersion": "1.0.1e-57.el6", "FixedVersion": "1.0.1e-58.el6_10", "Layer": { + "Digest": "sha256:ff50d722b38227ec8f2bbf0cdbce428b66745077c173d8117d91376128fa532e", "DiffID": "sha256:af6bf1987c2eb07d73f33836b0d8fd825d7c785273526b077e46780e8b4b2ae9" }, "SeveritySource": "redhat", diff --git a/integration/testdata/centos-7-ignore-unfixed.json.golden b/integration/testdata/centos-7-ignore-unfixed.json.golden index e22a00e426..75eb95d4ef 100644 --- a/integration/testdata/centos-7-ignore-unfixed.json.golden +++ b/integration/testdata/centos-7-ignore-unfixed.json.golden @@ -7,27 +7,27 @@ "Family": "centos", "Name": "7.6.1810" }, - "ImageID": "sha256:9f38484d220fa527b1fb19747638497179500a1bed8bf0498eb788229229e6e1", + "ImageID": "sha256:f1cb7c7d58b73eac859c395882eec49d50651244e342cd6c68a5c7809785f427", "DiffIDs": [ - "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" ], "ImageConfig": { "architecture": "amd64", - "container": "958baf5225f586da9c70a21e911a0a875402dd22d83133d78b3b3aa6130e7892", - "created": "2019-03-14T21:19:53.361167852Z", + "container": "cc6043a787f6d1c7ae3e121ebdf1c4478186336aa7274871780a0a7bcc3a061a", + "created": "2019-03-14T21:20:29.635970966Z", "docker_version": "18.06.1-ce", "history": [ { - "created": "2019-03-14T21:19:52.66982152Z", - "created_by": "/bin/sh -c #(nop) ADD file:074f2c974463ab38cf3532134e8ba2c91c9e346457713f2e8b8e2ac0ee9fd83d in / " + "created": "2019-03-14T21:20:28.997703205Z", + "created_by": "/bin/sh -c #(nop) ADD file:54b004357379717dfb7ea6f024ca80ce762ea4b06647fcddc0f6697146551172 in / " }, { - "created": "2019-03-14T21:19:53.099141434Z", - "created_by": "/bin/sh -c #(nop) LABEL org.label-schema.schema-version=1.0 org.label-schema.name=CentOS Base Image org.label-schema.vendor=CentOS org.label-schema.license=GPLv2 org.label-schema.build-date=20190305", + "created": "2019-03-14T21:20:29.452720615Z", + "created_by": "/bin/sh -c #(nop) LABEL org.label-schema.schema-version=1.0 org.label-schema.name=CentOS Base Image org.label-schema.vendor=CentOS org.label-schema.license=GPLv2 org.label-schema.build-date=20181204", "empty_layer": true }, { - "created": "2019-03-14T21:19:53.361167852Z", + "created": "2019-03-14T21:20:29.635970966Z", "created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]", "empty_layer": true } @@ -36,7 +36,7 @@ "rootfs": { "type": "layers", "diff_ids": [ - "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" ] }, "config": { @@ -46,9 +46,9 @@ "Env": [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ], - "Image": "sha256:294e8d8145287e70f07328cc09d840fad8980b801223321b983442f097aff0d8", + "Image": "sha256:698a0848ee35389ab7b98494bdc60f887c54ddb94fc2326a1fb4eff8895aff43", "Labels": { - "org.label-schema.build-date": "20190305", + "org.label-schema.build-date": "20181204", "org.label-schema.license": "GPLv2", "org.label-schema.name": "CentOS Base Image", "org.label-schema.schema-version": "1.0", @@ -73,7 +73,8 @@ "InstalledVersion": "1:1.0.2k-16.el7", "FixedVersion": "1:1.0.2k-19.el7", "Layer": { - "DiffID": "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "Digest": "sha256:ac9208207adaac3a48e54a4dc6b49c69e78c3072d2b3add7efdabf814db2133b", + "DiffID": "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" }, "SeveritySource": "redhat", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-1559", @@ -152,7 +153,8 @@ "InstalledVersion": "1:1.0.2k-16.el7", "FixedVersion": "1:1.0.2k-19.el7", "Layer": { - "DiffID": "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "Digest": "sha256:ac9208207adaac3a48e54a4dc6b49c69e78c3072d2b3add7efdabf814db2133b", + "DiffID": "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" }, "SeveritySource": "redhat", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2018-0734", diff --git a/integration/testdata/centos-7-medium.json.golden b/integration/testdata/centos-7-medium.json.golden index dacb5e54ae..06666c40a7 100644 --- a/integration/testdata/centos-7-medium.json.golden +++ b/integration/testdata/centos-7-medium.json.golden @@ -7,27 +7,27 @@ "Family": "centos", "Name": "7.6.1810" }, - "ImageID": "sha256:9f38484d220fa527b1fb19747638497179500a1bed8bf0498eb788229229e6e1", + "ImageID": "sha256:f1cb7c7d58b73eac859c395882eec49d50651244e342cd6c68a5c7809785f427", "DiffIDs": [ - "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" ], "ImageConfig": { "architecture": "amd64", - "container": "958baf5225f586da9c70a21e911a0a875402dd22d83133d78b3b3aa6130e7892", - "created": "2019-03-14T21:19:53.361167852Z", + "container": "cc6043a787f6d1c7ae3e121ebdf1c4478186336aa7274871780a0a7bcc3a061a", + "created": "2019-03-14T21:20:29.635970966Z", "docker_version": "18.06.1-ce", "history": [ { - "created": "2019-03-14T21:19:52.66982152Z", - "created_by": "/bin/sh -c #(nop) ADD file:074f2c974463ab38cf3532134e8ba2c91c9e346457713f2e8b8e2ac0ee9fd83d in / " + "created": "2019-03-14T21:20:28.997703205Z", + "created_by": "/bin/sh -c #(nop) ADD file:54b004357379717dfb7ea6f024ca80ce762ea4b06647fcddc0f6697146551172 in / " }, { - "created": "2019-03-14T21:19:53.099141434Z", - "created_by": "/bin/sh -c #(nop) LABEL org.label-schema.schema-version=1.0 org.label-schema.name=CentOS Base Image org.label-schema.vendor=CentOS org.label-schema.license=GPLv2 org.label-schema.build-date=20190305", + "created": "2019-03-14T21:20:29.452720615Z", + "created_by": "/bin/sh -c #(nop) LABEL org.label-schema.schema-version=1.0 org.label-schema.name=CentOS Base Image org.label-schema.vendor=CentOS org.label-schema.license=GPLv2 org.label-schema.build-date=20181204", "empty_layer": true }, { - "created": "2019-03-14T21:19:53.361167852Z", + "created": "2019-03-14T21:20:29.635970966Z", "created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]", "empty_layer": true } @@ -36,7 +36,7 @@ "rootfs": { "type": "layers", "diff_ids": [ - "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" ] }, "config": { @@ -46,9 +46,9 @@ "Env": [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ], - "Image": "sha256:294e8d8145287e70f07328cc09d840fad8980b801223321b983442f097aff0d8", + "Image": "sha256:698a0848ee35389ab7b98494bdc60f887c54ddb94fc2326a1fb4eff8895aff43", "Labels": { - "org.label-schema.build-date": "20190305", + "org.label-schema.build-date": "20181204", "org.label-schema.license": "GPLv2", "org.label-schema.name": "CentOS Base Image", "org.label-schema.schema-version": "1.0", @@ -73,7 +73,8 @@ "InstalledVersion": "1:1.0.2k-16.el7", "FixedVersion": "1:1.0.2k-19.el7", "Layer": { - "DiffID": "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "Digest": "sha256:ac9208207adaac3a48e54a4dc6b49c69e78c3072d2b3add7efdabf814db2133b", + "DiffID": "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" }, "SeveritySource": "redhat", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-1559", diff --git a/integration/testdata/centos-7.json.golden b/integration/testdata/centos-7.json.golden index 81257e619a..f705fe7814 100644 --- a/integration/testdata/centos-7.json.golden +++ b/integration/testdata/centos-7.json.golden @@ -7,27 +7,27 @@ "Family": "centos", "Name": "7.6.1810" }, - "ImageID": "sha256:9f38484d220fa527b1fb19747638497179500a1bed8bf0498eb788229229e6e1", + "ImageID": "sha256:f1cb7c7d58b73eac859c395882eec49d50651244e342cd6c68a5c7809785f427", "DiffIDs": [ - "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" ], "ImageConfig": { "architecture": "amd64", - "container": "958baf5225f586da9c70a21e911a0a875402dd22d83133d78b3b3aa6130e7892", - "created": "2019-03-14T21:19:53.361167852Z", + "container": "cc6043a787f6d1c7ae3e121ebdf1c4478186336aa7274871780a0a7bcc3a061a", + "created": "2019-03-14T21:20:29.635970966Z", "docker_version": "18.06.1-ce", "history": [ { - "created": "2019-03-14T21:19:52.66982152Z", - "created_by": "/bin/sh -c #(nop) ADD file:074f2c974463ab38cf3532134e8ba2c91c9e346457713f2e8b8e2ac0ee9fd83d in / " + "created": "2019-03-14T21:20:28.997703205Z", + "created_by": "/bin/sh -c #(nop) ADD file:54b004357379717dfb7ea6f024ca80ce762ea4b06647fcddc0f6697146551172 in / " }, { - "created": "2019-03-14T21:19:53.099141434Z", - "created_by": "/bin/sh -c #(nop) LABEL org.label-schema.schema-version=1.0 org.label-schema.name=CentOS Base Image org.label-schema.vendor=CentOS org.label-schema.license=GPLv2 org.label-schema.build-date=20190305", + "created": "2019-03-14T21:20:29.452720615Z", + "created_by": "/bin/sh -c #(nop) LABEL org.label-schema.schema-version=1.0 org.label-schema.name=CentOS Base Image org.label-schema.vendor=CentOS org.label-schema.license=GPLv2 org.label-schema.build-date=20181204", "empty_layer": true }, { - "created": "2019-03-14T21:19:53.361167852Z", + "created": "2019-03-14T21:20:29.635970966Z", "created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]", "empty_layer": true } @@ -36,7 +36,7 @@ "rootfs": { "type": "layers", "diff_ids": [ - "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" ] }, "config": { @@ -46,9 +46,9 @@ "Env": [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ], - "Image": "sha256:294e8d8145287e70f07328cc09d840fad8980b801223321b983442f097aff0d8", + "Image": "sha256:698a0848ee35389ab7b98494bdc60f887c54ddb94fc2326a1fb4eff8895aff43", "Labels": { - "org.label-schema.build-date": "20190305", + "org.label-schema.build-date": "20181204", "org.label-schema.license": "GPLv2", "org.label-schema.name": "CentOS Base Image", "org.label-schema.schema-version": "1.0", @@ -69,7 +69,8 @@ "PkgName": "bash", "InstalledVersion": "4.2.46-31.el7", "Layer": { - "DiffID": "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "Digest": "sha256:ac9208207adaac3a48e54a4dc6b49c69e78c3072d2b3add7efdabf814db2133b", + "DiffID": "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" }, "SeveritySource": "redhat", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-18276", @@ -116,7 +117,8 @@ "InstalledVersion": "1:1.0.2k-16.el7", "FixedVersion": "1:1.0.2k-19.el7", "Layer": { - "DiffID": "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "Digest": "sha256:ac9208207adaac3a48e54a4dc6b49c69e78c3072d2b3add7efdabf814db2133b", + "DiffID": "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" }, "SeveritySource": "redhat", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-1559", @@ -195,7 +197,8 @@ "InstalledVersion": "1:1.0.2k-16.el7", "FixedVersion": "1:1.0.2k-19.el7", "Layer": { - "DiffID": "sha256:d69483a6face4499acb974449d1303591fcbb5cdce5420f36f8a6607bda11854" + "Digest": "sha256:ac9208207adaac3a48e54a4dc6b49c69e78c3072d2b3add7efdabf814db2133b", + "DiffID": "sha256:89169d87dbe2b72ba42bfbb3579c957322baca28e03a1e558076542a1c1b2b4a" }, "SeveritySource": "redhat", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2018-0734", diff --git a/integration/testdata/debian-buster-ignore-unfixed.json.golden b/integration/testdata/debian-buster-ignore-unfixed.json.golden index 30edd4b493..20cba9ed33 100644 --- a/integration/testdata/debian-buster-ignore-unfixed.json.golden +++ b/integration/testdata/debian-buster-ignore-unfixed.json.golden @@ -61,6 +61,7 @@ "InstalledVersion": "2.0.5-1", "FixedVersion": "2.0.5-1+deb10u1", "Layer": { + "Digest": "sha256:4a56a430b2bac33260d6449e162017e2b23076c6411a17b46db67f5b84dde2bd", "DiffID": "sha256:78c1b9419976227e05be9d243b7fa583bea44a5258e52018b2af4cdfe23d148d" }, "SeveritySource": "nvd", diff --git a/integration/testdata/debian-buster.json.golden b/integration/testdata/debian-buster.json.golden index 28f1e640a7..bf33931bd5 100644 --- a/integration/testdata/debian-buster.json.golden +++ b/integration/testdata/debian-buster.json.golden @@ -57,6 +57,7 @@ "PkgName": "bash", "InstalledVersion": "5.0-4", "Layer": { + "Digest": "sha256:4a56a430b2bac33260d6449e162017e2b23076c6411a17b46db67f5b84dde2bd", "DiffID": "sha256:78c1b9419976227e05be9d243b7fa583bea44a5258e52018b2af4cdfe23d148d" }, "SeveritySource": "debian", @@ -109,6 +110,7 @@ "InstalledVersion": "2.0.5-1", "FixedVersion": "2.0.5-1+deb10u1", "Layer": { + "Digest": "sha256:4a56a430b2bac33260d6449e162017e2b23076c6411a17b46db67f5b84dde2bd", "DiffID": "sha256:78c1b9419976227e05be9d243b7fa583bea44a5258e52018b2af4cdfe23d148d" }, "SeveritySource": "nvd", diff --git a/integration/testdata/debian-stretch.json.golden b/integration/testdata/debian-stretch.json.golden index dfa4f20ef4..7a0b200147 100644 --- a/integration/testdata/debian-stretch.json.golden +++ b/integration/testdata/debian-stretch.json.golden @@ -57,6 +57,7 @@ "PkgName": "bash", "InstalledVersion": "4.4-5", "Layer": { + "Digest": "sha256:9cc2ad81d40d54dcae7fa5e8e17d9c34e8bba3b7c2cc7e26fb22734608bda32e", "DiffID": "sha256:f73e7e79899a33b4b9b78da62efb71520844f8dd518f3c390e27bc3063bce307" }, "SeveritySource": "debian", @@ -109,6 +110,7 @@ "InstalledVersion": "1.43.4-2", "FixedVersion": "1.43.4-2+deb9u1", "Layer": { + "Digest": "sha256:9cc2ad81d40d54dcae7fa5e8e17d9c34e8bba3b7c2cc7e26fb22734608bda32e", "DiffID": "sha256:f73e7e79899a33b4b9b78da62efb71520844f8dd518f3c390e27bc3063bce307" }, "SeveritySource": "nvd", @@ -167,6 +169,7 @@ "InstalledVersion": "1.43.4-2", "FixedVersion": "1.43.4-2+deb9u1", "Layer": { + "Digest": "sha256:9cc2ad81d40d54dcae7fa5e8e17d9c34e8bba3b7c2cc7e26fb22734608bda32e", "DiffID": "sha256:f73e7e79899a33b4b9b78da62efb71520844f8dd518f3c390e27bc3063bce307" }, "SeveritySource": "nvd", @@ -225,6 +228,7 @@ "InstalledVersion": "1.43.4-2", "FixedVersion": "1.43.4-2+deb9u1", "Layer": { + "Digest": "sha256:9cc2ad81d40d54dcae7fa5e8e17d9c34e8bba3b7c2cc7e26fb22734608bda32e", "DiffID": "sha256:f73e7e79899a33b4b9b78da62efb71520844f8dd518f3c390e27bc3063bce307" }, "SeveritySource": "nvd", @@ -283,6 +287,7 @@ "InstalledVersion": "1.43.4-2", "FixedVersion": "1.43.4-2+deb9u1", "Layer": { + "Digest": "sha256:9cc2ad81d40d54dcae7fa5e8e17d9c34e8bba3b7c2cc7e26fb22734608bda32e", "DiffID": "sha256:f73e7e79899a33b4b9b78da62efb71520844f8dd518f3c390e27bc3063bce307" }, "SeveritySource": "nvd", diff --git a/integration/testdata/distroless-base.json.golden b/integration/testdata/distroless-base.json.golden index 93c6996878..b414419ae0 100644 --- a/integration/testdata/distroless-base.json.golden +++ b/integration/testdata/distroless-base.json.golden @@ -55,6 +55,7 @@ "PkgName": "libssl1.1", "InstalledVersion": "1.1.0k-1~deb9u1", "Layer": { + "Digest": "sha256:e005d777a298a3529b1c8cf890883359e050cc966089ce84fea4d17b111907db", "DiffID": "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5" }, "SeveritySource": "nvd", @@ -126,6 +127,7 @@ "InstalledVersion": "1.1.0k-1~deb9u1", "FixedVersion": "1.1.0l-1~deb9u1", "Layer": { + "Digest": "sha256:e005d777a298a3529b1c8cf890883359e050cc966089ce84fea4d17b111907db", "DiffID": "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5" }, "SeveritySource": "nvd", @@ -201,6 +203,7 @@ "PkgName": "openssl", "InstalledVersion": "1.1.0k-1~deb9u1", "Layer": { + "Digest": "sha256:e005d777a298a3529b1c8cf890883359e050cc966089ce84fea4d17b111907db", "DiffID": "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5" }, "SeveritySource": "nvd", @@ -272,6 +275,7 @@ "InstalledVersion": "1.1.0k-1~deb9u1", "FixedVersion": "1.1.0l-1~deb9u1", "Layer": { + "Digest": "sha256:e005d777a298a3529b1c8cf890883359e050cc966089ce84fea4d17b111907db", "DiffID": "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5" }, "SeveritySource": "nvd", diff --git a/integration/testdata/distroless-python27.json.golden b/integration/testdata/distroless-python27.json.golden index 900e885d23..007327534f 100644 --- a/integration/testdata/distroless-python27.json.golden +++ b/integration/testdata/distroless-python27.json.golden @@ -72,6 +72,7 @@ "PkgName": "libssl1.1", "InstalledVersion": "1.1.0k-1~deb9u1", "Layer": { + "Digest": "sha256:e005d777a298a3529b1c8cf890883359e050cc966089ce84fea4d17b111907db", "DiffID": "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5" }, "SeveritySource": "nvd", @@ -143,6 +144,7 @@ "InstalledVersion": "1.1.0k-1~deb9u1", "FixedVersion": "1.1.0l-1~deb9u1", "Layer": { + "Digest": "sha256:e005d777a298a3529b1c8cf890883359e050cc966089ce84fea4d17b111907db", "DiffID": "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5" }, "SeveritySource": "nvd", @@ -218,6 +220,7 @@ "PkgName": "openssl", "InstalledVersion": "1.1.0k-1~deb9u1", "Layer": { + "Digest": "sha256:e005d777a298a3529b1c8cf890883359e050cc966089ce84fea4d17b111907db", "DiffID": "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5" }, "SeveritySource": "nvd", @@ -289,6 +292,7 @@ "InstalledVersion": "1.1.0k-1~deb9u1", "FixedVersion": "1.1.0l-1~deb9u1", "Layer": { + "Digest": "sha256:e005d777a298a3529b1c8cf890883359e050cc966089ce84fea4d17b111907db", "DiffID": "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5" }, "SeveritySource": "nvd", diff --git a/integration/testdata/fluentd-gems.json.golden b/integration/testdata/fluentd-gems.json.golden index 23ba1be3ec..122d6c9a00 100644 --- a/integration/testdata/fluentd-gems.json.golden +++ b/integration/testdata/fluentd-gems.json.golden @@ -114,6 +114,7 @@ "InstalledVersion": "2.0.5-1", "FixedVersion": "2.0.5-1+deb10u1", "Layer": { + "Digest": "sha256:000eee12ec04cc914bf96e8f5dee7767510c2aca3816af6078bd9fbe3150920c", "DiffID": "sha256:831c5620387fb9efec59fc82a42b948546c6be601e3ab34a87108ecf852aa15f" }, "SeveritySource": "nvd", @@ -174,6 +175,7 @@ "InstalledVersion": "6.0.2.1", "FixedVersion": "6.0.3.1, 5.2.4.3", "Layer": { + "Digest": "sha256:a8877cad19f14a7044524a145ce33170085441a7922458017db1631dcd5f7602", "DiffID": "sha256:75e43d55939745950bc3f8fad56c5834617c4339f0f54755e69a0dd5372624e9" }, "SeveritySource": "ghsa", @@ -223,4 +225,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/integration/testdata/mariner-1.0.json.golden b/integration/testdata/mariner-1.0.json.golden index e0ff4f6d66..78c0488649 100644 --- a/integration/testdata/mariner-1.0.json.golden +++ b/integration/testdata/mariner-1.0.json.golden @@ -42,6 +42,7 @@ "PkgName": "vim", "InstalledVersion": "8.2.4081-1.cm1", "Layer": { + "Digest": "sha256:3df36548ffbf2fa7319966e038058a3d2a922880009e535202546a6b250b9d57", "DiffID": "sha256:4266328c97a194b2ca52ec83bc05496596303f5e9b244ffa99cf84763a487804" }, "SeveritySource": "cbl-mariner", @@ -71,6 +72,7 @@ "InstalledVersion": "8.2.4081-1.cm1", "FixedVersion": "8.2.4082-1.cm1", "Layer": { + "Digest": "sha256:3df36548ffbf2fa7319966e038058a3d2a922880009e535202546a6b250b9d57", "DiffID": "sha256:4266328c97a194b2ca52ec83bc05496596303f5e9b244ffa99cf84763a487804" }, "SeveritySource": "cbl-mariner", diff --git a/integration/testdata/opensuse-leap-151.json.golden b/integration/testdata/opensuse-leap-151.json.golden index 484e2bb15e..a0d1146351 100644 --- a/integration/testdata/opensuse-leap-151.json.golden +++ b/integration/testdata/opensuse-leap-151.json.golden @@ -66,6 +66,7 @@ "InstalledVersion": "1.1.0i-lp151.8.3.1", "FixedVersion": "1.1.0i-lp151.8.6.1", "Layer": { + "Digest": "sha256:5c5a844f54abd051851758624820ae6a08a9d6ddffddaebbb335601c32608fb3", "DiffID": "sha256:f7f9ae80878a1c56d8f9ca977a5d844168f7afc0c1429feef9366e713eac06ff" }, "SeveritySource": "suse-cvrf", @@ -89,6 +90,7 @@ "InstalledVersion": "1.1.0i-lp151.8.3.1", "FixedVersion": "1.1.0i-lp151.8.6.1", "Layer": { + "Digest": "sha256:5c5a844f54abd051851758624820ae6a08a9d6ddffddaebbb335601c32608fb3", "DiffID": "sha256:f7f9ae80878a1c56d8f9ca977a5d844168f7afc0c1429feef9366e713eac06ff" }, "SeveritySource": "suse-cvrf", diff --git a/integration/testdata/oraclelinux-8-slim.json.golden b/integration/testdata/oraclelinux-8.json.golden similarity index 85% rename from integration/testdata/oraclelinux-8-slim.json.golden rename to integration/testdata/oraclelinux-8.json.golden index 647642ec1d..80c9057bb6 100644 --- a/integration/testdata/oraclelinux-8-slim.json.golden +++ b/integration/testdata/oraclelinux-8.json.golden @@ -1,21 +1,21 @@ { "SchemaVersion": 2, - "ArtifactName": "testdata/fixtures/images/oraclelinux-8-slim.tar.gz", + "ArtifactName": "testdata/fixtures/images/oraclelinux-8.tar.gz", "ArtifactType": "container_image", "Metadata": { "OS": { "Family": "oracle", "Name": "8.0" }, - "ImageID": "sha256:73f821d86dfb84de2f3371288b1c28ff9f78913f7f61bf60eb652fafab548ea3", + "ImageID": "sha256:8988c7081e1f7b6c2928cbc4832b8a05968bb589d45d444ca1e3027c68f97f56", "DiffIDs": [ - "sha256:e3196b7450602f5547c52d197255dfa96a006ea9c52c19bf3ba2d5412a4b161e" + "sha256:91bac58a9ffae0dc2031e3f90d7bf04f66ccf019f180372152b0916d6e8a796f" ], "ImageConfig": { "architecture": "amd64", "author": "Oracle Linux Product Team \u003col-ovm-info_ww@oracle.com\u003e", - "container": "c00a901742ec3d7be814b0a90a11eb41c332c8ed5c9f49035af0e97c2a4b1114", - "created": "2019-10-15T21:23:40.950042801Z", + "container": "b5339bf682ea7c2a5b817144038646d7fa55d72e9943283bd0ff5e01eb8e5e40", + "created": "2019-10-15T21:23:26.082686371Z", "docker_version": "18.06.1-ce", "history": [ { @@ -26,12 +26,12 @@ }, { "author": "Oracle Linux Product Team \u003col-ovm-info_ww@oracle.com\u003e", - "created": "2019-10-15T21:23:40.753460369Z", - "created_by": "/bin/sh -c #(nop) ADD file:4d6968487994b1c559af3fbb14644e32f15bf8c154b4db9209d05b434f691776 in / " + "created": "2019-10-15T21:23:25.715030578Z", + "created_by": "/bin/sh -c #(nop) ADD file:40a576906f00da132c935b4713c8012d0ac0422f507fc3239d647b0ed9930ed7 in / " }, { "author": "Oracle Linux Product Team \u003col-ovm-info_ww@oracle.com\u003e", - "created": "2019-10-15T21:23:40.950042801Z", + "created": "2019-10-15T21:23:26.082686371Z", "created_by": "/bin/sh -c #(nop) CMD [\"/bin/bash\"]", "empty_layer": true } @@ -40,7 +40,7 @@ "rootfs": { "type": "layers", "diff_ids": [ - "sha256:e3196b7450602f5547c52d197255dfa96a006ea9c52c19bf3ba2d5412a4b161e" + "sha256:91bac58a9ffae0dc2031e3f90d7bf04f66ccf019f180372152b0916d6e8a796f" ] }, "config": { @@ -50,14 +50,14 @@ "Env": [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ], - "Image": "sha256:966f5e6fbcc4915f120935883ccc882ae0271e00917a2955cae3cca10fc899b9", + "Image": "sha256:d2f0ba2a964f3d0b1935be99979b6930f8b989217ff6a5e6d4093e9df9baee11", "ArgsEscaped": true } } }, "Results": [ { - "Target": "testdata/fixtures/images/oraclelinux-8-slim.tar.gz (oracle 8.0)", + "Target": "testdata/fixtures/images/oraclelinux-8.tar.gz (oracle 8.0)", "Class": "os-pkgs", "Type": "oracle", "Vulnerabilities": [ @@ -67,7 +67,8 @@ "InstalledVersion": "7.61.1-8.el8", "FixedVersion": "7.61.1-11.el8", "Layer": { - "DiffID": "sha256:e3196b7450602f5547c52d197255dfa96a006ea9c52c19bf3ba2d5412a4b161e" + "Digest": "sha256:e1b9aa33b064e76023cc29e9fac51bcebe62740c92ed38f09ba6205ddd9aa6f4", + "DiffID": "sha256:91bac58a9ffae0dc2031e3f90d7bf04f66ccf019f180372152b0916d6e8a796f" }, "SeveritySource": "oracle-oval", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-3823", @@ -122,7 +123,8 @@ "InstalledVersion": "7.61.1-8.el8", "FixedVersion": "7.61.1-12.el8", "Layer": { - "DiffID": "sha256:e3196b7450602f5547c52d197255dfa96a006ea9c52c19bf3ba2d5412a4b161e" + "Digest": "sha256:e1b9aa33b064e76023cc29e9fac51bcebe62740c92ed38f09ba6205ddd9aa6f4", + "DiffID": "sha256:91bac58a9ffae0dc2031e3f90d7bf04f66ccf019f180372152b0916d6e8a796f" }, "SeveritySource": "oracle-oval", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-5436", diff --git a/integration/testdata/photon-30.json.golden b/integration/testdata/photon-30.json.golden index f11404f787..2747bd6317 100644 --- a/integration/testdata/photon-30.json.golden +++ b/integration/testdata/photon-30.json.golden @@ -68,6 +68,7 @@ "InstalledVersion": "4.4.18-1.ph3", "FixedVersion": "4.4.18-2.ph3", "Layer": { + "Digest": "sha256:675aead3dff5e25094cb9f4d7cc64f05e9f04a3f3397d5d45bfbc1c8a99c3a73", "DiffID": "sha256:0f379947a276b7b051643960392fa66c2f0cb493bc1dcd471abb5545005949fd" }, "SeveritySource": "photon", @@ -117,6 +118,7 @@ "InstalledVersion": "7.61.1-4.ph3", "FixedVersion": "7.61.1-5.ph3", "Layer": { + "Digest": "sha256:675aead3dff5e25094cb9f4d7cc64f05e9f04a3f3397d5d45bfbc1c8a99c3a73", "DiffID": "sha256:0f379947a276b7b051643960392fa66c2f0cb493bc1dcd471abb5545005949fd" }, "SeveritySource": "photon", @@ -173,6 +175,7 @@ "InstalledVersion": "7.61.1-4.ph3", "FixedVersion": "7.61.1-5.ph3", "Layer": { + "Digest": "sha256:675aead3dff5e25094cb9f4d7cc64f05e9f04a3f3397d5d45bfbc1c8a99c3a73", "DiffID": "sha256:0f379947a276b7b051643960392fa66c2f0cb493bc1dcd471abb5545005949fd" }, "SeveritySource": "photon", diff --git a/integration/testdata/rockylinux-8.json.golden b/integration/testdata/rockylinux-8.json.golden index 840b35cf8a..05d68f6f02 100644 --- a/integration/testdata/rockylinux-8.json.golden +++ b/integration/testdata/rockylinux-8.json.golden @@ -57,6 +57,7 @@ "InstalledVersion": "1:1.1.1k-4.el8", "FixedVersion": "1:1.1.1k-5.el8_5", "Layer": { + "Digest": "sha256:72a2451028f11c6927678e5f1bb8f35b4e723d3b342ec1a6980d7b5591cf81d6", "DiffID": "sha256:65dbea0a4b39709e0a2cc8624fd99478e9f302c0a5661d7676d6d3bd3cb6d181" }, "SeveritySource": "rocky", diff --git a/integration/testdata/ubi-7.json.golden b/integration/testdata/ubi-7.json.golden index c9a54f40bc..2f34f82170 100644 --- a/integration/testdata/ubi-7.json.golden +++ b/integration/testdata/ubi-7.json.golden @@ -80,6 +80,7 @@ "PkgName": "bash", "InstalledVersion": "4.2.46-33.el7", "Layer": { + "Digest": "sha256:7b1c937e0f6794db2535be6e4cb6d60a0b668ef78c2576611a3fb9c97a95ccdf", "DiffID": "sha256:4468e6d912c76d5b127f3554c3cd83b7dc07cce6107c6b916299ba76fa7d15ac" }, "SeveritySource": "redhat", diff --git a/integration/testdata/ubuntu-1804-ignore-unfixed.json.golden b/integration/testdata/ubuntu-1804-ignore-unfixed.json.golden index bbe8da088b..d228b69e1a 100644 --- a/integration/testdata/ubuntu-1804-ignore-unfixed.json.golden +++ b/integration/testdata/ubuntu-1804-ignore-unfixed.json.golden @@ -76,6 +76,7 @@ "InstalledVersion": "1.44.1-1ubuntu1.1", "FixedVersion": "1.44.1-1ubuntu1.2", "Layer": { + "Digest": "sha256:35c102085707f703de2d9eaad8752d6fe1b8f02b5d2149f1d8357c9cc7fb7d0a", "DiffID": "sha256:6cebf3abed5fac58d2e792ce8461454e92c245d5312c42118f02e231a73b317f" }, "SeveritySource": "ubuntu", @@ -131,6 +132,7 @@ "InstalledVersion": "1.44.1-1ubuntu1.1", "FixedVersion": "1.44.1-1ubuntu1.2", "Layer": { + "Digest": "sha256:35c102085707f703de2d9eaad8752d6fe1b8f02b5d2149f1d8357c9cc7fb7d0a", "DiffID": "sha256:6cebf3abed5fac58d2e792ce8461454e92c245d5312c42118f02e231a73b317f" }, "SeveritySource": "ubuntu", @@ -186,6 +188,7 @@ "InstalledVersion": "1.44.1-1ubuntu1.1", "FixedVersion": "1.44.1-1ubuntu1.2", "Layer": { + "Digest": "sha256:35c102085707f703de2d9eaad8752d6fe1b8f02b5d2149f1d8357c9cc7fb7d0a", "DiffID": "sha256:6cebf3abed5fac58d2e792ce8461454e92c245d5312c42118f02e231a73b317f" }, "SeveritySource": "ubuntu", @@ -241,6 +244,7 @@ "InstalledVersion": "1.44.1-1ubuntu1.1", "FixedVersion": "1.44.1-1ubuntu1.2", "Layer": { + "Digest": "sha256:35c102085707f703de2d9eaad8752d6fe1b8f02b5d2149f1d8357c9cc7fb7d0a", "DiffID": "sha256:6cebf3abed5fac58d2e792ce8461454e92c245d5312c42118f02e231a73b317f" }, "SeveritySource": "ubuntu", @@ -293,4 +297,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/integration/testdata/ubuntu-1804.json.golden b/integration/testdata/ubuntu-1804.json.golden index 08d62b4a25..b9a47ea39a 100644 --- a/integration/testdata/ubuntu-1804.json.golden +++ b/integration/testdata/ubuntu-1804.json.golden @@ -75,6 +75,7 @@ "PkgName": "bash", "InstalledVersion": "4.4.18-2ubuntu1.2", "Layer": { + "Digest": "sha256:35c102085707f703de2d9eaad8752d6fe1b8f02b5d2149f1d8357c9cc7fb7d0a", "DiffID": "sha256:6cebf3abed5fac58d2e792ce8461454e92c245d5312c42118f02e231a73b317f" }, "SeveritySource": "ubuntu", @@ -124,6 +125,7 @@ "InstalledVersion": "1.44.1-1ubuntu1.1", "FixedVersion": "1.44.1-1ubuntu1.2", "Layer": { + "Digest": "sha256:35c102085707f703de2d9eaad8752d6fe1b8f02b5d2149f1d8357c9cc7fb7d0a", "DiffID": "sha256:6cebf3abed5fac58d2e792ce8461454e92c245d5312c42118f02e231a73b317f" }, "SeveritySource": "ubuntu", @@ -179,6 +181,7 @@ "InstalledVersion": "1.44.1-1ubuntu1.1", "FixedVersion": "1.44.1-1ubuntu1.2", "Layer": { + "Digest": "sha256:35c102085707f703de2d9eaad8752d6fe1b8f02b5d2149f1d8357c9cc7fb7d0a", "DiffID": "sha256:6cebf3abed5fac58d2e792ce8461454e92c245d5312c42118f02e231a73b317f" }, "SeveritySource": "ubuntu", @@ -234,6 +237,7 @@ "InstalledVersion": "1.44.1-1ubuntu1.1", "FixedVersion": "1.44.1-1ubuntu1.2", "Layer": { + "Digest": "sha256:35c102085707f703de2d9eaad8752d6fe1b8f02b5d2149f1d8357c9cc7fb7d0a", "DiffID": "sha256:6cebf3abed5fac58d2e792ce8461454e92c245d5312c42118f02e231a73b317f" }, "SeveritySource": "ubuntu", @@ -289,6 +293,7 @@ "InstalledVersion": "1.44.1-1ubuntu1.1", "FixedVersion": "1.44.1-1ubuntu1.2", "Layer": { + "Digest": "sha256:35c102085707f703de2d9eaad8752d6fe1b8f02b5d2149f1d8357c9cc7fb7d0a", "DiffID": "sha256:6cebf3abed5fac58d2e792ce8461454e92c245d5312c42118f02e231a73b317f" }, "SeveritySource": "ubuntu",