From 5ab04ac5a143a9e83ddf9c6eccb038832682d430 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Wed, 27 Sep 2023 10:59:42 -0600 Subject: [PATCH] pkg/unpack: use mediatype helpers Signed-off-by: Bjorn Neergaard --- pkg/unpack/unpacker.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index f16b96888..9879a93a1 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -179,8 +179,7 @@ func (u *Unpacker) Unpack(h images.Handler) images.Handler { return children, err } - switch desc.MediaType { - case images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest: + if images.IsManifestType(desc.MediaType) { var nonLayers []ocispec.Descriptor var manifestLayers []ocispec.Descriptor // Split layers from non-layers, layers will be handled after @@ -203,7 +202,7 @@ func (u *Unpacker) Unpack(h images.Handler) images.Handler { lock.Unlock() children = nonLayers - case images.MediaTypeDockerSchema2Config, ocispec.MediaTypeImageConfig: + } else if images.IsConfigType(desc.MediaType) { lock.Lock() l := layers[desc.Digest] lock.Unlock()