chore(*): upgrade docker-go-dev and use new linter (#155)

Author: Joshua-Anderson

Makefile

@@ -11,19 +11,15 @@ endif
 BUILD_OS ?=linux darwin windows
 BUILD_ARCH ?=amd64 386
 
-DEV_ENV_IMAGE := quay.io/deis/go-dev:0.14.0
+DEV_ENV_IMAGE := quay.io/deis/go-dev:0.16.0
 DEV_ENV_WORK_DIR := /go/src/${repo_path}
 DEV_ENV_PREFIX := docker run --rm -e CGO_ENABLED=0 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
 DEV_ENV_PREFIX_CGO_ENABLED := docker run --rm -e CGO_ENABLED=1 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
 DIST_DIR := _dist
 
-GO_FILES = $(wildcard *.go)
 GO_LDFLAGS = -ldflags "-s -X ${repo_path}/version.BuildVersion=${VERSION}"
-GO_PACKAGES = cmd parser cli $(wildcard pkg/*)
-GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
-GOFMT = gofmtresult=$$(gofmt -e -l -s ${GO_FILES} ${GO_PACKAGES}); if [[ -n $$gofmtresult ]]; then echo "gofmt errors found in the following files: $${gofmtresult}"; false; fi;
-GOTEST = go test --race -v
+GOTEST = go test --race
 
 # The tag of the commit
 GIT_TAG := $(shell git tag -l --contains HEAD)
@@ -82,17 +78,8 @@ installer: build
 		&& echo 'See http://docs.deis.io/ for documentation.' \
 		&& echo"
 
-setup-gotools:
-	go get -u github.com/golang/lint/golint
-	go get -u golang.org/x/tools/cmd/cover
-	go get -u golang.org/x/tools/cmd/vet
-
 test-style:
-	${DEV_ENV_CMD} bash -c '${GOFMT}'
-	${DEV_ENV_CMD} sh -c 'go vet $(repo_path) $(GO_PACKAGES_REPO_PATH)'
-	@for i in $(addsuffix /...,$(GO_PACKAGES)); do \
-		${DEV_ENV_CMD} golint $$i; \
-	done
+	${DEV_ENV_CMD} lint
 
 test: test-style
 	${DEV_ENV_PREFIX_CGO_ENABLED} ${DEV_ENV_IMAGE} sh -c '${GOTEST} $$(glide nv)'

cmd/apps.go

@@ -306,7 +306,7 @@ func appURL(s *settings.Settings, appID string) (string, error) {
 	return expandURL(s.Client.ControllerURL.Host, domains[0].Domain), nil
 }
 
-// expandURL expands an app url if neccessary.
+// expandURL expands an app url if necessary.
 func expandURL(host, u string) string {
 	if strings.Contains(u, ".") {
 		// If domain is a full url.

cmd/auth.go

@@ -201,7 +201,7 @@ func Cancel(username string, password string, yes bool) error {
 		}
 	}
 
-	if yes == false {
+	if !yes {
 		confirm := ""
 
 		s, err = settings.Load()
@@ -224,7 +224,7 @@ func Cancel(username string, password string, yes bool) error {
 		}
 	}
 
-	if yes == false {
+	if !yes {
 		fmt.Fprintln(os.Stderr, "Account not changed")
 		return nil
 	}
@@ -281,7 +281,7 @@ func Regenerate(username string, all bool) error {
 		return err
 	}
 
-	if username == "" && all == false {
+	if username == "" && !all {
 		s.Client.Token = token
 
 		err = s.Save()

settings/settings_test.go

@@ -52,27 +52,27 @@ func TestLoadSave(t *testing.T) {
 	}
 
 	tests := []comparison{
-		comparison{
+		{
 			key:      false,
 			expected: s.Client.VerifySSL,
 		},
-		comparison{
+		{
 			key:      "a",
 			expected: s.Client.Token,
 		},
-		comparison{
+		{
 			key:      "t",
 			expected: s.Username,
 		},
-		comparison{
+		{
 			key:      "http://foo.bar",
 			expected: s.Client.ControllerURL.String(),
 		},
-		comparison{
+		{
 			key:      50,
 			expected: s.Limit,
 		},
-		comparison{
+		{
 			key:      "Deis Client v" + version.Version,
 			expected: s.Client.UserAgent,
 		},
@@ -107,27 +107,27 @@ func TestLoadSave(t *testing.T) {
 	}
 
 	tests = []comparison{
-		comparison{
+		{
 			key:      true,
 			expected: s.Client.VerifySSL,
 		},
-		comparison{
+		{
 			key:      "b",
 			expected: s.Client.Token,
 		},
-		comparison{
+		{
 			key:      "c",
 			expected: s.Username,
 		},
-		comparison{
+		{
 			key:      "http://deis.test",
 			expected: s.Client.ControllerURL.String(),
 		},
-		comparison{
+		{
 			key:      100,
 			expected: s.Limit,
 		},
-		comparison{
+		{
 			key:      "Deis Client v" + version.Version,
 			expected: s.Client.UserAgent,
 		},