build: use go modules to manage dependencies

Move us onto module for primary project dependencies. We also get
code-generator pinned down using modules with go mod vendor. Due to a
lack of release of GOPATHless upstreams, GOPATH is still required to
update code-generation.

Signed-off-by: Stephen Day <[email protected]>

Author: stevvooe

.travis.yml

@@ -5,7 +5,7 @@ services:
 language: go
 
 go:
-- "1.11.x"
+- "1.13.x"
 
 go_import_path: github.com/cruise-automation/rbacsync
 
@@ -16,6 +16,5 @@ install:
 
 script:
 - GIT_CHECK_EXCLUDE="./vendor" git-validation -q -run DCO,short-subject,dangling-whitespace
-# TODO(stevvooe): Add vendor check validation.
 - make build
 - make test

Makefile

@@ -23,9 +23,8 @@ COVERPACKAGES=$(shell go list ./... | grep -v /vendor/ | grep -v /generated/ | g
 
 GO_LDFLAGS=-ldflags '-s -w -X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PKG) $(EXTRA_LDFLAGS)'
 TESTFLAGS=-race -v
-COVERFLAGS=-coverpkg=$(COVERPACKAGES) -covermode=atomic -coverprofile=coverage.out
 
-.PHONY: all generate build test binaries clean FORCE vndr image deploy test-coverage .deps.coverage
+.PHONY: all generate build test binaries clean FORCE image deploy
 
 all: binaries
 FORCE: # force targets to run no matter what
@@ -44,16 +43,6 @@ bin/%: cmd/% FORCE
 test:
 	go test ${TESTFLAGS} ${PACKAGES} -logtostderr # for some reason, this flag only works on the end
 
-test-coverage: .deps.coverage
-	go test ${TESTFLAGS} ${COVERFLAGS} ${PACKAGES} -logtostderr # for some reason, this flag only works on the end
-	gocov convert coverage.out | gocov-xml > coverage.xml
-	go tool cover -html coverage.out -o coverage.html
-
-.deps.coverage:
-	# Installs coverage deps using go get. Should be replaced by something better.
-	go get github.com/axw/gocov/...
-	go get github.com/AlekSi/gocov-xml
-
 image:
 	docker build -t rbacsync:${VERSION_TAG} .
 
@@ -69,9 +58,6 @@ deploy: push
 	kubectl apply -f deploy/
 	kubectl set image deploy/rbacsync rbacsync=${REGISTRY}rbacsync:${VERSION_TAG}
 
-vndr:
-	vndr
-
 clean:
 	rm -rf bin/*
 

go.mod

@@ -0,0 +1,22 @@
+module github.com/cruise-automation/rbacsync
+
+go 1.13
+
+require (
+	github.com/Azure/go-autorest/autorest v0.9.4 // indirect
+	github.com/Azure/go-autorest/autorest/adal v0.8.1 // indirect
+	github.com/davecgh/go-spew v1.1.1
+	github.com/gophercloud/gophercloud v0.7.0 // indirect
+	github.com/imdario/mergo v0.3.8 // indirect
+	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.4.0
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
+	google.golang.org/api v0.15.0
+	gopkg.in/yaml.v2 v2.2.8
+	k8s.io/api v0.17.2
+	k8s.io/apimachinery v0.17.2
+	k8s.io/client-go v0.17.0
+	k8s.io/code-generator v0.17.2
+	k8s.io/klog v1.0.0
+	k8s.io/utils v0.0.0-20200124190032-861946025e34 // indirect
+)

go.sum

@@ -0,0 +1,5 @@
+// +build tools
+
+package tools
+
+import _ "k8s.io/code-generator"

hack/tools.go

@@ -18,25 +18,19 @@
 set -o errexit
 set -o nounset
 set -o pipefail
-set -o xtrace
 
-if [[ -z "${GOPATH}" ]]; then
-  GOPATH=~/go
-fi
-
-if [[ ! -d "${GOPATH}/src/k8s.io/code-generator" ]]; then
-  echo "k8s.io/code-generator missing from GOPATH"
-  exit 1
-fi
-
-cd ${GOPATH}/src/k8s.io/code-generator
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
 
 pkgroot=github.com/cruise-automation/rbacsync
 
-./generate-groups.sh \
+# TODO(stevvooe): Once new code-generator is released with 1.18, GOPATH is no
+# longer required for generation and this variable can be removed.
+GOPATH="$(go env GOPATH)" bash "${CODEGEN_PKG}"/generate-groups.sh \
   all \
-  github.com/cruise-automation/rbacsync/pkg/generated \
-  github.com/cruise-automation/rbacsync/pkg/apis \
+  "${pkgroot}"/pkg/generated \
+  "${pkgroot}"/pkg/apis \
   rbacsync:v1alpha \
+  --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
+  --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
   $@
-