Merge pull request #9155 from gyuho/dep

vendor: migrate to "golang/dep"

.gitignore

@@ -20,3 +20,21 @@ hack/scripts-dev/docker-dns/.Dockerfile
 hack/scripts-dev/docker-dns-srv/.Dockerfile
 hack/tls-setup/certs
 .idea
+
+# TODO: use dep prune
+# https://github.com/golang/dep/issues/120#issuecomment-306518546
+vendor/**/*
+!vendor/**/
+!vendor/**/*.go
+!vendor/**/*.c
+!vendor/**/*.cpp
+!vendor/**/*.s
+!vendor/**/COPYING*
+!vendor/**/PATENTS*
+!vendor/**/NOTICE*
+!vendor/**/Licence*
+!vendor/**/License*
+!vendor/**/LICENCE*
+!vendor/**/LICENSE*
+vendor/**/*_test.go
+

.travis.yml

@@ -51,7 +51,7 @@ before_install:
 - docker pull gcr.io/etcd-development/etcd-test:go1.9.3
 
 install:
-- pushd cmd/etcd && go get -t -v ./... && popd
+- go get -t -v ./...
 
 script:
  - >

Dockerfile

@@ -1,6 +1,5 @@
 FROM golang
 ADD . /go/src/github.com/coreos/etcd
-ADD cmd/vendor /go/src/github.com/coreos/etcd/vendor
 RUN go install github.com/coreos/etcd
 EXPOSE 2379 2380
 ENTRYPOINT ["etcd"]

Documentation/dl_build.md

@@ -26,16 +26,7 @@ To build a vendored `etcd` from the `master` branch via `go get`:
 # GOPATH should be set
 $ echo $GOPATH
 /Users/example/go
-$ go get github.com/coreos/etcd/cmd/etcd
-```
-
-To build `etcd` from the `master` branch without vendoring (may not build due to upstream conflicts):
-
-```sh
-# GOPATH should be set
-$ echo $GOPATH
-/Users/example/go
-$ go get github.com/coreos/etcd
+$ go get -v github.com/coreos/etcd
 ```
 
 ## Test the installation

Documentation/op-guide/monitoring.md

@@ -20,14 +20,14 @@ Showing top 10 nodes out of 157 (cum >= 10ms)
     flat  flat%   sum%        cum   cum%
    130ms 27.08% 27.08%      130ms 27.08%  runtime.futex
     70ms 14.58% 41.67%       70ms 14.58%  syscall.Syscall
-    20ms  4.17% 45.83%       20ms  4.17%  github.com/coreos/etcd/cmd/vendor/golang.org/x/net/http2/hpack.huffmanDecode
+    20ms  4.17% 45.83%       20ms  4.17%  github.com/coreos/etcd/vendor/golang.org/x/net/http2/hpack.huffmanDecode
     20ms  4.17% 50.00%       30ms  6.25%  runtime.pcvalue
     20ms  4.17% 54.17%       50ms 10.42%  runtime.schedule
-    10ms  2.08% 56.25%       10ms  2.08%  github.com/coreos/etcd/cmd/vendor/github.com/coreos/etcd/etcdserver.(*EtcdServer).AuthInfoFromCtx
-    10ms  2.08% 58.33%       10ms  2.08%  github.com/coreos/etcd/cmd/vendor/github.com/coreos/etcd/etcdserver.(*EtcdServer).Lead
-    10ms  2.08% 60.42%       10ms  2.08%  github.com/coreos/etcd/cmd/vendor/github.com/coreos/etcd/pkg/wait.(*timeList).Trigger
-    10ms  2.08% 62.50%       10ms  2.08%  github.com/coreos/etcd/cmd/vendor/github.com/prometheus/client_golang/prometheus.(*MetricVec).hashLabelValues
-    10ms  2.08% 64.58%       10ms  2.08%  github.com/coreos/etcd/cmd/vendor/golang.org/x/net/http2.(*Framer).WriteHeaders
+    10ms  2.08% 56.25%       10ms  2.08%  github.com/coreos/etcd/vendor/github.com/coreos/etcd/etcdserver.(*EtcdServer).AuthInfoFromCtx
+    10ms  2.08% 58.33%       10ms  2.08%  github.com/coreos/etcd/vendor/github.com/coreos/etcd/etcdserver.(*EtcdServer).Lead
+    10ms  2.08% 60.42%       10ms  2.08%  github.com/coreos/etcd/vendor/github.com/coreos/etcd/pkg/wait.(*timeList).Trigger
+    10ms  2.08% 62.50%       10ms  2.08%  github.com/coreos/etcd/vendor/github.com/prometheus/client_golang/prometheus.(*MetricVec).hashLabelValues
+    10ms  2.08% 64.58%       10ms  2.08%  github.com/coreos/etcd/vendor/golang.org/x/net/http2.(*Framer).WriteHeaders
 ```
 
 The `/debug/requests` endpoint gives gRPC traces and performance statistics through a web browser. For example, here is a `Range` request for the key `abc`:

Gopkg.lock

@@ -0,0 +1,382 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/beorn7/perks"
+  packages = ["quantile"]
+  revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
+  source = "https://github.com/beorn7/perks"
+
+[[projects]]
+  name = "github.com/bgentry/speakeasy"
+  packages = ["."]
+  revision = "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd"
+  source = "https://github.com/bgentry/speakeasy"
+  version = "v0.1.0"
+
+[[projects]]
+  name = "github.com/coreos/bbolt"
+  packages = ["."]
+  revision = "48ea1b39c25fc1bab3506fbc712ecbaa842c4d2d"
+  source = "https://github.com/coreos/bbolt"
+  version = "v1.3.1-coreos.6"
+
+[[projects]]
+  name = "github.com/coreos/go-semver"
+  packages = ["semver"]
+  revision = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"
+  source = "https://github.com/coreos/go-semver"
+  version = "v0.2.0"
+
+[[projects]]
+  name = "github.com/coreos/go-systemd"
+  packages = [
+    "daemon",
+    "journal",
+    "util"
+  ]
+  revision = "d2196463941895ee908e13531a23a39feb9e1243"
+  source = "https://github.com/coreos/go-systemd"
+  version = "v15"
+
+[[projects]]
+  name = "github.com/coreos/pkg"
+  packages = [
+    "capnslog",
+    "dlopen"
+  ]
+  revision = "3ac0863d7acf3bc44daf49afef8919af12f704ef"
+  source = "https://github.com/coreos/pkg"
+  version = "v3"
+
+[[projects]]
+  name = "github.com/cpuguy83/go-md2man"
+  packages = ["md2man"]
+  revision = "23709d0847197db6021a51fdb193e66e9222d4e7"
+  source = "https://github.com/cpuguy83/go-md2man"
+
+[[projects]]
+  name = "github.com/dgrijalva/jwt-go"
+  packages = ["."]
+  revision = "d2709f9f1f31ebcda9651b03077758c1f3a0018c"
+  source = "https://github.com/dgrijalva/jwt-go"
+  version = "v3.0.0"
+
+[[projects]]
+  name = "github.com/dustin/go-humanize"
+  packages = ["."]
+  revision = "bb3d318650d48840a39aa21a027c6630e198e626"
+  source = "https://github.com/dustin/go-humanize"
+
+[[projects]]
+  name = "github.com/ghodss/yaml"
+  packages = ["."]
+  revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
+  source = "https://github.com/ghodss/yaml"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/gogo/protobuf"
+  packages = [
+    "gogoproto",
+    "proto",
+    "protoc-gen-gogo/descriptor"
+  ]
+  revision = "342cbe0a04158f6dcb03ca0079991a51a4248c02"
+  source = "https://github.com/gogo/protobuf"
+  version = "v0.5"
+
+[[projects]]
+  name = "github.com/golang/groupcache"
+  packages = ["lru"]
+  revision = "02826c3e79038b59d737d3b1c0a1d937f71a4433"
+  source = "https://github.com/golang/groupcache"
+
+[[projects]]
+  name = "github.com/golang/protobuf"
+  packages = [
+    "jsonpb",
+    "proto",
+    "ptypes",
+    "ptypes/any",
+    "ptypes/duration",
+    "ptypes/struct",
+    "ptypes/timestamp"
+  ]
+  revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845"
+  source = "https://github.com/golang/protobuf"
+
+[[projects]]
+  name = "github.com/google/btree"
+  packages = ["."]
+  revision = "925471ac9e2131377a91e1595defec898166fe49"
+  source = "https://github.com/google/btree"
+
+[[projects]]
+  name = "github.com/gorilla/websocket"
+  packages = ["."]
+  revision = "4201258b820c74ac8e6922fc9e6b52f71fe46f8d"
+  source = "https://github.com/gorilla/websocket"
+
+[[projects]]
+  name = "github.com/grpc-ecosystem/go-grpc-prometheus"
+  packages = ["."]
+  revision = "0dafe0d496ea71181bf2dd039e7e3f44b6bd11a7"
+  source = "https://github.com/grpc-ecosystem/go-grpc-prometheus"
+
+[[projects]]
+  name = "github.com/grpc-ecosystem/grpc-gateway"
+  packages = [
+    "runtime",
+    "runtime/internal",
+    "utilities"
+  ]
+  revision = "07f5e79768022f9a3265235f0db4ac8c3f675fec"
+  source = "https://github.com/grpc-ecosystem/grpc-gateway"
+  version = "v1.3.1"
+
+[[projects]]
+  name = "github.com/inconshreveable/mousetrap"
+  packages = ["."]
+  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+  version = "v1.0"
+
+[[projects]]
+  name = "github.com/jonboulle/clockwork"
+  packages = ["."]
+  revision = "2eee05ed794112d45db504eb05aa693efd2b8b09"
+  source = "https://github.com/jonboulle/clockwork"
+  version = "v0.1.0"
+
+[[projects]]
+  name = "github.com/kr/pty"
+  packages = ["."]
+  revision = "2c10821df3c3cf905230d078702dfbe9404c9b23"
+  source = "https://github.com/kr/pty"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/mattn/go-runewidth"
+  packages = ["."]
+  revision = "9e777a8366cce605130a531d2cd6363d07ad7317"
+  source = "https://github.com/mattn/go-runewidth"
+  version = "v0.0.2"
+
+[[projects]]
+  name = "github.com/matttproud/golang_protobuf_extensions"
+  packages = ["pbutil"]
+  revision = "3247c84500bff8d9fb6d579d800f20b3e091582c"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/olekukonko/tablewriter"
+  packages = ["."]
+  revision = "a0225b3f23b5ce0cbec6d7a66a968f8a59eca9c4"
+  source = "https://github.com/olekukonko/tablewriter"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/petar/GoLLRB"
+  packages = ["llrb"]
+  revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"
+
+[[projects]]
+  name = "github.com/prometheus/client_golang"
+  packages = [
+    "prometheus",
+    "prometheus/promhttp"
+  ]
+  revision = "5cec1d0429b02e4323e042eb04dafdb079ddf568"
+  source = "https://github.com/prometheus/client_golang"
+
+[[projects]]
+  name = "github.com/prometheus/client_model"
+  packages = ["go"]
+  revision = "6f3806018612930941127f2a7c6c453ba2c527d2"
+  source = "https://github.com/prometheus/client_model"
+
+[[projects]]
+  name = "github.com/prometheus/common"
+  packages = [
+    "expfmt",
+    "internal/bitbucket.org/ww/goautoneg",
+    "model"
+  ]
+  revision = "e3fb1a1acd7605367a2b378bc2e2f893c05174b7"
+  source = "https://github.com/prometheus/common"
+
+[[projects]]
+  name = "github.com/prometheus/procfs"
+  packages = [
+    ".",
+    "xfs"
+  ]
+  revision = "a6e9df898b1336106c743392c48ee0b71f5c4efa"
+  source = "https://github.com/prometheus/procfs"
+
+[[projects]]
+  name = "github.com/russross/blackfriday"
+  packages = ["."]
+  revision = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"
+  source = "https://github.com/russross/blackfriday"
+
+[[projects]]
+  name = "github.com/sirupsen/logrus"
+  packages = ["."]
+  revision = "f006c2ac4710855cf0f916dd6b77acf6b048dc6e"
+  source = "https://github.com/sirupsen/logrus"
+  version = "v1.0.3"
+
+[[projects]]
+  name = "github.com/soheilhy/cmux"
+  packages = ["."]
+  revision = "bb79a83465015a27a175925ebd155e660f55e9f1"
+  source = "https://github.com/soheilhy/cmux"
+  version = "v0.1.3"
+
+[[projects]]
+  name = "github.com/spf13/cobra"
+  packages = ["."]
+  revision = "1c44ec8d3f1552cac48999f9306da23c4d8a288b"
+  source = "https://github.com/spf13/cobra"
+
+[[projects]]
+  name = "github.com/spf13/pflag"
+  packages = ["."]
+  revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+  source = "https://github.com/spf13/pflag"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/tmc/grpc-websocket-proxy"
+  packages = ["wsproxy"]
+  revision = "89b8d40f7ca833297db804fcb3be53a76d01c238"
+  source = "https://github.com/tmc/grpc-websocket-proxy"
+
+[[projects]]
+  name = "github.com/ugorji/go"
+  packages = ["codec"]
+  revision = "bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57"
+  source = "https://github.com/ugorji/go"
+
+[[projects]]
+  name = "github.com/urfave/cli"
+  packages = ["."]
+  revision = "1efa31f08b9333f1bd4882d61f9d668a70cd902e"
+  source = "https://github.com/urfave/cli"
+  version = "v1.18.0"
+
+[[projects]]
+  name = "github.com/xiang90/probing"
+  packages = ["."]
+  revision = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"
+  source = "https://github.com/xiang90/probing"
+  version = "0.0.1"
+
+[[projects]]
+  name = "golang.org/x/crypto"
+  packages = [
+    "bcrypt",
+    "blowfish",
+    "ssh/terminal"
+  ]
+  revision = "9419663f5a44be8b34ca85f08abc5fe1be11f8a3"
+  source = "https://github.com/golang/crypto"
+
+[[projects]]
+  name = "golang.org/x/net"
+  packages = [
+    "context",
+    "http2",
+    "http2/hpack",
+    "idna",
+    "internal/timeseries",
+    "lex/httplex",
+    "trace"
+  ]
+  revision = "66aacef3dd8a676686c7ae3716979581e8b03c47"
+  source = "https://github.com/golang/net"
+
+[[projects]]
+  name = "golang.org/x/sys"
+  packages = [
+    "unix",
+    "windows"
+  ]
+  revision = "ebfc5b4631820b793c9010c87fd8fef0f39eb082"
+  source = "https://github.com/golang/sys"
+
+[[projects]]
+  name = "golang.org/x/text"
+  packages = [
+    "internal/gen",
+    "internal/triegen",
+    "internal/ucd",
+    "secure/bidirule",
+    "transform",
+    "unicode/bidi",
+    "unicode/cldr",
+    "unicode/norm",
+    "unicode/rangetable"
+  ]
+  revision = "b19bf474d317b857955b12035d2c5acb57ce8b01"
+  source = "https://github.com/golang/text"
+
+[[projects]]
+  name = "golang.org/x/time"
+  packages = ["rate"]
+  revision = "c06e80d9300e4443158a03817b8a8cb37d230320"
+  source = "https://github.com/golang/time"
+
+[[projects]]
+  name = "google.golang.org/genproto"
+  packages = ["googleapis/rpc/status"]
+  revision = "09f6ed296fc66555a25fe4ce95173148778dfa85"
+  source = "https://github.com/google/go-genproto"
+
+[[projects]]
+  name = "google.golang.org/grpc"
+  packages = [
+    ".",
+    "balancer",
+    "codes",
+    "connectivity",
+    "credentials",
+    "grpclb/grpc_lb_v1/messages",
+    "grpclog",
+    "health",
+    "health/grpc_health_v1",
+    "internal",
+    "keepalive",
+    "metadata",
+    "naming",
+    "peer",
+    "resolver",
+    "stats",
+    "status",
+    "tap",
+    "transport"
+  ]
+  revision = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e"
+  source = "https://github.com/grpc/grpc-go"
+  version = "v1.7.5"
+
+[[projects]]
+  name = "gopkg.in/cheggaaa/pb.v1"
+  packages = ["."]
+  revision = "226d21d43a305fac52b3a104ef83e721b15275e0"
+  source = "https://github.com/cheggaaa/pb"
+  version = "v1.0.2"
+
+[[projects]]
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"
+  source = "https://github.com/go-yaml/yaml"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "d3d9cf93e8be79ee71de7d96f1b7529d51fbdf1a96cc0b865fc8ec6b1a42c575"
+  solver-name = "gps-cdcl"
+  solver-version = 1

Gopkg.toml

@@ -0,0 +1,224 @@
+################################
+# Direct dependencies
+
+[[constraint]]
+  name = "github.com/coreos/bbolt"
+  source = "https://github.com/coreos/bbolt"
+  version = "=v1.3.1-coreos.6"
+
+[[constraint]]
+  name = "github.com/google/btree"
+  source = "https://github.com/google/btree"
+  revision = "925471ac9e2131377a91e1595defec898166fe49"
+
+[[constraint]]
+  name = "google.golang.org/grpc"
+  source = "https://github.com/grpc/grpc-go"
+  version = "=v1.7.5"
+
+[[constraint]]
+  name = "github.com/grpc-ecosystem/grpc-gateway"
+  source = "https://github.com/grpc-ecosystem/grpc-gateway"
+  version = "=v1.3.1"
+
+[[constraint]]
+  name = "github.com/tmc/grpc-websocket-proxy"
+  source = "https://github.com/tmc/grpc-websocket-proxy"
+  revision = "89b8d40f7ca833297db804fcb3be53a76d01c238"
+
+[[constraint]]
+  name = "github.com/grpc-ecosystem/go-grpc-prometheus"
+  source = "https://github.com/grpc-ecosystem/go-grpc-prometheus"
+  revision = "0dafe0d496ea71181bf2dd039e7e3f44b6bd11a7"
+
+[[constraint]]
+  name = "github.com/gogo/protobuf"
+  source = "https://github.com/gogo/protobuf"
+  version = "=v0.5"
+
+[[constraint]]
+  name = "github.com/golang/protobuf"
+  source = "https://github.com/golang/protobuf"
+  revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845"
+
+[[constraint]]
+  name = "github.com/soheilhy/cmux"
+  source = "https://github.com/soheilhy/cmux"
+  version = "=v0.1.3"
+
+[[constraint]]
+  name = "github.com/golang/groupcache"
+  source = "https://github.com/golang/groupcache"
+  revision = "02826c3e79038b59d737d3b1c0a1d937f71a4433"
+
+[[constraint]]
+  name = "golang.org/x/time"
+  source = "https://github.com/golang/time"
+  revision = "c06e80d9300e4443158a03817b8a8cb37d230320"
+
+[[constraint]]
+  name = "golang.org/x/net"
+  source = "https://github.com/golang/net"
+  revision = "66aacef3dd8a676686c7ae3716979581e8b03c47"
+
+[[constraint]]
+  name = "golang.org/x/crypto"
+  source = "https://github.com/golang/crypto"
+  revision = "9419663f5a44be8b34ca85f08abc5fe1be11f8a3"
+
+[[constraint]]
+  name = "github.com/coreos/go-systemd"
+  source = "https://github.com/coreos/go-systemd"
+  version = "=v15"
+
+[[constraint]]
+  name = "github.com/coreos/go-semver"
+  source = "https://github.com/coreos/go-semver"
+  version = "=v0.2.0"
+
+[[constraint]]
+  name = "github.com/coreos/pkg"
+  source = "https://github.com/coreos/pkg"
+  version = "=v3"
+
+[[constraint]]
+  name = "github.com/spf13/cobra"
+  source = "https://github.com/spf13/cobra"
+  revision = "1c44ec8d3f1552cac48999f9306da23c4d8a288b"
+
+[[constraint]]
+  name = "github.com/spf13/pflag"
+  source = "https://github.com/spf13/pflag"
+  version = "=v1.0.0"
+
+[[constraint]]
+  name = "github.com/urfave/cli"
+  source = "https://github.com/urfave/cli"
+  version = "=v1.18.0"
+
+[[constraint]]
+  name = "github.com/ugorji/go"
+  source = "https://github.com/ugorji/go"
+  revision = "bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57"
+
+[[constraint]]
+  name = "github.com/kr/pty"
+  source = "https://github.com/kr/pty"
+  version = "=v1.0.0"
+
+[[constraint]]
+  name = "github.com/bgentry/speakeasy"
+  source = "https://github.com/bgentry/speakeasy"
+  version = "=v0.1.0"
+
+[[constraint]]
+  name = "github.com/dustin/go-humanize"
+  source = "https://github.com/dustin/go-humanize"
+  revision = "bb3d318650d48840a39aa21a027c6630e198e626"
+
+[[constraint]]
+  name = "github.com/olekukonko/tablewriter"
+  source = "https://github.com/olekukonko/tablewriter"
+  revision = "a0225b3f23b5ce0cbec6d7a66a968f8a59eca9c4"
+
+[[constraint]]
+  name = "gopkg.in/cheggaaa/pb.v1"
+  source = "https://github.com/cheggaaa/pb"
+  version = "=v1.0.2"
+
+[[constraint]]
+  name = "github.com/ghodss/yaml"
+  source = "https://github.com/ghodss/yaml"
+  version = "=v1.0.0"
+
+[[constraint]]
+  name = "github.com/jonboulle/clockwork"
+  source = "https://github.com/jonboulle/clockwork"
+  version = "=v0.1.0"
+
+[[constraint]]
+  name = "github.com/xiang90/probing"
+  source = "https://github.com/xiang90/probing"
+  version = "=0.0.1"
+
+[[constraint]]
+  name = "github.com/dgrijalva/jwt-go"
+  source = "https://github.com/dgrijalva/jwt-go"
+  version = "=v3.0.0"
+
+[[constraint]]
+  name = "github.com/prometheus/client_golang"
+  source = "https://github.com/prometheus/client_golang"
+  revision = "5cec1d0429b02e4323e042eb04dafdb079ddf568"
+
+[[constraint]]
+  name = "github.com/prometheus/client_model"
+  source = "https://github.com/prometheus/client_model"
+  revision = "6f3806018612930941127f2a7c6c453ba2c527d2"
+
+################################
+
+################################
+# Transitive dependencies, and overrides
+
+[[override]]
+  name = "google.golang.org/genproto"
+  source = "https://github.com/google/go-genproto"
+  revision = "09f6ed296fc66555a25fe4ce95173148778dfa85"
+
+[[override]]
+  name = "golang.org/x/sys"
+  source = "https://github.com/golang/sys"
+  revision = "ebfc5b4631820b793c9010c87fd8fef0f39eb082"
+
+[[override]]
+  name = "golang.org/x/text"
+  source = "https://github.com/golang/text"
+  revision = "b19bf474d317b857955b12035d2c5acb57ce8b01"
+
+[[override]]
+  name = "github.com/gorilla/websocket"
+  source = "https://github.com/gorilla/websocket"
+  revision = "4201258b820c74ac8e6922fc9e6b52f71fe46f8d"
+
+[[override]]
+  name = "gopkg.in/yaml.v2"
+  source = "https://github.com/go-yaml/yaml"
+  revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"
+
+[[override]]
+  name = "github.com/cpuguy83/go-md2man"
+  source = "https://github.com/cpuguy83/go-md2man"
+  revision = "23709d0847197db6021a51fdb193e66e9222d4e7"
+
+[[override]]
+  name = "github.com/russross/blackfriday"
+  source = "https://github.com/russross/blackfriday"
+  revision = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"
+
+[[override]]
+  name = "github.com/prometheus/common"
+  source = "https://github.com/prometheus/common"
+  revision = "e3fb1a1acd7605367a2b378bc2e2f893c05174b7"
+
+[[override]]
+  name = "github.com/prometheus/procfs"
+  source = "https://github.com/prometheus/procfs"
+  revision = "a6e9df898b1336106c743392c48ee0b71f5c4efa"
+
+[[override]]
+  name = "github.com/beorn7/perks"
+  source = "https://github.com/beorn7/perks"
+  revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
+
+[[override]]
+  name = "github.com/sirupsen/logrus"
+  source = "https://github.com/sirupsen/logrus"
+  version = "=v1.0.3"
+
+[[override]]
+  name = "github.com/mattn/go-runewidth"
+  source = "https://github.com/mattn/go-runewidth"
+  version = "=v0.0.2"
+
+################################

build

@@ -10,7 +10,7 @@ if [ ! -z "$FAILPOINTS" ]; then
 fi
 
 # Set GO_LDFLAGS="-s" for building without symbols for debugging.
-GO_LDFLAGS="$GO_LDFLAGS -X ${REPO_PATH}/cmd/vendor/${REPO_PATH}/version.GitSHA=${GIT_SHA}"
+GO_LDFLAGS="$GO_LDFLAGS -X ${REPO_PATH}/version.GitSHA=${GIT_SHA}"
 
 # enable/disable failpoints
 toggle_failpoints() {
@@ -36,31 +36,14 @@ etcd_build() {
 	# Static compilation is useful when etcd is run in a container. $GO_BUILD_FLAGS is OK
 
 	# shellcheck disable=SC2086
-	CGO_ENABLED=0 go build $GO_BUILD_FLAGS -installsuffix cgo -ldflags "$GO_LDFLAGS" -o "${out}/etcd" ${REPO_PATH}/cmd/etcd || return
+	CGO_ENABLED=0 go build $GO_BUILD_FLAGS -installsuffix cgo -ldflags "$GO_LDFLAGS" -o "${out}/etcd" ${REPO_PATH} || return
 	# shellcheck disable=SC2086
-	CGO_ENABLED=0 go build $GO_BUILD_FLAGS -installsuffix cgo -ldflags "$GO_LDFLAGS" -o "${out}/etcdctl" ${REPO_PATH}/cmd/etcdctl || return
-}
-
-etcd_setup_gopath() {
-	d=$(dirname "$0")
-	CDIR=$(cd "$d" && pwd)
-	cd "$CDIR"
-	etcdGOPATH="${CDIR}/gopath"
-	# preserve old gopath to support building with unvendored tooling deps (e.g., gofail)
-	if [ -n "$GOPATH" ]; then
-		GOPATH=":$GOPATH"
-	fi
-	export GOPATH=${etcdGOPATH}$GOPATH
-	rm -rf "${etcdGOPATH}/src"
-	mkdir -p "${etcdGOPATH}"
-	ln -s "${CDIR}/cmd/vendor" "${etcdGOPATH}/src"
+	CGO_ENABLED=0 go build $GO_BUILD_FLAGS -installsuffix cgo -ldflags "$GO_LDFLAGS" -o "${out}/etcdctl" ${REPO_PATH}/etcdctl || return
 }
 
 toggle_failpoints_default
 
 # only build when called directly, not sourced
 if echo "$0" | grep "build$" >/dev/null; then
-	# force new gopath so builds outside of gopath work
-	etcd_setup_gopath
 	etcd_build
 fi

build.ps1

@@ -10,7 +10,7 @@ if ($FSYS.StartsWith("FAT","CurrentCultureIgnoreCase")) {
 }
 
 # Set $Env:GO_LDFLAGS="-s" for building without symbols.
-$GO_LDFLAGS="$Env:GO_LDFLAGS -X $REPO_PATH/cmd/vendor/$REPO_PATH/version.GitSHA=$GIT_SHA"
+$GO_LDFLAGS="$Env:GO_LDFLAGS -X $REPO_PATH/version.GitSHA=$GIT_SHA"
 
 # rebuild symlinks
 git ls-files -s cmd | select-string -pattern 120000 | ForEach {

client/README.md

@@ -4,12 +4,7 @@ etcd/client is the Go client library for etcd.
 
 [![GoDoc](https://godoc.org/github.com/coreos/etcd/client?status.png)](https://godoc.org/github.com/coreos/etcd/client)
 
-etcd uses `cmd/vendor` directory to store external dependencies, which are
-to be compiled into etcd release binaries. `client` can be imported without
-vendoring. For full compatibility, it is recommended to vendor builds using
-etcd's vendored packages, using tools like godep, as in
-[vendor directories](https://golang.org/cmd/go/#hdr-Vendor_Directories).
-For more detail, please read [Go vendor design](https://golang.org/s/go15vendor).
+For full compatibility, it is recommended to vendor builds using etcd's vendored packages, using tools like `golang/dep`, as in [vendor directories](https://golang.org/cmd/go/#hdr-Vendor_Directories).
 
 ## Install
 

clientv3/README.md

@@ -40,12 +40,7 @@ if err != nil {
 // use the response
 ```
 
-etcd uses `cmd/vendor` directory to store external dependencies, which are
-to be compiled into etcd release binaries. `client` can be imported without
-vendoring. For full compatibility, it is recommended to vendor builds using
-etcd's vendored packages, using tools like godep, as in
-[vendor directories](https://golang.org/cmd/go/#hdr-Vendor_Directories).
-For more detail, please read [Go vendor design](https://golang.org/s/go15vendor).
+For full compatibility, it is recommended to vendor builds using etcd's vendored packages, using tools like `golang/dep`, as in [vendor directories](https://golang.org/cmd/go/#hdr-Vendor_Directories).
 
 ## Error Handling
 

cmd/README.md

@@ -1,4 +0,0 @@
-## cmd
-
-This directory is meant to enforce vendoring for etcd binaries without polluting
-the etcd client libraries with vendored dependencies.

cmd/etcd

@@ -1 +0,0 @@
-../

cmd/etcdctl

@@ -1 +0,0 @@
-../etcdctl

cmd/tools

@@ -1 +0,0 @@
-../tools

cmd/vendor/github.com/coreos/etcd

@@ -1 +0,0 @@
-../../../../

glide.lock

@@ -1,187 +0,0 @@
-hash: 717378e57448533f1e2b054fe152b3f51e5e397292527c82ab24fb2c6c7d2a8f
-updated: 2018-01-09T12:39:45.249170188-08:00
-imports:
-- name: github.com/beorn7/perks
-  version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-  subpackages:
-  - quantile
-- name: github.com/bgentry/speakeasy
-  version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
-- name: github.com/coreos/bbolt
-  version: 48ea1b39c25fc1bab3506fbc712ecbaa842c4d2d
-- name: github.com/coreos/go-semver
-  version: 8ab6407b697782a06568d4b7f1db25550ec2e4c6
-  subpackages:
-  - semver
-- name: github.com/coreos/go-systemd
-  version: d2196463941895ee908e13531a23a39feb9e1243
-  subpackages:
-  - daemon
-  - journal
-  - util
-- name: github.com/coreos/pkg
-  version: 3ac0863d7acf3bc44daf49afef8919af12f704ef
-  subpackages:
-  - capnslog
-  - dlopen
-- name: github.com/cpuguy83/go-md2man
-  version: 23709d0847197db6021a51fdb193e66e9222d4e7
-  subpackages:
-  - md2man
-- name: github.com/dgrijalva/jwt-go
-  version: d2709f9f1f31ebcda9651b03077758c1f3a0018c
-- name: github.com/dustin/go-humanize
-  version: bb3d318650d48840a39aa21a027c6630e198e626
-- name: github.com/ghodss/yaml
-  version: 0ca9ea5df5451ffdf184b4428c902747c2c11cd7
-- name: github.com/gogo/protobuf
-  version: 342cbe0a04158f6dcb03ca0079991a51a4248c02
-  subpackages:
-  - gogoproto
-  - proto
-  - protoc-gen-gogo/descriptor
-- name: github.com/golang/groupcache
-  version: 02826c3e79038b59d737d3b1c0a1d937f71a4433
-  subpackages:
-  - lru
-- name: github.com/golang/protobuf
-  version: 1e59b77b52bf8e4b449a57e6f79f21226d571845
-  subpackages:
-  - jsonpb
-  - proto
-  - ptypes
-  - ptypes/any
-  - ptypes/duration
-  - ptypes/struct
-  - ptypes/timestamp
-- name: github.com/google/btree
-  version: 925471ac9e2131377a91e1595defec898166fe49
-- name: github.com/gorilla/websocket
-  version: 4201258b820c74ac8e6922fc9e6b52f71fe46f8d
-- name: github.com/grpc-ecosystem/go-grpc-prometheus
-  version: 0dafe0d496ea71181bf2dd039e7e3f44b6bd11a7
-- name: github.com/grpc-ecosystem/grpc-gateway
-  version: 07f5e79768022f9a3265235f0db4ac8c3f675fec
-  subpackages:
-  - runtime
-  - runtime/internal
-  - utilities
-- name: github.com/inconshreveable/mousetrap
-  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-- name: github.com/jonboulle/clockwork
-  version: 2eee05ed794112d45db504eb05aa693efd2b8b09
-- name: github.com/kr/pty
-  version: 2c10821df3c3cf905230d078702dfbe9404c9b23
-- name: github.com/mattn/go-runewidth
-  version: 9e777a8366cce605130a531d2cd6363d07ad7317
-  subpackages:
-  - runewidth.go
-- name: github.com/matttproud/golang_protobuf_extensions
-  version: c12348ce28de40eed0136aa2b644d0ee0650e56c
-  subpackages:
-  - pbutil
-- name: github.com/olekukonko/tablewriter
-  version: a0225b3f23b5ce0cbec6d7a66a968f8a59eca9c4
-- name: github.com/prometheus/client_golang
-  version: 5cec1d0429b02e4323e042eb04dafdb079ddf568
-  subpackages:
-  - prometheus
-  - prometheus/promhttp
-- name: github.com/prometheus/client_model
-  version: 6f3806018612930941127f2a7c6c453ba2c527d2
-  subpackages:
-  - go
-- name: github.com/prometheus/common
-  version: e3fb1a1acd7605367a2b378bc2e2f893c05174b7
-  subpackages:
-  - expfmt
-  - internal/bitbucket.org/ww/goautoneg
-  - model
-- name: github.com/prometheus/procfs
-  version: a6e9df898b1336106c743392c48ee0b71f5c4efa
-  subpackages:
-  - xfs
-- name: github.com/russross/blackfriday
-  version: 4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c
-- name: github.com/sirupsen/logrus
-  version: f006c2ac4710855cf0f916dd6b77acf6b048dc6e
-- name: github.com/soheilhy/cmux
-  version: bb79a83465015a27a175925ebd155e660f55e9f1
-- name: github.com/spf13/cobra
-  version: 1c44ec8d3f1552cac48999f9306da23c4d8a288b
-- name: github.com/spf13/pflag
-  version: e57e3eeb33f795204c1ca35f56c44f83227c6e66
-- name: github.com/tmc/grpc-websocket-proxy
-  version: 89b8d40f7ca833297db804fcb3be53a76d01c238
-  subpackages:
-  - wsproxy
-- name: github.com/ugorji/go
-  version: bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57
-  subpackages:
-  - codec
-- name: github.com/urfave/cli
-  version: 1efa31f08b9333f1bd4882d61f9d668a70cd902e
-- name: github.com/xiang90/probing
-  version: 07dd2e8dfe18522e9c447ba95f2fe95262f63bb2
-- name: golang.org/x/crypto
-  version: 9419663f5a44be8b34ca85f08abc5fe1be11f8a3
-  subpackages:
-  - bcrypt
-  - blowfish
-  - ssh/terminal
-- name: golang.org/x/net
-  version: 66aacef3dd8a676686c7ae3716979581e8b03c47
-  subpackages:
-  - context
-  - http2
-  - http2/hpack
-  - idna
-  - internal/timeseries
-  - lex/httplex
-  - trace
-- name: golang.org/x/sys
-  version: ebfc5b4631820b793c9010c87fd8fef0f39eb082
-  subpackages:
-  - unix
-  - windows
-- name: golang.org/x/text
-  version: b19bf474d317b857955b12035d2c5acb57ce8b01
-  subpackages:
-  - secure/bidirule
-  - transform
-  - unicode/bidi
-  - unicode/norm
-- name: golang.org/x/time
-  version: c06e80d9300e4443158a03817b8a8cb37d230320
-  subpackages:
-  - rate
-- name: google.golang.org/genproto
-  version: 09f6ed296fc66555a25fe4ce95173148778dfa85
-  subpackages:
-  - googleapis/rpc/status
-- name: google.golang.org/grpc
-  version: 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e
-  subpackages:
-  - balancer
-  - codes
-  - connectivity
-  - credentials
-  - grpclb/grpc_lb_v1/messages
-  - grpclog
-  - health
-  - health/grpc_health_v1
-  - internal
-  - keepalive
-  - metadata
-  - naming
-  - peer
-  - resolver
-  - stats
-  - status
-  - tap
-  - transport
-- name: gopkg.in/cheggaaa/pb.v1
-  version: 226d21d43a305fac52b3a104ef83e721b15275e0
-- name: gopkg.in/yaml.v2
-  version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
-testImports: []

glide.yaml

@@ -1,150 +0,0 @@
-package: github.com/coreos/etcd
-ignore:
-- google.golang.org/appengine
-import:
-- package: github.com/bgentry/speakeasy
-  version: v0.1.0
-- package: github.com/coreos/bbolt
-  version: v1.3.1-coreos.6
-- package: github.com/coreos/go-semver
-  version: v0.2.0
-  subpackages:
-  - semver
-- package: github.com/coreos/go-systemd
-  version: v15
-  subpackages:
-  - daemon
-  - journal
-  - util
-- package: github.com/coreos/pkg
-  version: v3
-  subpackages:
-  - capnslog
-- package: github.com/cpuguy83/go-md2man
-  version: 23709d0847197db6021a51fdb193e66e9222d4e7
-- package: github.com/dustin/go-humanize
-  version: bb3d318650d48840a39aa21a027c6630e198e626
-- package: github.com/ghodss/yaml
-  version: v1.0.0
-- package: github.com/gogo/protobuf
-  version: v0.5
-  subpackages:
-  - proto
-  - gogoproto
-- package: github.com/gorilla/websocket
-  version: 4201258b820c74ac8e6922fc9e6b52f71fe46f8d
-- package: github.com/golang/groupcache
-  version: 02826c3e79038b59d737d3b1c0a1d937f71a4433
-  subpackages:
-  - lru
-- package: github.com/golang/protobuf
-  version: 1e59b77b52bf8e4b449a57e6f79f21226d571845
-  subpackages:
-  - jsonpb
-  - proto
-- package: github.com/google/btree
-  version: 925471ac9e2131377a91e1595defec898166fe49
-- package: github.com/grpc-ecosystem/grpc-gateway
-  version: v1.3.1
-  subpackages:
-  - runtime
-  - runtime/internal
-  - utilities
-- package: github.com/jonboulle/clockwork
-  version: v0.1.0
-- package: github.com/kr/pty
-  version: v1.0.0
-- package: github.com/olekukonko/tablewriter
-  version: a0225b3f23b5ce0cbec6d7a66a968f8a59eca9c4
-- package: github.com/mattn/go-runewidth
-  version: v0.0.2
-  subpackages:
-  - runewidth.go
-- package: github.com/prometheus/client_golang
-  version: 5cec1d0429b02e4323e042eb04dafdb079ddf568
-  subpackages:
-  - prometheus
-  - prometheus/promhttp
-- package: github.com/prometheus/client_model
-  version: 6f3806018612930941127f2a7c6c453ba2c527d2
-  subpackages:
-  - go
-- package: github.com/prometheus/common
-  version: e3fb1a1acd7605367a2b378bc2e2f893c05174b7
-- package: github.com/prometheus/procfs
-  version: a6e9df898b1336106c743392c48ee0b71f5c4efa
-  subpackages:
-  - xfs
-- package: github.com/grpc-ecosystem/go-grpc-prometheus
-  version: 0dafe0d496ea71181bf2dd039e7e3f44b6bd11a7
-- package: github.com/spf13/cobra
-  version: 1c44ec8d3f1552cac48999f9306da23c4d8a288b
-- package: github.com/spf13/pflag
-  version: v1.0.0
-- package: github.com/ugorji/go
-  version: bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57
-  subpackages:
-  - codec
-- package: github.com/urfave/cli
-  version: v1.18.0
-- package: github.com/xiang90/probing
-  version: 0.0.1
-- package: golang.org/x/crypto
-  version: 9419663f5a44be8b34ca85f08abc5fe1be11f8a3
-  subpackages:
-  - bcrypt
-  - blowfish
-- package: golang.org/x/net
-  version: 66aacef3dd8a676686c7ae3716979581e8b03c47
-  subpackages:
-  - context
-  - http2
-  - http2/hpack
-  - internal/timeseries
-  - trace
-- package: golang.org/x/sys
-  version: ebfc5b4631820b793c9010c87fd8fef0f39eb082
-- package: golang.org/x/time
-  version: c06e80d9300e4443158a03817b8a8cb37d230320
-  subpackages:
-  - rate
-- package: google.golang.org/grpc
-  version: v1.7.5
-  subpackages:
-  - codes
-  - credentials
-  - grpclog
-  - internal
-  - metadata
-  - naming
-  - peer
-  - transport
-  - health
-  - health/grpc_health_v1
-- package: gopkg.in/cheggaaa/pb.v1
-  version: v1.0.2
-- package: gopkg.in/yaml.v2
-  version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
-- package: github.com/dgrijalva/jwt-go
-  version: v3.0.0
-- package: google.golang.org/genproto
-  version: 09f6ed296fc66555a25fe4ce95173148778dfa85
-  subpackages:
-  - googleapis/rpc/status
-- package: golang.org/x/text
-  version: b19bf474d317b857955b12035d2c5acb57ce8b01
-  subpackages:
-  - secure/bidirule
-  - transform
-  - unicode/bidi
-  - unicode/norm
-- package: github.com/russross/blackfriday
-  version: 4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c
-- package: github.com/sirupsen/logrus
-  version: v1.0.3
-- package: github.com/soheilhy/cmux
-  version: v0.1.3
-- package: github.com/tmc/grpc-websocket-proxy
-  version: 89b8d40f7ca833297db804fcb3be53a76d01c238
-  subpackages:
-  - wsproxy

scripts/updatebom.sh

@@ -10,19 +10,9 @@ fi
 echo "installing 'bill-of-materials.json'"
 go get -v -u github.com/coreos/license-bill-of-materials
 
-echo "setting up GOPATH"
-rm -rf ./gopath
-mkdir ./gopath
-mv ./cmd/vendor ./gopath/src
-
 echo "generating bill-of-materials.json"
-GOPATH=$(pwd)/gopath license-bill-of-materials \
+license-bill-of-materials \
     --override-file ./bill-of-materials.override.json \
     github.com/coreos/etcd github.com/coreos/etcd/etcdctl > bill-of-materials.json
 
-echo "reverting GOPATH,vendor"
-mv ./gopath/src ./cmd/vendor
-rm -rf ./gopath
-
 echo "generated bill-of-materials.json"
-

scripts/updatedep.sh

@@ -1,69 +1,11 @@
 #!/usr/bin/env bash
-
-# A script for updating godep dependencies for the vendored directory /cmd/
-# without pulling in etcd itself as a dependency.
-#
-# update depedency
-# 1. edit glide.yaml with version, git SHA
-# 2. run ./scripts/updatedep.sh
-# 3. it automatically detects new git SHA, and vendors updates to cmd/vendor directory
-#
-# add depedency
-# 1. run ./scripts/updatedep.sh github.com/USER/PROJECT#^1.0.0
-#        OR
-#        ./scripts/updatedep.sh github.com/USER/PROJECT#9b772b54b3bf0be1eec083c9669766a56332559a
-# 2. make sure glide.yaml and glide.lock are updated
+set -e
 
 if ! [[ "$0" =~ scripts/updatedep.sh ]]; then
-	echo "must be run from repository root"
-	exit 255
+  echo "must be run from repository root"
+  exit 255
 fi
 
-rm -rf vendor
-mv cmd/vendor vendor
-
-# TODO: glide doesn't play well with symlink
-echo "manually deleting etcd-repo symlink in vendor"
-rm -f vendor/github.com/coreos/etcd
-
-GLIDE_ROOT="$GOPATH/src/github.com/Masterminds/glide"
-GLIDE_SHA=21ff6d397ccca910873d8eaabab6a941c364cc70
-go get -d -u github.com/Masterminds/glide
-pushd "${GLIDE_ROOT}"
-	git reset --hard ${GLIDE_SHA}
-	go install
-popd
-
-GLIDE_VC_ROOT="$GOPATH/src/github.com/sgotti/glide-vc"
-GLIDE_VC_SHA=d96375d23c85287e80296cdf48f9d21c227fa40a
-go get -d -u github.com/sgotti/glide-vc
-pushd "${GLIDE_VC_ROOT}"
-	git reset --hard ${GLIDE_VC_SHA}
-	go install
-popd
-
-if [ -n "$1" ]; then
-	echo "glide get on $1"
-	matches=$(grep "name: $1" glide.lock)
-	if [ ! -z "$matches" ]; then
-		echo "glide update on $1"
-		glide update --strip-vendor "$1"
-	else
-		echo "glide get on $1"
-		glide get --strip-vendor "$1"
-	fi
-else
-	echo "glide update on *"
-	glide update --strip-vendor
-fi;
-
-echo "removing test files"
-glide vc --only-code --no-tests
-
-mv vendor cmd/
-
-echo "recreating symlink to etcd"
-ln -s ../../../../ cmd/vendor/github.com/coreos/etcd
-
-echo "done"
-
+go get -v -u github.com/golang/dep/cmd/dep
+dep ensure -v
+dep prune

test

@@ -21,9 +21,6 @@ if [[ "${PASSES}" == *"functional"* ]]; then
 	./tools/functional-tester/build
 fi
 
-# build tests with vendored dependencies
-etcd_setup_gopath
-
 if [ -z "$PASSES" ]; then
 	PASSES="fmt bom dep compile build unit"
 fi
@@ -34,7 +31,7 @@ USERPKG=${PKG:-}
 COVER=${COVER:-"-cover"}
 
 # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt.
-IGNORE_PKGS="(cmd/|etcdserverpb|rafttest|gopath.proto|v3lockpb|v3electionpb)"
+IGNORE_PKGS="(vendor/|etcdserverpb|rafttest|gopath.proto|v3lockpb|v3electionpb)"
 INTEGRATION_PKGS="(integration|e2e|contrib|functional-tester)"
 
 # all github.com/coreos/etcd/whatever pkgs that are not auto-generated / tools
@@ -431,7 +428,7 @@ function nakedret_pass {
 
 function license_header_pass {
 	licRes=""
-	files=$(find . -type f -iname '*.go' ! -path './cmd/*' ! -path './gopath.proto/*')
+	files=$(find . -type f -iname '*.go' ! -path './vendor/*' ! -path './gopath.proto/*')
 	for file in $files; do
 		if ! head -n3 "${file}" | grep -Eq "(Copyright|generated|GENERATED)" ; then
 			licRes="${licRes}"$(echo -e "  ${file}")

tools/benchmark/cmd/util.go

@@ -21,10 +21,10 @@ import (
 	"os"
 	"strings"
 
+	"github.com/bgentry/speakeasy"
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/pkg/report"
 	"google.golang.org/grpc/grpclog"
-	"github.com/bgentry/speakeasy"
 )
 
 var (

tools/functional-tester/build

@@ -5,7 +5,7 @@ if ! [[ "$0" =~ "tools/functional-tester/build" ]]; then
 	exit 255
 fi
 
-CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-s" -o bin/etcd-agent ./cmd/tools/functional-tester/etcd-agent
-CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-s" -o bin/etcd-tester ./cmd/tools/functional-tester/etcd-tester
-CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-s" -o bin/etcd-runner ./cmd/tools/functional-tester/etcd-runner
+CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-s" -o bin/etcd-agent ./tools/functional-tester/etcd-agent
+CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-s" -o bin/etcd-tester ./tools/functional-tester/etcd-tester
+CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-s" -o bin/etcd-runner ./tools/functional-tester/etcd-runner
 

vendor/github.com/coreos/go-semver/example.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+	"github.com/coreos/go-semver/semver"
+	"os"
+)
+
+func main() {
+	vA, err := semver.NewVersion(os.Args[1])
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	vB, err := semver.NewVersion(os.Args[2])
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	fmt.Printf("%s < %s == %t\n", vA, vB, vA.LessThan(*vB))
+}

vendor/github.com/cpuguy83/go-md2man/md2man.go

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+
+	"github.com/cpuguy83/go-md2man/md2man"
+)
+
+var inFilePath = flag.String("in", "", "Path to file to be processed (default: stdin)")
+var outFilePath = flag.String("out", "", "Path to output processed file (default: stdout)")
+
+func main() {
+	var err error
+	flag.Parse()
+
+	inFile := os.Stdin
+	if *inFilePath != "" {
+		inFile, err = os.Open(*inFilePath)
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+	}
+	defer inFile.Close()
+
+	doc, err := ioutil.ReadAll(inFile)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	out := md2man.Render(doc)
+
+	outFile := os.Stdout
+	if *outFilePath != "" {
+		outFile, err = os.Create(*outFilePath)
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+		defer outFile.Close()
+	}
+	_, err = outFile.Write(out)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}