From 9fc13ca02e80ea4e6cee1e5cd41e12c59e26d559 Mon Sep 17 00:00:00 2001
From: Roberto Rojas <robertojrojas@gmail.com>
Date: Fri, 13 Dec 2019 11:04:58 -0500
Subject: [PATCH] Fixes Issue #538 (#539)

* Adds openshift to autodetect node type

* detect okd node units

* OCP fixes
---
 check/check.go | 17 ++++++++++++-----
 check/test.go  |  2 +-
 cmd/common.go  |  4 ++--
 cmd/run.go     |  4 ++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/check/check.go b/check/check.go
index 23e8c76..b501ad4 100644
--- a/check/check.go
+++ b/check/check.go
@@ -171,7 +171,6 @@ func (c *Check) run() State {
 		c.State = PASS
 		c.ActualValue = finalOutput.actualResult
 		c.ExpectedResult = finalOutput.ExpectedResult
-		glog.V(3).Infof("Check.ID: %s Command: %q TestResult: %t Score: %q \n", c.ID, lastCommand, finalOutput.testResult, c.State)
 	} else {
 		if c.Scored {
 			c.State = FAIL
@@ -180,7 +179,9 @@ func (c *Check) run() State {
 		}
 	}
 
-	if finalOutput == nil {
+	if finalOutput != nil {
+		glog.V(3).Infof("Check.ID: %s Command: %q TestResult: %t State: %q \n", c.ID, lastCommand, finalOutput.testResult, c.State)
+	} else {
 		glog.V(3).Infof("Check.ID: %s Command: %q TestResult: <<EMPTY>> \n", c.ID, lastCommand)
 	}
 
@@ -242,8 +243,7 @@ func isShellCommand(s string) bool {
 
 	out, err := cmd.Output()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", err)
-		os.Exit(1)
+		exitWithError(fmt.Errorf("failed to check if command: %q is valid %v", s, err))
 	}
 
 	if strings.Contains(string(out), s) {
@@ -331,6 +331,13 @@ func runExecCommands(audit string, commands []*exec.Cmd, out *bytes.Buffer) (Sta
 		i++
 	}
 
-	glog.V(3).Infof("Command %q - Output:\n\n %s\n", audit, out.String())
+	glog.V(3).Infof("Command %q - Output:\n\n %q\n - Error Messages:%q \n", audit, out.String(), errmsgs)
 	return "", errmsgs
 }
+
+func exitWithError(err error) {
+	fmt.Fprintf(os.Stderr, "\n%v\n", err)
+	// flush before exit non-zero
+	glog.Flush()
+	os.Exit(1)
+}
diff --git a/check/test.go b/check/test.go
index b947fe5..be068b3 100644
--- a/check/test.go
+++ b/check/test.go
@@ -165,7 +165,7 @@ func compareOp(tCompareOp string, flagVal string, tCompareValue string) (string,
 	case "gt", "gte", "lt", "lte":
 		a, b, err := toNumeric(flagVal, tCompareValue)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "%v\n", err)
+			fmt.Fprintf(os.Stderr, "Not numeric value - flag: %q - compareValue: %q %v\n", flagVal, tCompareValue, err)
 			os.Exit(1)
 		}
 		switch tCompareOp {
diff --git a/cmd/common.go b/cmd/common.go
index ec0601f..b2a29f4 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -90,7 +90,7 @@ func runChecks(nodetype check.NodeType, testYamlFile string) {
 
 	// Checks that the executables we need for the section are running.
 	if err != nil {
-		exitWithError(err)
+		exitWithError(fmt.Errorf("failed to get a set of executables needed for tests: %v", err))
 	}
 
 	confmap := getFiles(typeConf, "config")
@@ -229,7 +229,7 @@ func loadConfig(nodetype check.NodeType) string {
 
 	benchmarkVersion, err := getBenchmarkVersion(kubeVersion, benchmarkVersion, viper.GetViper())
 	if err != nil {
-		exitWithError(err)
+		exitWithError(fmt.Errorf("failed to get benchMark version: %v", err))
 	}
 
 	path, err := getConfigFilePath(benchmarkVersion, file)
diff --git a/cmd/run.go b/cmd/run.go
index b95defa..4b7e3d0 100644
--- a/cmd/run.go
+++ b/cmd/run.go
@@ -29,12 +29,12 @@ var runCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		targets, err := cmd.Flags().GetStringSlice("targets")
 		if err != nil {
-			exitWithError(err)
+			exitWithError(fmt.Errorf("unable to get `targets` from command line :%v", err))
 		}
 
 		benchmarkVersion, err := getBenchmarkVersion(kubeVersion, benchmarkVersion, viper.GetViper())
 		if err != nil {
-			exitWithError(err)
+			exitWithError(fmt.Errorf("unable to get benchmark version. error: %v", err))
 		}
 
 		glog.V(2).Infof("Checking targets %v for %v", targets, benchmarkVersion)