Merge pull request #16 from NETWAYS/refactor-strings

Refactor strings

Author: martialblog

.golangci.yml

@@ -1,5 +1,7 @@
 run:
-  deadline: 1m
+  timeout: 5m
+  skip-files:
+    - '(.+)_test\.go'
 
 linters:
   disable-all: false

check.go

@@ -9,6 +9,7 @@ import (
 	"github.com/spf13/pflag"
 	"net/url"
 	"os"
+	"strings"
 )
 
 type Config struct {
@@ -111,8 +112,10 @@ func (c *Config) Run() (rc int, output string, err error) {
 		byLocation[index] = append(byLocation[index], threat)
 	}
 
+	var sb strings.Builder
+
 	for index, list := range byLocation {
-		output += fmt.Sprintf("\n## %s\n\n", index)
+		sb.WriteString(fmt.Sprintf("\n## %s\n\n", index))
 
 		for _, threat := range list {
 			var stateText string
@@ -127,29 +130,31 @@ func (c *Config) Run() (rc int, output string, err error) {
 				stateText = "WARNING"
 			}
 
-			output += fmt.Sprintf("[%s] [%s] %s: (%s) %s (%s)\n",
+			sb.WriteString(fmt.Sprintf("[%s] [%s] %s: (%s) %s (%s)\n",
 				threat.ThreatInfo.CreatedAt.Local().Format("2006-01-02 15:04 MST"),
 				stateText,
 				threat.AgentRealtimeInfo.AgentComputerName,
 				threat.ThreatInfo.Classification,
 				threat.ThreatInfo.ThreatName,
 				threat.ThreatInfo.MitigationStatusDescription,
-			)
+			))
 		}
 	}
 
 	// Add summary on top
-	output = fmt.Sprintf("%d threats found, %d not mitigated\n", total, notMitigated) + output
+	sb.WriteString(fmt.Sprintf("%d threats found, %d not mitigated\n", total, notMitigated) + sb.String())
+
 	if c.SiteName != "" && c.ComputerName == "" {
-		output = fmt.Sprintf("site %s - ", c.SiteName) + output
+		sb.WriteString(fmt.Sprintf("site %s - ", c.SiteName) + sb.String())
 	} else if c.ComputerName != "" {
-		output = fmt.Sprintf("Computer %s - ", c.ComputerName) + output
+		sb.WriteString(fmt.Sprintf("Computer %s - ", c.ComputerName) + sb.String())
 	}
 
 	// Add perfdata
-	output += "|"
-	output += fmt.Sprintf(" threats=%d", total)
-	output += fmt.Sprintf(" threats_not_mitigated=%d", notMitigated)
+	sb.WriteString("|")
+	sb.WriteString(fmt.Sprintf(" threats=%d", total))
+	sb.WriteString(fmt.Sprintf(" threats_not_mitigated=%d", notMitigated))
+	output = sb.String()
 
 	// determine final state
 	if notMitigated > 0 {

check_test.go

@@ -0,0 +1,66 @@
+package main
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"os/exec"
+	"strings"
+	"testing"
+)
+
+func TestMain_ConnectionRefused(t *testing.T) {
+	cmd := exec.Command("go", "run", "./...")
+	out, _ := cmd.CombinedOutput()
+
+	actual := string(out)
+	expected := "UNKNOWN - url and token are required"
+
+	if !strings.Contains(actual, expected) {
+		t.Error("\nActual: ", actual, "\nExpected: ", expected)
+	}
+}
+
+type IntegrationTest struct {
+	name     string
+	server   *httptest.Server
+	args     []string
+	expected string
+}
+
+func TestMainCmd(t *testing.T) {
+	tests := []IntegrationTest{
+		{
+			name: "invalid-json",
+			server: httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte(`{"foo}`))
+			})),
+			args:     []string{"run", "./...", "-T", "test", "--url"},
+			expected: "UNKNOWN - could not decode JSON from body",
+		},
+		{
+			name: "empty-response",
+			server: httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte(`{"data" : [ {"id": "c86dc437", "name": "test1"}], "pagination": { "nextCursor": null, "totalItems": 2}}`))
+			})),
+			args:     []string{"run", "./...", "-T", "test", "--url"},
+			expected: "WARNING -",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			defer test.server.Close()
+
+			cmd := exec.Command("go", append(test.args, test.server.URL)...)
+			out, _ := cmd.CombinedOutput()
+
+			actual := string(out)
+
+			if !strings.Contains(actual, test.expected) {
+				t.Error("\nActual: ", actual, "\nExpected: ", test.expected)
+			}
+		})
+	}
+}