From a728bd0ee93010ec2415f96a343ffcb6ca70ad5d Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Thu, 13 Jul 2023 16:49:15 -0600 Subject: [PATCH] builder-next/pull: use ResolveMode.String() helper Introduced years ago in https://github.com/moby/buildkit/commit/6644e1b0dab8cae614207083ec1ba523a495fb44 Signed-off-by: Bjorn Neergaard --- .../builder-next/adapters/containerimage/pull.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go index f819394e8c..d516b49385 100644 --- a/builder/builder-next/adapters/containerimage/pull.go +++ b/builder/builder-next/adapters/containerimage/pull.go @@ -300,7 +300,7 @@ func (p *puller) resolve(ctx context.Context, g session.Group) error { if err != nil { return struct{}{}, err } - newRef, _, dt, err := p.is.ResolveImageConfig(ctx, ref.String(), llb.ResolveImageConfigOpt{Platform: &p.platform, ResolveMode: resolveModeToString(p.src.ResolveMode)}, p.sm, g) + newRef, _, dt, err := p.is.ResolveImageConfig(ctx, ref.String(), llb.ResolveImageConfigOpt{Platform: &p.platform, ResolveMode: p.src.ResolveMode.String()}, p.sm, g) if err != nil { return struct{}{}, err } @@ -849,20 +849,6 @@ func cacheKeyFromConfig(dt []byte) digest.Digest { return identity.ChainID(img.RootFS.DiffIDs) } -// resolveModeToString is the equivalent of github.com/moby/buildkit/solver/llb.ResolveMode.String() -// FIXME: add String method on source.ResolveMode -func resolveModeToString(rm source.ResolveMode) string { - switch rm { - case source.ResolveModeDefault: - return "default" - case source.ResolveModeForcePull: - return "pull" - case source.ResolveModePreferLocal: - return "local" - } - return "" -} - func platformMatches(img *image.Image, p *ocispec.Platform) bool { return dimages.OnlyPlatformWithFallback(*p).Match(ocispec.Platform{ Architecture: img.Architecture,