From 377c5ca9cd4b44e8e1cd13e0aa46e2db77f16d7f Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Wed, 27 Sep 2023 09:17:03 -0600 Subject: [PATCH] images/archive: use mediatype helpers Signed-off-by: Bjorn Neergaard --- images/archive/exporter.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/images/archive/exporter.go b/images/archive/exporter.go index e902e2f43..b0617b430 100644 --- a/images/archive/exporter.go +++ b/images/archive/exporter.go @@ -170,8 +170,7 @@ func Export(ctx context.Context, store content.Provider, writer io.Writer, opts dManifests := map[digest.Digest]*exportManifest{} resolvedIndex := map[digest.Digest]digest.Digest{} for _, desc := range eo.manifests { - switch desc.MediaType { - case images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest: + if images.IsManifestType(desc.MediaType) { mt, ok := dManifests[desc.Digest] if !ok { // TODO(containerd): Skip if already added @@ -191,7 +190,7 @@ func Export(ctx context.Context, store content.Provider, writer io.Writer, opts if name != "" { mt.names = append(mt.names, name) } - case images.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex: + } else if images.IsIndexType(desc.MediaType) { d, ok := resolvedIndex[desc.Digest] if !ok { if err := desc.Digest.Validate(); err != nil { @@ -255,7 +254,7 @@ func Export(ctx context.Context, store content.Provider, writer io.Writer, opts } } - default: + } else { return fmt.Errorf("only manifests may be exported: %w", errdefs.ErrInvalidArgument) } }