Merge pull request #951 from tristanmorgan/remove_vendor

Remove vendored modules in favour of go mod.

Dockerfile

@@ -11,8 +11,9 @@ RUN cd /usr/local/bin && unzip vault_${vault_version}_linux_amd64.zip
 RUN apk update && apk add --no-cache git
 WORKDIR /src
 COPY . .
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go test -mod=vendor -trimpath -ldflags "-s -w" ./...
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod=vendor -trimpath -ldflags "-s -w"
+RUN go mod tidy
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go test -trimpath -ldflags "-s -w" ./...
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags "-s -w"
 
 FROM alpine:3.16
 RUN apk update && apk add --no-cache ca-certificates

Makefile

@@ -12,7 +12,7 @@ VERSION ?= $(shell git describe --tags --first-parent --abbrev=0 | cut -c 2-)
 
 
 # GOFLAGS is the flags for the go compiler.
-GOFLAGS ?= -mod=vendor -ldflags "-X main.version=$(CUR_TAG)"
+GOFLAGS ?= -ldflags "-X main.version=$(CUR_TAG)"
 
 # GOVERSION is the current go version, e.g. go1.9.2
 GOVERSION ?= $(shell go version | awk '{print $$3;}')
@@ -64,12 +64,11 @@ test: build
 .PHONY: mod
 mod:
 	go mod tidy
-	go mod vendor
 
 # gofmt runs gofmt on the code
 .PHONY: gofmt
 gofmt:
-	gofmt -s -w `find . -type f -name '*.go' | grep -v vendor`
+	gofmt -s -w `find . -type f -name '*.go'`
 
 
 beta: $(BETA_OSES)