Gomod Updates

boilerplate/lyft/golang_dockerfile/Dockerfile.GoTemplate

@@ -5,14 +5,14 @@
 
 # Using go1.10.4
 FROM golang:1.10.4-alpine3.8 as builder
-RUN apk add git openssh-client make curl dep
+RUN apk add git openssh-client make curl
 
-# COPY only the dep files for efficient caching
-COPY Gopkg.* /go/src/github.com/lyft/{{REPOSITORY}}/
+# COPY only the go mod files for efficient caching
+COPY go.mod go.sum /go/src/github.com/lyft/{{REPOSITORY}}/
 WORKDIR /go/src/github.com/lyft/{{REPOSITORY}}
 
 # Pull dependencies
-RUN dep ensure -vendor-only
+RUN go mod download
 
 # COPY the rest of the source code
 COPY . /go/src/github.com/lyft/{{REPOSITORY}}/

boilerplate/lyft/golang_test_targets/Makefile

@@ -1,25 +1,29 @@
 # WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES.
 # ONLY EDIT THIS FILE FROM WITHIN THE 'LYFT/BOILERPLATE' REPOSITORY:
-# 
+#
 # TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst
 
-DEP_SHA=1f7c19e5f52f49ffb9f956f64c010be14683468b
+
+.PHONY: download_tooling
+download_tooling: #download dependencies (including test deps) for the package
+	@boilerplate/lyft/golang_test_targets/download_tooling.sh
 
 .PHONY: lint
-lint: #lints the package for common code smells
-	which golangci-lint || curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $$GOPATH/bin v1.16.0
-	golangci-lint run --exclude deprecated
+lint: download_tooling #lints the package for common code smells
+	GL_DEBUG=linters_output,env golangci-lint run --deadline=5m --exclude deprecated -v
 
 # If code is failing goimports linter, this will fix.
 # skips 'vendor'
 .PHONY: goimports
 goimports:
 	@boilerplate/lyft/golang_test_targets/goimports
 
+.PHONY: mod_download
+mod_download: #download dependencies (including test deps) for the package
+	go mod download
+
 .PHONY: install
-install: #download dependencies (including test deps) for the package
-	which dep || (curl "https://raw.githubusercontent.com/golang/dep/${DEP_SHA}/install.sh" | sh)
-	dep ensure
+install: download_tooling mod_download
 
 .PHONY: test_unit
 test_unit:

boilerplate/lyft/golang_test_targets/Readme.rst

@@ -1,7 +1,7 @@
 Golang Test Targets
 ~~~~~~~~~~~~~~~~~~~
 
-Provides an ``install`` make target that uses ``dep`` install golang dependencies.
+Provides an ``install`` make target that uses ``go mod`` to install golang dependencies.
 
 Provides a ``lint`` make target that uses golangci to lint your code.
 
@@ -17,7 +17,7 @@ Provides a ``test_benchmark`` target for benchmark tests.
 
 Add ``lyft/golang_test_targets`` to your ``boilerplate/update.cfg`` file.
 
-Make sure you're using ``dep`` for dependency management.
+Make sure you're using ``go mod`` for dependency management.
 
 Provide a ``.golangci`` configuration (the lint target requires it).
 

boilerplate/lyft/golang_test_targets/download_tooling.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Everything in this file needs to be installed outside of current module
+# The reason we cannot turn off module entirely and install is that we need the replace statement in go.mod
+# because we are installing a mockery fork. Turning it off would result installing the original not the fork.
+# However, because the installation of these tools themselves sometimes modifies the go.mod/go.sum files. We don't
+# want this either. So instead, we're going to copy those files into a temporary directory, do the installation, and
+# ignore any changes made to the go mod files.
+# (See https://github.com/golang/go/issues/30515 for some background context)
+
+set -e
+
+go_install_tool () {
+  tmp_dir=$(mktemp -d -t gotooling-XXXXXXXXXX)
+  echo "Installing $1 inside $tmp_dir"
+  cp go.mod go.sum "$tmp_dir"
+  pushd "$tmp_dir"
+  go get "$1"
+  popd
+}
+
+# List of tools to go get
+# In the format of "<cli>:<package>" or ":<package>" if no cli
+tools=(
+  "mockery:github.com/vektra/mockery/cmd/mockery"
+  "pflags:github.com/lyft/flytestdlib/cli/pflags"
+  "golangci-lint:github.com/golangci/golangci-lint/cmd/golangci-lint"
+  "enumer:github.com/alvaroloes/enumer"
+)
+
+for tool in "${tools[@]}"
+do
+    cli=$(echo "$tool" | cut -d':' -f1)
+    package=$(echo "$tool" | cut -d':' -f2)
+    command -v "$cli" || go_install_tool "$package"
+done

boilerplate/update.sh

@@ -10,7 +10,7 @@ set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 OUT="$(mktemp -d)"
-git clone [email protected]:lyft/boilerplate.git "${OUT}"
+git clone --single-branch --branch gomod [email protected]:lyft/boilerplate.git "${OUT}"
 
 echo "Updating the update.sh script."
 cp "${OUT}/boilerplate/update.sh" "${DIR}/update.sh"