Merge pull request #5164 from errordeveloper/master

estesp · web-flow · commit 92009ad7a326 · 2021-03-13T22:05:53.000-05:00
Improve unexpected response error handling
diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go
@@ -354,7 +354,7 @@ func (pw *pushWriter) Commit(ctx context.Context, size int64, expected digest.Di
 	switch resp.StatusCode {
 	case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted:
 	default:
-		return errors.Errorf("unexpected status: %s", resp.Status)
+		return remoteserrors.NewUnexpectedStatusErr(resp.Response)
 	}
 
 	status, err := pw.tracker.GetStatus(pw.ref)
diff --git a/remotes/errors/errors.go b/remotes/errors/errors.go
@@ -27,9 +27,10 @@ var _ error = ErrUnexpectedStatus{}
 
 // ErrUnexpectedStatus is returned if a registry API request returned with unexpected HTTP status
 type ErrUnexpectedStatus struct {
-	Status     string
-	StatusCode int
-	Body       []byte
+	Status                    string
+	StatusCode                int
+	Body                      []byte
+	RequestURL, RequestMethod string
 }
 
 func (e ErrUnexpectedStatus) Error() string {
@@ -42,5 +43,14 @@ func NewUnexpectedStatusErr(resp *http.Response) error {
 	if resp.Body != nil {
 		b, _ = ioutil.ReadAll(io.LimitReader(resp.Body, 64000)) // 64KB
 	}
-	return ErrUnexpectedStatus{Status: resp.Status, StatusCode: resp.StatusCode, Body: b}
+	err := ErrUnexpectedStatus{
+		Body:          b,
+		Status:        resp.Status,
+		StatusCode:    resp.StatusCode,
+		RequestMethod: resp.Request.Method,
+	}
+	if resp.Request.URL != nil {
+		err.RequestURL = resp.Request.URL.String()
+	}
+	return err
 }

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ func (pw *pushWriter) Commit(ctx context.Context, size int64, expected digest.Di`
`354`	`354`	`switch resp.StatusCode {`
`355`	`355`	`case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted:`
`356`	`356`	`default:`
`357`		`- return errors.Errorf("unexpected status: %s", resp.Status)`
	`357`	`+ return remoteserrors.NewUnexpectedStatusErr(resp.Response)`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`status, err := pw.tracker.GetStatus(pw.ref)`