Merge branch 'coverage' into 'develop'

Add Unit test for Relay package

Author: rockyluke

Diff for: .gitlab-ci.yml

@@ -4,8 +4,10 @@
 stages:
   - linter
   - build
+  - test
   - pages
 
+
 # linter
 dockerlint:
   stage: linter
@@ -21,6 +23,7 @@ golint:
   script:
     - find . -type f -name "*\.go" | grep -v 'vendor' | xargs -I{} fgt golint {}
 
+
 # build
 docker-build:
   stage: build
@@ -43,6 +46,19 @@ go-build:
     - go build -a -ldflags '-extldflags "-static"' -o influxdb-relay
 
 
+# tests
+go-tests:
+  stage: test
+  image: vpgrp/golang:latest
+  before_script:
+    - mkdir -p ${GOPATH}/src/github.com/vente-privee
+    - ln -fsv ${CI_PROJECT_DIR} ${GOPATH}/src/github.com/vente-privee/influxdb-relay
+    - go get github.com/stretchr/testify/assert
+  script:
+    - cd ${GOPATH}/src/github.com/vente-privee/influxdb-relay
+    - go test ./...
+
+
 # vpage
 pages:
   stage: pages

Diff for: main.go

@@ -17,7 +17,7 @@ const (
 
 var (
 	usage = func() {
-		fmt.Println("Please, see README for more information about InfluxDB Relay...\n")
+		fmt.Println("Please, see README for more information about InfluxDB Relay...")
 		flag.PrintDefaults()
 	}
 

Diff for: relay/http.go

@@ -10,6 +10,7 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -36,8 +37,9 @@ type HTTP struct {
 
 	backends []*httpBackend
 
-	start time.Time
-	log   bool
+	start  time.Time
+	log    bool
+	logger *log.Logger
 }
 
 type relayHandlerFunc func(h *HTTP, w http.ResponseWriter, r *http.Request)
@@ -79,6 +81,9 @@ func NewHTTP(cfg config.HTTPConfig, verbose bool) (Relay, error) {
 	h.addr = cfg.Addr
 	h.name = cfg.Name
 	h.log = verbose
+	if verbose {
+		h.logger = log.New(os.Stdout, "", 0)
+	}
 
 	h.pingResponseCode = DefaultHTTPPingResponse
 	if cfg.DefaultPingResponse != 0 {
@@ -88,7 +93,7 @@ func NewHTTP(cfg config.HTTPConfig, verbose bool) (Relay, error) {
 	h.pingResponseHeaders = make(map[string]string)
 	h.pingResponseHeaders["X-InfluxDB-Version"] = "relay"
 	if h.pingResponseCode != http.StatusNoContent {
-		h.pingResponseHeaders["Content-Lenght"] = "0"
+		h.pingResponseHeaders["Content-Length"] = "0"
 	}
 
 	h.cert = cfg.SSLCombinedPem
@@ -206,7 +211,7 @@ func jsonResponse(w http.ResponseWriter, r response) {
 	w.Header().Set("Content-Length", fmt.Sprint(len(data)))
 	w.WriteHeader(r.code)
 
-	w.Write([]byte(data))
+	_, _ = w.Write(data)
 }
 
 type poster interface {

Diff for: relay/http_handlers.go

@@ -33,7 +33,7 @@ func (h *HTTP) handlePing(w http.ResponseWriter, r *http.Request) {
 		for key, value := range h.pingResponseHeaders {
 			w.Header().Add(key, value)
 		}
-		w.WriteHeader(http.StatusNoContent)
+		w.WriteHeader(h.pingResponseCode)
 	} else {
 		jsonResponse(w, response{http.StatusMethodNotAllowed, http.StatusText(http.StatusMethodNotAllowed)})
 		return
@@ -209,7 +209,7 @@ func (h *HTTP) handleStandard(w http.ResponseWriter, r *http.Request) {
 
 				responses <- &responseData{}
 			} else {
-				if resp.StatusCode / 100 == 5 {
+				if resp.StatusCode/100 == 5 {
 					log.Printf("5xx response for relay %q backend %q: %v", h.Name(), b.name, resp.StatusCode)
 				}
 				responses <- resp
@@ -295,7 +295,7 @@ func (h *HTTP) handleProm(w http.ResponseWriter, r *http.Request) {
 
 				responses <- &responseData{}
 			} else {
-				if resp.StatusCode / 100 == 5 {
+				if resp.StatusCode/100 == 5 {
 					log.Printf("5xx response for relay %q backend %q: %v", h.Name(), b.name, resp.StatusCode)
 				}