github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-04 02:16:56 +00:00
Code Issues Projects Releases Wiki Activity

proxy: Uncapitalize all errors

Browse Source 
By Go convention.

Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
Colin Walters 2021-11-10 08:49:59 -05:00
parent e9535f868b
commit 05a2ed4921
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/skopeo/proxy.go
View File

@ -201,14 +201,14 @@ func (h *proxyHandler) OpenImage(args []interface{}) (replyBuf, error) {
var ret replyBuf var ret replyBuf
if h.sysctx == nil { if h.sysctx == nil {
return ret, fmt.Errorf("Must invoke Initialize") return ret, fmt.Errorf("client error: must invoke Initialize")
} }
if len(args) != 1 { if len(args) != 1 {
return ret, fmt.Errorf("invalid request, expecting one argument") return ret, fmt.Errorf("invalid request, expecting one argument")
} }
imageref, ok := args[0].(string) imageref, ok := args[0].(string)
if !ok { if !ok {
return ret, fmt.Errorf("Expecting string imageref, not %T", args[0]) return ret, fmt.Errorf("expecting string imageref, not %T", args[0])
} }
imgRef, err := alltransports.ParseImageName(imageref) imgRef, err := alltransports.ParseImageName(imageref)
@ -237,7 +237,7 @@ func (h *proxyHandler) CloseImage(args []interface{}) (replyBuf, error) {
var ret replyBuf var ret replyBuf
if h.sysctx == nil { if h.sysctx == nil {
return ret, fmt.Errorf("Must invoke Initialize") return ret, fmt.Errorf("client error: must invoke Initialize")
} }
if len(args) != 1 { if len(args) != 1 {
return ret, fmt.Errorf("invalid request, expecting one argument") return ret, fmt.Errorf("invalid request, expecting one argument")
@ -255,7 +255,7 @@ func (h *proxyHandler) CloseImage(args []interface{}) (replyBuf, error) {
func parseImageID(v interface{}) (uint32, error) { func parseImageID(v interface{}) (uint32, error) {
imgidf, ok := v.(float64) imgidf, ok := v.(float64)
if !ok { if !ok {
return 0, fmt.Errorf("Expecting integer imageid, not %T", v) return 0, fmt.Errorf("expecting integer imageid, not %T", v)
} }
return uint32(imgidf), nil return uint32(imgidf), nil
} }
@ -264,10 +264,10 @@ func parseImageID(v interface{}) (uint32, error) {
func parseUint64(v interface{}) (uint64, error) { func parseUint64(v interface{}) (uint64, error) {
f, ok := v.(float64) f, ok := v.(float64)
if !ok { if !ok {
return 0, fmt.Errorf("Expecting numeric, not %T", v) return 0, fmt.Errorf("expecting numeric, not %T", v)
} }
if f > maxJSONFloat { if f > maxJSONFloat {
return 0, fmt.Errorf("Out of range integer for numeric %f", f) return 0, fmt.Errorf("out of range integer for numeric %f", f)
} }
return uint64(f), nil return uint64(f), nil
} }
@ -279,7 +279,7 @@ func (h *proxyHandler) parseImageFromID(v interface{}) (*openImage, error) {
} }
imgref, ok := h.images[imgid] imgref, ok := h.images[imgid]
if !ok { if !ok {
return nil, fmt.Errorf("No image %v", imgid) return nil, fmt.Errorf("no image %v", imgid)
} }
return imgref, nil return imgref, nil
} }
@ -368,7 +368,7 @@ func (h *proxyHandler) GetManifest(args []interface{}) (replyBuf, error) {
var ret replyBuf var ret replyBuf
if h.sysctx == nil { if h.sysctx == nil {
return ret, fmt.Errorf("Must invoke Initialize") return ret, fmt.Errorf("client error: must invoke Initialize")
} }
if len(args) != 1 { if len(args) != 1 {
return ret, fmt.Errorf("invalid request, expecting one argument") return ret, fmt.Errorf("invalid request, expecting one argument")
@ -397,9 +397,9 @@ func (h *proxyHandler) GetManifest(args []interface{}) (replyBuf, error) {
break break
// Explicitly reject e.g. docker schema 1 type with a "legacy" note // Explicitly reject e.g. docker schema 1 type with a "legacy" note
case manifest.DockerV2Schema1MediaType, manifest.DockerV2Schema1SignedMediaType: case manifest.DockerV2Schema1MediaType, manifest.DockerV2Schema1SignedMediaType:
return ret, fmt.Errorf("Unsupported legacy manifest MIME type: %s", manifestType) return ret, fmt.Errorf("unsupported legacy manifest MIME type: %s", manifestType)
default: default:
return ret, fmt.Errorf("Unsupported manifest MIME type: %s", manifestType) return ret, fmt.Errorf("unsupported manifest MIME type: %s", manifestType)
} }
// We always return the original digest, as that's what clients need to do pull-by-digest // We always return the original digest, as that's what clients need to do pull-by-digest
@ -438,7 +438,7 @@ func (h *proxyHandler) GetConfig(args []interface{}) (replyBuf, error) {
var ret replyBuf var ret replyBuf
if h.sysctx == nil { if h.sysctx == nil {
return ret, fmt.Errorf("Must invoke Initialize") return ret, fmt.Errorf("client error: must invoke Initialize")
} }
if len(args) != 1 { if len(args) != 1 {
return ret, fmt.Errorf("invalid request, expecting: [imgid]") return ret, fmt.Errorf("invalid request, expecting: [imgid]")
@ -474,7 +474,7 @@ func (h *proxyHandler) GetBlob(args []interface{}) (replyBuf, error) {
var ret replyBuf var ret replyBuf
if h.sysctx == nil { if h.sysctx == nil {
return ret, fmt.Errorf("Must invoke Initialize") return ret, fmt.Errorf("client error: must invoke Initialize")
} }
if len(args) != 3 { if len(args) != 3 {
return ret, fmt.Errorf("found %d args, expecting (imgid, digest, size)", len(args)) return ret, fmt.Errorf("found %d args, expecting (imgid, digest, size)", len(args))
@ -517,7 +517,7 @@ func (h *proxyHandler) GetBlob(args []interface{}) (replyBuf, error) {
return return
} }
if n != int64(size) { if n != int64(size) {
f.err = fmt.Errorf("Expected %d bytes in blob, got %d", size, n) f.err = fmt.Errorf("expected %d bytes in blob, got %d", size, n)
} }
if !verifier.Verified() { if !verifier.Verified() {
f.err = fmt.Errorf("corrupted blob, expecting %s", d.String()) f.err = fmt.Errorf("corrupted blob, expecting %s", d.String())