This update provides:
1) workaround around the build failures. In
summary, it forces the download of some packages during the build
process.
2) update the set of packages that should go inside the vendor
directory
3) Update the dockerfile to use go 1.10
Change-Id: I2bfd090ce0f25b0c10aa214755ae2da7e5384d60
diff --git a/Gopkg.lock b/Gopkg.lock
index 20064ac..0cd7e97 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+
# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
@@ -40,6 +40,14 @@
revision = "3df31a1ada83e310c2e24b267c8e8b68836547b4"
[[projects]]
+ branch = "master"
+ digest = "1:d6afaeed1502aa28e80a4ed0981d570ad91b2579193404256ce672ed0a609e0d"
+ name = "github.com/beorn7/perks"
+ packages = ["quantile"]
+ pruneopts = "UT"
+ revision = "3a771d992973f24aa725d07868b467d1ddfceafb"
+
+[[projects]]
digest = "1:526d64d0a3ac6c24875724a9355895be56a21f89a5d3ab5ba88d91244269a7d8"
name = "github.com/bsm/sarama-cluster"
packages = ["."]
@@ -56,34 +64,131 @@
revision = "0efaee1733e3399a3cb88fc7d2ce340bf2e863d7"
[[projects]]
- digest = "1:ad9bac31f001ab730600bf9e80c4da7552cb9cb47c505f3fa0fe80de81682bbe"
- name = "github.com/confluentinc/confluent-kafka-go"
- packages = ["kafka"]
+ digest = "1:c28625428387b63dd7154eb857f51e700465cfbf7c06f619e71f2da33cefe47e"
+ name = "github.com/coreos/bbolt"
+ packages = ["."]
pruneopts = "UT"
- revision = "460e8e43b282a1a68219df600ef63442b81faf5f"
- version = "v0.11.6"
+ revision = "583e8937c61f1af6513608ccc75c97b6abdf4ff9"
+ version = "v1.3.0"
[[projects]]
- digest = "1:b4ba0dcf39b5ba06f69d9cd4eaacaba334801073099eb8be273d595094c99db3"
+ digest = "1:f289be21debc99fde35e61caade2d61ec7803ba613c94b98f09b2d3e0990cb62"
name = "github.com/coreos/etcd"
packages = [
+ ".",
+ "alarm",
+ "auth",
"auth/authpb",
+ "client",
+ "clientv3",
+ "clientv3/concurrency",
+ "clientv3/leasing",
+ "clientv3/namespace",
+ "clientv3/naming",
+ "clientv3/ordering",
+ "compactor",
+ "discovery",
+ "embed",
+ "error",
+ "etcdmain",
+ "etcdserver",
+ "etcdserver/api",
+ "etcdserver/api/etcdhttp",
+ "etcdserver/api/v2http",
+ "etcdserver/api/v2http/httptypes",
+ "etcdserver/api/v2v3",
+ "etcdserver/api/v3client",
+ "etcdserver/api/v3election",
+ "etcdserver/api/v3election/v3electionpb",
+ "etcdserver/api/v3election/v3electionpb/gw",
+ "etcdserver/api/v3lock",
+ "etcdserver/api/v3lock/v3lockpb",
+ "etcdserver/api/v3lock/v3lockpb/gw",
+ "etcdserver/api/v3rpc",
"etcdserver/api/v3rpc/rpctypes",
+ "etcdserver/auth",
"etcdserver/etcdserverpb",
+ "etcdserver/etcdserverpb/gw",
+ "etcdserver/membership",
+ "etcdserver/stats",
+ "lease",
+ "lease/leasehttp",
+ "lease/leasepb",
+ "mvcc",
+ "mvcc/backend",
"mvcc/mvccpb",
+ "pkg/adt",
+ "pkg/contention",
+ "pkg/cors",
+ "pkg/cpuutil",
+ "pkg/crc",
+ "pkg/debugutil",
+ "pkg/fileutil",
+ "pkg/flags",
+ "pkg/httputil",
+ "pkg/idutil",
+ "pkg/ioutil",
+ "pkg/logutil",
+ "pkg/netutil",
+ "pkg/osutil",
+ "pkg/pathutil",
+ "pkg/pbutil",
+ "pkg/runtime",
+ "pkg/schedule",
+ "pkg/srv",
+ "pkg/tlsutil",
+ "pkg/transport",
"pkg/types",
+ "pkg/wait",
+ "proxy/grpcproxy",
+ "proxy/grpcproxy/adapter",
+ "proxy/grpcproxy/cache",
+ "proxy/httpproxy",
+ "proxy/tcpproxy",
+ "raft",
+ "raft/raftpb",
+ "rafthttp",
+ "snap",
+ "snap/snappb",
+ "store",
+ "version",
+ "wal",
+ "wal/walpb",
]
pruneopts = "UT"
revision = "2cf9e51d2a78003b164c2998886158e60ded1cbb"
version = "v3.3.11"
[[projects]]
- branch = "master"
- digest = "1:dea13cd1af2acdb1c6c05257e7b15af7557907f29c39d5150a5e9732c1f34b50"
- name = "github.com/coreswitch/log"
- packages = ["."]
+ digest = "1:0ef770954bca104ee99b3b6b7f9b240605ac03517d9f98cbc1893daa03f3c038"
+ name = "github.com/coreos/go-semver"
+ packages = ["semver"]
pruneopts = "UT"
- revision = "319a7dcf0937f2ff8f67e85a2e83f65c112a5405"
+ revision = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"
+ version = "v0.2.0"
+
+[[projects]]
+ digest = "1:bf1ec2f5361b43bcc281b2017fb9c05de39a747725389e6e2e825ff8bb37adfc"
+ name = "github.com/coreos/go-systemd"
+ packages = [
+ "daemon",
+ "journal",
+ "util",
+ ]
+ pruneopts = "UT"
+ revision = "9002847aa1425fb6ac49077c0a630b3b67e0fbfd"
+ version = "v18"
+
+[[projects]]
+ digest = "1:129a158ba1ebf652f53b189d61dcf9fbfca8ac70b36bcb48a501200a21fb6086"
+ name = "github.com/coreos/pkg"
+ packages = [
+ "capnslog",
+ "dlopen",
+ ]
+ pruneopts = "UT"
+ revision = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1"
+ version = "v4"
[[projects]]
digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec"
@@ -94,6 +199,14 @@
version = "v1.1.1"
[[projects]]
+ digest = "1:76dc72490af7174349349838f2fe118996381b31ea83243812a97e5a0fd5ed55"
+ name = "github.com/dgrijalva/jwt-go"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+ version = "v3.2.0"
+
+[[projects]]
digest = "1:1f0c7ab489b407a7f8f9ad16c25a504d28ab461517a971d341388a56156c1bd7"
name = "github.com/eapache/go-resiliency"
packages = ["breaker"]
@@ -118,6 +231,14 @@
version = "v1.1.0"
[[projects]]
+ digest = "1:2cd7915ab26ede7d95b8749e6b1f933f1c6d5398030684e6505940a10f31cfda"
+ name = "github.com/ghodss/yaml"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
+ version = "v1.0.0"
+
+[[projects]]
digest = "1:a9c85389dbd301c97a3499fe15a2b65b505b5f0cb0f1120dea59f1f3d6b11d96"
name = "github.com/gogo/protobuf"
packages = [
@@ -138,10 +259,19 @@
revision = "59788d5eb2591d3497ffb8fafed2f16fe00e7775"
[[projects]]
- digest = "1:d0f384a62cb855617be65bf8fbad8b9133965955537b950b03e67993ee5fcae3"
+ branch = "master"
+ digest = "1:3fb07f8e222402962fa190eb060608b34eddfb64562a18e2167df2de0ece85d8"
+ name = "github.com/golang/groupcache"
+ packages = ["lru"]
+ pruneopts = "UT"
+ revision = "c65c006176ff7ff98bb916961c7abbc6b0afc0aa"
+
+[[projects]]
+ digest = "1:1c31dba75f840ef15223c1d792a2e67e76ccd76ddc528fa23ff19320dde05463"
name = "github.com/golang/protobuf"
packages = [
"descriptor",
+ "jsonpb",
"proto",
"protoc-gen-go",
"protoc-gen-go/descriptor",
@@ -153,6 +283,7 @@
"ptypes/any",
"ptypes/duration",
"ptypes/empty",
+ "ptypes/struct",
"ptypes/timestamp",
]
pruneopts = "UT"
@@ -168,6 +299,14 @@
revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"
[[projects]]
+ branch = "master"
+ digest = "1:0bfbe13936953a98ae3cfe8ed6670d396ad81edf069a806d2f6515d7bb6950df"
+ name = "github.com/google/btree"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306"
+
+[[projects]]
digest = "1:236d7e1bdb50d8f68559af37dbcf9d142d56b431c9b2176d41e2a009b664cda8"
name = "github.com/google/uuid"
packages = ["."]
@@ -176,6 +315,42 @@
version = "v1.1.0"
[[projects]]
+ digest = "1:7b5c6e2eeaa9ae5907c391a91c132abfd5c9e8a784a341b5625e750c67e6825d"
+ name = "github.com/gorilla/websocket"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"
+ version = "v1.4.0"
+
+[[projects]]
+ digest = "1:1168584a5881d371e96cb0e66ef6db71d7cef0856cc7f311490bc856627f8328"
+ name = "github.com/grpc-ecosystem/go-grpc-middleware"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "c250d6563d4d4c20252cd865923440e829844f4e"
+ version = "v1.0.0"
+
+[[projects]]
+ digest = "1:9b7a07ac7577787a8ecc1334cb9f34df1c76ed82a917d556c5713d3ab84fbc43"
+ name = "github.com/grpc-ecosystem/go-grpc-prometheus"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "c225b8c3b01faf2899099b768856a9e916e5087b"
+ version = "v1.2.0"
+
+[[projects]]
+ digest = "1:3cbc83a159e161c6cf3e64590ae19da29069ecd8d92f9400ab6fda15e93cbc5f"
+ name = "github.com/grpc-ecosystem/grpc-gateway"
+ packages = [
+ "runtime",
+ "runtime/internal",
+ "utilities",
+ ]
+ pruneopts = "UT"
+ revision = "aeab1d96e0f1368d243e2e5f526aa29d495517bb"
+ version = "v1.5.1"
+
+[[projects]]
digest = "1:816a9a3902cc9d973a62475b829ab044cd46bbd7f064d317372ff868724cce89"
name = "github.com/gyuho/goraph"
packages = ["."]
@@ -214,6 +389,22 @@
revision = "19bbd39e421bdf3559d5025fb2c760f5ffa56233"
[[projects]]
+ digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
+ name = "github.com/inconshreveable/mousetrap"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+ version = "v1.0"
+
+[[projects]]
+ digest = "1:75ab90ae3f5d876167e60f493beadfe66f0ed861a710f283fb06c86437a09538"
+ name = "github.com/jonboulle/clockwork"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "2eee05ed794112d45db504eb05aa693efd2b8b09"
+ version = "v0.1.0"
+
+[[projects]]
digest = "1:0a69a1c0db3591fcefb47f115b224592c8dfa4368b7ba9fae509d5e16cdc95c8"
name = "github.com/konsorten/go-windows-terminal-sequences"
packages = ["."]
@@ -222,6 +413,14 @@
version = "v1.0.1"
[[projects]]
+ digest = "1:ff5ebae34cfbf047d505ee150de27e60570e8c394b3b8fdbb720ff6ac71985fc"
+ name = "github.com/matttproud/golang_protobuf_extensions"
+ packages = ["pbutil"]
+ pruneopts = "UT"
+ revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
+ version = "v1.0.1"
+
+[[projects]]
digest = "1:78bbb1ba5b7c3f2ed0ea1eab57bdd3859aec7e177811563edc41198a760b06af"
name = "github.com/mitchellh/go-homedir"
packages = ["."]
@@ -237,6 +436,14 @@
revision = "5a380f224700b8a6c4eaad048804f5bff514cb35"
[[projects]]
+ branch = "master"
+ digest = "1:3bf17a6e6eaa6ad24152148a631d18662f7212e21637c2699bff3369b7f00fa2"
+ name = "github.com/petar/GoLLRB"
+ packages = ["llrb"]
+ pruneopts = "UT"
+ revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"
+
+[[projects]]
digest = "1:e39a5ee8fcbec487f8fc68863ef95f2b025e0739b0e4aa55558a2b4cf8f0ecf0"
name = "github.com/pierrec/lz4"
packages = [
@@ -256,6 +463,51 @@
version = "v1.0.0"
[[projects]]
+ digest = "1:93a746f1060a8acbcf69344862b2ceced80f854170e1caae089b2834c5fbf7f4"
+ name = "github.com/prometheus/client_golang"
+ packages = [
+ "prometheus",
+ "prometheus/internal",
+ "prometheus/promhttp",
+ ]
+ pruneopts = "UT"
+ revision = "505eaef017263e299324067d40ca2c48f6a2cf50"
+ version = "v0.9.2"
+
+[[projects]]
+ branch = "master"
+ digest = "1:2d5cd61daa5565187e1d96bae64dbbc6080dacf741448e9629c64fd93203b0d4"
+ name = "github.com/prometheus/client_model"
+ packages = ["go"]
+ pruneopts = "UT"
+ revision = "56726106282f1985ea77d5305743db7231b0c0a8"
+
+[[projects]]
+ branch = "master"
+ digest = "1:ce62b400185bf6b16ef6088011b719e449f5c15c4adb6821589679f752c2788e"
+ name = "github.com/prometheus/common"
+ packages = [
+ "expfmt",
+ "internal/bitbucket.org/ww/goautoneg",
+ "model",
+ ]
+ pruneopts = "UT"
+ revision = "2998b132700a7d019ff618c06a234b47c1f3f681"
+
+[[projects]]
+ branch = "master"
+ digest = "1:08eb8b60450efe841e37512d66ce366a87d187505d7c67b99307a6c1803483a2"
+ name = "github.com/prometheus/procfs"
+ packages = [
+ ".",
+ "internal/util",
+ "nfs",
+ "xfs",
+ ]
+ pruneopts = "UT"
+ revision = "b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1"
+
+[[projects]]
branch = "master"
digest = "1:d38f81081a389f1466ec98192cf9115a82158854d6f01e1c23e2e7554b97db71"
name = "github.com/rcrowley/go-metrics"
@@ -264,19 +516,6 @@
revision = "3113b8401b8a98917cde58f8bbd42a1b1c03b1fd"
[[projects]]
- digest = "1:a073c2dd83aa92060bd5b551e3a19a40f8e24d4aaa7e7da767ee9c69f07b533a"
- name = "github.com/rs/zerolog"
- packages = [
- ".",
- "internal/cbor",
- "internal/json",
- "log",
- ]
- pruneopts = "UT"
- revision = "8747b7b3a51b5d08ee7ac50eaf4869edaf9f714a"
- version = "v1.11.0"
-
-[[projects]]
digest = "1:87c2e02fb01c27060ccc5ba7c5a407cc91147726f8f40b70cceeedbc52b1f3a8"
name = "github.com/sirupsen/logrus"
packages = ["."]
@@ -285,6 +524,30 @@
version = "v1.3.0"
[[projects]]
+ digest = "1:30e06e6d62a1d694e3cdbff29d8a9a96022e05a487d0c6eaf0ef898965ef28fb"
+ name = "github.com/soheilhy/cmux"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "e09e9389d85d8492d313d73d1469c029e710623f"
+ version = "v0.1.4"
+
+[[projects]]
+ digest = "1:645cabccbb4fa8aab25a956cbcbdf6a6845ca736b2c64e197ca7cbb9d210b939"
+ name = "github.com/spf13/cobra"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"
+ version = "v0.0.3"
+
+[[projects]]
+ digest = "1:c1b1102241e7f645bc8e0c22ae352e8f0dc6484b6cb4d132fa9f24174e0119e2"
+ name = "github.com/spf13/pflag"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "298182f68c66c05229eb03ac171abe6e309ee79a"
+ version = "v1.0.3"
+
+[[projects]]
digest = "1:972c2427413d41a1e06ca4897e8528e5a1622894050e2f527b38ddf0f343f759"
name = "github.com/stretchr/testify"
packages = ["assert"]
@@ -293,6 +556,30 @@
version = "v1.3.0"
[[projects]]
+ branch = "master"
+ digest = "1:d4e58a50951cee7efe774acb441b5a3b75c99f9fd8cc6d58a3146b4de190e14d"
+ name = "github.com/tmc/grpc-websocket-proxy"
+ packages = ["wsproxy"]
+ pruneopts = "UT"
+ revision = "0ad062ec5ee553a48f6dbd280b7a1b5638e8a113"
+
+[[projects]]
+ digest = "1:03aa6e485e528acb119fb32901cf99582c380225fc7d5a02758e08b180cb56c3"
+ name = "github.com/ugorji/go"
+ packages = ["codec"]
+ pruneopts = "UT"
+ revision = "b4c50a2b199d93b13dc15e78929cfb23bfdf21ab"
+ version = "v1.1.1"
+
+[[projects]]
+ digest = "1:6dff6d02950c110d7d61da0c200eaff9da9f312101291b2d8c07235954eaa19d"
+ name = "github.com/xiang90/probing"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"
+ version = "0.0.1"
+
+[[projects]]
digest = "1:0324f6a07ddafbb36e9260c8ec331108744e29e1df856141e7df6d5c7ce59501"
name = "go.etcd.io/etcd"
packages = [
@@ -336,9 +623,13 @@
[[projects]]
branch = "master"
- digest = "1:38f553aff0273ad6f367cb0a0f8b6eecbaef8dc6cb8b50e57b6a81c1d5b1e332"
+ digest = "1:427cdd2c12a3290ace873d2f9d3958d126c4d75596dbc09de05852da08a3dab5"
name = "golang.org/x/crypto"
- packages = ["ssh/terminal"]
+ packages = [
+ "bcrypt",
+ "blowfish",
+ "ssh/terminal",
+ ]
pruneopts = "UT"
revision = "ff983b9c42bc9fbf91556e191cc8efb585c16908"
@@ -394,17 +685,22 @@
[[projects]]
branch = "master"
- digest = "1:6c6b70cf6d2788d9f7dc6589bc88e0e1c7edc40612294431ebb7d09536d12240"
+ digest = "1:9fdc2b55e8e0fafe4b41884091e51e77344f7dc511c5acedcfd98200003bff90"
+ name = "golang.org/x/time"
+ packages = ["rate"]
+ pruneopts = "UT"
+ revision = "85acf8d2951cb2a3bde7632f9ff273ef0379bcbd"
+
+[[projects]]
+ branch = "master"
+ digest = "1:077c1c599507b3b3e9156d17d36e1e61928ee9b53a5b420f10f28ebd4a0b275c"
name = "google.golang.org/genproto"
- packages = [
- "googleapis/api/annotations",
- "googleapis/rpc/status",
- ]
+ packages = ["googleapis/rpc/status"]
pruneopts = "UT"
revision = "db91494dd46c1fdcbbde05e5ff5eb56df8f7d79a"
[[projects]]
- digest = "1:8f56475624fb72854d06ca16c2f7032e3cea14a63074e9c199ba8d46431c1127"
+ digest = "1:03af1505694005143ff6dc5d0e2802c8200ddb618b1d3f7201482f53798b99b4"
name = "google.golang.org/grpc"
packages = [
".",
@@ -419,6 +715,7 @@
"encoding",
"encoding/proto",
"grpclog",
+ "health",
"health/grpc_health_v1",
"internal",
"internal/backoff",
@@ -452,14 +749,21 @@
revision = "03a43f93cd29dc549e6d9b11892795c206f9c38c"
version = "v1.20.1"
+[[projects]]
+ digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96"
+ name = "gopkg.in/yaml.v2"
+ packages = ["."]
+ pruneopts = "UT"
+ revision = "51d6538a90f86fe93ac480b35f37b2be17fef232"
+ version = "v2.2.2"
+
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
input-imports = [
"github.com/bsm/sarama-cluster",
"github.com/cevaris/ordered_map",
- "github.com/confluentinc/confluent-kafka-go/kafka",
- "github.com/coreswitch/log",
+ "github.com/coreos/etcd",
"github.com/gogo/protobuf/proto",
"github.com/golang-collections/go-datastructures/queue",
"github.com/golang/protobuf/descriptor",
@@ -472,15 +776,11 @@
"github.com/google/uuid",
"github.com/gyuho/goraph",
"github.com/hashicorp/consul/api",
- "github.com/rs/zerolog/log",
- "github.com/sirupsen/logrus",
"github.com/stretchr/testify/assert",
"go.etcd.io/etcd/clientv3",
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes",
"go.uber.org/zap",
"go.uber.org/zap/zapcore",
- "golang.org/x/net/context",
- "google.golang.org/genproto/googleapis/api/annotations",
"google.golang.org/grpc",
"google.golang.org/grpc/codes",
"google.golang.org/grpc/credentials",