Adds log output of clients that are registered to debug

Signed-off-by: JoshVanL <[email protected]>

pkg/client/acr/acr.go

@@ -70,6 +70,10 @@ func New(opts Options) (*Client, error) {
 	}, nil
 }
 
+func (c *Client) Name() string {
+	return "acr"
+}
+
 func (c *Client) Tags(ctx context.Context, host, repo, image string) ([]api.ImageTag, error) {
 	client, err := c.getACRClient(ctx, host)
 	if err != nil {

pkg/client/client.go

@@ -19,6 +19,9 @@ import (
 // ImageClient represents a image registry client that can list available tags
 // for image URLs.
 type ImageClient interface {
+	// Returns the name of the client
+	Name() string
+
 	// IsHost will return true if this client is appropriate for the given
 	// host.
 	IsHost(host string) bool
@@ -75,7 +78,7 @@ func New(ctx context.Context, log *logrus.Entry, opts Options) (*Client, error)
 		return nil, fmt.Errorf("failed to create fallback client: %s", err)
 	}
 
-	return &Client{
+	c := &Client{
 		clients: append(
 			selfhostedClients,
 			acrClient,
@@ -85,7 +88,13 @@ func New(ctx context.Context, log *logrus.Entry, opts Options) (*Client, error)
 			quay.New(opts.Quay),
 		),
 		fallbackClient: fallbackClient,
-	}, nil
+	}
+
+	for _, client := range append(c.clients, fallbackClient) {
+		log.Debugf("registered client %q", client.Name())
+	}
+
+	return c, nil
 }
 
 // Tags returns the full list of image tags available, for a given image URL.

pkg/client/docker/docker.go

@@ -74,6 +74,10 @@ func New(ctx context.Context, opts Options) (*Client, error) {
 	}, nil
 }
 
+func (c *Client) Name() string {
+	return "dockerhub"
+}
+
 func (c *Client) Tags(ctx context.Context, _, repo, image string) ([]api.ImageTag, error) {
 	url := fmt.Sprintf(lookupURL, repo, image)
 

pkg/client/ecr/ecr.go

@@ -34,6 +34,10 @@ func New(opts Options) *Client {
 	}
 }
 
+func (c *Client) Name() string {
+	return "ecr"
+}
+
 func (c *Client) Tags(ctx context.Context, host, repo, image string) ([]api.ImageTag, error) {
 	matches := ecrPattern.FindStringSubmatch(host)
 	if len(matches) < 3 {

pkg/client/gcr/gcr.go

@@ -43,6 +43,10 @@ func New(opts Options) *Client {
 	}
 }
 
+func (c *Client) Name() string {
+	return "gcr"
+}
+
 func (c *Client) Tags(ctx context.Context, host, repo, image string) ([]api.ImageTag, error) {
 	if repo == "google-containers" {
 		host = "gcr.io"

pkg/client/quay/quay.go

@@ -43,6 +43,10 @@ func New(opts Options) *Client {
 	}
 }
 
+func (c *Client) Name() string {
+	return "quay"
+}
+
 func (c *Client) Tags(ctx context.Context, _, repo, image string) ([]api.ImageTag, error) {
 	url := fmt.Sprintf(lookupURL, repo, image)
 

pkg/client/selfhosted/selfhosted.go

@@ -24,7 +24,7 @@ const (
 	// /v2/{repo/image}/manifests/{tag}
 	manifestPath = "%s/v2/%s/manifests/%s"
 	// Token endpoint
-	tokenPath = "%s/v2/token"
+	tokenPath = "/v2/token"
 
 	// HTTP headers to request API version
 	dockerAPIv1Header = "application/vnd.docker.distribution.manifest.v1+json"
@@ -95,8 +95,13 @@ func New(ctx context.Context, log *logrus.Entry, opts *Options) (*Client, error)
 			}
 
 			token, err := client.setupBasicAuth(ctx, opts.Host)
+			if httpErr, ok := selfhostederrors.IsHTTPError(err); ok {
+				return nil, fmt.Errorf("failed to setup token auth (%d): %s",
+					httpErr.StatusCode, httpErr.Body)
+			}
+
 			if err != nil {
-				return nil, fmt.Errorf("failed to setup auth: %s", err)
+				return nil, fmt.Errorf("failed to setup token auth: %s", err)
 			}
 			client.Bearer = token
 		}
@@ -110,6 +115,15 @@ func New(ctx context.Context, log *logrus.Entry, opts *Options) (*Client, error)
 	return client, nil
 }
 
+// Name returns the name of the host URL for the selfhosted client
+func (c *Client) Name() string {
+	if len(c.Host) == 0 {
+		return "dockerapi"
+	}
+
+	return c.Host
+}
+
 // Tags will fetch the image tags from a given image URL. It must first query
 // the tags that are available, then query the 2.1 and 2.2 API endpoints to
 // gather the image digest and created time.
@@ -221,15 +235,16 @@ func (c *Client) setupBasicAuth(ctx context.Context, url string) (string, error)
 
 	req, err := http.NewRequest(http.MethodPost, tokenURL, upReader)
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("failed to create basic auth request: %s", err)
 	}
 
 	req.Header.Set("Content-Type", "application/json")
 	req = req.WithContext(ctx)
 
 	resp, err := c.Do(req)
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("failed to send basic auth request %q: %s",
+			req.URL, err)
 	}
 
 	body, err := ioutil.ReadAll(resp.Body)