Merge pull request #21 from ReconfigureIO/fix/deployment-not-found-error

interpret the error returned from request.go

Author: Max Siegieda

client.go

@@ -51,7 +51,7 @@ var (
 	errProjectNotCreated      = errors.New("No projects found. Run 'reco project create' to create one")
 	errProjectNotFound        = errors.New("Project not found. Run 'reco project list' to view all your available projects")
 	errNetworkError           = errors.New("Network error")
-	errNotFound               = errors.New("Not found")
+	ErrNotFound               = errors.New("Not found")
 	errInvalidToken           = errors.New("The token is invalid")
 	errUnknownError           = errors.New("Unknown error occurred")
 	errBadResponse            = errors.New("Bad response from server")

cmd/deployment.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"reflect"
@@ -17,6 +18,8 @@ var (
 		wait: "true",
 	}
 
+	errorDeploymentNotFound = errors.New("No deployment with that ID could be found. Run 'reco deploy list' to view available deployments")
+
 	deploymentCmdStart = &cobra.Command{
 		Use:     "run [flags] <build_ID> <your_cmd> -- [args]",
 		Aliases: []string{"r", "start", "starts"},
@@ -64,7 +67,7 @@ your command. The two forms are equivalent:
 		Run: func(cmd *cobra.Command, args []string) {
 			l := reflect.ValueOf(tool).MethodByName("Deployment").Call(nil)[0].Interface()
 			if err := l.(reco.Job).Log(args[0], os.Stdout); err != nil {
-				exitWithError(err)
+				exitWithError(interpretErrorDeployment(err))
 			}
 		},
 	}
@@ -84,7 +87,7 @@ your command. The two forms are equivalent:
 		Run: func(cmd *cobra.Command, args []string) {
 			l := reflect.ValueOf(tool).MethodByName("Deployment").Call(nil)[0].Interface()
 			if err := l.(reco.Job).Stop(args[0]); err != nil {
-				exitWithError(err)
+				exitWithError(interpretErrorDeployment(err))
 			}
 			logger.Std.Printf("deployment stopped successfully")
 		},
@@ -125,7 +128,7 @@ func startDeployment(cmd *cobra.Command, args []string) {
 	}
 	out, err := tool.Deployment().Start(reco.Args{image, command, commandArgs, deploymentVars.wait})
 	if err != nil {
-		exitWithError(err)
+		exitWithError(interpretErrorDeployment(err))
 	}
 	logger.Std.Println(out)
 }
@@ -135,6 +138,15 @@ func connectDeployment(cmd *cobra.Command, args []string) {
 		exitWithError("deployment ID required")
 	}
 	if err := tool.Deployment().(reco.DeploymentProxy).Connect(args[0], true); err != nil {
-		exitWithError(err)
+		exitWithError(interpretErrorDeployment(err))
+	}
+}
+
+func interpretErrorDeployment(err error) error {
+	switch err {
+	case reco.ErrNotFound:
+		return errorDeploymentNotFound
+	default:
+		return err
 	}
 }

cmd/graph.go

@@ -10,6 +10,8 @@ import (
 	"github.com/ReconfigureIO/reco/logger"
 )
 
+var errorGraphNotFound = errors.New("No graph with that ID could be found. Run 'reco graph list' to view available graphs")
+
 var graphCmd = &cobra.Command{
 	Use:     "graph",
 	Aliases: []string{"g", "graphs"},
@@ -61,7 +63,7 @@ func generateGraph(cmd *cobra.Command, args []string) {
 	}
 	id, err := tool.Graph().Generate(reco.Args{srcDir})
 	if err != nil {
-		exitWithError(err)
+		exitWithError(interpretErrorGraph(err))
 	}
 	logger.Std.Println("Graph submitted. Run 'reco graph list' to track the status of your graph")
 	logger.Std.Println("Once the graph has been completed run 'reco graph open " + id + "' to view it")
@@ -73,7 +75,7 @@ func openGraph(_ *cobra.Command, args []string) {
 	}
 	file, err := tool.Graph().Open(args[0])
 	if err != nil {
-		exitWithError(err)
+		exitWithError(interpretErrorGraph(err))
 	}
 	var cmd *exec.Cmd
 	switch runtime.GOOS {
@@ -94,10 +96,19 @@ func openGraph(_ *cobra.Command, args []string) {
 	}
 }
 
+func interpretErrorGraph(err error) error {
+	switch err {
+	case reco.ErrNotFound:
+		return errorGraphNotFound
+	default:
+		return err
+	}
+}
+
 func validGraphDir(srcDir string) bool {
 	// Do we have a main.go to graph?
 	if !hasMain(srcDir) {
 		return false
 	}
 	return true
-}
+}

deployment.go

@@ -120,7 +120,7 @@ func (p deploymentJob) List(filter M) (printer.Table, error) {
 	}
 
 	table = printer.Table{
-		Header: []string{"id", "image", "command", "status", "started", "duration"},
+		Header: []string{"deployment id", "build id", "command", "status", "started", "duration"},
 		Body:   body,
 	}
 	if allProjects {

request.go

@@ -139,7 +139,7 @@ func (p *clientRequest) Do(method string, body interface{}) (*http.Response, err
 		case 401, 403:
 			err = errAuthFailed
 		case 404:
-			err = errNotFound
+			err = ErrNotFound
 		}
 	} else if err != nil {
 		err = errNetworkError