Merge pull request #4064 from Joshua-Anderson/parser-cleanup

style(client-go): make if statements to adhere to go style guide

Author: mboersma

client-go/controller/client/auth.go

@@ -101,9 +101,7 @@ func Login(controllerURL url.URL, username string, password string, sslVerify bo
 
 // Logout from a Deis controller by deleting config file.
 func Logout() error {
-	err := deleteSettings()
-
-	if err != nil {
+	if err := deleteSettings(); err != nil {
 		return err
 	}
 

client-go/controller/client/auth_test.go

@@ -147,7 +147,9 @@ func TestRegister(t *testing.T) {
 }
 
 func TestLogin(t *testing.T) {
-	err := createTempProfile("")
+	if err := createTempProfile(""); err != nil {
+		t.Fatal(err)
+	}
 
 	handler := fakeAuthHTTPServer{}
 	server := httptest.NewServer(handler)
@@ -190,13 +192,11 @@ func TestLogin(t *testing.T) {
 }
 
 func TestLogout(t *testing.T) {
-	err := createTempProfile(sFile)
-
-	if err != nil {
+	if err := createTempProfile(sFile); err != nil {
 		t.Fatal(err)
 	}
 
-	if err = Logout(); err != nil {
+	if err := Logout(); err != nil {
 		t.Fatal(err)
 	}
 
@@ -213,13 +213,11 @@ func TestPasswd(t *testing.T) {
 	defer server.Close()
 
 	sF := fmt.Sprintf(`{"username":"t","ssl_verify":false,"controller":"%s","token":"a"}`, server.URL)
-	err := createTempProfile(sF)
-
-	if err != nil {
+	if err := createTempProfile(sF); err != nil {
 		t.Fatal(err)
 	}
 
-	if err = Passwd("test", "old", "new"); err != nil {
+	if err := Passwd("test", "old", "new"); err != nil {
 		t.Error(err)
 	}
 }
@@ -231,17 +229,15 @@ func TestCancel(t *testing.T) {
 	defer server.Close()
 
 	sF := fmt.Sprintf(`{"username":"t","ssl_verify":false,"controller":"%s","token":"a"}`, server.URL)
-	err := createTempProfile(sF)
-
-	if err != nil {
+	if err := createTempProfile(sF); err != nil {
 		t.Fatal(err)
 	}
 
-	if err = Regenerate("", true); err != nil {
+	if err := Regenerate("", true); err != nil {
 		t.Error(err)
 	}
 
-	if err = Cancel(); err != nil {
+	if err := Cancel(); err != nil {
 		t.Error(err)
 	}
 
@@ -259,21 +255,19 @@ func TestRegenerate(t *testing.T) {
 	defer server.Close()
 
 	sF := fmt.Sprintf(`{"username":"t","ssl_verify":false,"controller":"%s","token":"a"}`, server.URL)
-	err := createTempProfile(sF)
-
-	if err != nil {
+	if err := createTempProfile(sF); err != nil {
 		t.Fatal(err)
 	}
 
-	if err = Regenerate("", true); err != nil {
+	if err := Regenerate("", true); err != nil {
 		t.Error(err)
 	}
 
-	if err = Regenerate("test", false); err != nil {
+	if err := Regenerate("test", false); err != nil {
 		t.Error(err)
 	}
 
-	if err = Regenerate("", false); err != nil {
+	if err := Regenerate("", false); err != nil {
 		t.Error(err)
 	}
 

client-go/controller/client/client.go

@@ -39,9 +39,7 @@ type settingsFile struct {
 func New() (*Client, error) {
 	filename := locateSettingsFile()
 
-	_, err := os.Stat(filename)
-
-	if err != nil {
+	if _, err := os.Stat(filename); err != nil {
 		if os.IsNotExist(err) {
 			return nil, errors.New("Not logged in. Use 'deis login' or 'deis register' to get started.")
 		}

client-go/controller/client/client_test.go

@@ -32,9 +32,7 @@ func createTempProfile(contents string) error {
 }
 
 func TestLoadSave(t *testing.T) {
-	err := createTempProfile(sFile)
-
-	if err != nil {
+	if err := createTempProfile(sFile); err != nil {
 		t.Fatal(err)
 	}
 

client-go/controller/client/utils.go

@@ -21,17 +21,15 @@ func locateSettingsFile() string {
 func deleteSettings() error {
 	filename := locateSettingsFile()
 
-	_, err := os.Stat(filename)
-
-	if err != nil {
+	if _, err := os.Stat(filename); err != nil {
 		if os.IsNotExist(err) {
 			return nil
 		}
 
 		return err
 	}
 
-	if err = os.Remove(filename); err != nil {
+	if err := os.Remove(filename); err != nil {
 		return err
 	}
 

client-go/controller/client/utils_test.go

@@ -30,13 +30,11 @@ func TestChooseSettingsFileUsingProfile(t *testing.T) {
 }
 
 func TestDeleteSettings(t *testing.T) {
-	err := createTempProfile("")
-
-	if err != nil {
+	if err := createTempProfile(""); err != nil {
 		t.Fatal(err)
 	}
 
-	if err = deleteSettings(); err != nil {
+	if err := deleteSettings(); err != nil {
 		t.Fatal(err)
 	}
 

client-go/parser/apps.go

@@ -93,9 +93,7 @@ Lists applications visible to the current user.
 
 Usage: deis apps:list
 `
-	_, err := docopt.Parse(usage, argv, true, "", false, true)
-
-	if err != nil {
+	if _, err := docopt.Parse(usage, argv, true, "", false, true); err != nil {
 		return err
 	}
 

client-go/parser/auth.go

@@ -133,9 +133,7 @@ Logs out from a controller and clears the user session.
 Usage: deis auth:logout
 `
 
-	_, err := docopt.Parse(usage, argv, true, "", false, true)
-
-	if err != nil {
+	if _, err := docopt.Parse(usage, argv, true, "", false, true); err != nil {
 		return err
 	}
 
@@ -177,9 +175,7 @@ Displays the currently logged in user.
 Usage: deis auth:whoami
 `
 
-	_, err := docopt.Parse(usage, argv, true, "", false, true)
-
-	if err != nil {
+	if _, err := docopt.Parse(usage, argv, true, "", false, true); err != nil {
 		return err
 	}
 

client-go/parser/keys.go

@@ -45,9 +45,7 @@ Lists SSH keys for the logged in user.
 Usage: deis keys:list
 `
 
-	_, err := docopt.Parse(usage, argv, true, "", false, true)
-
-	if err != nil {
+	if _, err := docopt.Parse(usage, argv, true, "", false, true); err != nil {
 		return err
 	}
 

client-go/parser/users.go

@@ -40,9 +40,7 @@ Requires admin privilages.
 Usage: deis users:list
 `
 
-	_, err := docopt.Parse(usage, argv, true, "", false, true)
-
-	if err != nil {
+	if _, err := docopt.Parse(usage, argv, true, "", false, true); err != nil {
 		return err
 	}