Merge pull request #16504 from brahmaroutu/ImageErrors

Adding error codes to image package
This commit is contained in:
Tibor Vass 2015-09-23 19:15:25 -04:00
Родитель 01670bec48 da0ca83377
Коммит 793a409081
2 изменённых файлов: 22 добавлений и 2 удалений

20
errors/image.go Normal file
Просмотреть файл

@ -0,0 +1,20 @@
package errors
// This file contains all of the errors that can be generated from the
// docker/image component.
import (
"net/http"
"github.com/docker/distribution/registry/api/errcode"
)
var (
// ErrorCodeInvalidImageID is generated when image id specified is incorrectly formatted.
ErrorCodeInvalidImageID = errcode.Register(errGroup, errcode.ErrorDescriptor{
Value: "INVALIDIMAGEID",
Message: "image ID '%s' is invalid ",
Description: "The specified image id is incorrectly formatted",
HTTPStatusCode: http.StatusInternalServerError,
})
)

Просмотреть файл

@ -2,10 +2,10 @@ package image
import (
"encoding/json"
"fmt"
"regexp"
"time"
derr "github.com/docker/docker/errors"
"github.com/docker/docker/runconfig"
)
@ -53,7 +53,7 @@ func NewImgJSON(src []byte) (*Image, error) {
// ValidateID checks whether an ID string is a valid image ID.
func ValidateID(id string) error {
if ok := validHex.MatchString(id); !ok {
return fmt.Errorf("image ID '%s' is invalid", id)
return derr.ErrorCodeInvalidImageID.WithArgs(id)
}
return nil
}