Merge pull request #468 from Comcast/null-errorMessage

Null error message

cmd/kuberhealthy/kuberhealthy.go

@@ -980,6 +980,12 @@ func (k *Kuberhealthy) externalCheckReportHandler(w http.ResponseWriter, r *http
 	}
 	log.Debugf("Check report after unmarshal: +%v\n", state)
 
+	// if nill error is passed turn it into a slice of string
+	if state.Errors == nil {
+		log.Debugln("Saw nil error slice come through and turned into slice")
+		state.Errors = []string{}
+	}
+
 	// ensure that if ok is set to false, then an error is provided
 	if !state.OK {
 		if len(state.Errors) == 0 {

cmd/kuberhealthy/util_test.go

@@ -31,7 +31,7 @@ func newExternalTestCheck(c *kubernetes.Clientset) (*external.Checker, error) {
 // spec file for pods
 func newTestCheckFromSpec(c *kubernetes.Clientset, spec *khcheckcrd.KuberhealthyCheck) *external.Checker {
 	// create a new checker and insert this pod spec
-	checker := external.New(c, spec) // external checker does not ever return an error so we drop it
+	checker := external.New(c, spec, khCheckClient, khStateClient, externalCheckReportingURL) // external checker does not ever return an error so we drop it
 	checker.Debug = true
 	return checker
 }

cmd/kuberhealthy/webserver_test.go

@@ -13,6 +13,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
@@ -46,6 +47,9 @@ func makeTestKuberhealthy(t *testing.T) *Kuberhealthy {
 
 // TestWebServer tests the web server status page functionality
 func TestWebServer(t *testing.T) {
+
+	ctx, _ := context.WithCancel(context.Background())
+
 	if testing.Short() {
 		t.Skip()
 	}
@@ -60,7 +64,7 @@ func TestWebServer(t *testing.T) {
 	kh.AddCheck(fc)
 
 	t.Log("Starting Kuberhealthy checks")
-	go kh.Start()
+	go kh.Start(ctx)
 	// give the checker time to make CRDs
 	t.Log("Waiting for checks to run")
 	time.Sleep(time.Second * 2)
@@ -99,6 +103,8 @@ func TestWebServer(t *testing.T) {
 // TestWebServerNotOK tests the web server status when things are not OK
 func TestWebServerNotOK(t *testing.T) {
 
+	ctx, _ := context.WithCancel(context.Background())
+
 	// create a new kuberhealthy
 	kh := makeTestKuberhealthy(t)
 
@@ -110,7 +116,7 @@ func TestWebServerNotOK(t *testing.T) {
 	kh.AddCheck(fc)
 
 	// run the checker for enough time to make and update CRD entries, then stop it
-	go kh.Start()
+	go kh.Start(ctx)
 	time.Sleep(time.Second * 5)
 	kh.StopChecks()