github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9155 from neersighted/image_cleanup_2

Browse Source 
Use mediatype helpers in more places
This commit is contained in:
Derek McGowan
2023-10-03 07:11:12 -07:00
committed by GitHub
parent 28fa2751f2 5518a50260
commit e8770b1716
12 changed files with 81 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
integration/client/export_test.go
View File

@@ -116,8 +116,7 @@ func TestExportDockerManifest(t *testing.T) {
// test single-platform export
var result ocispec.Descriptor
err = images.Walk(ctx, images.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
switch desc.MediaType {
case images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest:
if images.IsManifestType(desc.MediaType) {
p, err := content.ReadBlob(ctx, client.ContentStore(), desc)
if err != nil {
return nil, err
@@ -132,7 +131,7 @@ func TestExportDockerManifest(t *testing.T) {
result = desc
}
return nil, nil
case images.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:
} else if images.IsIndexType(desc.MediaType) {
p, err := content.ReadBlob(ctx, client.ContentStore(), desc)
if err != nil {
return nil, err