From 94a1f3c41f997d4155a1edab647669051d19fb07 Mon Sep 17 00:00:00 2001 From: Lee Briggs Date: Thu, 11 Jan 2018 10:01:58 -0800 Subject: [PATCH] Lint all code for golint tests --- cmd/common.go | 2 +- cmd/database.go | 2 +- cmd/root.go | 4 ++-- cmd/util.go | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cmd/common.go b/cmd/common.go index c552f86..608195c 100644 --- a/cmd/common.go +++ b/cmd/common.go @@ -107,7 +107,7 @@ func runChecks(t check.NodeType) { fmt.Println(string(out)) } else { // if we want to store in PostgreSQL, convert to JSON and save it - if (summary.Fail > 0 || summary.Warn > 0 || summary.Pass > 0) && pgSql { + if (summary.Fail > 0 || summary.Warn > 0 || summary.Pass > 0) && pgSQL { out, err := controls.JSON() if err != nil { exitWithError(fmt.Errorf("failed to output in JSON format: %v", err)) diff --git a/cmd/database.go b/cmd/database.go index 46668ae..dbbbb94 100644 --- a/cmd/database.go +++ b/cmd/database.go @@ -7,7 +7,7 @@ import ( "github.com/golang/glog" "github.com/jinzhu/gorm" - _ "github.com/jinzhu/gorm/dialects/postgres" + _ "github.com/jinzhu/gorm/dialects/postgres" // database packages get blank imports "github.com/spf13/viper" ) diff --git a/cmd/root.go b/cmd/root.go index 3c80f5d..76d871a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -30,7 +30,7 @@ var ( defaultKubeVersion = "1.6" cfgFile string jsonFmt bool - pgSql bool + pgSQL bool checkList string groupList string masterFile string @@ -61,7 +61,7 @@ func init() { cobra.OnInitialize(initConfig) RootCmd.PersistentFlags().BoolVar(&jsonFmt, "json", false, "Prints the results as JSON") - RootCmd.PersistentFlags().BoolVar(&pgSql, "pgsql", false, "Save the results to PostgreSQL") + RootCmd.PersistentFlags().BoolVar(&pgSQL, "pgsql", false, "Save the results to PostgreSQL") RootCmd.PersistentFlags().StringVarP( &checkList, "check", diff --git a/cmd/util.go b/cmd/util.go index f2c6b29..d1c14fd 100644 --- a/cmd/util.go +++ b/cmd/util.go @@ -196,9 +196,8 @@ func findExecutable(candidates []string) (string, error) { for _, c := range candidates { if verifyBin(c) { return c, nil - } else { - glog.V(1).Info(fmt.Sprintf("executable '%s' not running", c)) } + glog.V(1).Info(fmt.Sprintf("executable '%s' not running", c)) } return "", fmt.Errorf("no candidates running")