exporter: fix supplement sboms on empty scratch layer

jedevc · tonistiigi · commit 0ddf80166482 · 2023-02-12T21:13:04.000-08:00
Signed-off-by: Justin Chadwell <me@jedevc.com> (cherry picked from commit f3db114)
diff --git a/exporter/containerimage/attestations.go b/exporter/containerimage/attestations.go
@@ -31,6 +31,9 @@ var intotoPlatform ocispecs.Platform = ocispecs.Platform{
 
 // supplementSBOM modifies SPDX attestations to include the file layers
 func supplementSBOM(ctx context.Context, s session.Group, target cache.ImmutableRef, targetRemote *solver.Remote, att exporter.Attestation) (exporter.Attestation, error) {
+	if target == nil {
+		return att, nil
+	}
 	if att.Kind != gatewaypb.AttestationKindInToto {
 		return att, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ var intotoPlatform ocispecs.Platform = ocispecs.Platform{`
`31`	`31`
`32`	`32`	`// supplementSBOM modifies SPDX attestations to include the file layers`
`33`	`33`	`func supplementSBOM(ctx context.Context, s session.Group, target cache.ImmutableRef, targetRemote *solver.Remote, att exporter.Attestation) (exporter.Attestation, error) {`
	`34`	`+ if target == nil {`
	`35`	`+ return att, nil`
	`36`	`+ }`
`34`	`37`	`if att.Kind != gatewaypb.AttestationKindInToto {`
`35`	`38`	`return att, nil`
`36`	`39`	`}`