remove remaining references to govendor and vendorfmt (#5587)

.github/CONTRIBUTING.md

@@ -131,15 +131,7 @@ it does not fail after 30 iterations, it should be sufficiently stable.
 
 ## Vendoring
 
-Consul currently uses [govendor](https://github.com/kardianos/govendor) for
-vendoring and [vendorfmt](https://github.com/magiconair/vendorfmt) for formatting
-`vendor.json` to a more merge-friendly "one line per package" format.
-
-If you are submitting a change that requires new or updated dependencies, 
-please include them in `vendor/vendor.json` and in the `vendor/` folder. 
-This helps everything get tested properly in CI.
-
-Use `govendor fetch <project>` to add a project as a dependency. See govendor's [Quick Start](https://github.com/kardianos/govendor#quick-start-also-see-the-faq) for examples.
+Consul currently uses Go Modules for vendoring.
 
 Please only apply the minimal vendor changes to get your PR to work. 
 Consul does not attempt to track the latest version for each dependency.

GNUmakefile

@@ -2,7 +2,6 @@ SHELL = bash
 GOTOOLS = \
 	github.com/elazarl/go-bindata-assetfs/... \
 	github.com/hashicorp/go-bindata/... \
-	github.com/magiconair/vendorfmt/cmd/vendorfmt \
 	github.com/mitchellh/gox \
 	golang.org/x/tools/cmd/cover \
 	golang.org/x/tools/cmd/stringer \
@@ -114,19 +113,14 @@ bin: tools
 	@$(SHELL) $(CURDIR)/build-support/scripts/build-local.sh
 
 # dev creates binaries for testing locally - these are put into ./bin and $GOPATH
-dev: changelogfmt vendorfmt dev-build
+dev: changelogfmt dev-build
 
 dev-build:
 	@$(SHELL) $(CURDIR)/build-support/scripts/build-local.sh -o $(GOOS) -a $(GOARCH)
 
 dev-docker: go-build-image
 	@docker build -t '$(CONSUL_DEV_IMAGE)' --build-arg 'GIT_COMMIT=$(GIT_COMMIT)' --build-arg 'GIT_DIRTY=$(GIT_DIRTY)' --build-arg 'GIT_DESCRIBE=$(GIT_DESCRIBE)' --build-arg 'CONSUL_BUILD_IMAGE=$(GO_BUILD_TAG)' -f $(CURDIR)/build-support/docker/Consul-Dev.dockerfile '$(CURDIR)'
 
-vendorfmt:
-	@echo "--> Formatting vendor/vendor.json"
-	test -x $(GOPATH)/bin/vendorfmt || go get -u github.com/magiconair/vendorfmt/cmd/vendorfmt
-	vendorfmt
-
 changelogfmt:
 	@echo "--> Making [GH-xxxx] references clickable..."
 	@sed -E 's|([^\[])\[GH-([0-9]+)\]|\1[[GH-\2](https://github.com/hashicorp/consul/issues/\2)]|g' CHANGELOG.md > changelog.tmp && mv changelog.tmp CHANGELOG.md
@@ -276,5 +270,5 @@ ui-legacy-docker: ui-legacy-build-image
 proto:
 	protoc agent/connect/ca/plugin/*.proto --gofast_out=plugins=grpc:../../..
 
-.PHONY: all ci bin dev dist cov test test-ci test-internal test-install-deps cover format vet ui static-assets tools vendorfmt
+.PHONY: all ci bin dev dist cov test test-ci test-internal test-install-deps cover format vet ui static-assets tools
 .PHONY: docker-images go-build-image ui-build-image ui-legacy-build-image static-assets-docker consul-docker ui-docker ui-legacy-docker version proto

build-support/docker/Build-Go.dockerfile

@@ -3,7 +3,6 @@ FROM golang:${GOLANG_VERSION}
 
 ARG GOTOOLS="github.com/elazarl/go-bindata-assetfs/... \
    github.com/hashicorp/go-bindata/... \
-   github.com/magiconair/vendorfmt/cmd/vendorfmt \
    github.com/mitchellh/gox \
    golang.org/x/tools/cmd/cover \
    golang.org/x/tools/cmd/stringer \
@@ -12,4 +11,4 @@ ARG GOTOOLS="github.com/elazarl/go-bindata-assetfs/... \
 
 RUN go get -u -v ${GOTOOLS} && mkdir -p /consul
 
-WORKDIR /consul
+WORKDIR /consul