From 6219286cae508aab1e4a30a6e58bcc380d6862a7 Mon Sep 17 00:00:00 2001 From: Dan Lorenc Date: Tue, 6 Sep 2016 20:47:12 -0700 Subject: [PATCH] Cleanup some "go vet" and "go lint" errors. We should automate these checks... --- cmd/minikube/cmd/config/config.go | 9 ++++----- cmd/minikube/cmd/config/util.go | 3 +-- cmd/minikube/cmd/dashboard.go | 2 +- cmd/minikube/cmd/env.go | 2 +- cmd/minikube/cmd/service.go | 2 +- pkg/minikube/cluster/cluster_test.go | 8 ++++---- .../kubernetes_versions/kubernetes_versions_test.go | 4 ++-- pkg/minikube/notify/notify.go | 2 +- pkg/util/utils.go | 2 +- 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go index 357f1f2b13..19f3db3ccc 100644 --- a/cmd/minikube/cmd/config/config.go +++ b/cmd/minikube/cmd/config/config.go @@ -43,7 +43,7 @@ type Setting struct { // These are all the settings that are configurable // and their validation and callback fn run on Set -var settings []Setting = []Setting{ +var settings = []Setting{ { name: "vm-driver", set: SetString, @@ -102,7 +102,7 @@ var ConfigCmd = &cobra.Command{ }, } -// Reads in the JSON minikube config +// ReadConfig reads in the JSON minikube config func ReadConfig() (MinikubeConfig, error) { f, err := os.Open(constants.ConfigFile) if err != nil { @@ -111,8 +111,7 @@ func ReadConfig() (MinikubeConfig, error) { } return nil, fmt.Errorf("Could not open file %s: %s", constants.ConfigFile, err) } - var m MinikubeConfig - m, err = decode(f) + m, err := decode(f) if err != nil { return nil, fmt.Errorf("Could not decode config %s: %s", constants.ConfigFile, err) } @@ -120,7 +119,7 @@ func ReadConfig() (MinikubeConfig, error) { return m, nil } -// Writes a minikube config to the JSON file +// WriteConfig writes a minikube config to the JSON file func WriteConfig(m MinikubeConfig) error { f, err := os.Create(constants.ConfigFile) if err != nil { diff --git a/cmd/minikube/cmd/config/util.go b/cmd/minikube/cmd/config/util.go index 4728abaa71..2981f02417 100644 --- a/cmd/minikube/cmd/config/util.go +++ b/cmd/minikube/cmd/config/util.go @@ -32,9 +32,8 @@ func run(name string, value string, fns []setFn) error { } if len(errors) > 0 { return fmt.Errorf("%v", errors) - } else { - return nil } + return nil } func findSetting(name string) (Setting, error) { diff --git a/cmd/minikube/cmd/dashboard.go b/cmd/minikube/cmd/dashboard.go index 262ff0e0a3..9253b0faad 100644 --- a/cmd/minikube/cmd/dashboard.go +++ b/cmd/minikube/cmd/dashboard.go @@ -48,7 +48,7 @@ var dashboardCmd = &cobra.Command{ service := "kubernetes-dashboard" if err := commonutil.RetryAfter(20, func() error { return CheckService(namespace, service) }, 6*time.Second); err != nil { - fmt.Fprintln(os.Stderr, "Could not find finalized endpoint being pointed to by %s: %s", service, err) + fmt.Fprintf(os.Stderr, "Could not find finalized endpoint being pointed to by %s: %s\n", service, err) os.Exit(1) } diff --git a/cmd/minikube/cmd/env.go b/cmd/minikube/cmd/env.go index 624e789623..8696b9ae15 100644 --- a/cmd/minikube/cmd/env.go +++ b/cmd/minikube/cmd/env.go @@ -104,7 +104,7 @@ func shellCfgSet(api libmachine.API) (*ShellConfig, error) { host, err := api.Load(constants.MachineName) if err != nil { - return nil, fmt.Errorf("Error getting IP: ", err) + return nil, fmt.Errorf("Error getting IP: %s", err) } ip, err := host.Driver.GetIP() diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go index 1cd0568134..bac32c8d1d 100644 --- a/cmd/minikube/cmd/service.go +++ b/cmd/minikube/cmd/service.go @@ -55,7 +55,7 @@ var serviceCmd = &cobra.Command{ cluster.EnsureMinikubeRunningOrExit(api) if err := commonutil.RetryAfter(20, func() error { return CheckService(namespace, service) }, 6*time.Second); err != nil { - fmt.Fprintln(os.Stderr, "Could not find finalized endpoint being pointed to by %s: %s", service, err) + fmt.Fprintf(os.Stderr, "Could not find finalized endpoint being pointed to by %s: %s\n", service, err) os.Exit(1) } diff --git a/pkg/minikube/cluster/cluster_test.go b/pkg/minikube/cluster/cluster_test.go index ccc4ea15c8..d5dc270ebf 100644 --- a/pkg/minikube/cluster/cluster_test.go +++ b/pkg/minikube/cluster/cluster_test.go @@ -94,7 +94,7 @@ func TestStartCluster(t *testing.T) { for _, cmd := range []string{stopCommand, GetStartCommand(kubernetesConfig)} { if _, ok := h.Commands[cmd]; !ok { - t.Fatalf("Expected command not run: %s. Commands run: %s", cmd, h.Commands) + t.Fatalf("Expected command not run: %s. Commands run: %v", cmd, h.Commands) } } } @@ -298,7 +298,7 @@ func TestDeleteHostMultipleErrors(t *testing.T) { expectedErrors := []string{"Error removing " + constants.MachineName, "Error deleting machine"} for _, expectedError := range expectedErrors { if !strings.Contains(err.Error(), expectedError) { - t.Fatalf("Error %s expected to contain: %s. ", err) + t.Fatalf("Error %s expected to contain: %s.", err, expectedError) } } } @@ -477,11 +477,11 @@ func TestGetDashboardURL(t *testing.T) { port, err := getServicePortFromServiceGetter(mockServiceGetter, "kubernetes-dashboard") if err != nil { - t.Fatalf("Error getting dashboard port from api: Error: ", err) + t.Fatalf("Error getting dashboard port from api: Error: %s", err) } expected := 1234 if port != expected { - t.Fatalf("Error getting dashboard port from api: Expected: %s, Got: %s", port, expected) + t.Fatalf("Error getting dashboard port from api: Expected: %d, Got: %d", port, expected) } } diff --git a/pkg/minikube/kubernetes_versions/kubernetes_versions_test.go b/pkg/minikube/kubernetes_versions/kubernetes_versions_test.go index 8eb82c652e..3878321a9b 100644 --- a/pkg/minikube/kubernetes_versions/kubernetes_versions_test.go +++ b/pkg/minikube/kubernetes_versions/kubernetes_versions_test.go @@ -54,7 +54,7 @@ func TestGetK8sVersionsFromURLCorrect(t *testing.T) { } if len(k8sVersions) != 2 { // TODO(aprindle) change to len(handler....) //Check values here as well? Write eq method? - t.Fatalf("Expected two kubernetes versions from URL to be %s, it was instead %s", 2, len(k8sVersions)) + t.Fatalf("Expected %d kubernetes versions from URL. Instead there were: %d", 2, len(k8sVersions)) } } @@ -115,7 +115,7 @@ func TestPrintKubernetesVersions(t *testing.T) { PrintKubernetesVersions(&outputBuffer, server.URL) if len(outputBuffer.String()) == 0 { - t.Fatalf("Expected PrintKubernetesVersion to output text as %s versions were served from URL but output was [%s]", + t.Fatalf("Expected PrintKubernetesVersion to output text as %d versions were served from URL but output was [%s]", 2, outputBuffer.String()) //TODO(aprindle) change the 2 } } diff --git a/pkg/minikube/notify/notify.go b/pkg/minikube/notify/notify.go index d28b1b1ca3..9be9a7338c 100644 --- a/pkg/minikube/notify/notify.go +++ b/pkg/minikube/notify/notify.go @@ -113,7 +113,7 @@ func getLatestVersionFromURL(url string) (semver.Version, error) { func writeTimeToFile(path string, inputTime time.Time) error { err := ioutil.WriteFile(path, []byte(inputTime.Format(timeLayout)), 0644) if err != nil { - return fmt.Errorf("Error writing current update time to file: ", err) + return fmt.Errorf("Error writing current update time to file: %s", err) } return nil } diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 9213332898..545a487cdd 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -52,7 +52,7 @@ func Until(fn func() error, w io.Writer, name string, sleep time.Duration, done } func Pad(str string) string { - return fmt.Sprint("\n%s\n", str) + return fmt.Sprintf("\n%s\n", str) } // If the file represented by path exists and