chore(*): upgrade docker-go-dev and switch to the new linter (#399)

Author: Joshua-Anderson

.travis.yml

@@ -13,6 +13,6 @@ sudo: required
 install:
   - make bootstrap
 script:
-  - make test-cover build docker-build
+  - make test-style test-cover build docker-build
 after_success:
   - bash <(curl -s https://codecov.io/bash)

Makefile

@@ -7,7 +7,7 @@ export GO15VENDOREXPERIMENT=1
 
 # dockerized development environment variables
 REPO_PATH := github.com/deis/${SHORT_NAME}
-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 GO15VENDOREXPERIMENT=1 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
@@ -29,10 +29,7 @@ BINDIR := ./rootfs
 
 DEIS_REGISTRY ?= ${DEV_REGISTRY}/
 
-GO_FILES = $(wildcard *.go)
-GO_PACKAGES := $(shell find pkg -maxdepth 1 -type d)
-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
 
 all:
 	@echo "Use a Makefile to control top-level building of the project."
@@ -53,14 +50,10 @@ build:
 test: test-style test-unit
 
 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-unit:
-	${DEV_ENV_CMD} sh -c 'go test $$(glide nv)'
+	${DEV_ENV_CMD} sh -c '${GOTEST} $$(glide nv)'
 
 test-cover:
 	${DEV_ENV_CMD} test-cover.sh

pkg/controller/utils.go

@@ -27,8 +27,8 @@ type UserInfo struct {
 	Apps        []string
 }
 
-// ControllerURLStr returns the url for connecting to deis controller
-func ControllerURLStr(additionalPath ...string) (string, error) {
+// URLStr returns the url of the controller with the given path prepended.
+func URLStr(additionalPath ...string) (string, error) {
 	host := os.Getenv(hostEnvName)
 	port := os.Getenv(portEnvName)
 
@@ -66,7 +66,7 @@ func fingerprint(key ssh.PublicKey) string {
 // UserInfoFromKey makes a request to the controller to get the user info from they given key.
 func UserInfoFromKey(key ssh.PublicKey) (*UserInfo, error) {
 	fp := fingerprint(key)
-	url, err := ControllerURLStr("v2", "hooks", "key", fp)
+	url, err := URLStr("v2", "hooks", "key", fp)
 	if err != nil {
 		return nil, err
 	}

pkg/git/sha.go

@@ -5,10 +5,8 @@ import (
 	"regexp"
 )
 
-const (
-	// this constant represents the length of a shortened git sha - 8 characters long
-	shortShaIdx = 8
-)
+// this constant represents the length of a shortened git sha - 8 characters long
+const shortShaIdx = 8
 
 var shaRegex = regexp.MustCompile(`^[\da-f]{40}$`)
 
@@ -33,7 +31,7 @@ func NewSha(rawSha string) (*SHA, error) {
 	if !shaRegex.MatchString(rawSha) {
 		return nil, ErrInvalidGitSha{sha: rawSha}
 	}
-	return &SHA{full: rawSha, short: rawSha[0:8]}, nil
+	return &SHA{full: rawSha, short: rawSha[0:shortShaIdx]}, nil
 }
 
 // Full returns the full git sha.

pkg/gitreceive/run.go

@@ -58,8 +58,6 @@ func Run(conf *Config, fs sys.FS, env sys.Env, storageDriver storagedriver.Stora
 			}
 		}
 	}
-	if err := scanner.Err(); err != nil {
-		return err
-	}
-	return nil
+
+	return scanner.Err()
 }

pkg/healthsrv/buckets_lister.go

@@ -11,20 +11,6 @@ type BucketLister interface {
 	List(ctx context.Context, opath string) ([]string, error)
 }
 
-type emptyBucketLister struct{}
-
-func (e emptyBucketLister) List(ctx context.Context, opath string) ([]string, error) {
-	return nil, nil
-}
-
-type errBucketLister struct {
-	err error
-}
-
-func (e errBucketLister) List(ctx context.Context, opath string) ([]string, error) {
-	return nil, e.err
-}
-
 // listBuckets calls bl.ListBuckets(...) and sends the results back on the various given channels.
 // This func is intended to be run in a goroutine and communicates via the channels it's passed.
 //

pkg/healthsrv/controller_state.go

@@ -2,9 +2,7 @@ package healthsrv
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net/http"
-	"strings"
 
 	"github.com/deis/builder/pkg/controller"
 )
@@ -15,36 +13,8 @@ type GetClient interface {
 	Get(string) (*http.Response, error)
 }
 
-type successGetClient struct{}
-
-func (e successGetClient) Get(url string) (*http.Response, error) {
-	resp := &http.Response{
-		Body:       ioutil.NopCloser(strings.NewReader("")),
-		StatusCode: http.StatusOK,
-	}
-	return resp, nil
-}
-
-type failureGetClient struct{}
-
-func (e failureGetClient) Get(url string) (*http.Response, error) {
-	resp := &http.Response{
-		Body:       ioutil.NopCloser(strings.NewReader("")),
-		StatusCode: http.StatusServiceUnavailable,
-	}
-	return resp, nil
-}
-
-type errGetClient struct {
-	err error
-}
-
-func (e errGetClient) Get(url string) (*http.Response, error) {
-	return nil, e.err
-}
-
 func controllerState(client GetClient, succCh chan<- string, errCh chan<- error, stopCh <-chan struct{}) {
-	url, err := controller.ControllerURLStr("healthz")
+	url, err := controller.URLStr("healthz")
 	if err != nil {
 		select {
 		case errCh <- err:

pkg/healthsrv/healthz_handler_test.go

@@ -3,11 +3,17 @@ package healthsrv
 import (
 	"bytes"
 	"errors"
+	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
+	"strings"
 	"testing"
 
+	"k8s.io/kubernetes/pkg/api"
+
+	"github.com/docker/distribution/context"
+
 	"github.com/arschles/assert"
 	"github.com/deis/builder/pkg/sshd"
 )
@@ -16,6 +22,62 @@ var (
 	errTest = errors.New("test error")
 )
 
+type emptyBucketLister struct{}
+
+func (e emptyBucketLister) List(ctx context.Context, opath string) ([]string, error) {
+	return nil, nil
+}
+
+type errBucketLister struct {
+	err error
+}
+
+func (e errBucketLister) List(ctx context.Context, opath string) ([]string, error) {
+	return nil, e.err
+}
+
+type successGetClient struct{}
+
+func (e successGetClient) Get(url string) (*http.Response, error) {
+	resp := &http.Response{
+		Body:       ioutil.NopCloser(strings.NewReader("")),
+		StatusCode: http.StatusOK,
+	}
+	return resp, nil
+}
+
+type failureGetClient struct{}
+
+func (e failureGetClient) Get(url string) (*http.Response, error) {
+	resp := &http.Response{
+		Body:       ioutil.NopCloser(strings.NewReader("")),
+		StatusCode: http.StatusServiceUnavailable,
+	}
+	return resp, nil
+}
+
+type errGetClient struct {
+	err error
+}
+
+func (e errGetClient) Get(url string) (*http.Response, error) {
+	return nil, e.err
+}
+
+type emptyNamespaceLister struct{}
+
+func (n emptyNamespaceLister) List(opts api.ListOptions) (*api.NamespaceList, error) {
+	return &api.NamespaceList{}, nil
+}
+
+type errNamespaceLister struct {
+	err error
+}
+
+func (e errNamespaceLister) List(opts api.ListOptions) (*api.NamespaceList, error) {
+	return nil, e.err
+}
+
 func TestHealthZCircuitOpen(t *testing.T) {
 	bLister := emptyBucketLister{}
 	c := sshd.NewCircuit()

pkg/healthsrv/namespace_lister.go

@@ -14,20 +14,6 @@ type NamespaceLister interface {
 	List(opts api.ListOptions) (*api.NamespaceList, error)
 }
 
-type emptyNamespaceLister struct{}
-
-func (n emptyNamespaceLister) List(opts api.ListOptions) (*api.NamespaceList, error) {
-	return &api.NamespaceList{}, nil
-}
-
-type errNamespaceLister struct {
-	err error
-}
-
-func (e errNamespaceLister) List(opts api.ListOptions) (*api.NamespaceList, error) {
-	return nil, e.err
-}
-
 // listNamespaces calls nl.List(...) and sends the results back on the various given channels.
 // This func is intended to be run in a goroutine and communicates via the channels it's passed.
 //

pkg/sshd/lock.go

@@ -63,7 +63,7 @@ type inMemoryRepoLock struct {
 	timeout time.Duration
 }
 
-// Lock aquires a lock associated with the specified name.
+// Lock acquires a lock associated with the specified name.
 func (rl *inMemoryRepoLock) Lock(repoName string) error {
 	rl.mutex.Lock()
 	defer rl.mutex.Unlock()