From 49d5b2cc8e81b1d3b0981e9cdf16fd5542007cc4 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 28 Dec 2023 11:29:54 +0100 Subject: [PATCH] builder/builder-next: puller.resolve: rename err-return Prevent accidentally shadowing the error, which is used in a defers, and while at it, also fixed some linting warnings about unhandled errors and shadowed vars. Signed-off-by: Sebastiaan van Stijn --- builder/builder-next/adapters/containerimage/pull.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go index f8840c4e62..bbd16b0a8d 100644 --- a/builder/builder-next/adapters/containerimage/pull.go +++ b/builder/builder-next/adapters/containerimage/pull.go @@ -343,10 +343,10 @@ func (p *puller) resolveLocal() { } func (p *puller) resolve(ctx context.Context, g session.Group) error { - _, err := p.g.Do(ctx, "", func(ctx context.Context) (_ struct{}, err error) { + _, err := p.g.Do(ctx, "", func(ctx context.Context) (_ struct{}, retErr error) { resolveProgressDone := oneOffProgress(ctx, "resolve "+p.src.Reference.String()) defer func() { - resolveProgressDone(err) + _ = resolveProgressDone(retErr) }() ref, err := distreference.ParseNormalizedNamed(p.src.Reference.String()) @@ -370,11 +370,11 @@ func (p *puller) resolve(ctx context.Context, g session.Group) error { // It may be possible to have a mapping between schema 1 manifests // and the schema 2 manifests they are converted to. if p.config == nil && p.desc.MediaType != c8dimages.MediaTypeDockerSchema1Manifest { - ref, err := distreference.WithDigest(ref, p.desc.Digest) + refWithDigest, err := distreference.WithDigest(ref, p.desc.Digest) if err != nil { return struct{}{}, err } - _, dt, err := p.is.ResolveImageConfig(ctx, ref.String(), sourceresolver.Opt{ + _, dt, err := p.is.ResolveImageConfig(ctx, refWithDigest.String(), sourceresolver.Opt{ Platform: &p.platform, ImageOpt: &sourceresolver.ResolveImageOpt{ ResolveMode: p.src.ResolveMode.String(), @@ -384,7 +384,7 @@ func (p *puller) resolve(ctx context.Context, g session.Group) error { return struct{}{}, err } - p.ref = ref.String() + p.ref = refWithDigest.String() p.config = dt } return struct{}{}, nil