From 8b105984b57e7fdeb0118b3260b499700299644b Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Wed, 27 Sep 2023 11:54:45 -0600 Subject: [PATCH] pkg/transfer/local: simplify mediatype logic Signed-off-by: Bjorn Neergaard --- pkg/transfer/local/pull.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkg/transfer/local/pull.go b/pkg/transfer/local/pull.go index 3c77af7dd..e0b08b5d8 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -255,24 +255,22 @@ func (ts *localTransferService) pull(ctx context.Context, ir transfer.ImageFetch } func fetchHandler(ingester content.Ingester, fetcher remotes.Fetcher, pt *ProgressTracker) images.HandlerFunc { - return func(ctx context.Context, desc ocispec.Descriptor) (subdescs []ocispec.Descriptor, err error) { + return func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) { ctx = log.WithLogger(ctx, log.G(ctx).WithFields(log.Fields{ "digest": desc.Digest, "mediatype": desc.MediaType, "size": desc.Size, })) - switch desc.MediaType { - case images.MediaTypeDockerSchema1Manifest: + if desc.MediaType == images.MediaTypeDockerSchema1Manifest { return nil, fmt.Errorf("%v not supported", desc.MediaType) - default: - err := remotes.Fetch(ctx, ingester, fetcher, desc) - if errdefs.IsAlreadyExists(err) { - pt.MarkExists(desc) - return nil, nil - } - return nil, err } + err := remotes.Fetch(ctx, ingester, fetcher, desc) + if errdefs.IsAlreadyExists(err) { + pt.MarkExists(desc) + return nil, nil + } + return nil, err } }