Merge pull request #85 from JoshVanL/remove-vendor

Removes vendor in favour of using pure go mod

Author: jetstack-bot

Makefile

@@ -3,6 +3,8 @@ BINDIR   ?= $(CURDIR)/bin
 HACK_DIR ?= hack
 PATH     := $(BINDIR):$(PATH)
 
+export GO111MODULE=on
+
 help:  ## display this help
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n\nTargets:\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-20s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST)
 
@@ -26,7 +28,7 @@ endif
 
 $(BINDIR)/mockgen:
 	mkdir -p $(BINDIR)
-	go build -o $(BINDIR)/mockgen ./vendor/github.com/golang/mock/mockgen
+	go build -o $(BINDIR)/mockgen github.com/golang/mock/mockgen
 
 $(BINDIR)/kubectl:
 	mkdir -p $(BINDIR)
@@ -48,34 +50,28 @@ depend: $(BINDIR)/mockgen $(BINDIR)/kubectl $(BINDIR)/golangci-lint
 verify_boilerplate:
 	$(HACK_DIR)/verify-boilerplate.sh
 
-verify_vendor:
-	go mod verify
-
 go_fmt:
 	@set -e; \
-	GO_FMT=$$(git ls-files *.go | grep -v 'vendor/' | xargs gofmt -d); \
+	GO_FMT=$$(git ls-files *.go | xargs gofmt -d); \
 	if [ -n "$${GO_FMT}" ] ; then \
 		echo "Please run go fmt"; \
 		echo "$$GO_FMT"; \
 		exit 1; \
 	fi
 
 go_vet:
-	go vet $$(go list ./pkg/... ./cmd/...)
+	go vet
 
-# We vendor packages using ./hack/tools with go modules for building binaries.
-# These files will fail linting since they use '_' importing with no usage so
-# must be ommited.
 go_lint: $(BINDIR)/golangci-lint ## lint golang code for problems
-	go list -f '{{.Dir}}' ./...  | fgrep -v hack/tools | xargs realpath --relative-to=. | xargs $(BINDIR)/golangci-lint run
+	$(BINDIR)/golangci-lint run
 
 clean: ## clean up created files
 	rm -rf \
 		$(BINDIR) \
 		kube-oidc-proxy \
 		pkg/mocks/authenticator.go
 
-verify: verify_boilerplate verify_vendor go_fmt go_vet go_lint ## verify code and vendor
+verify: depend verify_boilerplate go_fmt go_vet go_lint ## verify code and mod
 
 generate: depend ## generates mocks and assets files
 	go generate $$(go list ./pkg/... ./cmd/...)

hack/tools/tools.go

@@ -1,11 +1,11 @@
+// +build tools
+
 // Copyright Jetstack Ltd. See LICENSE for details.
 package tools
 
 // This file is used to vendor packages we use to build binaries.
 // This is the current canonical way with go modules.
 
-//+build tools
-
 import (
 	_ "github.com/golang/mock/mockgen"
 )