From 8bfbafa7902d1b3ac7c00fb77031f582e1f75fa2 Mon Sep 17 00:00:00 2001
From: James Bardin <j.bardin@gmail.com>
Date: Wed, 23 Sep 2020 16:57:36 -0400
Subject: [PATCH] remove vendor from some tooling

---
 .circleci/config.yml | 1 -
 Makefile             | 2 +-
 e2e/e2e.go           | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 29d7bcc58..d36f14544 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,6 @@ executors:
       GOPROXY: https://proxy.golang.org/
       TEST_RESULTS_DIR: &TEST_RESULTS_DIR /tmp/test-results
       ARTIFACTS_DIR: &ARTIFACTS_DIR /tmp/artifacts
-      GOFLAGS: "-mod=vendor"
 
 jobs:
   go-checks:
diff --git a/Makefile b/Makefile
index c6165e1c3..0324eca9c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ VERSION?="0.3.44"
 # source files, except the protobuf stubs which are built instead with
 # "make protobuf".
 generate:
-	GOFLAGS=-mod=vendor go generate ./...
+	go generate ./...
 	# go fmt doesn't support -mod=vendor but it still wants to populate the
 	# module cache with everything in go.mod even though formatting requires
 	# no dependencies, and so we're disabling modules mode for this right
diff --git a/e2e/e2e.go b/e2e/e2e.go
index cde417ebf..dbe73a911 100644
--- a/e2e/e2e.go
+++ b/e2e/e2e.go
@@ -265,7 +265,6 @@ func GoBuild(pkgPath, tmpPrefix string) string {
 
 	cmd := exec.Command(
 		"go", "build",
-		"-mod=vendor",
 		"-o", tmpFilename,
 		pkgPath,
 	)