From 263aee07a32ce50667237481f337b05adaf19751 Mon Sep 17 00:00:00 2001 From: Nikita Pivkin Date: Tue, 21 Oct 2025 01:12:08 +0600 Subject: [PATCH] test: update golden files for TestRepository* integration tests (#9684) Signed-off-by: nikpivkin --- integration/testdata/bun.json.golden | 17 +--- integration/testdata/cargo.lock.json.golden | 21 +---- integration/testdata/cocoapods.json.golden | 18 +--- .../testdata/composer.lock.json.golden | 17 +--- .../testdata/composer.vendor.json.golden | 18 +--- integration/testdata/conan.json.golden | 22 +---- .../dockerfile-custom-policies.json.golden | 28 +----- integration/testdata/dockerfile.json.golden | 21 +---- .../dockerfile_file_pattern.json.golden | 21 +---- integration/testdata/dotnet.json.golden | 16 +--- integration/testdata/gomod-skip.json.golden | 18 +--- integration/testdata/gomod-vex.json.golden | 18 +--- integration/testdata/gomod.json.golden | 19 +--- integration/testdata/gradle.json.golden | 16 +--- integration/testdata/helm.json.golden | 89 ++++--------------- integration/testdata/helm_badname.json.golden | 16 +--- .../testdata/helm_testchart.json.golden | 41 ++------- .../helm_testchart.overridden.json.golden | 49 ++-------- integration/testdata/mix.lock.json.golden | 25 +----- .../testdata/npm-ubuntu-severity.json.golden | 15 +--- integration/testdata/npm-with-dev.json.golden | 28 +----- integration/testdata/npm.json.golden | 27 +----- integration/testdata/nuget.json.golden | 17 +--- .../testdata/packagesprops.json.golden | 18 +--- integration/testdata/pip.json.golden | 23 +---- integration/testdata/pipenv.json.golden | 17 +--- integration/testdata/pnpm.json.golden | 22 +---- integration/testdata/poetry.json.golden | 24 +---- integration/testdata/pom.json.golden | 16 +--- integration/testdata/pubspec.lock.json.golden | 21 +---- integration/testdata/sbt.json.golden | 16 +--- integration/testdata/secrets.json.golden | 2 +- integration/testdata/swift.json.golden | 17 +--- ...exclude-misconfs-remote-module.json.golden | 2 +- .../terraform-opentofu-registry.json.golden | 2 +- ...rraform-remote-module-in-child.json.golden | 2 +- .../terraform-remote-module.json.golden | 2 +- .../terraform-remote-submodule.json.golden | 2 +- .../terraform-terraform-registry.json.golden | 2 +- integration/testdata/uv.json.golden | 28 ++---- integration/testdata/yarn.json.golden | 19 +--- 41 files changed, 92 insertions(+), 720 deletions(-) diff --git a/integration/testdata/bun.json.golden b/integration/testdata/bun.json.golden index a5d518c025..8e761af7ca 100644 --- a/integration/testdata/bun.json.golden +++ b/integration/testdata/bun.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/bun", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "bun.lock", @@ -31,7 +19,6 @@ }, "Version": "3.3.1", "Relationship": "direct", - "Layer": {}, "Locations": [ { "StartLine": 24, @@ -48,7 +35,6 @@ }, "Version": "5.8.3", "Relationship": "direct", - "Layer": {}, "Locations": [ { "StartLine": 26, @@ -69,7 +55,6 @@ "InstalledVersion": "3.3.1", "FixedVersion": "3.4.0", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-11358", "DataSource": { diff --git a/integration/testdata/cargo.lock.json.golden b/integration/testdata/cargo.lock.json.golden index 620a6fb953..f4070b83ba 100644 --- a/integration/testdata/cargo.lock.json.golden +++ b/integration/testdata/cargo.lock.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/cargo", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "Cargo.lock", @@ -35,7 +23,6 @@ "memchr@1.0.2", "regex@1.7.3" ], - "Layer": {}, "Locations": [ { "StartLine": 14, @@ -55,7 +42,6 @@ "DependsOn": [ "libc@0.2.171" ], - "Layer": {}, "Locations": [ { "StartLine": 29, @@ -77,7 +63,6 @@ "memchr@2.7.4", "regex-syntax@0.6.29" ], - "Layer": {}, "Locations": [ { "StartLine": 44, @@ -98,7 +83,6 @@ "DependsOn": [ "memchr@2.7.4" ], - "Layer": {}, "Locations": [ { "StartLine": 5, @@ -116,7 +100,6 @@ "Version": "0.2.171", "Indirect": true, "Relationship": "indirect", - "Layer": {}, "Locations": [ { "StartLine": 23, @@ -134,7 +117,6 @@ "Version": "2.7.4", "Indirect": true, "Relationship": "indirect", - "Layer": {}, "Locations": [ { "StartLine": 38, @@ -152,7 +134,6 @@ "Version": "0.6.29", "Indirect": true, "Relationship": "indirect", - "Layer": {}, "Locations": [ { "StartLine": 55, diff --git a/integration/testdata/cocoapods.json.golden b/integration/testdata/cocoapods.json.golden index 6ff800c321..6ea2c9b1f2 100644 --- a/integration/testdata/cocoapods.json.golden +++ b/integration/testdata/cocoapods.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/cocoapods", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "Podfile.lock", @@ -29,8 +17,7 @@ "PURL": "pkg:cocoapods/_NIODataStructures@2.41.0", "UID": "ddc948d6b5e15241" }, - "Version": "2.41.0", - "Layer": {} + "Version": "2.41.0" } ], "Vulnerabilities": [ @@ -45,7 +32,6 @@ "InstalledVersion": "2.41.0", "FixedVersion": "2.29.1, 2.39.1, 2.42.0", "Status": "fixed", - "Layer": {}, "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2022-3215", "Title": "SwiftNIO vulnerable to Improper Neutralization of CRLF Sequences in HTTP Headers ('HTTP Response Splitting')", "Description": "`NIOHTTP1` and projects using it for generating HTTP responses, including SwiftNIO, can be subject to a HTTP Response Injection attack...", diff --git a/integration/testdata/composer.lock.json.golden b/integration/testdata/composer.lock.json.golden index ec8772ca9e..5fdab20dbd 100644 --- a/integration/testdata/composer.lock.json.golden +++ b/integration/testdata/composer.lock.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/composer", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "composer.lock", @@ -37,7 +25,6 @@ "DependsOn": [ "guzzlehttp/psr7@1.8.3" ], - "Layer": {}, "Locations": [ { "StartLine": 9, @@ -58,7 +45,6 @@ ], "Indirect": true, "Relationship": "indirect", - "Layer": {}, "Locations": [ { "StartLine": 130, @@ -79,7 +65,6 @@ "InstalledVersion": "1.8.3", "FixedVersion": "1.8.4", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2022-24775", "DataSource": { diff --git a/integration/testdata/composer.vendor.json.golden b/integration/testdata/composer.vendor.json.golden index beadf7b579..05ee4df6f5 100644 --- a/integration/testdata/composer.vendor.json.golden +++ b/integration/testdata/composer.vendor.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/composer-vendor", "ArtifactType": "filesystem", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "installed.json", @@ -37,7 +25,6 @@ "psr/http-message@1.1", "ralouphie/getallheaders@3.0.3" ], - "Layer": {}, "Locations": [ { "StartLine": 3, @@ -56,7 +43,6 @@ "Licenses": [ "MIT" ], - "Layer": {}, "Locations": [ { "StartLine": 116, @@ -75,7 +61,6 @@ "Licenses": [ "MIT" ], - "Layer": {}, "Locations": [ { "StartLine": 172, @@ -96,7 +81,6 @@ "InstalledVersion": "1.8.3", "FixedVersion": "1.8.4", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2022-24775", "DataSource": { diff --git a/integration/testdata/conan.json.golden b/integration/testdata/conan.json.golden index e91028c063..b87a40e095 100644 --- a/integration/testdata/conan.json.golden +++ b/integration/testdata/conan.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/conan", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "conan.lock", @@ -38,7 +26,6 @@ "sqlite3/3.39.2", "openssl/1.1.1q" ], - "Layer": {}, "Locations": [ { "StartLine": 12, @@ -56,7 +43,6 @@ "Version": "1.0.8", "Indirect": true, "Relationship": "indirect", - "Layer": {}, "Locations": [ { "StartLine": 37, @@ -74,7 +60,6 @@ "Version": "2.4.8", "Indirect": true, "Relationship": "indirect", - "Layer": {}, "Locations": [ { "StartLine": 51, @@ -92,7 +77,6 @@ "Version": "1.1.1q", "Indirect": true, "Relationship": "indirect", - "Layer": {}, "Locations": [ { "StartLine": 65, @@ -114,7 +98,6 @@ "bzip2/1.0.8", "zlib/1.2.12" ], - "Layer": {}, "Locations": [ { "StartLine": 26, @@ -132,7 +115,6 @@ "Version": "3.39.2", "Indirect": true, "Relationship": "indirect", - "Layer": {}, "Locations": [ { "StartLine": 58, @@ -150,7 +132,6 @@ "Version": "1.2.12", "Indirect": true, "Relationship": "indirect", - "Layer": {}, "Locations": [ { "StartLine": 44, @@ -171,7 +152,6 @@ "InstalledVersion": "8.43", "FixedVersion": "8.45", "Status": "fixed", - "Layer": {}, "SeveritySource": "nvd", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2020-14155", "Title": "pcre: Integer overflow when parsing callout numeric arguments", diff --git a/integration/testdata/dockerfile-custom-policies.json.golden b/integration/testdata/dockerfile-custom-policies.json.golden index d1ab22c554..00c4c4a575 100644 --- a/integration/testdata/dockerfile-custom-policies.json.golden +++ b/integration/testdata/dockerfile-custom-policies.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/custom-policy", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "Dockerfile", @@ -38,14 +26,9 @@ "Resolution": "Custom policy for testing", "Severity": "LOW", "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Custom", - "Service": "custom", - "Code": { - "Lines": null - }, - "RenderedCause": {} + "Service": "custom" } }, { @@ -60,14 +43,9 @@ "Resolution": "Custom policy for testing", "Severity": "LOW", "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Custom", - "Service": "custom", - "Code": { - "Lines": null - }, - "RenderedCause": {} + "Service": "custom" } } ] diff --git a/integration/testdata/dockerfile.json.golden b/integration/testdata/dockerfile.json.golden index 21c5ac2d57..c6c650e80f 100644 --- a/integration/testdata/dockerfile.json.golden +++ b/integration/testdata/dockerfile.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/dockerfile", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "Dockerfile", @@ -43,14 +31,9 @@ "https://avd.aquasec.com/misconfig/ds002" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Dockerfile", - "Service": "general", - "Code": { - "Lines": null - }, - "RenderedCause": {} + "Service": "general" } } ] diff --git a/integration/testdata/dockerfile_file_pattern.json.golden b/integration/testdata/dockerfile_file_pattern.json.golden index 6a37e77c05..2e15643ed3 100644 --- a/integration/testdata/dockerfile_file_pattern.json.golden +++ b/integration/testdata/dockerfile_file_pattern.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/dockerfile_file_pattern", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "Customfile", @@ -43,14 +31,9 @@ "https://avd.aquasec.com/misconfig/ds002" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Dockerfile", - "Service": "general", - "Code": { - "Lines": null - }, - "RenderedCause": {} + "Service": "general" } } ] diff --git a/integration/testdata/dotnet.json.golden b/integration/testdata/dotnet.json.golden index 1e35a9b806..50e6499078 100644 --- a/integration/testdata/dotnet.json.golden +++ b/integration/testdata/dotnet.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/dotnet", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "datacollector.deps.json", @@ -30,7 +18,6 @@ "UID": "e678401f5d07418a" }, "Version": "9.0.1", - "Layer": {}, "Locations": [ { "StartLine": 8, @@ -51,7 +38,6 @@ "InstalledVersion": "9.0.1", "FixedVersion": "13.0.1", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://github.com/advisories/GHSA-5crp-9r3c-p9vr", "DataSource": { diff --git a/integration/testdata/gomod-skip.json.golden b/integration/testdata/gomod-skip.json.golden index c5252c3750..7efc2172ea 100644 --- a/integration/testdata/gomod-skip.json.golden +++ b/integration/testdata/gomod-skip.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/gomod", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "go.mod", @@ -33,7 +21,6 @@ "InstalledVersion": "v2.7.1+incompatible", "FixedVersion": "v2.8.0", "Status": "fixed", - "Layer": {}, "DataSource": { "ID": "ghsa", "Name": "GitHub Security Advisory Go", @@ -60,7 +47,6 @@ "InstalledVersion": "v0.35.0", "FixedVersion": "0.37.0", "Status": "fixed", - "Layer": {}, "SeveritySource": "nvd", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2022-23628", "DataSource": { @@ -107,7 +93,6 @@ "InstalledVersion": "v0.3.6", "FixedVersion": "0.3.7", "Status": "fixed", - "Layer": {}, "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2021-38561", "DataSource": { "ID": "ghsa", @@ -140,7 +125,6 @@ "InstalledVersion": "v2.7.1+incompatible", "FixedVersion": "v2.8.0", "Status": "fixed", - "Layer": {}, "DataSource": { "ID": "ghsa", "Name": "GitHub Security Advisory Go", diff --git a/integration/testdata/gomod-vex.json.golden b/integration/testdata/gomod-vex.json.golden index 1a8fb17c8a..314c9bfdf1 100644 --- a/integration/testdata/gomod-vex.json.golden +++ b/integration/testdata/gomod-vex.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/gomod", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "go.mod", @@ -33,7 +21,6 @@ "InstalledVersion": "v2.7.1+incompatible", "FixedVersion": "v2.8.0", "Status": "fixed", - "Layer": {}, "DataSource": { "ID": "ghsa", "Name": "GitHub Security Advisory Go", @@ -60,7 +47,6 @@ "InstalledVersion": "v0.3.6", "FixedVersion": "0.3.7", "Status": "fixed", - "Layer": {}, "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2021-38561", "DataSource": { "ID": "ghsa", @@ -93,7 +79,6 @@ "InstalledVersion": "v2.7.1+incompatible", "FixedVersion": "v2.8.0", "Status": "fixed", - "Layer": {}, "DataSource": { "ID": "ghsa", "Name": "GitHub Security Advisory Go", @@ -127,7 +112,6 @@ "InstalledVersion": "v2.7.1+incompatible", "FixedVersion": "v2.8.0", "Status": "fixed", - "Layer": {}, "DataSource": { "ID": "ghsa", "Name": "GitHub Security Advisory Go", diff --git a/integration/testdata/gomod.json.golden b/integration/testdata/gomod.json.golden index 5215d6c2ec..29cfb05240 100644 --- a/integration/testdata/gomod.json.golden +++ b/integration/testdata/gomod.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/gomod", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "go.mod", @@ -33,7 +21,6 @@ "InstalledVersion": "v2.7.1+incompatible", "FixedVersion": "v2.8.0", "Status": "fixed", - "Layer": {}, "DataSource": { "ID": "ghsa", "Name": "GitHub Security Advisory Go", @@ -60,7 +47,6 @@ "InstalledVersion": "v0.35.0", "FixedVersion": "0.37.0", "Status": "fixed", - "Layer": {}, "SeveritySource": "nvd", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2022-23628", "DataSource": { @@ -107,7 +93,6 @@ "InstalledVersion": "v0.3.6", "FixedVersion": "0.3.7", "Status": "fixed", - "Layer": {}, "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2021-38561", "DataSource": { "ID": "ghsa", @@ -140,7 +125,6 @@ "InstalledVersion": "v2.7.1+incompatible", "FixedVersion": "v2.8.0", "Status": "fixed", - "Layer": {}, "DataSource": { "ID": "ghsa", "Name": "GitHub Security Advisory Go", @@ -174,7 +158,6 @@ "InstalledVersion": "v2.7.1+incompatible", "FixedVersion": "v2.8.0", "Status": "fixed", - "Layer": {}, "DataSource": { "ID": "ghsa", "Name": "GitHub Security Advisory Go", diff --git a/integration/testdata/gradle.json.golden b/integration/testdata/gradle.json.golden index a89ed62fa9..ee7c758f2f 100644 --- a/integration/testdata/gradle.json.golden +++ b/integration/testdata/gradle.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/gradle", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "gradle.lockfile", @@ -33,7 +21,6 @@ "InstalledVersion": "2.9.1", "FixedVersion": "2.9.10.4", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2020-9548", "DataSource": { @@ -99,7 +86,6 @@ "InstalledVersion": "2.9.1", "FixedVersion": "2.9.10.7", "Status": "fixed", - "Layer": {}, "SeveritySource": "nvd", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2021-20190", "DataSource": { diff --git a/integration/testdata/helm.json.golden b/integration/testdata/helm.json.golden index 2eb13ab56c..9e065d473f 100644 --- a/integration/testdata/helm.json.golden +++ b/integration/testdata/helm.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/helm", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "testchart.tar.gz:templates/pod.yaml", @@ -43,7 +31,6 @@ "https://avd.aquasec.com/misconfig/ksv001" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -92,8 +79,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -113,7 +99,6 @@ "https://avd.aquasec.com/misconfig/ksv003" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -162,8 +147,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -183,7 +167,6 @@ "https://avd.aquasec.com/misconfig/ksv004" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -232,8 +215,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -253,7 +235,6 @@ "https://avd.aquasec.com/misconfig/ksv011" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -302,8 +283,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -323,7 +303,6 @@ "https://avd.aquasec.com/misconfig/ksv012" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -372,8 +351,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -393,7 +371,6 @@ "https://avd.aquasec.com/misconfig/ksv014" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -442,8 +419,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -463,7 +439,6 @@ "https://avd.aquasec.com/misconfig/ksv015" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -512,8 +487,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -533,7 +507,6 @@ "https://avd.aquasec.com/misconfig/ksv016" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -582,8 +555,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -603,7 +575,6 @@ "https://avd.aquasec.com/misconfig/ksv018" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -652,8 +623,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -673,7 +643,6 @@ "https://avd.aquasec.com/misconfig/ksv020" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -722,8 +691,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -743,7 +711,6 @@ "https://avd.aquasec.com/misconfig/ksv021" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -792,8 +759,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -813,7 +779,6 @@ "https://avd.aquasec.com/misconfig/ksv030" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -862,8 +827,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -883,7 +847,6 @@ "https://avd.aquasec.com/misconfig/ksv104" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -932,8 +895,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -953,7 +915,6 @@ "https://avd.aquasec.com/misconfig/ksv106" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -1002,8 +963,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -1023,7 +983,6 @@ "https://avd.aquasec.com/misconfig/ksv110" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -1062,8 +1021,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -1084,14 +1042,9 @@ "https://avd.aquasec.com/misconfig/ksv117" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", - "Service": "general", - "Code": { - "Lines": null - }, - "RenderedCause": {} + "Service": "general" } }, { @@ -1111,7 +1064,6 @@ "https://avd.aquasec.com/misconfig/ksv118" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -1160,8 +1112,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -1181,7 +1132,6 @@ "https://avd.aquasec.com/misconfig/ksv118" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -1240,8 +1190,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } } ] diff --git a/integration/testdata/helm_badname.json.golden b/integration/testdata/helm_badname.json.golden index 504a3a99d3..dd7d45c835 100644 --- a/integration/testdata/helm_badname.json.golden +++ b/integration/testdata/helm_badname.json.golden @@ -1,19 +1,7 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/helm_badname", - "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - } + "ArtifactType": "repository" } diff --git a/integration/testdata/helm_testchart.json.golden b/integration/testdata/helm_testchart.json.golden index 0d23f5bf5d..a076ed42fb 100644 --- a/integration/testdata/helm_testchart.json.golden +++ b/integration/testdata/helm_testchart.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/helm_testchart", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "templates/deployment.yaml", @@ -43,7 +31,6 @@ "https://avd.aquasec.com/misconfig/ksv001" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -151,8 +138,7 @@ "LastCause": false } ] - }, - "RenderedCause": {} + } } }, { @@ -172,7 +158,6 @@ "https://avd.aquasec.com/misconfig/ksv030" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -280,8 +265,7 @@ "LastCause": false } ] - }, - "RenderedCause": {} + } } }, { @@ -301,7 +285,6 @@ "https://avd.aquasec.com/misconfig/ksv104" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -409,8 +392,7 @@ "LastCause": false } ] - }, - "RenderedCause": {} + } } }, { @@ -430,7 +412,6 @@ "https://avd.aquasec.com/misconfig/ksv110" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -509,8 +490,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -531,14 +511,9 @@ "https://avd.aquasec.com/misconfig/ksv117" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", - "Service": "general", - "Code": { - "Lines": null - }, - "RenderedCause": {} + "Service": "general" } }, { @@ -558,7 +533,6 @@ "https://avd.aquasec.com/misconfig/ksv118" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -666,8 +640,7 @@ "LastCause": false } ] - }, - "RenderedCause": {} + } } } ] diff --git a/integration/testdata/helm_testchart.overridden.json.golden b/integration/testdata/helm_testchart.overridden.json.golden index bb51547399..69d7280c6b 100644 --- a/integration/testdata/helm_testchart.overridden.json.golden +++ b/integration/testdata/helm_testchart.overridden.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/helm_testchart", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "templates/deployment.yaml", @@ -43,7 +31,6 @@ "https://avd.aquasec.com/misconfig/ksv001" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -151,8 +138,7 @@ "LastCause": false } ] - }, - "RenderedCause": {} + } } }, { @@ -172,7 +158,6 @@ "https://avd.aquasec.com/misconfig/ksv020" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -280,8 +265,7 @@ "LastCause": false } ] - }, - "RenderedCause": {} + } } }, { @@ -301,7 +285,6 @@ "https://avd.aquasec.com/misconfig/ksv030" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -409,8 +392,7 @@ "LastCause": false } ] - }, - "RenderedCause": {} + } } }, { @@ -430,7 +412,6 @@ "https://avd.aquasec.com/misconfig/ksv104" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -538,8 +519,7 @@ "LastCause": false } ] - }, - "RenderedCause": {} + } } }, { @@ -559,7 +539,6 @@ "https://avd.aquasec.com/misconfig/ksv105" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -638,8 +617,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -659,7 +637,6 @@ "https://avd.aquasec.com/misconfig/ksv110" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -738,8 +715,7 @@ "LastCause": true } ] - }, - "RenderedCause": {} + } } }, { @@ -760,14 +736,9 @@ "https://avd.aquasec.com/misconfig/ksv117" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", - "Service": "general", - "Code": { - "Lines": null - }, - "RenderedCause": {} + "Service": "general" } }, { @@ -787,7 +758,6 @@ "https://avd.aquasec.com/misconfig/ksv118" ], "Status": "FAIL", - "Layer": {}, "CauseMetadata": { "Provider": "Kubernetes", "Service": "general", @@ -895,8 +865,7 @@ "LastCause": false } ] - }, - "RenderedCause": {} + } } } ] diff --git a/integration/testdata/mix.lock.json.golden b/integration/testdata/mix.lock.json.golden index 55388aaa9a..1c8e39a1c6 100644 --- a/integration/testdata/mix.lock.json.golden +++ b/integration/testdata/mix.lock.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/mixlock", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "mix.lock", @@ -30,7 +18,6 @@ "UID": "92fd0f5d45735c7c" }, "Version": "0.1.18", - "Layer": {}, "Locations": [ { "StartLine": 2, @@ -46,7 +33,6 @@ "UID": "b9cff6ce54a65dae" }, "Version": "1.4.0", - "Layer": {}, "Locations": [ { "StartLine": 3, @@ -62,7 +48,6 @@ "UID": "5b0d3fb75bef47e3" }, "Version": "1.6.13", - "Layer": {}, "Locations": [ { "StartLine": 4, @@ -78,7 +63,6 @@ "UID": "8c18e24394b53ab" }, "Version": "3.2.0", - "Layer": {}, "Locations": [ { "StartLine": 5, @@ -94,7 +78,6 @@ "UID": "89226dc20d54eb50" }, "Version": "2.1.1", - "Layer": {}, "Locations": [ { "StartLine": 6, @@ -110,7 +93,6 @@ "UID": "5cd9afe7111a31b7" }, "Version": "1.0.0", - "Layer": {}, "Locations": [ { "StartLine": 7, @@ -126,7 +108,6 @@ "UID": "2f4485f9653589ad" }, "Version": "2.0.1", - "Layer": {}, "Locations": [ { "StartLine": 8, @@ -142,7 +123,6 @@ "UID": "2390188ac1142ded" }, "Version": "1.14.0", - "Layer": {}, "Locations": [ { "StartLine": 9, @@ -158,7 +138,6 @@ "UID": "912b06dac071654" }, "Version": "1.2.3", - "Layer": {}, "Locations": [ { "StartLine": 10, @@ -174,7 +153,6 @@ "UID": "15879b8627da74b9" }, "Version": "1.1.0", - "Layer": {}, "Locations": [ { "StartLine": 11, @@ -195,7 +173,6 @@ "InstalledVersion": "1.6.13", "FixedVersion": "1.6.14", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2022-42975", "DataSource": { diff --git a/integration/testdata/npm-ubuntu-severity.json.golden b/integration/testdata/npm-ubuntu-severity.json.golden index eb0d7052fb..6309a45321 100644 --- a/integration/testdata/npm-ubuntu-severity.json.golden +++ b/integration/testdata/npm-ubuntu-severity.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/npm", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "package-lock.json", @@ -33,7 +21,6 @@ "InstalledVersion": "3.3.9", "FixedVersion": "3.4.0", "Status": "fixed", - "Layer": {}, "SeveritySource": "ubuntu", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-11358", "DataSource": { diff --git a/integration/testdata/npm-with-dev.json.golden b/integration/testdata/npm-with-dev.json.golden index 9750f98682..0db6466576 100644 --- a/integration/testdata/npm-with-dev.json.golden +++ b/integration/testdata/npm-with-dev.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/npm", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "package-lock.json", @@ -30,7 +18,6 @@ "UID": "199d95f873330bd3" }, "Version": "2.0.6", - "Layer": {}, "Locations": [ { "StartLine": 6, @@ -49,7 +36,6 @@ "Licenses": [ "MIT" ], - "Layer": {}, "Locations": [ { "StartLine": 11, @@ -65,7 +51,6 @@ "UID": "605df7770562762" }, "Version": "4.0.0", - "Layer": {}, "Locations": [ { "StartLine": 16, @@ -84,7 +69,6 @@ "DependsOn": [ "js-tokens@4.0.0" ], - "Layer": {}, "Locations": [ { "StartLine": 21, @@ -100,7 +84,6 @@ "UID": "ec3b70276c206ac2" }, "Version": "4.1.1", - "Layer": {}, "Locations": [ { "StartLine": 29, @@ -122,7 +105,6 @@ "DependsOn": [ "asap@2.0.6" ], - "Layer": {}, "Locations": [ { "StartLine": 34, @@ -143,7 +125,6 @@ "object-assign@4.1.1", "react-is@16.8.6" ], - "Layer": {}, "Locations": [ { "StartLine": 42, @@ -168,7 +149,6 @@ "prop-types@15.7.2", "scheduler@0.13.6" ], - "Layer": {}, "Locations": [ { "StartLine": 52, @@ -187,7 +167,6 @@ "Licenses": [ "MIT" ], - "Layer": {}, "Locations": [ { "StartLine": 63, @@ -210,7 +189,6 @@ "loose-envify@1.4.0", "symbol-observable@1.2.0" ], - "Layer": {}, "Locations": [ { "StartLine": 68, @@ -230,7 +208,6 @@ "loose-envify@1.4.0", "object-assign@4.1.1" ], - "Layer": {}, "Locations": [ { "StartLine": 77, @@ -246,7 +223,6 @@ "UID": "b14a083f8b9e59bc" }, "Version": "1.2.0", - "Layer": {}, "Locations": [ { "StartLine": 86, @@ -266,7 +242,6 @@ "Licenses": [ "MIT" ], - "Layer": {}, "Locations": [ { "StartLine": 91, @@ -287,7 +262,6 @@ "InstalledVersion": "3.3.9", "FixedVersion": "3.4.0", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-11358", "DataSource": { diff --git a/integration/testdata/npm.json.golden b/integration/testdata/npm.json.golden index b35e23c4bc..f897cf9120 100644 --- a/integration/testdata/npm.json.golden +++ b/integration/testdata/npm.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/npm", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "package-lock.json", @@ -30,7 +18,6 @@ "UID": "199d95f873330bd3" }, "Version": "2.0.6", - "Layer": {}, "Locations": [ { "StartLine": 6, @@ -49,7 +36,6 @@ "Licenses": [ "MIT" ], - "Layer": {}, "Locations": [ { "StartLine": 11, @@ -65,7 +51,6 @@ "UID": "605df7770562762" }, "Version": "4.0.0", - "Layer": {}, "Locations": [ { "StartLine": 16, @@ -84,7 +69,6 @@ "DependsOn": [ "js-tokens@4.0.0" ], - "Layer": {}, "Locations": [ { "StartLine": 21, @@ -100,7 +84,6 @@ "UID": "ec3b70276c206ac2" }, "Version": "4.1.1", - "Layer": {}, "Locations": [ { "StartLine": 29, @@ -122,7 +105,6 @@ "DependsOn": [ "asap@2.0.6" ], - "Layer": {}, "Locations": [ { "StartLine": 34, @@ -143,7 +125,6 @@ "object-assign@4.1.1", "react-is@16.8.6" ], - "Layer": {}, "Locations": [ { "StartLine": 42, @@ -168,7 +149,6 @@ "prop-types@15.7.2", "scheduler@0.13.6" ], - "Layer": {}, "Locations": [ { "StartLine": 52, @@ -187,7 +167,6 @@ "Licenses": [ "MIT" ], - "Layer": {}, "Locations": [ { "StartLine": 63, @@ -210,7 +189,6 @@ "loose-envify@1.4.0", "symbol-observable@1.2.0" ], - "Layer": {}, "Locations": [ { "StartLine": 68, @@ -230,7 +208,6 @@ "loose-envify@1.4.0", "object-assign@4.1.1" ], - "Layer": {}, "Locations": [ { "StartLine": 77, @@ -246,7 +223,6 @@ "UID": "b14a083f8b9e59bc" }, "Version": "1.2.0", - "Layer": {}, "Locations": [ { "StartLine": 86, @@ -267,7 +243,6 @@ "InstalledVersion": "3.3.9", "FixedVersion": "3.4.0", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-11358", "DataSource": { diff --git a/integration/testdata/nuget.json.golden b/integration/testdata/nuget.json.golden index 5296999be8..4236edef5e 100644 --- a/integration/testdata/nuget.json.golden +++ b/integration/testdata/nuget.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/nuget", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "packages.lock.json", @@ -31,7 +19,6 @@ }, "Version": "12.0.3", "Relationship": "direct", - "Layer": {}, "Locations": [ { "StartLine": 5, @@ -51,7 +38,6 @@ "DependsOn": [ "Newtonsoft.Json@12.0.3" ], - "Layer": {}, "Locations": [ { "StartLine": 11, @@ -72,7 +58,6 @@ "InstalledVersion": "12.0.3", "FixedVersion": "13.0.1", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://github.com/advisories/GHSA-5crp-9r3c-p9vr", "DataSource": { diff --git a/integration/testdata/packagesprops.json.golden b/integration/testdata/packagesprops.json.golden index 9dc8678f57..b0867a2468 100644 --- a/integration/testdata/packagesprops.json.golden +++ b/integration/testdata/packagesprops.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/packagesprops", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "Directory.Packages.props", @@ -29,8 +17,7 @@ "PURL": "pkg:nuget/Newtonsoft.Json@9.0.1", "UID": "a391c576ea549d63" }, - "Version": "9.0.1", - "Layer": {} + "Version": "9.0.1" } ], "Vulnerabilities": [ @@ -45,7 +32,6 @@ "InstalledVersion": "9.0.1", "FixedVersion": "13.0.1", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://github.com/advisories/GHSA-5crp-9r3c-p9vr", "DataSource": { diff --git a/integration/testdata/pip.json.golden b/integration/testdata/pip.json.golden index bc4027fc1c..ee6cbbf16a 100644 --- a/integration/testdata/pip.json.golden +++ b/integration/testdata/pip.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/pip", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "requirements.txt", @@ -29,7 +17,6 @@ "UID": "8b02ba2c070d72c6" }, "Version": "2.0.0", - "Layer": {}, "Locations": [ { "StartLine": 2, @@ -44,7 +31,6 @@ "UID": "476df0c1e49c8f99" }, "Version": "3.0.0", - "Layer": {}, "Locations": [ { "StartLine": 4, @@ -59,7 +45,6 @@ "UID": "4163de19df046f49" }, "Version": "0.11", - "Layer": {}, "Locations": [ { "StartLine": 6, @@ -74,7 +59,6 @@ "UID": "71e4c8ef31456bf" }, "Version": "8.0.0", - "Layer": {}, "Locations": [ { "StartLine": 1, @@ -89,7 +73,6 @@ "UID": "389c7cbc34cb6b32" }, "Version": "2.0.0", - "Layer": {}, "Locations": [ { "StartLine": 3, @@ -104,7 +87,6 @@ "UID": "c63f60db796a16ed" }, "Version": "4.0.0", - "Layer": {}, "Locations": [ { "StartLine": 7, @@ -119,7 +101,6 @@ "UID": "ccad39abab737d13" }, "Version": "2.0.0", - "Layer": {}, "Locations": [ { "StartLine": 8, @@ -139,7 +120,6 @@ "InstalledVersion": "0.11", "FixedVersion": "0.15.3", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-14806", "DataSource": { @@ -196,7 +176,6 @@ "InstalledVersion": "0.11", "FixedVersion": "0.11.6", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2020-28724", "DataSource": { diff --git a/integration/testdata/pipenv.json.golden b/integration/testdata/pipenv.json.golden index c0514e777a..20c1265f5c 100644 --- a/integration/testdata/pipenv.json.golden +++ b/integration/testdata/pipenv.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/pipenv", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "Pipfile.lock", @@ -29,7 +17,6 @@ "UID": "390fc5ac777dc4e0" }, "Version": "0.11.1", - "Layer": {}, "Locations": [ { "StartLine": 19, @@ -49,7 +36,6 @@ "InstalledVersion": "0.11.1", "FixedVersion": "0.15.3", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-14806", "DataSource": { @@ -106,7 +92,6 @@ "InstalledVersion": "0.11.1", "FixedVersion": "0.11.6", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2020-28724", "DataSource": { diff --git a/integration/testdata/pnpm.json.golden b/integration/testdata/pnpm.json.golden index 2a26fd08ec..1f7b26d2de 100644 --- a/integration/testdata/pnpm.json.golden +++ b/integration/testdata/pnpm.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/pnpm", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "pnpm-lock.yaml", @@ -33,8 +21,7 @@ "Licenses": [ "MIT" ], - "Relationship": "direct", - "Layer": {} + "Relationship": "direct" }, { "ID": "lodash@4.17.4", @@ -47,8 +34,7 @@ "Licenses": [ "MIT" ], - "Relationship": "direct", - "Layer": {} + "Relationship": "direct" } ], "Vulnerabilities": [ @@ -63,7 +49,6 @@ "InstalledVersion": "3.3.9", "FixedVersion": "3.4.0", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-11358", "DataSource": { @@ -196,7 +181,6 @@ "InstalledVersion": "4.17.4", "FixedVersion": "4.17.12", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-10744", "DataSource": { diff --git a/integration/testdata/poetry.json.golden b/integration/testdata/poetry.json.golden index 1751bd3cc6..037881a50f 100644 --- a/integration/testdata/poetry.json.golden +++ b/integration/testdata/poetry.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/poetry", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "poetry.lock", @@ -33,8 +21,7 @@ "Relationship": "direct", "DependsOn": [ "colorama@0.4.6" - ], - "Layer": {} + ] }, { "ID": "werkzeug@0.14", @@ -44,8 +31,7 @@ "UID": "d14d05cca13c7a6b" }, "Version": "0.14", - "Relationship": "direct", - "Layer": {} + "Relationship": "direct" }, { "ID": "colorama@0.4.6", @@ -56,8 +42,7 @@ }, "Version": "0.4.6", "Indirect": true, - "Relationship": "indirect", - "Layer": {} + "Relationship": "indirect" } ], "Vulnerabilities": [ @@ -72,7 +57,6 @@ "InstalledVersion": "0.14", "FixedVersion": "0.15.3", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-14806", "DataSource": { diff --git a/integration/testdata/pom.json.golden b/integration/testdata/pom.json.golden index ef37675911..da83051381 100644 --- a/integration/testdata/pom.json.golden +++ b/integration/testdata/pom.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/pom", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "pom.xml", @@ -33,7 +21,6 @@ "InstalledVersion": "2.9.1", "FixedVersion": "2.9.10.4", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2020-9548", "DataSource": { @@ -99,7 +86,6 @@ "InstalledVersion": "2.9.1", "FixedVersion": "2.9.10.7", "Status": "fixed", - "Layer": {}, "SeveritySource": "nvd", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2021-20190", "DataSource": { diff --git a/integration/testdata/pubspec.lock.json.golden b/integration/testdata/pubspec.lock.json.golden index dce4671111..a7fff752f5 100644 --- a/integration/testdata/pubspec.lock.json.golden +++ b/integration/testdata/pubspec.lock.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/pubspec", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "pubspec.lock", @@ -30,8 +18,7 @@ "UID": "fe8339221b1b26b8" }, "Version": "0.13.2", - "Relationship": "direct", - "Layer": {} + "Relationship": "direct" }, { "ID": "shelf@1.3.1", @@ -42,8 +29,7 @@ }, "Version": "1.3.1", "Indirect": true, - "Relationship": "indirect", - "Layer": {} + "Relationship": "indirect" } ], "Vulnerabilities": [ @@ -58,7 +44,6 @@ "InstalledVersion": "0.13.2", "FixedVersion": "0.13.3", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2020-35669", "DataSource": { diff --git a/integration/testdata/sbt.json.golden b/integration/testdata/sbt.json.golden index 9a1f845532..6765d0266a 100644 --- a/integration/testdata/sbt.json.golden +++ b/integration/testdata/sbt.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/sbt", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "build.sbt.lock", @@ -33,7 +21,6 @@ "InstalledVersion": "2.9.1", "FixedVersion": "2.9.10.4", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2020-9548", "DataSource": { @@ -99,7 +86,6 @@ "InstalledVersion": "2.9.1", "FixedVersion": "2.9.10.7", "Status": "fixed", - "Layer": {}, "SeveritySource": "nvd", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2021-20190", "DataSource": { diff --git a/integration/testdata/secrets.json.golden b/integration/testdata/secrets.json.golden index 3a379d35a1..64269dfa87 100644 --- a/integration/testdata/secrets.json.golden +++ b/integration/testdata/secrets.json.golden @@ -1,9 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/secrets", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "Results": [ { "Target": "deploy.sh", diff --git a/integration/testdata/swift.json.golden b/integration/testdata/swift.json.golden index 3cba871728..94a5e25947 100644 --- a/integration/testdata/swift.json.golden +++ b/integration/testdata/swift.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/swift", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "Package.resolved", @@ -30,7 +18,6 @@ "UID": "863921f724d081f4" }, "Version": "1.1.0", - "Layer": {}, "Locations": [ { "StartLine": 4, @@ -46,7 +33,6 @@ "UID": "e98d348b22b3c01" }, "Version": "2.41.0", - "Layer": {}, "Locations": [ { "StartLine": 13, @@ -67,7 +53,6 @@ "InstalledVersion": "2.41.0", "FixedVersion": "2.29.1, 2.39.1, 2.42.0", "Status": "fixed", - "Layer": {}, "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2022-3215", "Title": "SwiftNIO vulnerable to Improper Neutralization of CRLF Sequences in HTTP Headers ('HTTP Response Splitting')", "Description": "`NIOHTTP1` and projects using it for generating HTTP responses, including SwiftNIO, can be subject to a HTTP Response Injection attack...", diff --git a/integration/testdata/terraform-exclude-misconfs-remote-module.json.golden b/integration/testdata/terraform-exclude-misconfs-remote-module.json.golden index 590a6e61bf..55cdb3be2e 100644 --- a/integration/testdata/terraform-exclude-misconfs-remote-module.json.golden +++ b/integration/testdata/terraform-exclude-misconfs-remote-module.json.golden @@ -1,9 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/terraform/remote-module", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "Results": [ { "Target": ".", diff --git a/integration/testdata/terraform-opentofu-registry.json.golden b/integration/testdata/terraform-opentofu-registry.json.golden index eb34ced015..e4936adb15 100644 --- a/integration/testdata/terraform-opentofu-registry.json.golden +++ b/integration/testdata/terraform-opentofu-registry.json.golden @@ -1,9 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/terraform/opentofu-registry", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "Results": [ { "Target": ".", diff --git a/integration/testdata/terraform-remote-module-in-child.json.golden b/integration/testdata/terraform-remote-module-in-child.json.golden index 9495a54de8..750cc0c3e8 100644 --- a/integration/testdata/terraform-remote-module-in-child.json.golden +++ b/integration/testdata/terraform-remote-module-in-child.json.golden @@ -1,9 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/terraform/remote-module-in-child", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "Results": [ { "Target": ".", diff --git a/integration/testdata/terraform-remote-module.json.golden b/integration/testdata/terraform-remote-module.json.golden index a2b007c155..f16a8832b4 100644 --- a/integration/testdata/terraform-remote-module.json.golden +++ b/integration/testdata/terraform-remote-module.json.golden @@ -1,9 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/terraform/remote-module", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "Results": [ { "Target": ".", diff --git a/integration/testdata/terraform-remote-submodule.json.golden b/integration/testdata/terraform-remote-submodule.json.golden index a69409e032..b9cd3d1d8f 100644 --- a/integration/testdata/terraform-remote-submodule.json.golden +++ b/integration/testdata/terraform-remote-submodule.json.golden @@ -1,9 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/terraform/remote-submodule", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "Results": [ { "Target": ".", diff --git a/integration/testdata/terraform-terraform-registry.json.golden b/integration/testdata/terraform-terraform-registry.json.golden index eb34ced015..e4936adb15 100644 --- a/integration/testdata/terraform-terraform-registry.json.golden +++ b/integration/testdata/terraform-terraform-registry.json.golden @@ -1,9 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/terraform/opentofu-registry", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "Results": [ { "Target": ".", diff --git a/integration/testdata/uv.json.golden b/integration/testdata/uv.json.golden index 0a6c45655f..41c7a5a4bb 100644 --- a/integration/testdata/uv.json.golden +++ b/integration/testdata/uv.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/uv", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "uv.lock", @@ -34,8 +22,7 @@ "DependsOn": [ "click@8.1.3", "werkzeug@0.11.1" - ], - "Layer": {} + ] }, { "ID": "click@8.1.3", @@ -48,8 +35,7 @@ "Relationship": "direct", "DependsOn": [ "colorama@0.4.6" - ], - "Layer": {} + ] }, { "ID": "werkzeug@0.11.1", @@ -59,8 +45,7 @@ "UID": "de1411a7bb678535" }, "Version": "0.11.1", - "Relationship": "direct", - "Layer": {} + "Relationship": "direct" }, { "ID": "colorama@0.4.6", @@ -71,8 +56,7 @@ }, "Version": "0.4.6", "Indirect": true, - "Relationship": "indirect", - "Layer": {} + "Relationship": "indirect" } ], "Vulnerabilities": [ @@ -87,7 +71,6 @@ "InstalledVersion": "0.11.1", "FixedVersion": "0.15.3", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-14806", "DataSource": { @@ -145,7 +128,6 @@ "InstalledVersion": "0.11.1", "FixedVersion": "0.11.6", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2020-28724", "DataSource": { diff --git a/integration/testdata/yarn.json.golden b/integration/testdata/yarn.json.golden index 0ae0c2c59e..780d9e846b 100644 --- a/integration/testdata/yarn.json.golden +++ b/integration/testdata/yarn.json.golden @@ -1,21 +1,9 @@ { "SchemaVersion": 2, + "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", "CreatedAt": "2021-08-25T12:20:30.000000005Z", "ArtifactName": "testdata/fixtures/repo/yarn", "ArtifactType": "repository", - "ReportID": "3ff14136-e09f-4df9-80ea-000000000002", - "Metadata": { - "ImageConfig": { - "architecture": "", - "created": "0001-01-01T00:00:00Z", - "os": "", - "rootfs": { - "type": "", - "diff_ids": null - }, - "config": {} - } - }, "Results": [ { "Target": "yarn.lock", @@ -36,8 +24,7 @@ "Relationship": "root", "DependsOn": [ "jquery@3.2.1" - ], - "Layer": {} + ] }, { "ID": "jquery@3.2.1", @@ -51,7 +38,6 @@ "MIT" ], "Relationship": "direct", - "Layer": {}, "Locations": [ { "StartLine": 10, @@ -72,7 +58,6 @@ "InstalledVersion": "3.2.1", "FixedVersion": "3.4.0", "Status": "fixed", - "Layer": {}, "SeveritySource": "ghsa", "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2019-11358", "DataSource": {