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

Author: Joshua-Anderson

Makefile

@@ -1,44 +1,28 @@
-export GO15VENDOREXPERIMENT=1
-
 # the filepath to this repository, relative to $GOPATH/src
 repo_path = github.com/deis/controller-sdk-go
 
-DEV_ENV_IMAGE := quay.io/deis/go-dev:0.10.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 -e CGO_ENABLED=0 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
-DEV_ENV_PREFIX_CGO_ENABLED := docker run --rm -e GO15VENDOREXPERIMENT=1 -e CGO_ENABLED=1 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
+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}
 
-GO_FILES = $(wildcard *.go)
-GO_PACKAGES = api apps auth builds certs config domains keys perms ps releases users pkg/time
-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 --cover --race -v
-
 # UID and GID of local user
 UID := $(shell id -u)
 GID := $(shell id -g)
 
+GOTEST = go test --cover --race
 
 bootstrap:
 	${DEV_ENV_CMD} glide install
 
 glideup:
 	${DEV_ENV_CMD} glide up
 
-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: 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_PREFIX_CGO_ENABLED} ${DEV_ENV_IMAGE} sh -c '${GOTEST} $$(glide nv)'

api/apps.go

@@ -10,6 +10,7 @@ type App struct {
 	UUID    string `json:"uuid"`
 }
 
+// Apps defines a collection of app objects.
 type Apps []App
 
 func (a Apps) Len() int           { return len(a) }

api/domains.go

@@ -9,6 +9,7 @@ type Domain struct {
 	Updated string `json:"updated"`
 }
 
+// Domains defines a collection of domain objects.
 type Domains []Domain
 
 func (d Domains) Len() int           { return len(d) }

api/keys.go

@@ -10,6 +10,7 @@ type Key struct {
 	UUID    string `json:"uuid"`
 }
 
+// Keys defines a collection of key objects.
 type Keys []Key
 
 func (k Keys) Len() int           { return len(k) }

api/ps.go

@@ -11,17 +11,20 @@ type Pods struct {
 	Started time.Time `json:"started"`
 }
 
+// PodsList defines a collection of app pods.
 type PodsList []Pods
 
 func (p PodsList) Len() int           { return len(p) }
 func (p PodsList) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
 func (p PodsList) Less(i, j int) bool { return p[i].Name < p[j].Name }
 
+// PodType holds pods of the same type.
 type PodType struct {
 	Type     string
 	PodsList PodsList
 }
 
+// PodTypes holds groups of pods organized by type.
 type PodTypes []PodType
 
 func (p PodTypes) Len() int           { return len(p) }

api/users.go

@@ -34,6 +34,7 @@ Date Joined: %s`
 		u.IsSuperuser, u.IsStaff, u.IsActive, u.DateJoined)
 }
 
+// Users holds a collection of user objects.
 type Users []User
 
 func (u Users) Len() int           { return len(u) }

apps/apps_test.go

@@ -61,12 +61,12 @@ func (f *fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 			res.Write(nil)
 		}
 
-		if string(body) == appCreateExpected && f.createID == false {
+		if string(body) == appCreateExpected && !f.createID {
 			f.createID = true
 			res.WriteHeader(http.StatusCreated)
 			res.Write([]byte(appFixture))
 			return
-		} else if string(body) == "" && f.createWithoutID == false {
+		} else if string(body) == "" && !f.createWithoutID {
 			f.createWithoutID = true
 			res.WriteHeader(http.StatusCreated)
 			res.Write([]byte(appFixture))

auth/auth.go

@@ -84,14 +84,14 @@ func Delete(c *deis.Client, username string) error {
 // with this new token to avoid authentication errors.
 //
 // If username is set and all is false, this will regenerate that user's token
-// and return a new token. If not targeting yourself, regenerate requires administrative privilages.
+// and return a new token. If not targeting yourself, regenerate requires administrative privileges.
 //
-// If all is true, this will regenerate every user's token. This requires administrative privilages.
+// If all is true, this will regenerate every user's token. This requires administrative privileges.
 func Regenerate(c *deis.Client, username string, all bool) (string, error) {
 	var reqBody []byte
 	var err error
 
-	if all == true {
+	if all {
 		reqBody, err = json.Marshal(api.AuthRegenerateRequest{All: all})
 	} else if username != "" {
 		reqBody, err = json.Marshal(api.AuthRegenerateRequest{Name: username})
@@ -111,7 +111,7 @@ func Regenerate(c *deis.Client, username string, all bool) (string, error) {
 		res.Body.Close()
 	}()
 
-	if all == true {
+	if all {
 		return "", nil
 	}
 
@@ -128,7 +128,7 @@ func Regenerate(c *deis.Client, username string, all bool) (string, error) {
 // If username if an empty string, change the password of the client's user.
 //
 // If username is set, change the password of another user and do not require
-// their password. This requires administrative privilages.
+// their password. This requires administrative privileges.
 func Passwd(c *deis.Client, username, password, newPassword string) error {
 	req := api.AuthPasswdRequest{Password: password, NewPassword: newPassword}
 
@@ -149,6 +149,7 @@ func Passwd(c *deis.Client, username, password, newPassword string) error {
 	return err
 }
 
+// Whoami retrives the user object for the authenticated user.
 func Whoami(c *deis.Client) (api.User, error) {
 	res, err := c.Request("GET", "/v2/auth/whoami/", nil)
 	if err != nil {

config/config.go

@@ -37,7 +37,7 @@ func List(c *deis.Client, app string) (api.Config, error) {
 // This is a patching operation, which means when you call Set() with an api.Config:
 //
 //    - If the variable does not exist, it will be set.
-//    - If the variable exists, it will be overwriten.
+//    - If the variable exists, it will be overwritten.
 //    - If the variable is set to nil, it will be unset.
 //    - If the variable was ignored in the api.Config, it will remain unchanged.
 //

errors_test.go

@@ -21,17 +21,16 @@ func (m *mockReadCloser) Close() error {
 }
 
 func (m *mockReadCloser) Read(msg []byte) (int, error) {
-	if m.closed == true {
+	if m.closed {
 		return 0, errors.New("You can't read on a closed ReadCloser")
 	}
 
 	if m.msg == "" {
 		return 0, io.EOF
 	}
 
-	for i, b := range []byte(m.msg) {
-		msg[i] = b
-	}
+	copy(msg, []byte(m.msg))
+
 	len := len(m.msg)
 	m.msg = ""
 	return len, nil