Fix golint (#14)

Ref: golang/lint#415

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-  - 1.8
+  - 1.11
 
 os:
   - linux

Makefile

@@ -48,7 +48,7 @@ get-build-deps:
 	@echo "+ Downloading build dependencies"
 	@go get golang.org/x/tools/cmd/goimports
 	@go get github.com/tools/godep
-	@go get github.com/golang/lint/golint
+	@go get golang.org/x/lint/golint
 	@go get github.com/wadey/gocovmerge
 
 

cmd/common.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/bitnami/gonit/monitor"
 	"github.com/bitnami/gonit/utils"
-
 	"github.com/spf13/cobra"
 )
 

cmd/root.go

@@ -8,11 +8,10 @@ import (
 	"runtime"
 	"syscall"
 
+	"github.com/VividCortex/godaemon"
 	"github.com/bitnami/gonit/log"
 	"github.com/bitnami/gonit/monitor"
 	"github.com/bitnami/gonit/utils"
-
-	"github.com/VividCortex/godaemon"
 	"github.com/spf13/cobra"
 )
 

gonit_test.go

@@ -13,11 +13,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bitnami/gonit/utils"
-
 	gt "github.com/bitnami/gonit/gonittest"
 	"github.com/bitnami/gonit/monitor"
 	tu "github.com/bitnami/gonit/testutils"
+	"github.com/bitnami/gonit/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"

monitor/checks.go

@@ -10,9 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/bitnami/gonit/utils"
-
 	"github.com/bitnami/gonit/log"
+	"github.com/bitnami/gonit/utils"
 )
 
 // CheckMaxStartTries defines a global default value for how many failed start attempts are made

monitor/client.go

@@ -4,9 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
-	u "net/url"
-
 	"net/http"
+	u "net/url"
 	"time"
 )
 

monitor/monitor_test.go

@@ -14,9 +14,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bitnami/gonit/log"
-
 	gt "github.com/bitnami/gonit/gonittest"
+	"github.com/bitnami/gonit/log"
 	tu "github.com/bitnami/gonit/testutils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

utils/file_test.go

@@ -20,7 +20,7 @@ func TestIsFile(t *testing.T) {
 		linkToDir:                         false,
 		brokenLink:                        false,
 		sb.Normalize("non-existent-path"): false,
-		file: true,
+		file:                              true,
 	} {
 		assert.Equal(t, IsFile(path), expected,
 			"Expected IsFile('%s') to be '%t'", path, expected)
@@ -35,11 +35,11 @@ func TestFileExists(t *testing.T) {
 	nonExistingFile := sb.TempFile()
 
 	for path, expected := range map[string]bool{
-		existingFile:                                  true,
-		existingDir:                                   true,
-		nonTraversableDir:                             true,
+		existingFile:      true,
+		existingDir:       true,
+		nonTraversableDir: true,
 		filepath.Join(nonTraversableDir, "dummy.txt"): false,
-		nonExistingFile:                               false,
+		nonExistingFile: false,
 	} {
 		assert.Equal(t, FileExists(path), expected,
 			"Expected FileExists('%s') to be '%t'", path, expected)
@@ -78,13 +78,13 @@ func TestIsWritableFile(t *testing.T) {
 	nonExistingFile := sb.TempFile()
 
 	for path, expected := range map[string]bool{
-		writableFile:                                true,
-		nonWritableFile:                             false,
-		writableDir:                                 false,
-		filepath.Join(writableDir, "sample.txt"):    true,
+		writableFile:                             true,
+		nonWritableFile:                          false,
+		writableDir:                              false,
+		filepath.Join(writableDir, "sample.txt"): true,
 		filepath.Join(nonWritableDir, "sample.txt"): false,
-		nonWritableDir:                              false,
-		nonExistingFile:                             true,
+		nonWritableDir:  false,
+		nonExistingFile: true,
 	} {
 		assert.Equal(t, IsWritableFile(path), expected,
 			"Expected IsWritableFile('%s') to be '%t'", path, expected)