manifest inspect: add some debug logs

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

cli/command/manifest/inspect.go

@@ -11,6 +11,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/manifest/types"
 	"github.com/docker/distribution/manifest/manifestlist"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -69,10 +70,12 @@ func runInspect(ctx context.Context, dockerCli command.Cli, opts inspectOptions)
 	}
 
 	// Try a local manifest list first
+	logrus.WithFields(logrus.Fields{"name": namedRef}).Debug("trying local manifest")
 	localManifestList, err := newManifestStore(dockerCli).GetList(namedRef)
 	if err == nil {
 		return printManifestList(dockerCli, namedRef, localManifestList, opts)
 	}
+	logrus.WithFields(logrus.Fields{"name": namedRef}).Debug("trying remote manifest")
 
 	// Next try a remote manifest
 	registryClient := newRegistryClient(dockerCli, opts.insecure)
@@ -82,6 +85,7 @@ func runInspect(ctx context.Context, dockerCli command.Cli, opts inspectOptions)
 	}
 
 	// Finally try a remote manifest list
+	logrus.WithFields(logrus.Fields{"name": namedRef}).Debug("trying remote manifest list")
 	manifestList, err := registryClient.GetManifestList(ctx, namedRef)
 	if err != nil {
 		return err

internal/registry/service.go

@@ -67,7 +67,7 @@ func (s *Service) Auth(ctx context.Context, authConfig *registry.AuthConfig, use
 			// Try next endpoint
 			log.G(ctx).WithFields(log.Fields{
 				"error":    err,
-				"endpoint": endpoint,
+				"endpoint": endpoint.URL,
 			}).Infof("Error logging in to endpoint, trying next endpoint")
 			lastErr = err
 			continue

internal/registryclient/client.go

@@ -161,26 +161,24 @@ func (c *client) getHTTPTransportForRepoEndpoint(ctx context.Context, repoEndpoi
 // GetManifest returns an ImageManifest for the reference
 func (c *client) GetManifest(ctx context.Context, ref reference.Named) (manifesttypes.ImageManifest, error) {
 	var result manifesttypes.ImageManifest
-	fetch := func(ctx context.Context, repo distribution.Repository, ref reference.Named) (bool, error) {
+	err := c.iterateEndpoints(ctx, ref, func(fetchCtx context.Context, repo distribution.Repository, ref reference.Named) (bool, error) {
 		var err error
-		result, err = fetchManifest(ctx, repo, ref)
+		logrus.WithFields(logrus.Fields{"ref": ref}).Debug("fetching manifest")
+		result, err = fetchManifest(fetchCtx, repo, ref)
 		return result.Ref != nil, err
-	}
-
-	err := c.iterateEndpoints(ctx, ref, fetch)
+	})
 	return result, err
 }
 
 // GetManifestList returns a list of ImageManifest for the reference
 func (c *client) GetManifestList(ctx context.Context, ref reference.Named) ([]manifesttypes.ImageManifest, error) {
 	result := []manifesttypes.ImageManifest{}
-	fetch := func(ctx context.Context, repo distribution.Repository, ref reference.Named) (bool, error) {
+	err := c.iterateEndpoints(ctx, ref, func(ctx context.Context, repo distribution.Repository, ref reference.Named) (bool, error) {
 		var err error
+		logrus.WithFields(logrus.Fields{"ref": ref}).Debug("fetching manifest list")
 		result, err = fetchList(ctx, repo, ref)
 		return len(result) > 0, err
-	}
-
-	err := c.iterateEndpoints(ctx, ref, fetch)
+	})
 	return result, err
 }
 

internal/registryclient/fetcher.go

@@ -37,8 +37,9 @@ func fetchManifest(ctx context.Context, repo distribution.Repository, ref refere
 		return pullManifestOCISchema(ctx, ref, repo, *v)
 	case *manifestlist.DeserializedManifestList:
 		return types.ImageManifest{}, fmt.Errorf("%s is a manifest list", ref)
+	default:
+		return types.ImageManifest{}, fmt.Errorf("%s is not a manifest", ref)
 	}
-	return types.ImageManifest{}, fmt.Errorf("%s is not a manifest", ref)
 }
 
 func fetchList(ctx context.Context, repo distribution.Repository, ref reference.Named) ([]types.ImageManifest, error) {
@@ -163,6 +164,7 @@ func pullManifestList(ctx context.Context, ref reference.Named, repo distributio
 		if err != nil {
 			return nil, err
 		}
+		logrus.WithFields(logrus.Fields{"digest": manifestDescriptor.Digest}).Debug("pulling manifest")
 		manifest, err := manSvc.Get(ctx, manifestDescriptor.Digest)
 		if err != nil {
 			return nil, err
@@ -286,7 +288,11 @@ func allEndpoints(ctx context.Context, namedRef reference.Named, insecure bool)
 		return nil, err
 	}
 	endpoints, err := registryService.Endpoints(ctx, reference.Domain(namedRef))
-	logrus.Debugf("endpoints for %s: %v", namedRef, endpoints)
+	var epUrls []string
+	for _, ep := range endpoints {
+		epUrls = append(epUrls, ep.URL.String())
+	}
+	logrus.WithField("endpoints", epUrls).Debugf("resolved endpoints for %s", namedRef)
 	return endpoints, err
 }