Skip to content

Commit d020f26

Browse files
authored
feat(report): add image reference to report metadata (#9729)
1 parent 29f0347 commit d020f26

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+121
-83
lines changed

integration/registry_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"github.com/testcontainers/testcontainers-go"
2828
"github.com/testcontainers/testcontainers-go/wait"
2929

30+
"github.com/aquasecurity/trivy/internal/testutil"
3031
"github.com/aquasecurity/trivy/pkg/types"
3132
)
3233

@@ -249,7 +250,7 @@ func TestRegistry(t *testing.T) {
249250
runTest(t, osArgs, tt.golden, types.FormatJSON, runOptions{
250251
wantErr: tt.wantErr,
251252
fakeUUID: "3ff14136-e09f-4df9-80ea-%012d",
252-
override: overrideFuncs(overrideUID, func(_ *testing.T, want, got *types.Report) {
253+
override: overrideFuncs(overrideUID, func(t *testing.T, want, got *types.Report) {
253254
// Exclude ArtifactID from comparison because registry tests use random ports
254255
// (e.g., localhost:54321/alpine:3.10), which causes RepoTags and the calculated
255256
// Artifact ID to vary on each test run.
@@ -258,6 +259,7 @@ func TestRegistry(t *testing.T) {
258259

259260
want.ArtifactName = s
260261
want.Metadata.RepoTags = []string{s}
262+
want.Metadata.Reference = testutil.MustParseReference(t, s)
261263
for i := range want.Results {
262264
want.Results[i].Target = fmt.Sprintf("%s (%s)", s, tt.os)
263265
}

integration/testdata/almalinux-8.json.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"RepoTags": [
1919
"ghcr.io/aquasecurity/trivy-test-images:almalinux-8"
2020
],
21+
"Reference": "ghcr.io/aquasecurity/trivy-test-images:almalinux-8",
2122
"ImageConfig": {
2223
"architecture": "amd64",
2324
"container": "a467f67a48d469e1975b7414f33f2cf87121d4cc59d2ee029ea58e6b81774769",

integration/testdata/alpine-310.json.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"RepoTags": [
2020
"ghcr.io/aquasecurity/trivy-test-images:alpine-310"
2121
],
22+
"Reference": "ghcr.io/aquasecurity/trivy-test-images:alpine-310",
2223
"ImageConfig": {
2324
"architecture": "amd64",
2425
"container": "0a80155a31551fcc1a36fccbbda79fcd3f0b1c7d270653d00310e6e2217c57e6",

integration/testdata/alpine-39-high-critical.json.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"RepoTags": [
2020
"ghcr.io/aquasecurity/trivy-test-images:alpine-39"
2121
],
22+
"Reference": "ghcr.io/aquasecurity/trivy-test-images:alpine-39",
2223
"ImageConfig": {
2324
"architecture": "amd64",
2425
"container": "c10d36fa368a7ea673683682666758adf35efe98e10989505f4f566b5b18538f",

integration/testdata/alpine-39-ignore-cveids.json.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"RepoTags": [
2020
"ghcr.io/aquasecurity/trivy-test-images:alpine-39"
2121
],
22+
"Reference": "ghcr.io/aquasecurity/trivy-test-images:alpine-39",
2223
"ImageConfig": {
2324
"architecture": "amd64",
2425
"container": "c10d36fa368a7ea673683682666758adf35efe98e10989505f4f566b5b18538f",

integration/testdata/alpine-39-skip.json.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"RepoTags": [
1919
"ghcr.io/aquasecurity/trivy-test-images:alpine-39"
2020
],
21+
"Reference": "ghcr.io/aquasecurity/trivy-test-images:alpine-39",
2122
"ImageConfig": {
2223
"architecture": "amd64",
2324
"container": "c10d36fa368a7ea673683682666758adf35efe98e10989505f4f566b5b18538f",

integration/testdata/alpine-39.json.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"RepoTags": [
2020
"ghcr.io/aquasecurity/trivy-test-images:alpine-39"
2121
],
22+
"Reference": "ghcr.io/aquasecurity/trivy-test-images:alpine-39",
2223
"ImageConfig": {
2324
"architecture": "amd64",
2425
"container": "c10d36fa368a7ea673683682666758adf35efe98e10989505f4f566b5b18538f",

integration/testdata/alpine-distroless.json.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"RepoTags": [
1919
"ghcr.io/aquasecurity/trivy-test-images:alpine-distroless"
2020
],
21+
"Reference": "ghcr.io/aquasecurity/trivy-test-images:alpine-distroless",
2122
"ImageConfig": {
2223
"architecture": "amd64",
2324
"author": "github.com/chainguard-dev/apko",

integration/testdata/amazon-1.json.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"RepoTags": [
1919
"ghcr.io/aquasecurity/trivy-test-images:amazon-1"
2020
],
21+
"Reference": "ghcr.io/aquasecurity/trivy-test-images:amazon-1",
2122
"ImageConfig": {
2223
"architecture": "amd64",
2324
"container": "ef1b126795001e9b4bdc14a01180e4d8146282d279f53e05adfaa8195ecda20e",

integration/testdata/amazon-2.json.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"RepoTags": [
1919
"ghcr.io/aquasecurity/trivy-test-images:amazon-2"
2020
],
21+
"Reference": "ghcr.io/aquasecurity/trivy-test-images:amazon-2",
2122
"ImageConfig": {
2223
"architecture": "amd64",
2324
"container": "e020a5508b9f809b29659128692cd634e3d4fba3f2c13d2029d797317b5c3a56",

0 commit comments

Comments
 (0)