BUILD Enforce go vet to check for format/issues in build

This also showed that require dependency was almost not needed,
replaced it with require which was used elsewhere.

travis will now call make travis that will check:
 - formatting is correct
 - go vet is called
 - no differences with git

Author: pierresouchay

.travis.yml

@@ -10,6 +10,7 @@ before_script:
   - sudo wget https://github.com/haproxytech/dataplaneapi/releases/download/v1.2.5/dataplaneapi -O /usr/local/bin/dataplaneapi
   - sudo chmod +x /usr/local/bin/dataplaneapi
   - haproxy -vv
+script: make travis
 addons:
   apt:
     update: true

GNUmakefile

@@ -10,3 +10,8 @@ bin: $(BIN)
 
 test:
 	go test -v -timeout 30s ${gobuild_args} ./...
+check:
+	go fmt ./...
+	go vet ./...
+	git diff --exit-code
+travis: check bin test

go.sum

@@ -50,7 +50,6 @@ github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQ
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY=
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=

haproxy/halog/log_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/bmizerany/assert"
 	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/require"
 )
 
 type fakeHook struct {
@@ -30,7 +30,7 @@ func (h *fakeHook) Fire(e *logrus.Entry) error {
 
 func ensureLogIsPresent(t *testing.T, hook *fakeHook, expectedLevel logrus.Level, prefix, msg string) {
 	haproxyLog("haproxy", fmt.Sprintf("%s%s", prefix, msg))
-	assert.Equal(t, fmt.Sprintf("haproxy: %s", msg), hook.lastMessage[expectedLevel])
+	require.Equal(t, fmt.Sprintf("haproxy: %s", msg), hook.lastMessage[expectedLevel])
 }
 
 func Test_log(t *testing.T) {

haproxy/haproxy_cmd/cmd_test.go

@@ -4,22 +4,22 @@ import (
 	"testing"
 
 	"github.com/haproxytech/haproxy-consul-connect/lib"
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_runCommand_ok(t *testing.T) {
 	t.Parallel()
 	sd := lib.NewShutdown()
 	cmd, err := runCommand(sd, "ls", ".")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	cmd.Wait()
 }
 
 func Test_runCommand_nok_wrong_path(t *testing.T) {
 	t.Parallel()
 	sd := lib.NewShutdown()
 	cmd, err := runCommand(sd, "/path/to/nowhere/that/can/be/found/myExec", "--help")
-	assert.NotNil(t, err)
-	assert.Contains(t, err.Error(), "no such file or directory")
-	assert.Nil(t, cmd)
+	require.NotNil(t, err)
+	require.Contains(t, err.Error(), "no such file or directory")
+	require.Nil(t, cmd)
 }

lib/shutdown_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_Shutdown(t *testing.T) {
@@ -17,7 +17,7 @@ func Test_Shutdown(t *testing.T) {
 		sd.Done()
 	}()
 	sd.Wait()
-	assert.GreaterOrEqual(t, time.Since(start).Milliseconds(), expectedDuration.Milliseconds())
+	require.GreaterOrEqual(t, time.Since(start).Milliseconds(), expectedDuration.Milliseconds())
 
 	// Shutting down
 	start = time.Now()
@@ -26,6 +26,6 @@ func Test_Shutdown(t *testing.T) {
 		sd.Shutdown("Kill waiting tasks")
 	}()
 	<-sd.Stop
-	assert.GreaterOrEqual(t, time.Since(start).Milliseconds(), expectedDuration.Milliseconds())
+	require.GreaterOrEqual(t, time.Since(start).Milliseconds(), expectedDuration.Milliseconds())
 
 }