From 4c7cdbf20f289b784e51d9fc95df722e27c6bd2c Mon Sep 17 00:00:00 2001 From: Brian Matheson Date: Wed, 8 May 2019 17:55:31 -0400 Subject: [PATCH] move to go.etcd.io --- discovery.go | 3 +-- easy_client.go | 2 +- easy_config.go | 2 +- go.mod | 3 ++- go.sum | 6 ++++-- pair.go | 2 +- queue.go | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/discovery.go b/discovery.go index fcdfc10..c7c7561 100644 --- a/discovery.go +++ b/discovery.go @@ -8,8 +8,7 @@ import ( "net" "os" "time" - - etcd "github.com/coreos/etcd/clientv3" + etcd "go.etcd.io/etcd/clientv3" ) type Discovery struct { diff --git a/easy_client.go b/easy_client.go index bfe6891..9db7afd 100644 --- a/easy_client.go +++ b/easy_client.go @@ -6,7 +6,7 @@ import ( "errors" "time" - etcd "github.com/coreos/etcd/clientv3" + etcd "go.etcd.io/etcd/clientv3" ) type EasyClient struct { diff --git a/easy_config.go b/easy_config.go index e279b13..9c36176 100644 --- a/easy_config.go +++ b/easy_config.go @@ -7,7 +7,7 @@ import ( "log" "time" - etcd "github.com/coreos/etcd/clientv3" + etcd "go.etcd.io/etcd/clientv3" ) type EasyConfig struct { diff --git a/go.mod b/go.mod index 95310bb..27647a9 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,10 @@ module git.wit.com/wit/etcd_tools replace git.wit.com/wit/etcd_tools => /home/bmath/wit/etcd_tools require ( - github.com/coreos/etcd v3.3.12+incompatible + github.com/coreos/etcd v3.3.13+incompatible // indirect github.com/gogo/protobuf v1.2.1 // indirect github.com/golang/protobuf v1.3.1 // indirect + go.etcd.io/etcd v3.3.13+incompatible golang.org/x/net v0.0.0-20190415214537-1da14a5a36f2 // indirect google.golang.org/grpc v1.20.0 // indirect ) diff --git a/go.sum b/go.sum index 9369544..cd44567 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/coreos/etcd v3.3.12+incompatible h1:pAWNwdf7QiT1zfaWyqCtNZQWCLByQyA3JrSQyuYAqnQ= -github.com/coreos/etcd v3.3.12+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -16,6 +16,8 @@ github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +go.etcd.io/etcd v3.3.13+incompatible h1:jCejD5EMnlGxFvcGRyEV4VGlENZc7oPQX6o0t7n3xbw= +go.etcd.io/etcd v3.3.13+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= diff --git a/pair.go b/pair.go index e7e5155..64e5403 100644 --- a/pair.go +++ b/pair.go @@ -3,7 +3,7 @@ package etcd_tools import ( "encoding/json" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/mvcc/mvccpb" ) type Pair struct { diff --git a/queue.go b/queue.go index dc548f2..70b91fd 100644 --- a/queue.go +++ b/queue.go @@ -7,7 +7,7 @@ import ( "strings" "time" - etcd "github.com/coreos/etcd/clientv3" + etcd "go.etcd.io/etcd/clientv3" ) var timeFormat = "2006-01-02.15:04:05.000000000"