admin/aquasecurity-trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2026-01-24 10:33:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(report): add Trivy version to JSON output (#10065)

Browse Source
This commit is contained in:
Teppei Fukuda
2026-01-20 13:36:33 +04:00
committed by GitHub
parent d2dc46ad60
commit fe7d20a31c
83 changed files with 249 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
integration/testdata/almalinux-8.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:fb75459277a4cbcf98182b48c789cfbd4b34414e05898e1231ae8b2ca099f4e7",

3
integration/testdata/alpine-310.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:39549bf49d696f172a6513103cdc8f53717024ad1fbce62d680a8e7ddde1a612",

3
integration/testdata/alpine-39-high-critical.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:988a8e3eb049d90c20fafb183d0e792c99b8ba28433be1d1e4447a8b5a1adbdf",

3
integration/testdata/alpine-39-ignore-cveids.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:988a8e3eb049d90c20fafb183d0e792c99b8ba28433be1d1e4447a8b5a1adbdf",

3
integration/testdata/alpine-39-skip.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:988a8e3eb049d90c20fafb183d0e792c99b8ba28433be1d1e4447a8b5a1adbdf",

3
integration/testdata/alpine-39.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:988a8e3eb049d90c20fafb183d0e792c99b8ba28433be1d1e4447a8b5a1adbdf",

3
integration/testdata/alpine-distroless.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:0edd1906378dca3abc435f47f2e4b91059e9950e55cd82c76089d60b9ca68f90",

3
integration/testdata/amazon-1.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:5a0fd7bb415c9b52d1bb909e40b9f498a89a5572724bd107d26ead4a25f203e1",

3
integration/testdata/amazon-2.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:87e7ebcf8b5c0a26985fd80875e09e11850fa4828e1156da190f85b17dcecb71",

3
integration/testdata/amazonlinux2-gp2-x86-vm.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "disk.img",
"ArtifactType": "vm",

3
integration/testdata/bun.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/bun",

3
integration/testdata/busybox-with-lockfile.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:4f807ebe9dfe3b25af3d4354d6cff8288e9a8c63477dabcde5e63998f0e68188",

3
integration/testdata/cargo.lock.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/cargo",

3
integration/testdata/centos-6.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:6fd360ff01eb63800aaafdb5e58af85fab9d7849344b577f5f6077cceb0399bb",

3
integration/testdata/centos-7-ignore-unfixed.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:8af996fb4a61e515887a173fdea3d5111c90c76e9f8247b3f668b17ab8215946",

3
integration/testdata/centos-7-medium.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:8af996fb4a61e515887a173fdea3d5111c90c76e9f8247b3f668b17ab8215946",

3
integration/testdata/centos-7.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:8af996fb4a61e515887a173fdea3d5111c90c76e9f8247b3f668b17ab8215946",

3
integration/testdata/cocoapods.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/cocoapods",

3
integration/testdata/composer.lock.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/composer",

3
integration/testdata/composer.vendor.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/composer-vendor",

3
integration/testdata/conan.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/conan",

3
integration/testdata/debian-buster-ignore-unfixed.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:b75d2c78a42eae6eaa44e99638ba5fa36900538fa0b7a4feba19d18dd588552d",

3
integration/testdata/debian-buster.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:b75d2c78a42eae6eaa44e99638ba5fa36900538fa0b7a4feba19d18dd588552d",

3
integration/testdata/debian-stretch.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:e7f0b65012f754f3e69bfa9e94999ba080f12cd7e6ac2742d5cb908252f9609f",

3
integration/testdata/distroless-base.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:6c3688715cb42ea1466b96eb45b39d8afc9f8cdcf723df8464fb26391711a7db",

3
integration/testdata/distroless-python27.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:b9ec0b7f93064fddace988e9a901386ccd55a6c16a34c00d5c45b06f62ec20ca",

3
integration/testdata/dockerfile-custom-policies.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/custom-policy",

3
integration/testdata/dockerfile.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/dockerfile",

3
integration/testdata/dockerfile_file_pattern.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/dockerfile_file_pattern",

3
integration/testdata/dotnet.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/dotnet",

3
integration/testdata/fluentd-gems.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:7a550fb73ac2bf3e1fe50c96a8a5ba699be62cbb09ba9bd982557e574c904b3d",

3
integration/testdata/fluentd-multiple-lockfiles.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/sbom/fluentd-multiple-lockfiles-cyclonedx.json",

3
integration/testdata/gomod-skip.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/gomod",

3
integration/testdata/gomod-vex.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/gomod",

3
integration/testdata/gomod.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/gomod",

3
integration/testdata/gradle.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/gradle",

3
integration/testdata/helm.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/helm",

3
integration/testdata/helm_badname.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/helm_badname",

3
integration/testdata/helm_testchart.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/helm_testchart",

3
integration/testdata/helm_testchart.overridden.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/helm_testchart",

3
integration/testdata/license-cyclonedx.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/sbom/license-cyclonedx.json",

3
integration/testdata/mariner-1.0.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:357e30db7fb673e279ababa1128b33c8acc2fce50826727ec57ef24f5213fe0d",

3
integration/testdata/minikube-kbom.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/sbom/minikube-kbom.json",

3
integration/testdata/mix.lock.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/mixlock",

3
integration/testdata/npm-ubuntu-severity.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/npm",

3
integration/testdata/npm-with-dev.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/npm",

3
integration/testdata/npm.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/npm",

3
integration/testdata/nuget.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/nuget",

3
integration/testdata/opensuse-leap-151.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:b9f31768f6c3908af7de80cff1a9e53c62f46d1bc54aaf3b97b2c922ed9cf1fd",

3
integration/testdata/opensuse-tumbleweed.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:1ab435ff0da0a8c95292bfd8a3b270b457cfca575a4a68731dd2fc142e2c13ef",

3
integration/testdata/oraclelinux-8.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:2982b2b5fd16f59d6b9ccdef6292e710791eb7fa12895a593959c5bceb7780e6",

3
integration/testdata/packagesprops.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/packagesprops",

3
integration/testdata/photon-30.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:1d4bc53b38b27a97aca270bea3abf3e9ea14964d02c71d2c93cd7bc53b74d660",

3
integration/testdata/pip.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/pip",

3
integration/testdata/pipenv.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/pipenv",

3
integration/testdata/pnpm.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/pnpm",

3
integration/testdata/poetry.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/poetry",

3
integration/testdata/pom.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/pom",

3
integration/testdata/pubspec.lock.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/pubspec",

3
integration/testdata/rockylinux-8.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:ed11998b28b0bcd0488c4d2fda300f80d71ac058ce7eb12a43a4deb312ce429c",

3
integration/testdata/sbt.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/sbt",

3
integration/testdata/secrets.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/secrets",

3
integration/testdata/sl-micro-rancher5.4.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:f3d716e4652bf4a60bf4289eace7bb2b46878fa9461c86b12b4c059126563aee",

3
integration/testdata/spring4shell-jre11.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:d5fbfb11da0ffb72f8bdeae29420a8101a04534c281854fe5ace22ec13d133bb",

3
integration/testdata/spring4shell-jre8.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:8ac64b751688d0e2577befd47be60baea54f7294bee6deeb0288b580daf6ca52",

3
integration/testdata/swift.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/swift",

3
integration/testdata/terraform-exclude-misconfs-remote-module.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/terraform/remote-module",

3
integration/testdata/terraform-opentofu-registry.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/terraform/opentofu-registry",

3
integration/testdata/terraform-remote-module-in-child.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/terraform/remote-module-in-child",

3
integration/testdata/terraform-remote-module.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/terraform/remote-module",

3
integration/testdata/terraform-remote-submodule.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/terraform/remote-submodule",

3
integration/testdata/terraform-terraform-registry.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/terraform/opentofu-registry",

3
integration/testdata/test-repo.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:4f8b4cb139bdac63ad60b7382a80cd0414c55018e2f80d4163f59e40f71766cc",

3
integration/testdata/ubi-7-comprehensive.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:b4b4762f4769903a61d4605927079c4e60d007d9b12f65c39714e5311fa3d0ca",

3
integration/testdata/ubi-7.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:b4b4762f4769903a61d4605927079c4e60d007d9b12f65c39714e5311fa3d0ca",

3
integration/testdata/ubuntu-1804-ignore-unfixed.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:61d0ff5073e754270b3b59487ac8049c50e12bca1cf792d84ec9a62dad36a8a1",

3
integration/testdata/ubuntu-1804.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactID": "sha256:61d0ff5073e754270b3b59487ac8049c50e12bca1cf792d84ec9a62dad36a8a1",

3
integration/testdata/ubuntu-gp2-x86-vm.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "disk.img",
"ArtifactType": "vm",

3
integration/testdata/uv.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/uv",

3
integration/testdata/yarn.json.golden vendored
View File

@@ -1,5 +1,8 @@
{
"SchemaVersion": 2,
"Trivy": {
"Version": "dev"
},
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
"ArtifactName": "testdata/fixtures/repo/yarn",

2
pkg/scan/service.go
View File

@@ -16,6 +16,7 @@ import (
"github.com/aquasecurity/trivy/pkg/report"
"github.com/aquasecurity/trivy/pkg/types"
"github.com/aquasecurity/trivy/pkg/uuid"
"github.com/aquasecurity/trivy/pkg/version/app"
)
// Service is the main service that coordinates security scanning operations.
@@ -85,6 +86,7 @@ func (s Service) ScanArtifact(ctx context.Context, options types.ScanOptions) (t
r := types.Report{
SchemaVersion: report.SchemaVersion,
Trivy: types.TrivyInfo{Version: app.Version()},
ReportID: reportID.String(),
CreatedAt: clock.Now(ctx),
ArtifactID: s.generateArtifactID(artifactInfo),

1
pkg/scan/service_test.go
View File

@@ -55,6 +55,7 @@ func TestScanner_ScanArtifact(t *testing.T) {
fixtures: []string{"local/testdata/fixtures/happy.yaml"},
want: tTypes.Report{
SchemaVersion: 2,
Trivy: tTypes.TrivyInfo{Version: "dev"},
CreatedAt: time.Date(2021, 8, 25, 12, 20, 30, 5, time.UTC),
ArtifactID: "sha256:574abdaf07824449b1277ec1e7e67659cc869bbf97fd95447812b55644350a21", // hash(ImageID:index.docker.io/library/alpine) from RepoTag alpine:3.11
ArtifactName: "../fanal/test/testdata/alpine-311.tar.gz",

6
pkg/types/report.go
View File

@@ -10,9 +10,15 @@ import (
"github.com/aquasecurity/trivy/pkg/sbom/core"
)
// TrivyInfo contains Trivy-specific information
type TrivyInfo struct {
Version string `json:",omitempty"` // Trivy version
}
// Report represents a scan result
type Report struct {
SchemaVersion int `json:",omitempty"`
Trivy TrivyInfo `json:",omitzero"`
ReportID string `json:",omitempty"` // Unique identifier for this scan report
CreatedAt time.Time `json:",omitzero"`