Manage dependencies via Godep

Embrace the future and use Go 1.6's vendor support via Godep.

Go 1.5 users should `export GO15VENDOREXPERIMENT=1`

GNUmakefile

@@ -1,12 +1,9 @@
-GOTOOLS = github.com/mitchellh/gox golang.org/x/tools/cmd/stringer \
-	github.com/jteeuwen/go-bindata/... github.com/elazarl/go-bindata-assetfs/...
-DEPS = $(shell go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
-PACKAGES = $(shell go list ./...)
+PACKAGES=$(shell go list ./... | grep -v '^github.com/hashicorp/consul/vendor/')
 VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
          -nilfunc -printf -rangeloops -shift -structtags -unsafeptr
 VERSION?=$(shell awk -F\" '/^const Version/ { print $$2; exit }' version.go)
 
-all: deps format
+all: format
 	@mkdir -p bin/
 	@bash --norc -i ./scripts/build.sh
 
@@ -26,30 +23,16 @@ cov:
 	gocov test ./... | gocov-html > /tmp/coverage.html
 	open /tmp/coverage.html
 
-deps:
-	@echo "--> Installing build dependencies"
-	@go get -v $(GOTOOLS)
-	@go get -d -v ./... $(DEPS)
-
-updatedeps: deps
-	go get -u -v $(GOTOOLS)
-	go list ./... \
-		| xargs go list -f '{{join .Deps "\n"}}' \
-		| grep -v github.com/hashicorp/consul \
-		| grep -v '/internal/' \
-		| sort -u \
-		| xargs go get -f -u -v
-
-test: deps
+test:
 	@$(MAKE) vet
 	@./scripts/verify_no_uuid.sh
 	@./scripts/test.sh
 
-cover: deps
+cover:
 	./scripts/verify_no_uuid.sh
 	go list ./... | xargs -n1 go test --cover
 
-format: deps
+format:
 	@echo "--> Running go fmt"
 	@go fmt $(PACKAGES)
 
@@ -65,12 +48,12 @@ vet:
 	fi
 
 # generate runs `go generate` to build the dynamically generated source files
-generate: deps
+generate:
 	find . -type f -name '.DS_Store' -delete
 	go generate ./...
 
 # generates the static web ui
-static-assets: deps
+static-assets:
 	@echo "--> Generating static assets"
 	@go-bindata-assetfs -pkg agent -prefix pkg ./pkg/web_ui/...
 	@mv bindata_assetfs.go command/agent
@@ -82,4 +65,4 @@ web:
 web-push:
 	./scripts/website_push.sh
 
-.PHONY: all bin dev dist cov deps test vet web web-push generate test-nodep static-assets
+.PHONY: all bin dev dist cov test vet web web-push generate static-assets

scripts/build.sh

@@ -3,6 +3,8 @@
 # This script builds the application from source for multiple platforms.
 set -e
 
+export GO15VENDOREXPERIMENT=1
+
 # Get the parent directory of where this script is.
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
@@ -20,10 +22,6 @@ GIT_DESCRIBE=$(git describe --tags)
 XC_ARCH=${XC_ARCH:-"386 amd64 arm"}
 XC_OS=${XC_OS:-"solaris darwin freebsd linux windows"}
 
-# Install dependencies
-echo "==> Getting dependencies..."
-go get ./...
-
 # Delete the old dir
 echo "==> Removing old directory..."
 rm -f bin/*

scripts/dist.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
 
+export GO15VENDOREXPERIMENT=1
+
 # Get the version from the command line
 VERSION=$1
 if [ -z $VERSION ]; then

scripts/test.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+export GO15VENDOREXPERIMENT=1
+
 # Create a temp dir and clean it up on exit
 TEMPDIR=`mktemp -d -t consul-test.XXX`
 trap "rm -rf $TEMPDIR" EXIT HUP INT QUIT TERM
@@ -10,4 +12,4 @@ go build -o $TEMPDIR/consul || exit 1
 
 # Run the tests
 echo "--> Running tests"
-go list ./... | PATH=$TEMPDIR:$PATH xargs -n1 go test
+go list ./... | grep -v ^github.com/hashicorp/consul/vendor/ | PATH=$TEMPDIR:$PATH xargs -n1 go test