Fix image resolution pipeline

Author: wlan0

pkg/build/frontend.go

@@ -165,7 +165,7 @@ func resolveStates(ctx context.Context, bopts *BOpts, platform ocispecs.Platform
 			resolverOpts.ImageOpt = &sourceresolver.ResolveImageOpt{
 				ResolveMode: llb.ResolveModePreferLocal.String(),
 			}
-			_, digest, img, err := bopts.Resolver.ResolveImageConfig(ctx, ref.String(), resolverOpts)
+			_, digest, img, err := bopts.Resolver.ResolveImageConfig(ctx, resolvedBaseStageName.Result, resolverOpts)
 			if err != nil {
 				if err == reference.ErrObjectRequired {
 					return

pkg/resolver/resolver.go

@@ -21,12 +21,10 @@ import (
 	"fmt"
 
 	"github.com/containerd/containerd/platforms"
-	"github.com/containerd/containerd/reference"
 	"github.com/google/uuid"
 	"github.com/moby/buildkit/client/llb"
 	"github.com/moby/buildkit/client/llb/sourceresolver"
 	"github.com/opencontainers/go-digest"
-	"github.com/sirupsen/logrus"
 
 	"github.com/apple/container-builder-shim/pkg/api"
 	"github.com/apple/container-builder-shim/pkg/stream"
@@ -119,14 +117,6 @@ Response Format:
 */
 func (r *ResolverProxy) ResolveImageConfig(ctx context.Context, ref string, opt sourceresolver.Opt) (string, digest.Digest, []byte, error) {
 	var err error
-	u, err := reference.Parse(ref)
-	if err != nil {
-		logrus.Debugf("reference parse error: %v", err)
-		return ref, digest.Digest(""), nil, err
-	} else if u.Object == "" {
-		logrus.Debugf("reference object empty: %#v", u)
-		return ref, digest.Digest(""), nil, reference.ErrObjectRequired
-	}
 
 	req := &api.ImageTransfer{
 		Direction: api.TransferDirection_INTO,