feat: Add local ImageID to SARIF metadata (#6522)

charlesoxyer · knqyf263 · web-flow · commit f144e912d342 · 2024-06-19T10:30:55.000Z
Signed-off-by: knqyf263 &lt;knqyf263@gmail.com&gt;
Co-authored-by: knqyf263 &lt;knqyf263@gmail.com&gt;
diff --git a/integration/testdata/alpine-310.sarif.golden b/integration/testdata/alpine-310.sarif.golden
@@ -184,6 +184,7 @@
         }
       },
       "properties": {
+        "imageID": "sha256:961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4",
         "imageName": "testdata/fixtures/images/alpine-310.tar.gz",
         "repoDigests": null,
         "repoTags": null
diff --git a/pkg/report/sarif.go b/pkg/report/sarif.go
@@ -137,6 +137,7 @@ func (sw *SarifWriter) Write(ctx context.Context, report types.Report) error {
 			"imageName":   report.ArtifactName,
 			"repoTags":    report.Metadata.RepoTags,
 			"repoDigests": report.Metadata.RepoDigests,
+			"imageID":     report.Metadata.ImageID,
 		}
 	}
 	if sw.Target != "" {
diff --git a/pkg/report/sarif_test.go b/pkg/report/sarif_test.go
@@ -31,6 +31,7 @@ func TestReportWriter_Sarif(t *testing.T) {
 				ArtifactName: "debian:9",
 				ArtifactType: artifact.TypeContainerImage,
 				Metadata: types.Metadata{
+					ImageID: "sha256:7640c3f9e75002deb419d5e32738eeff82cf2b3edca3781b4fe1f1f626d11b20",
 					RepoTags: []string{
 						"debian:9",
 					},
@@ -177,6 +178,7 @@ func TestReportWriter_Sarif(t *testing.T) {
 						PropertyBag: sarif.PropertyBag{
 							Properties: map[string]any{
 								"imageName":   "debian:9",
+								"imageID":     "sha256:7640c3f9e75002deb419d5e32738eeff82cf2b3edca3781b4fe1f1f626d11b20",
 								"repoDigests": []any{"debian@sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534"},
 								"repoTags":    []any{"debian:9"},
 							},

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,7 @@`
`184`	`184`	`}`
`185`	`185`	`},`
`186`	`186`	`"properties": {`
	`187`	`+ "imageID": "sha256:961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4",`
`187`	`188`	`"imageName": "testdata/fixtures/images/alpine-310.tar.gz",`
`188`	`189`	`"repoDigests": null,`
`189`	`190`	`"repoTags": null`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,7 @@ func (sw *SarifWriter) Write(ctx context.Context, report types.Report) error {`
`137`	`137`	`"imageName": report.ArtifactName,`
`138`	`138`	`"repoTags": report.Metadata.RepoTags,`
`139`	`139`	`"repoDigests": report.Metadata.RepoDigests,`
	`140`	`+ "imageID": report.Metadata.ImageID,`
`140`	`141`	`}`
`141`	`142`	`}`
`142`	`143`	`if sw.Target != "" {`