Merge pull request #281 from mboersma/update-go-dev

chore(Dockerfile): update go-dev to v0.21.0

Author: mboersma

Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/deis/go-dev:0.19.0
+FROM quay.io/deis/go-dev:v0.21.0
 # This Dockerfile is used to bundle the source and all dependencies into an image for testing.
 
 RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk-jessie main" \

cmd/auth.go

@@ -43,6 +43,10 @@ func (d *DeisCmd) Register(controller string, username string, password string,
 	if password == "" {
 		d.Print("password: ")
 		password, err = readPassword()
+		if err != nil {
+			return err
+		}
+
 		d.Printf("\npassword (confirm): ")
 		passwordConfirm, err := readPassword()
 		d.Println()
@@ -164,6 +168,10 @@ func (d *DeisCmd) Passwd(username, password, newPassword string) error {
 	if newPassword == "" {
 		d.Print("new password: ")
 		newPassword, err = readPassword()
+		if err != nil {
+			return err
+		}
+
 		d.Printf("\nnew password (confirm): ")
 		passwordConfirm, err := readPassword()
 

cmd/git.go

@@ -12,6 +12,9 @@ const remoteDeletionMsg = "Git remotes for app %s removed.\n"
 // GitRemote creates a git remote for a deis app.
 func (d *DeisCmd) GitRemote(appID, remote string, force bool) error {
 	s, appID, err := load(d.ConfigFile, appID)
+	if err != nil {
+		return err
+	}
 
 	remoteURL, err := git.RemoteURL(git.DefaultCmd, remote)
 

cmd/ps.go

@@ -118,7 +118,7 @@ func printProcesses(appID string, input []api.Pods, wOut io.Writer) {
 }
 
 func parseType(target string, appID string) (string, string) {
-	psType, psName := "", ""
+	var psType, psName string
 
 	if strings.Contains(target, "-") {
 		replaced := strings.Replace(target, appID+"-", "", 1)

cmd/utils_test.go

@@ -29,6 +29,7 @@ func TestLoad(t *testing.T) {
 	}
 
 	filename, err = config.Save(filename)
+	assert.NoErr(t, err)
 
 	_, appID, err := load(filename, "test")
 	assert.NoErr(t, err)

parser/labels.go

@@ -64,7 +64,7 @@ func labelsSet(argv []string, cmdr cmd.Commander) error {
 Sets labels for an application.
 
 A label is a key/value pair used to label an application. This label is a general information for deis user.
-Mostly used for administraton/maintenance information, note for application. This information isn't send to scheduler.
+Mostly used for administration/maintenance information, note for application. This information isn't send to scheduler.
 
 Usage: deis labels:set [options] <key>=<value>...
 

parser/releases.go

@@ -86,6 +86,9 @@ Options:
 `
 
 	args, err := docopt.Parse(usage, argv, true, "", false, true)
+	if err != nil {
+		return err
+	}
 
 	version, err := versionFromString(args["<version>"].(string))
 
@@ -114,6 +117,9 @@ Options:
 `
 
 	args, err := docopt.Parse(usage, argv, true, "", false, true)
+	if err != nil {
+		return err
+	}
 
 	var version int
 

pkg/git/git_test.go

@@ -147,6 +147,7 @@ deis	ssh://git@deis-builder.example.com:2222/test.git (push)
 		assert.Equal(t, cmd, []string{"remote", "-v"}, "args")
 		return "", errors.New("test error")
 	}, "deis.test.com")
+	assert.NoErr(t, err)
 	wd, err := os.Getwd()
 	assert.NoErr(t, err)
 	assert.Equal(t, app, filepath.Base(wd), "app")

pkg/logging/log_unix.go

@@ -43,9 +43,8 @@ func chooseColor(input string) string {
 
 // PrintLog prints a log line with a color matched to its category.
 func PrintLog(out io.Writer, log string) {
-	category := "unknown"
 	parts := strings.Split(strings.Split(log, " -- ")[0], " ")
-	category = parts[0]
+	category := parts[0]
 	colorVars := map[string]string{
 		"Color": chooseColor(category),
 		"Log":   log,