daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused and duplicate error types 

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
master
Derek McGowan 2015-05-15 16:34:00 -07:00
parent 98836d6267
commit 94e375c5d1
3 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
registry/client/blob_writer.go
View File

@ -28,7 +28,7 @@ type httpBlobUpload struct {
func (hbu *httpBlobUpload) handleErrorResponse(resp *http.Response) error { func (hbu *httpBlobUpload) handleErrorResponse(resp *http.Response) error {
if resp.StatusCode == http.StatusNotFound { if resp.StatusCode == http.StatusNotFound {
return &BlobUploadNotFoundError{Location: hbu.location} return distribution.ErrBlobUploadUnknown
} }
return handleErrorResponse(resp) return handleErrorResponse(resp)
} }

6
registry/client/blob_writer_test.go
View File

@ -151,10 +151,8 @@ func TestUploadReadFrom(t *testing.T) {
if err == nil { if err == nil {
t.Fatalf("Expected error when not found") t.Fatalf("Expected error when not found")
} }
if blobErr, ok := err.(*BlobUploadNotFoundError); !ok { if err != distribution.ErrBlobUploadUnknown {
t.Fatalf("Wrong error type %T: %s", err, err) t.Fatalf("Wrong error thrown: %s, expected", err, distribution.ErrBlobUploadUnknown)
} else if expected := e + locationPath; blobErr.Location != expected {
t.Fatalf("Unexpected location: %s, expected %s", blobErr.Location, expected)
} }
// 400 valid json // 400 valid json

28
registry/client/errors.go
View File

@ -9,34 +9,6 @@ import (
"github.com/docker/distribution/registry/api/v2" "github.com/docker/distribution/registry/api/v2"
) )
// BlobUploadNotFoundError is returned when making a blob upload operation against an
// invalid blob upload location url.
// This may be the result of using a cancelled, completed, or stale upload
// location.
type BlobUploadNotFoundError struct {
Location string
}
func (e *BlobUploadNotFoundError) Error() string {
return fmt.Sprintf("No blob upload found at Location: %s", e.Location)
}
// BlobUploadInvalidRangeError is returned when attempting to upload an image
// blob chunk that is out of order.
// This provides the known BlobSize and LastValidRange which can be used to
// resume the upload.
type BlobUploadInvalidRangeError struct {
Location string
LastValidRange int
BlobSize int
}
func (e *BlobUploadInvalidRangeError) Error() string {
return fmt.Sprintf(
"Invalid range provided for upload at Location: %s. Last Valid Range: %d, Blob Size: %d",
e.Location, e.LastValidRange, e.BlobSize)
}
// UnexpectedHTTPStatusError is returned when an unexpected HTTP status is // UnexpectedHTTPStatusError is returned when an unexpected HTTP status is
// returned when making a registry api call. // returned when making a registry api call.
type UnexpectedHTTPStatusError struct { type UnexpectedHTTPStatusError struct {