Merge pull request #11538 from dmcgowan/backport-11327

mxpv · web-flow · commit 574a30406e06 · 2025-03-14T12:57:13.000-07:00
[release/1.7] Update image type checks to avoid unnecessary logs for attestations
diff --git a/images/image.go b/images/image.go
@@ -378,7 +378,7 @@ func Children(ctx context.Context, provider content.Provider, desc ocispec.Descr
 
 		descs = append(descs, index.Manifests...)
 	default:
-		if IsLayerType(desc.MediaType) || IsKnownConfig(desc.MediaType) {
+		if IsLayerType(desc.MediaType) || IsKnownConfig(desc.MediaType) || IsAttestationType(desc.MediaType) {
 			// childless data types.
 			return nil, nil
 		}
diff --git a/images/mediatypes.go b/images/mediatypes.go
@@ -57,6 +57,9 @@ const (
 
 	MediaTypeImageLayerEncrypted     = ocispec.MediaTypeImageLayer + "+encrypted"
 	MediaTypeImageLayerGzipEncrypted = ocispec.MediaTypeImageLayerGzip + "+encrypted"
+
+	// In-toto attestation
+	MediaTypeInToto = "application/vnd.in-toto+json"
 )
 
 // DiffCompression returns the compression as defined by the layer diff media
@@ -186,6 +189,16 @@ func IsKnownConfig(mt string) bool {
 	return false
 }
 
+// IsAttestationType returns true if the media type is an attestation type
+func IsAttestationType(mt string) bool {
+	switch mt {
+	case MediaTypeInToto:
+		return true
+	default:
+		return false
+	}
+}
+
 // ChildGCLabels returns the label for a given descriptor to reference it
 func ChildGCLabels(desc ocispec.Descriptor) []string {
 	mt := desc.MediaType
diff --git a/remotes/handlers.go b/remotes/handlers.go
@@ -81,6 +81,8 @@ func MakeRefKey(ctx context.Context, desc ocispec.Descriptor) string {
 		return "layer-" + key
 	case images.IsKnownConfig(mt):
 		return "config-" + key
+	case images.IsAttestationType(desc.MediaType):
+		return "attestation-" + key
 	default:
 		log.G(ctx).Warnf("reference for unknown type: %s", mt)
 		return "unknown-" + key

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ func Children(ctx context.Context, provider content.Provider, desc ocispec.Descr`
`378`	`378`
`379`	`379`	`descs = append(descs, index.Manifests...)`
`380`	`380`	`default:`
`381`		`- if IsLayerType(desc.MediaType) \|\| IsKnownConfig(desc.MediaType) {`
	`381`	`+ if IsLayerType(desc.MediaType) \|\| IsKnownConfig(desc.MediaType) \|\| IsAttestationType(desc.MediaType) {`
`382`	`382`	`// childless data types.`
`383`	`383`	`return nil, nil`
`384`	`384`	`}`