Merge pull request #1625 from enisoc/vendor

Use native Go vendor mode for godeps.

Godeps/Godeps.json

@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/youtube/vitess",
-	"GoVersion": "go1.4.1",
+	"GoVersion": "go1.5",
 	"Packages": [
 		"./go/stats/influxdbbackend",
 		"./go/vt/etcdtopo"

Makefile

@@ -30,7 +30,7 @@ build:
 ifndef NOBANNER
 	echo $$(date): Building source tree
 endif
-	godep go install $(VT_GO_PARALLEL) -ldflags "$(tools/build_version_flags.sh)" ./go/...
+	go install $(VT_GO_PARALLEL) -ldflags "$(tools/build_version_flags.sh)" ./go/...
 
 # To pass extra flags, run test.go manually.
 # For example: go run test.go -docker=false -- --extra-flag
@@ -52,13 +52,13 @@ clean_pkg:
 
 unit_test: build
 	echo $$(date): Running unit tests
-	godep go test $(VT_GO_PARALLEL) ./go/...
+	go test $(VT_GO_PARALLEL) ./go/...
 
 # Run the code coverage tools, compute aggregate.
 # If you want to improve in a directory, run:
 #   go test -coverprofile=coverage.out && go tool cover -html=coverage.out
 unit_test_cover: build
-	godep go test $(VT_GO_PARALLEL) -cover ./go/... | misc/parse_cover.py
+	go test $(VT_GO_PARALLEL) -cover ./go/... | misc/parse_cover.py
 
 unit_test_race: build
 	tools/unit_test_race.sh
@@ -73,18 +73,18 @@ SHELL = /bin/bash
 
 # Run the following tests after making worker changes.
 worker_test:
-	godep go test ./go/vt/worker/
+	go test ./go/vt/worker/
 	go run test.go -docker=false -tag=worker_test
 
 site_integration_test:
 	go run test.go -docker=false -tag=site_test
 
 java_test:
-	godep go install ./go/cmd/vtgateclienttest
+	go install ./go/cmd/vtgateclienttest
 	mvn -f java/pom.xml clean verify
 
 php_test:
-	godep go install ./go/cmd/vtgateclienttest
+	go install ./go/cmd/vtgateclienttest
 	phpunit php/tests
 
 # This rule rebuilds all the go files from the proto definitions for gRPC.

bootstrap.sh

@@ -98,9 +98,6 @@ else
   export PYTHONPATH=$(prepend_path $PYTHONPATH $grpc_dist/usr/local/lib/python2.7/dist-packages)
 fi
 
-ln -nfs $VTTOP/third_party/go/launchpad.net $VTROOT/src
-go install launchpad.net/gozk/zookeeper
-
 # Download third-party Go libraries.
 # (We use one go get command (and therefore one variable) for all repositories because this saves us several seconds of execution time.)
 repos="github.com/golang/glog \

dev.env

@@ -25,6 +25,7 @@ mkdir -p $VTDATAROOT
 
 export VTPORTSTART=15000
 
+export GO15VENDOREXPERIMENT=1
 
 for pypath in $(find $VTROOT/dist -name site-packages -or -name dist-packages | grep -v src/python/grpcio/.tox/py27/lib/python2.7/site-packages)
 do

doc/GettingStarted.md

@@ -73,7 +73,7 @@ OS X 10.11 (El Capitan) should work as well, the installation instructions are b
 
 In addition, Vitess requires the software and libraries listed below.
 
-1.  [Install Go 1.4+](http://golang.org/doc/install).
+1.  [Install Go 1.5+](http://golang.org/doc/install).
 
 2.  Install [MariaDB 10.0](https://downloads.mariadb.org/) or
     [MySQL 5.6](http://dev.mysql.com/downloads/mysql). You can use any

doc/GettingStartedKubernetes.md

@@ -9,13 +9,13 @@ The `kubectl` steps will apply to any Kubernetes cluster.
 
 ## Prerequisites
 
-To complete the exercise in this guide, you must locally install Go 1.3+,
+To complete the exercise in this guide, you must locally install Go 1.5+,
 Vitess' `vtctlclient` tool, and Google Cloud SDK. The
 following sections explain how to set these up in your environment.
 
-### Install Go 1.3+
+### Install Go 1.5+
 
-You need to install [Go 1.3+](http://golang.org/doc/install) to build the
+You need to install [Go 1.5+](http://golang.org/doc/install) to build the
 `vtctlclient` tool, which issues commands to Vitess.
 
 After installing Go, make sure your `GOPATH` environment

docker/bootstrap/Dockerfile.common

@@ -75,6 +75,7 @@ ENV PKG_CONFIG_PATH $VTROOT/lib
 ENV CGO_CFLAGS -I$VTROOT/dist/vt-zookeeper-3.4.6/include/zookeeper
 ENV CGO_LDFLAGS -L$VTROOT/dist/vt-zookeeper-3.4.6/lib
 ENV LD_LIBRARY_PATH $VTROOT/dist/vt-zookeeper-3.4.6/lib
+ENV GO15VENDOREXPERIMENT 1
 
 # Copy files needed for bootstrap
 COPY bootstrap.sh dev.env /vt/src/github.com/youtube/vitess/

docker/bootstrap/Dockerfile.mysql56

@@ -1,7 +1,7 @@
 FROM vitess/bootstrap:common
 
 # Install MySQL 5.6
-RUN apt-key adv --recv-keys --keyserver pgp.mit.edu 5072E1F5 && \
+RUN apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net 5072E1F5 && \
     add-apt-repository 'deb http://repo.mysql.com/apt/debian/ jessie mysql-5.6' && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server libmysqlclient-dev && \

test/config.json

@@ -14,7 +14,7 @@
 			"Args": [],
 			"Command": [],
 			"Manual": false,
-			"Shard": 4,
+			"Shard": 3,
 			"RetryMax": 0,
 			"Tags": []
 		},
@@ -47,6 +47,24 @@
 			"RetryMax": 0,
 			"Tags": []
 		},
+		"encrypted_replication": {
+			"File": "encrypted_replication.py",
+			"Args": [],
+			"Command": [],
+			"Manual": false,
+			"Shard": 4,
+			"RetryMax": 0,
+			"Tags": []
+		},
+		"encrypted_transport": {
+			"File": "encrypted_transport.py",
+			"Args": [],
+			"Command": [],
+			"Manual": false,
+			"Shard": 4,
+			"RetryMax": 0,
+			"Tags": []
+		},
 		"goveralls": {
 			"File": "",
 			"Args": [],
@@ -88,7 +106,7 @@
 				"java_test"
 			],
 			"Manual": false,
-			"Shard": 2,
+			"Shard": 3,
 			"RetryMax": 0,
 			"Tags": []
 		},
@@ -99,7 +117,7 @@
 				"test/keyrange_test.py"
 			],
 			"Manual": false,
-			"Shard": 1,
+			"Shard": 4,
 			"RetryMax": 0,
 			"Tags": [
 				"site_test"
@@ -123,7 +141,7 @@
 				"test/local_example.sh"
 			],
 			"Manual": false,
-			"Shard": 3,
+			"Shard": 2,
 			"RetryMax": 0,
 			"Tags": []
 		},
@@ -132,7 +150,7 @@
 			"Args": [],
 			"Command": [],
 			"Manual": false,
-			"Shard": 1,
+			"Shard": 4,
 			"RetryMax": 0,
 			"Tags": []
 		},
@@ -164,7 +182,7 @@
 			"Args": [],
 			"Command": [],
 			"Manual": false,
-			"Shard": 1,
+			"Shard": 0,
 			"RetryMax": 0,
 			"Tags": []
 		},
@@ -173,7 +191,7 @@
 			"Args": [],
 			"Command": [],
 			"Manual": false,
-			"Shard": 3,
+			"Shard": 2,
 			"RetryMax": 0,
 			"Tags": []
 		},
@@ -182,7 +200,7 @@
 			"Args": [],
 			"Command": [],
 			"Manual": false,
-			"Shard": 0,
+			"Shard": 3,
 			"RetryMax": 0,
 			"Tags": [
 				"worker_test"
@@ -193,7 +211,7 @@
 			"Args": [],
 			"Command": [],
 			"Manual": false,
-			"Shard": 1,
+			"Shard": 0,
 			"RetryMax": 0,
 			"Tags": [
 				"worker_test"
@@ -217,24 +235,6 @@
 			"RetryMax": 0,
 			"Tags": []
 		},
-		"encrypted_replication": {
-			"File": "encrypted_replication.py",
-			"Args": [],
-			"Command": [],
-			"Manual": false,
-			"Shard": 4,
-			"RetryMax": 0,
-			"Tags": []
-		},
-		"encrypted_transport": {
-			"File": "encrypted_transport.py",
-			"Args": [],
-			"Command": [],
-			"Manual": false,
-			"Shard": 4,
-			"RetryMax": 0,
-			"Tags": []
-		},
 		"sharded": {
 			"File": "sharded.py",
 			"Args": [],
@@ -251,7 +251,7 @@
 				"test/sql_builder_test.py"
 			],
 			"Manual": false,
-			"Shard": 0,
+			"Shard": 3,
 			"RetryMax": 0,
 			"Tags": []
 		},
@@ -273,7 +273,7 @@
 				"tools/unit_test_runner.sh"
 			],
 			"Manual": false,
-			"Shard": 2,
+			"Shard": 1,
 			"RetryMax": 1,
 			"Tags": []
 		},
@@ -285,7 +285,7 @@
 				"unit_test_race"
 			],
 			"Manual": false,
-			"Shard": 3,
+			"Shard": 4,
 			"RetryMax": 0,
 			"Tags": []
 		},
@@ -323,7 +323,7 @@
 			"Args": [],
 			"Command": [],
 			"Manual": false,
-			"Shard": 1,
+			"Shard": 3,
 			"RetryMax": 0,
 			"Tags": []
 		},
@@ -367,7 +367,7 @@
 			"Args": [],
 			"Command": [],
 			"Manual": false,
-			"Shard": 4,
+			"Shard": 2,
 			"RetryMax": 0,
 			"Tags": []
 		},
@@ -383,4 +383,4 @@
 			]
 		}
 	}
-}
+}

test/environment.py

@@ -144,7 +144,7 @@ def prog_compile(name):
     return
   compiled_progs.append(name)
   logging.debug('Compiling %s', name)
-  run(['godep', 'go', 'install'], cwd=os.path.join(vttop, 'go', 'cmd', name))
+  run(['go', 'install'], cwd=os.path.join(vttop, 'go', 'cmd', name))
 
 
 # binary management: returns the full path for a binary this should

tools/unit_test_runner.sh

@@ -29,7 +29,7 @@ all_except_flaky_tests=$(echo "$packages_with_tests" | grep -vE ".+ .+_flaky_tes
 flaky_tests=$(echo "$packages_with_tests" | grep -E ".+ .+_flaky_test\.go" | cut -d" " -f1)
 
 # Run non-flaky tests.
-echo "$all_except_flaky_tests" | xargs godep go test $GO_PARALLEL
+echo "$all_except_flaky_tests" | xargs go test $GO_PARALLEL
 if [ $? -ne 0 ]; then
   echo "ERROR: Go unit tests failed. See above for errors."
   echo
@@ -43,7 +43,7 @@ for pkg in $flaky_tests; do
   max_attempts=3
   attempt=1
   # Set a timeout because some tests may deadlock when they flake.
-  until godep go test -timeout 30s $GO_PARALLEL $pkg; do
+  until go test -timeout 30s $GO_PARALLEL $pkg; do
     echo "FAILED (try $attempt/$max_attempts) in $pkg (return code $?). See above for errors."
     if [ $((++attempt)) -gt $max_attempts ]; then
       echo "ERROR: Flaky Go unit tests in package $pkg failed too often (after $max_attempts retries). Please reduce the flakiness."

travis/goveralls.sh

@@ -5,7 +5,7 @@
 
 set -e
 
-go list -f '{{if len .TestGoFiles}}godep go test $(VT_GO_PARALLEL) -coverprofile={{.Dir}}/.coverprofile {{.ImportPath}}{{end    }}' ./go/... | xargs -i sh -c {} | tee unit_test_goveralls.txt
+go list -f '{{if len .TestGoFiles}}go test $(VT_GO_PARALLEL) -coverprofile={{.Dir}}/.coverprofile {{.ImportPath}}{{end    }}' ./go/... | xargs -i sh -c {} | tee unit_test_goveralls.txt
 gover ./go/
 # -shallow ensures that goveralls does not return with a failure \
 # if Coveralls returns a 500 http error or higher (e.g. when the site is in read-only mode). \