Added tests and updated ci process

.dockerignore

@@ -1 +1,2 @@
-vendor
+vendor
+bin

.gitignore

@@ -1,3 +1,5 @@
 sfTraefikWatchdog
 traefik-appinsights-watchdog
 debug
+bin
+**/debug.test

Dockerfile

@@ -1,5 +1,5 @@
 # build stage
-FROM golang:1.9.2-alpine AS build-env
+FROM golang:1.9.2-alpine
 ENV GOBIN /go/bin
 RUN apk add --update --no-progress openssl git wget bash gcc musl-dev && \ 
     rm -rf /var/cache/apk/* && \
@@ -15,12 +15,5 @@ RUN dep ensure --vendor-only -v
 
 COPY . /go/src/github.com/lawrencegripper/traefik-appinsights-watchdog/
 
-RUN chmod +x codechecks.sh; sync; ./codechecks.sh
-
-RUN go build -o traefik-appinsights-watchdog -v
-
-# final stage
-FROM alpine
-WORKDIR /app
-COPY --from=build-env /go/src/github.com/lawrencegripper/traefik-appinsights-watchdog/traefik-appinsights-watchdog .
-ENTRYPOINT ["./traefik-appinsights-watchdog"]
+RUN chmod +x ./codechecks.sh;
+RUN chmod +x ./build.sh

build.sh

@@ -1,2 +1,9 @@
-#/bin/sh
-docker build . -t traefik-appinsights-watchdog
+#/bin/bash
+set -e 
+set -o pipefail
+
+./codechecks.sh 
+
+echo "Building...."
+GOOS=windows go build -o traefik-appinsights-watchdog -o ./bin/traefik-appinsgihts-watchdog.exe
+GOOS=windows go build -o traefik-appinsights-watchdog -o ./bin/traefik-appinsgihts-watchdog

ci.ps1

@@ -0,0 +1,2 @@
+docker build . -t traefik-appinsights-watchdog
+docker run -it traefik-appinsights-watchdog

ci.sh

@@ -0,0 +1,3 @@
+#/bin/sh
+docker build . -t traefik-appinsights-watchdog 
+docker run -it -v $PWD/bin:/go/src/github.com/lawrencegripper/traefik-appinsights-watchdog/bin traefik-appinsights-watchdog bash -f build.sh

codechecks.sh

@@ -3,6 +3,8 @@
 set -e
 set -o pipefail
 
+go test -v ./...
+
 PKGS=$(go list ./... | grep -v '/vendor/') 
 GOFILES=$(go list -f '{{range $index, $element := .GoFiles}}{{$.Dir}}/{{$element}}{{"\n"}}{{end}}' ./... | grep -v '/vendor/') 
 echo "----------> Running gofmt"
@@ -16,6 +18,4 @@ golint -set_exit_status $PKGS
 echo "----------> Running simple"
 gosimple $PKGS 
 echo "----------> Running staticcheck" 
-staticcheck $PKGS 
-echo "----------> Running go test"
-go test -v -cover $PKGS 
+staticcheck $PKGS 

health/health.go

@@ -1,26 +1,33 @@
 package health
 
 import (
+	"context"
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"github.com/lawrencegripper/traefik-appinsights-watchdog/types"
 	"io/ioutil"
 	"net/http"
 	"time"
+
+	"github.com/lawrencegripper/traefik-appinsights-watchdog/types"
 )
 
 // StartCheck poll health endpoint
-func StartCheck(config types.Configuration, healthChannel chan<- types.StatsEvent) {
+func StartCheck(ctx context.Context, config types.Configuration, healthChannel chan<- types.StatsEvent) {
 	intervalDuration := time.Second * time.Duration(config.PollIntervalSec)
 	tlsConfig := &tls.Config{}
 	if config.AllowInvalidCert {
 		tlsConfig.InsecureSkipVerify = true
 	}
 	for {
-		ev := getStatsEvent(config.TraefikHealthEndpoint, tlsConfig)
-		healthChannel <- ev
-		time.Sleep(intervalDuration)
+		select {
+		case <-ctx.Done():
+			return
+		default:
+			ev := getStatsEvent(config.TraefikHealthEndpoint, tlsConfig)
+			healthChannel <- ev
+			time.Sleep(intervalDuration)
+		}
 	}
 }
 
@@ -60,7 +67,7 @@ func getStatsEvent(endpoint string, tlsConfig *tls.Config) types.StatsEvent {
 	}
 	var data map[string]interface{}
 	jsonErr := json.Unmarshal(body, &data)
-	if err != nil {
+	if jsonErr != nil {
 		event.IsSuccess = false
 		event.ErrorDetails = jsonErr.Error()
 		return event

health/health_test.go

@@ -0,0 +1,150 @@
+package health
+
+import (
+	"context"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/lawrencegripper/traefik-appinsights-watchdog/types"
+)
+
+func TestHealthRetreiveMetrics(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(handleHealthSuceed))
+	defer server.Close()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	config := types.Configuration{TraefikHealthEndpoint: server.URL + "/health"}
+	channel := make(chan types.StatsEvent)
+
+	go StartCheck(ctx, config, channel)
+
+	timeout := time.After(time.Second * 3)
+
+	select {
+	case statEvent := <-channel:
+		if !statEvent.IsSuccess {
+			t.Error("Stats event was a failure")
+		}
+		t.Log(statEvent)
+		return
+	case <-timeout:
+		t.Error("Timeout occurred")
+		return
+	}
+}
+
+func TestHealthRetreiveMetrics_Invalid(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(handleHealthInvalid))
+	defer server.Close()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	config := types.Configuration{TraefikHealthEndpoint: server.URL + "/health"}
+	channel := make(chan types.StatsEvent)
+
+	go StartCheck(ctx, config, channel)
+
+	timeout := time.After(time.Second * 3)
+
+	select {
+	case statEvent := <-channel:
+		if statEvent.IsSuccess {
+			t.Error("Stats expected to fail but suceeded")
+		}
+		t.Log(statEvent)
+		return
+	case <-timeout:
+		t.Error("Timeout occurred")
+		return
+	}
+}
+
+func TestHealthRetreiveMetrics_Timeout(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(handleHealthTimeout))
+	defer server.Close()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	config := types.Configuration{TraefikHealthEndpoint: server.URL + "/health"}
+	channel := make(chan types.StatsEvent)
+
+	go StartCheck(ctx, config, channel)
+
+	timeout := time.After(time.Second * 5)
+
+	select {
+	case statEvent := <-channel:
+		if statEvent.IsSuccess {
+			t.Error("Stats expected to fail but suceeded")
+		}
+		if !strings.Contains(statEvent.ErrorDetails, "net/http: request canceled (Client.Timeout exceeded while awaiting headers)") {
+			t.Error("Expected timout error")
+		}
+		t.Log(statEvent)
+		return
+	case <-timeout:
+		t.Error("Test timeout occurred")
+		return
+	}
+}
+
+func handleHealthSuceed(w http.ResponseWriter, r *http.Request) {
+	if r.URL.Path != "/health" {
+		http.NotFound(w, r)
+		return
+	}
+
+	body, err := ioutil.ReadFile("testdata/healthresponse_normal.json")
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		_, err = w.Write([]byte(err.Error()))
+		if err != nil {
+			log.Fatal(err)
+		}
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+	_, err = w.Write(body)
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+func handleHealthInvalid(w http.ResponseWriter, r *http.Request) {
+	if r.URL.Path != "/health" {
+		http.NotFound(w, r)
+		return
+	}
+
+	body, err := ioutil.ReadFile("testdata/healthresponse_invalid.json")
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		_, err = w.Write([]byte(err.Error()))
+		if err != nil {
+			log.Fatal(err)
+		}
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+	_, err = w.Write(body)
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+func handleHealthTimeout(w http.ResponseWriter, r *http.Request) {
+	if r.URL.Path != "/health" {
+		http.NotFound(w, r)
+		return
+	}
+
+	time.Sleep(time.Second * 5)
+}

health/testdata/healthresponse_invalid.json

@@ -0,0 +1 @@
+jammydodgers

health/testdata/healthresponse_normal.json

@@ -0,0 +1,31 @@
+{
+  "pid": 2458,
+  "uptime": "39m6.885931127s",
+  "uptime_sec": 2346.885931127,
+  "time": "2015-10-07 18:32:24.362238909 +0200 CEST",
+  "unixtime": 1444235544,
+  "status_code_count": {
+    "502": 1
+  },
+  "total_status_code_count": {
+    "200": 7,
+    "404": 21,
+    "502": 13
+  },
+  "count": 1,
+  "total_count": 41,
+  "total_response_time": "35.456865605s",
+  "total_response_time_sec": 35.456865605,
+  "average_response_time": "864.8016ms",
+  "average_response_time_sec": 0.8648016000000001,
+  "recent_errors": [
+    {
+      "status_code": 500,
+      "status": "Internal Server Error",
+      "method": "GET",
+      "host": "localhost",
+      "path": "/path",
+      "time": "2016-10-21T16:59:15.418495872-07:00"
+    }
+  ]
+}

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -60,9 +61,10 @@ func prettyPrintStruct(item interface{}) string {
 func startWatchdog(config types.Configuration) {
 	healthChan := make(chan types.StatsEvent)
 	client := NewTelemetryClient(config)
+	ctx := context.Background()
 
-	go routing.StartCheck(config, healthChan)
-	go health.StartCheck(config, healthChan)
+	go routing.StartCheck(ctx, config, healthChan)
+	go health.StartCheck(ctx, config, healthChan)
 
 	for {
 		event := <-healthChan

routing/routing.go

@@ -1,6 +1,7 @@
 package routing
 
 import (
+	"context"
 	"crypto/sha1"
 	"crypto/tls"
 	"fmt"
@@ -15,7 +16,7 @@ import (
 
 // StartCheck begins checking that traefik is routing information successfully by settings up a
 // dummy server and pushing requests through traefik back to itself.
-func StartCheck(config types.Configuration, healthChannel chan<- types.StatsEvent) {
+func StartCheck(ctx context.Context, config types.Configuration, healthChannel chan<- types.StatsEvent) {
 	context := RequestContext{
 		Port:              config.WatchdogTestServerPort,
 		FabricURI:         config.TraefikBackendName,
@@ -32,10 +33,15 @@ func StartCheck(config types.Configuration, healthChannel chan<- types.StatsEven
 	intervalDuration := time.Second * time.Duration(config.PollIntervalSec)
 	go context.runServer()
 	for {
-		context.StartTime = time.Now()
-		context.Nonce = uuid.New().String()
-		healthChannel <- context.makeRequest(tlsConfig)
-		time.Sleep(intervalDuration)
+		select {
+		case <-ctx.Done():
+			return
+		default:
+			context.StartTime = time.Now()
+			context.Nonce = uuid.New().String()
+			healthChannel <- context.makeRequest(tlsConfig)
+			time.Sleep(intervalDuration)
+		}
 	}
 }