Merge pull request containerd#6617 from FabHof/main

estesp · web-flow · commit 4fbdb4023633 · 2022-03-08T13:28:50.000-05:00
Improve unexpected response error handling in resolver
diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go
@@ -32,6 +32,7 @@ import (
 	"github.com/containerd/containerd/reference"
 	"github.com/containerd/containerd/remotes"
 	"github.com/containerd/containerd/remotes/docker/schema1"
+	remoteerrors "github.com/containerd/containerd/remotes/errors"
 	"github.com/containerd/containerd/version"
 	digest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -297,11 +298,11 @@ func (r *dockerResolver) Resolve(ctx context.Context, ref string) (string, ocisp
 				if resp.StatusCode > 399 {
 					// Set firstErr when encountering the first non-404 status code.
 					if firstErr == nil {
-						firstErr = fmt.Errorf("pulling from host %s failed with status code %v: %v", host.Host, u, resp.Status)
+						firstErr = remoteerrors.NewUnexpectedStatusErr(resp)
 					}
 					continue // try another host
 				}
-				return "", ocispec.Descriptor{}, fmt.Errorf("pulling from host %s failed with unexpected status code %v: %v", host.Host, u, resp.Status)
+				return "", ocispec.Descriptor{}, remoteerrors.NewUnexpectedStatusErr(resp)
 			}
 			size := resp.ContentLength
 			contentType := getManifestMediaType(resp)
diff --git a/remotes/errors/errors.go b/remotes/errors/errors.go
@@ -33,7 +33,7 @@ type ErrUnexpectedStatus struct {
 }
 
 func (e ErrUnexpectedStatus) Error() string {
-	return fmt.Sprintf("unexpected status: %s", e.Status)
+	return fmt.Sprintf("unexpected status from %s request to %s: %s", e.RequestMethod, e.RequestURL, e.Status)
 }
 
 // NewUnexpectedStatusErr creates an ErrUnexpectedStatus from HTTP response

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ type ErrUnexpectedStatus struct {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (e ErrUnexpectedStatus) Error() string {`
`36`		`- return fmt.Sprintf("unexpected status: %s", e.Status)`
	`36`	`+ return fmt.Sprintf("unexpected status from %s request to %s: %s", e.RequestMethod, e.RequestURL, e.Status)`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// NewUnexpectedStatusErr creates an ErrUnexpectedStatus from HTTP response`