Improve cx status error message if resource not found

cortexlabs · Feb 12, 2019 · d93b9b5 · d93b9b5
1 parent 4197d8d
commit d93b9b5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/cli/cmd/get.go b/cli/cmd/get.go
@@ -76,8 +76,8 @@ func runGet(cmd *cobra.Command, args []string) (string, error) {
 		}
 
 		if _, err = resourcesRes.Context.VisibleResourceByName(resourceNameOrType); err != nil {
-			if rerr, ok := err.(resource.ResourceError); ok && rerr.Kind == resource.ErrNotFound {
-				return "", errors.New(s.ErrUndefinedNameOrType(resourceNameOrType))
+			if rerr, ok := err.(resource.ResourceError); ok && rerr.Kind == resource.ErrNameNotFound {
+				return "", resource.ErrorNameOrTypeNotFound(resourceNameOrType)
 			}
 			return "", err
 		}

diff --git a/pkg/api/context/context.go b/pkg/api/context/context.go
@@ -241,7 +241,7 @@ func (ctx *Context) VisibleResourcesByName(name string) []ComputedResource {
 func (ctx *Context) VisibleResourceByName(name string) (ComputedResource, error) {
 	resources := ctx.VisibleResourcesByName(name)
 	if len(resources) == 0 {
-		return nil, resource.ErrorNotFound(name, resource.UnknownType)
+		return nil, resource.ErrorNameNotFound(name)
 	}
 	if len(resources) > 1 {
 		validStrs := make([]string, len(resources))

diff --git a/pkg/api/resource/errors.go b/pkg/api/resource/errors.go
@@ -28,6 +28,8 @@ const (
 	ErrUnknown ErrorKind = iota
 	ErrUnknownKind
 	ErrNotFound
+	ErrNameNotFound
+	ErrNameOrTypeNotFound
 	ErrInvalidType
 )
 
@@ -36,6 +38,8 @@ var (
 		"err_unknown",
 		"err_unknown_kind",
 		"err_not_found",
+		"err_name_not_found",
+		"err_name_or_type_not_found",
 		"err_invalid_type",
 	}
 )
@@ -87,6 +91,20 @@ func ErrorNotFound(name string, resourceType Type) error {
 	}
 }
 
+func ErrorNameNotFound(name string) error {
+	return ResourceError{
+		Kind:    ErrNameNotFound,
+		message: fmt.Sprintf("resource name %s not found", s.UserStr(name)),
+	}
+}
+
+func ErrorNameOrTypeNotFound(nameOrType string) error {
+	return ResourceError{
+		Kind:    ErrNameOrTypeNotFound,
+		message: fmt.Sprintf("resource name or type %s not found", s.UserStr(nameOrType)),
+	}
+}
+
 func ErrorInvalidType(invalid string) error {
 	return ResourceError{
 		Kind:    ErrInvalidType,