Allow for images with artifacts to pull

jsturtevant · jsturtevant · commit a9ba33f8ff8b · 2023-09-25T22:10:19.000Z
Signed-off-by: James Sturtevant &lt;jstur@microsoft.com&gt;
diff --git a/image.go b/image.go
@@ -379,7 +379,15 @@ func (i *image) getLayers(ctx context.Context, manifest ocispec.Manifest) ([]roo
 	if err != nil {
 		return nil, fmt.Errorf("failed to resolve rootfs: %w", err)
 	}
-	if len(diffIDs) != len(manifest.Layers) {
+
+	// parse out the image layers from oci artifact layers
+	imageLayers := []ocispec.Descriptor{}
+	for _, ociLayer := range manifest.Layers {
+		if images.IsLayerType(ociLayer.MediaType) {
+			imageLayers = append(imageLayers, ociLayer)
+		}
+	}
+	if len(diffIDs) != len(imageLayers) {
 		return nil, errors.New("mismatched image rootfs and manifest layers")
 	}
 	layers := make([]rootfs.Layer, len(diffIDs))
@@ -389,7 +397,7 @@ func (i *image) getLayers(ctx context.Context, manifest ocispec.Manifest) ([]roo
 			MediaType: ocispec.MediaTypeImageLayer,
 			Digest:    diffIDs[i],
 		}
-		layers[i].Blob = manifest.Layers[i]
+		layers[i].Blob = imageLayers[i]
 	}
 	return layers, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,15 @@ func (i *image) getLayers(ctx context.Context, manifest ocispec.Manifest) ([]roo`
`379`	`379`	`if err != nil {`
`380`	`380`	`return nil, fmt.Errorf("failed to resolve rootfs: %w", err)`
`381`	`381`	`}`
`382`		`- if len(diffIDs) != len(manifest.Layers) {`
	`382`	`+`
	`383`	`+ // parse out the image layers from oci artifact layers`
	`384`	`+ imageLayers := []ocispec.Descriptor{}`
	`385`	`+ for _, ociLayer := range manifest.Layers {`
	`386`	`+ if images.IsLayerType(ociLayer.MediaType) {`
	`387`	`+ imageLayers = append(imageLayers, ociLayer)`
	`388`	`+ }`
	`389`	`+ }`
	`390`	`+ if len(diffIDs) != len(imageLayers) {`
`383`	`391`	`return nil, errors.New("mismatched image rootfs and manifest layers")`
`384`	`392`	`}`
`385`	`393`	`layers := make([]rootfs.Layer, len(diffIDs))`
`@@ -389,7 +397,7 @@ func (i *image) getLayers(ctx context.Context, manifest ocispec.Manifest) ([]roo`
`389`	`397`	`MediaType: ocispec.MediaTypeImageLayer,`
`390`	`398`	`Digest: diffIDs[i],`
`391`	`399`	`}`
`392`		`- layers[i].Blob = manifest.Layers[i]`
	`400`	`+ layers[i].Blob = imageLayers[i]`
`393`	`401`	`}`
`394`	`402`	`return layers, nil`
`395`	`403`	`}`