Use govendor for all Go dependencies.

Instead of `go get`. This way we control when to update versions.
riseofthetigers · Apr 15, 2016 · 441e5ef · 441e5ef
1 parent 587f3a9
commit 441e5ef
Show file tree

Hide file tree

Showing 2 changed files with 339 additions and 17 deletions.
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -101,39 +101,43 @@ else
   export PYTHONPATH=$(prepend_path $PYTHONPATH $grpc_dist/usr/local/lib/python2.7/dist-packages)
 fi
 
-# 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 \
+# Install third-party Go tools used as part of the development workflow.
+#
+# DO NOT ADD LIBRARY DEPENDENCIES HERE. Instead use govendor as described below.
+#
+gotools=" \
        github.com/golang/lint/golint \
-       github.com/golang/mock/gomock \
        github.com/golang/mock/mockgen \
-       github.com/golang/protobuf/proto \
        github.com/golang/protobuf/protoc-gen-go \
-       github.com/olekukonko/tablewriter \
        github.com/kardianos/govendor \
-       golang.org/x/crypto/ssh/terminal \
-       golang.org/x/net/context \
-       golang.org/x/oauth2/google \
        golang.org/x/tools/cmd/goimports \
-       google.golang.org/cloud \
-       google.golang.org/cloud/storage \
-       google.golang.org/grpc \
 "
 
-# Packages for uploading code coverage to coveralls.io (used by Travis CI).
-repos+=" github.com/modocache/gover github.com/mattn/goveralls"
+# Tools for uploading code coverage to coveralls.io (used by Travis CI).
+gotools+=" github.com/modocache/gover github.com/mattn/goveralls"
 # The cover tool needs to be installed into the Go toolchain, so it will fail
 # if Go is installed somewhere that requires root access.
 source tools/shell_functions.inc
 if goversion_min 1.4; then
-  repos+=" golang.org/x/tools/cmd/cover"
+  gotools+=" golang.org/x/tools/cmd/cover"
 else
-  repos+=" code.google.com/p/go.tools/cmd/cover"
+  gotools+=" code.google.com/p/go.tools/cmd/cover"
 fi
 
-go get -u $repos || fail "Failed to download some Go dependencies with 'go get'. Please re-run bootstrap.sh in case of transient errors."
+echo "Installing dev tools with 'go get'..."
+go get -u $gotools || fail "Failed to download some Go tools with 'go get'. Please re-run bootstrap.sh in case of transient errors."
 
 # Download dependencies that are version-pinned via govendor.
+#
+# To add a new dependency, run:
+#   govendor fetch <package_path>
+#
+# Then:
+#   git add vendor/vendor.json
+#   git commit
+#
+# See https://github.com/kardianos/govendor for more options.
+echo "Updating govendor dependencies..."
 govendor sync || fail "Failed to download/update dependencies with govendor. Please re-run bootstrap.sh in case of transient errors."
 
 ln -snf $VTTOP/config $VTROOT/config

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -10,13 +10,331 @@
 			"version": "=v2.0.0",
 			"versionExact": "v2.0.0"
 		},
+		{
+			"checksumSHA1": "yUc84k7cfnRi9AlPFuRo77Y18Og=",
+			"path": "github.com/golang/glog",
+			"revision": "23def4e6c14b4da8ac2ed8007337bc5eb5007998",
+			"revisionTime": "2016-01-25T20:49:56Z"
+		},
+		{
+			"checksumSHA1": "EKlPqAOSRdB3oivOJPneqQm+Skk=",
+			"path": "github.com/golang/mock/gomock",
+			"revision": "bd3c8e81be01eef76d4b503f5e687d2d1354d2d9",
+			"revisionTime": "2016-01-21T18:51:14Z"
+		},
+		{
+			"checksumSHA1": "ks9nCA68MefWDMUIjIF/zJwpTuw=",
+			"path": "github.com/golang/mock/gomock/mock_matcher",
+			"revision": "bd3c8e81be01eef76d4b503f5e687d2d1354d2d9",
+			"revisionTime": "2016-01-21T18:51:14Z"
+		},
+		{
+			"checksumSHA1": "w0BinE1jv7sLR9iqXmTUeaN2yZQ=",
+			"path": "github.com/golang/protobuf/proto",
+			"revision": "f0a097ddac24fb00e07d2ac17f8671423f3ea47c",
+			"revisionTime": "2016-04-13T04:01:00Z"
+		},
+		{
+			"checksumSHA1": "FAcShrpHCr+JlEzLtrlXb2509ng=",
+			"path": "github.com/golang/protobuf/proto/proto3_proto",
+			"revision": "f0a097ddac24fb00e07d2ac17f8671423f3ea47c",
+			"revisionTime": "2016-04-13T04:01:00Z"
+		},
+		{
+			"checksumSHA1": "ziJ4U3fMgzYUaflqefqATULDFv0=",
+			"path": "github.com/golang/protobuf/ptypes/any",
+			"revision": "f0a097ddac24fb00e07d2ac17f8671423f3ea47c",
+			"revisionTime": "2016-04-13T04:01:00Z"
+		},
 		{
 			"checksumSHA1": "fe0NspvyJjx6DhmTjIpO0zmR+kg=",
 			"path": "github.com/influxdb/influxdb/client",
 			"revision": "afde71eb1740fd763ab9450e1f700ba0e53c36d0",
 			"revisionTime": "2014-12-28T19:15:54Z",
 			"version": "=v0.8.8",
 			"versionExact": "v0.8.8"
+		},
+		{
+			"checksumSHA1": "09mQOEtlqUoIz/sXFWA/vY1lEPw=",
+			"path": "github.com/mattn/go-runewidth",
+			"revision": "d6bea18f789704b5f83375793155289da36a3c7f",
+			"revisionTime": "2016-03-15T04:07:12Z"
+		},
+		{
+			"checksumSHA1": "FR9klLOXPp3dMRN8Y0nzSbNynVk=",
+			"path": "github.com/minio/minio-go",
+			"revision": "17b4ebd52505bde655e3b14df732e31850641bb7",
+			"revisionTime": "2016-04-14T21:22:01Z"
+		},
+		{
+			"checksumSHA1": "fb3i4XcL9StitSFLi/5pgGtRXDk=",
+			"path": "github.com/olekukonko/tablewriter",
+			"revision": "cca8bbc0798408af109aaaa239cbd2634846b340",
+			"revisionTime": "2016-01-15T11:10:02Z"
+		},
+		{
+			"checksumSHA1": "N5zDlkYc/+g7EwjB3GyHkYfOJAI=",
+			"path": "golang.org/x/crypto/ssh/terminal",
+			"revision": "1777f3ba8c1fed80fcaec3317e3aaa4f627764d2",
+			"revisionTime": "2016-03-18T12:12:46Z"
+		},
+		{
+			"checksumSHA1": "WMRVWZKfmpPuAD9paJXp1YmQFEY=",
+			"path": "golang.org/x/net/context",
+			"revision": "fb93926129b8ec0056f2f458b1f519654814edf0",
+			"revisionTime": "2016-04-12T22:48:50Z"
+		},
+		{
+			"checksumSHA1": "eiQWDBulU3IQDIrb6SbQ3ySr2YU=",
+			"path": "golang.org/x/net/context/ctxhttp",
+			"revision": "fb93926129b8ec0056f2f458b1f519654814edf0",
+			"revisionTime": "2016-04-12T22:48:50Z"
+		},
+		{
+			"checksumSHA1": "PcWKRwSoGnJmLQz5JW7cP/42sIY=",
+			"path": "golang.org/x/net/http2",
+			"revision": "fb93926129b8ec0056f2f458b1f519654814edf0",
+			"revisionTime": "2016-04-12T22:48:50Z"
+		},
+		{
+			"checksumSHA1": "EpDZJMriEXyqpJgLmVtytPsj/9Y=",
+			"path": "golang.org/x/net/http2/hpack",
+			"revision": "fb93926129b8ec0056f2f458b1f519654814edf0",
+			"revisionTime": "2016-04-12T22:48:50Z"
+		},
+		{
+			"checksumSHA1": "RkU5lZBX/UA0RorQ0a68/sq8dPQ=",
+			"path": "golang.org/x/net/internal/timeseries",
+			"revision": "fb93926129b8ec0056f2f458b1f519654814edf0",
+			"revisionTime": "2016-04-12T22:48:50Z"
+		},
+		{
+			"checksumSHA1": "Lmld3vVJChsEiGZ2TNiMM5fIXYs=",
+			"path": "golang.org/x/net/trace",
+			"revision": "fb93926129b8ec0056f2f458b1f519654814edf0",
+			"revisionTime": "2016-04-12T22:48:50Z"
+		},
+		{
+			"checksumSHA1": "yhH5x3vjFC4f3wOH5kwUtB7OfGU=",
+			"path": "golang.org/x/oauth2",
+			"revision": "b0e2337fe6ec0c637fa4f123268b972f334504eb",
+			"revisionTime": "2016-04-08T01:06:28Z"
+		},
+		{
+			"checksumSHA1": "ba3PTvr9D2a9LYzkJFG3Z6hSBGs=",
+			"path": "golang.org/x/oauth2/google",
+			"revision": "b0e2337fe6ec0c637fa4f123268b972f334504eb",
+			"revisionTime": "2016-04-08T01:06:28Z"
+		},
+		{
+			"checksumSHA1": "lCxjjgnSNuU6Nq0F1gG5lif7Eqw=",
+			"path": "golang.org/x/oauth2/internal",
+			"revision": "b0e2337fe6ec0c637fa4f123268b972f334504eb",
+			"revisionTime": "2016-04-08T01:06:28Z"
+		},
+		{
+			"checksumSHA1": "4GaanJZHtrkglrx6a585C3I07+s=",
+			"path": "golang.org/x/oauth2/jws",
+			"revision": "b0e2337fe6ec0c637fa4f123268b972f334504eb",
+			"revisionTime": "2016-04-08T01:06:28Z"
+		},
+		{
+			"checksumSHA1": "V1zdUqirPV0WiXRyVwe+gGdS7kE=",
+			"path": "golang.org/x/oauth2/jwt",
+			"revision": "b0e2337fe6ec0c637fa4f123268b972f334504eb",
+			"revisionTime": "2016-04-08T01:06:28Z"
+		},
+		{
+			"checksumSHA1": "GPy9lvgd0AOA8b4GJpkpG/BiCB8=",
+			"path": "google.golang.org/api/gensupport",
+			"revision": "9737cc9e103c00d06a8f3993361dec083df3d252",
+			"revisionTime": "2016-04-08T06:59:26Z"
+		},
+		{
+			"checksumSHA1": "+9ex7DpAjKVXowD+x/UOL5PUr/g=",
+			"path": "google.golang.org/api/googleapi",
+			"revision": "9737cc9e103c00d06a8f3993361dec083df3d252",
+			"revisionTime": "2016-04-08T06:59:26Z"
+		},
+		{
+			"checksumSHA1": "TMVeMtw3bZZLjxImI9lnC5Pph3A=",
+			"path": "google.golang.org/api/googleapi/internal/uritemplates",
+			"revision": "9737cc9e103c00d06a8f3993361dec083df3d252",
+			"revisionTime": "2016-04-08T06:59:26Z"
+		},
+		{
+			"checksumSHA1": "nd34LJ7TukpbCb8ZxvLcwGxZYjk=",
+			"path": "google.golang.org/api/storage/v1",
+			"revision": "9737cc9e103c00d06a8f3993361dec083df3d252",
+			"revisionTime": "2016-04-08T06:59:26Z"
+		},
+		{
+			"checksumSHA1": "hUqAsLCtjrc8oXa8AznNPvhC3QY=",
+			"path": "google.golang.org/appengine",
+			"revision": "b67c870a16a2d58b3afa024461dcc51805f52e9d",
+			"revisionTime": "2016-03-31T04:59:47Z"
+		},
+		{
+			"checksumSHA1": "ADOB9+y5edl026RW6m7760nUjzo=",
+			"path": "google.golang.org/appengine/internal",
+			"revision": "b67c870a16a2d58b3afa024461dcc51805f52e9d",
+			"revisionTime": "2016-03-31T04:59:47Z"
+		},
+		{
+			"checksumSHA1": "rccBu+HNVpDlx0z1EtcOWUM5OME=",
+			"path": "google.golang.org/appengine/internal/aetesting",
+			"revision": "b67c870a16a2d58b3afa024461dcc51805f52e9d",
+			"revisionTime": "2016-03-31T04:59:47Z"
+		},
+		{
+			"checksumSHA1": "x6Thdfyasqd68dWZWqzWWeIfAfI=",
+			"path": "google.golang.org/appengine/internal/app_identity",
+			"revision": "b67c870a16a2d58b3afa024461dcc51805f52e9d",
+			"revisionTime": "2016-03-31T04:59:47Z"
+		},
+		{
+			"checksumSHA1": "TsNO8P0xUlLNyh3Ic/tzSp/fDWM=",
+			"path": "google.golang.org/appengine/internal/base",
+			"revision": "b67c870a16a2d58b3afa024461dcc51805f52e9d",
+			"revisionTime": "2016-03-31T04:59:47Z"
+		},
+		{
+			"checksumSHA1": "5QsV5oLGSfKZqTCVXP6NRz5T4Tw=",
+			"path": "google.golang.org/appengine/internal/datastore",
+			"revision": "b67c870a16a2d58b3afa024461dcc51805f52e9d",
+			"revisionTime": "2016-03-31T04:59:47Z"
+		},
+		{
+			"checksumSHA1": "Gep2T9zmVYV8qZfK2gu3zrmG6QE=",
+			"path": "google.golang.org/appengine/internal/log",
+			"revision": "b67c870a16a2d58b3afa024461dcc51805f52e9d",
+			"revisionTime": "2016-03-31T04:59:47Z"
+		},
+		{
+			"checksumSHA1": "eLZVX1EHLclFtQnjDIszsdyWRHo=",
+			"path": "google.golang.org/appengine/internal/modules",
+			"revision": "b67c870a16a2d58b3afa024461dcc51805f52e9d",
+			"revisionTime": "2016-03-31T04:59:47Z"
+		},
+		{
+			"checksumSHA1": "a1XY7rz3BieOVqVI2Et6rKiwQCk=",
+			"path": "google.golang.org/appengine/internal/remote_api",
+			"revision": "b67c870a16a2d58b3afa024461dcc51805f52e9d",
+			"revisionTime": "2016-03-31T04:59:47Z"
+		},
+		{
+			"checksumSHA1": "QtAbHtHmDzcf6vOV9eqlCpKgjiw=",
+			"path": "google.golang.org/appengine/internal/urlfetch",
+			"revision": "b67c870a16a2d58b3afa024461dcc51805f52e9d",
+			"revisionTime": "2016-03-31T04:59:47Z"
+		},
+		{
+			"checksumSHA1": "akOV9pYnCbcPA8wJUutSQVibdyg=",
+			"path": "google.golang.org/appengine/urlfetch",
+			"revision": "b67c870a16a2d58b3afa024461dcc51805f52e9d",
+			"revisionTime": "2016-03-31T04:59:47Z"
+		},
+		{
+			"checksumSHA1": "rSgGMT74IwMih4MI/WXWoBa8psU=",
+			"path": "google.golang.org/cloud",
+			"revision": "7b5d2677dff6d957e7f87c784b54cfaa03150c68",
+			"revisionTime": "2016-04-13T14:33:21Z"
+		},
+		{
+			"checksumSHA1": "Wp8g9MHRmK8SwcyGVCoGtPx+5Lo=",
+			"path": "google.golang.org/cloud/compute/metadata",
+			"revision": "7b5d2677dff6d957e7f87c784b54cfaa03150c68",
+			"revisionTime": "2016-04-13T14:33:21Z"
+		},
+		{
+			"checksumSHA1": "U7dGDNwEHORvJFMoNSXErKE7ITg=",
+			"path": "google.golang.org/cloud/internal",
+			"revision": "7b5d2677dff6d957e7f87c784b54cfaa03150c68",
+			"revisionTime": "2016-04-13T14:33:21Z"
+		},
+		{
+			"checksumSHA1": "sYR6mMwX7a3dCYpIWUoe7pZ4yxU=",
+			"path": "google.golang.org/cloud/internal/opts",
+			"revision": "7b5d2677dff6d957e7f87c784b54cfaa03150c68",
+			"revisionTime": "2016-04-13T14:33:21Z"
+		},
+		{
+			"checksumSHA1": "Hqj8iaSrOrk4ZRGPac3UA8lzPUA=",
+			"path": "google.golang.org/cloud/internal/testutil",
+			"revision": "7b5d2677dff6d957e7f87c784b54cfaa03150c68",
+			"revisionTime": "2016-04-13T14:33:21Z"
+		},
+		{
+			"checksumSHA1": "tNmeleIWZe+HirBxokHO0KpSon8=",
+			"path": "google.golang.org/cloud/internal/transport",
+			"revision": "7b5d2677dff6d957e7f87c784b54cfaa03150c68",
+			"revisionTime": "2016-04-13T14:33:21Z"
+		},
+		{
+			"checksumSHA1": "6ys25d2PYO8AghjGlbgQLxsDidE=",
+			"path": "google.golang.org/cloud/storage",
+			"revision": "7b5d2677dff6d957e7f87c784b54cfaa03150c68",
+			"revisionTime": "2016-04-13T14:33:21Z"
+		},
+		{
+			"checksumSHA1": "7lcXU1qQzZgE8BpGasfhm91RL1A=",
+			"path": "google.golang.org/grpc",
+			"revision": "9ac074585f926c8506b6351bfdc396d2b19b1cb1",
+			"revisionTime": "2016-04-13T17:35:15Z"
+		},
+		{
+			"checksumSHA1": "08icuA15HRkdYCt6H+Cs90RPQsY=",
+			"path": "google.golang.org/grpc/codes",
+			"revision": "9ac074585f926c8506b6351bfdc396d2b19b1cb1",
+			"revisionTime": "2016-04-13T17:35:15Z"
+		},
+		{
+			"checksumSHA1": "a+C+FoyX7Tc4iNFhBndt/y/iPEg=",
+			"path": "google.golang.org/grpc/credentials",
+			"revision": "9ac074585f926c8506b6351bfdc396d2b19b1cb1",
+			"revisionTime": "2016-04-13T17:35:15Z"
+		},
+		{
+			"checksumSHA1": "aKQ51Peys87Nx4MPmO7yLYWPliM=",
+			"path": "google.golang.org/grpc/credentials/oauth",
+			"revision": "9ac074585f926c8506b6351bfdc396d2b19b1cb1",
+			"revisionTime": "2016-04-13T17:35:15Z"
+		},
+		{
+			"checksumSHA1": "3Lt5hNAG8qJAYSsNghR5uA1zQns=",
+			"path": "google.golang.org/grpc/grpclog",
+			"revision": "9ac074585f926c8506b6351bfdc396d2b19b1cb1",
+			"revisionTime": "2016-04-13T17:35:15Z"
+		},
+		{
+			"checksumSHA1": "T3Q0p8kzvXFnRkMaK/G8mCv6mc0=",
+			"path": "google.golang.org/grpc/internal",
+			"revision": "9ac074585f926c8506b6351bfdc396d2b19b1cb1",
+			"revisionTime": "2016-04-13T17:35:15Z"
+		},
+		{
+			"checksumSHA1": "L+HffiwJSKA8pFa8c0ZgtWW3mm4=",
+			"path": "google.golang.org/grpc/metadata",
+			"revision": "9ac074585f926c8506b6351bfdc396d2b19b1cb1",
+			"revisionTime": "2016-04-13T17:35:15Z"
+		},
+		{
+			"checksumSHA1": "fGJlPKvpYAZ6+HRX3qScFnZ9dd4=",
+			"path": "google.golang.org/grpc/naming",
+			"revision": "9ac074585f926c8506b6351bfdc396d2b19b1cb1",
+			"revisionTime": "2016-04-13T17:35:15Z"
+		},
+		{
+			"checksumSHA1": "3RRoLeH6X2//7tVClOVzxW2bY+E=",
+			"path": "google.golang.org/grpc/peer",
+			"revision": "9ac074585f926c8506b6351bfdc396d2b19b1cb1",
+			"revisionTime": "2016-04-13T17:35:15Z"
+		},
+		{
+			"checksumSHA1": "dbjKJXLB0jD+OOb8UJnCGxSj3u4=",
+			"path": "google.golang.org/grpc/transport",
+			"revision": "9ac074585f926c8506b6351bfdc396d2b19b1cb1",
+			"revisionTime": "2016-04-13T17:35:15Z"
 		}
 	],
 	"rootPath": "github.com/youtube/vitess"