Skip to content
Snippets Groups Projects
Unverified Commit 94a1f3c4 authored by Lee Briggs's avatar Lee Briggs
Browse files

Lint all code for golint tests

parent e7152265
Branches
Tags
No related merge requests found
...@@ -107,7 +107,7 @@ func runChecks(t check.NodeType) { ...@@ -107,7 +107,7 @@ func runChecks(t check.NodeType) {
fmt.Println(string(out)) fmt.Println(string(out))
} else { } else {
// if we want to store in PostgreSQL, convert to JSON and save it // 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() out, err := controls.JSON()
if err != nil { if err != nil {
exitWithError(fmt.Errorf("failed to output in JSON format: %v", err)) exitWithError(fmt.Errorf("failed to output in JSON format: %v", err))
......
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"github.com/jinzhu/gorm" "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" "github.com/spf13/viper"
) )
......
...@@ -30,7 +30,7 @@ var ( ...@@ -30,7 +30,7 @@ var (
defaultKubeVersion = "1.6" defaultKubeVersion = "1.6"
cfgFile string cfgFile string
jsonFmt bool jsonFmt bool
pgSql bool pgSQL bool
checkList string checkList string
groupList string groupList string
masterFile string masterFile string
...@@ -61,7 +61,7 @@ func init() { ...@@ -61,7 +61,7 @@ func init() {
cobra.OnInitialize(initConfig) cobra.OnInitialize(initConfig)
RootCmd.PersistentFlags().BoolVar(&jsonFmt, "json", false, "Prints the results as JSON") 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( RootCmd.PersistentFlags().StringVarP(
&checkList, &checkList,
"check", "check",
......
...@@ -196,9 +196,8 @@ func findExecutable(candidates []string) (string, error) { ...@@ -196,9 +196,8 @@ func findExecutable(candidates []string) (string, error) {
for _, c := range candidates { for _, c := range candidates {
if verifyBin(c) { if verifyBin(c) {
return c, nil 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") return "", fmt.Errorf("no candidates running")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment