summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrini Brahmaroutu <srbrahma@us.ibm.com>2015-09-23 00:17:46 +0000
committerSrini Brahmaroutu <srbrahma@us.ibm.com>2015-09-23 17:03:37 +0000
commitda0ca83377db0228db82b7be4096b34e3ebfb114 (patch)
tree80b0b60c49b12c7d0f372b8f7547a5f742ab1022
parent9dc0973655bba2250b906bc8b316d87af809a15e (diff)
downloaddocker-da0ca83377db0228db82b7be4096b34e3ebfb114.tar.gz
Adding error codes to image package
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
-rw-r--r--errors/image.go20
-rw-r--r--image/image.go4
2 files changed, 22 insertions, 2 deletions
diff --git a/errors/image.go b/errors/image.go
new file mode 100644
index 0000000000..04efe6fcba
--- /dev/null
+++ b/errors/image.go
@@ -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,
+ })
+)
diff --git a/image/image.go b/image/image.go
index a405b538fb..e069262eac 100644
--- a/image/image.go
+++ b/image/image.go
@@ -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
}