Replace coreos/etcd imports with etcd-io/etcd imports

newrelic-eheinlein · Oct 3, 2019 · 9d8c936 · 9d8c936
1 parent 3c6b655
commit 9d8c936
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 13 deletions.
diff --git a/config/source/etcd/etcd.go b/config/source/etcd/etcd.go
@@ -6,8 +6,8 @@ import (
 	"net"
 	"time"
 
-	cetcd "github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	cetcd "github.com/etcd-io/etcd/clientv3"
+	"github.com/etcd-io/etcd/mvcc/mvccpb"
 	"github.com/micro/go-micro/config/source"
 )
 

diff --git a/config/source/etcd/util.go b/config/source/etcd/util.go
@@ -3,8 +3,8 @@ package etcd
 import (
 	"strings"
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
+	"github.com/etcd-io/etcd/clientv3"
+	"github.com/etcd-io/etcd/mvcc/mvccpb"
 	"github.com/micro/go-micro/config/encoder"
 )
 

diff --git a/config/source/etcd/watcher.go b/config/source/etcd/watcher.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	cetcd "github.com/coreos/etcd/clientv3"
+	cetcd "github.com/etcd-io/etcd/clientv3"
 	"github.com/micro/go-micro/config/source"
 )
 

diff --git a/go.mod b/go.mod
@@ -10,6 +10,7 @@ require (
 	github.com/coreos/etcd v3.3.15+incompatible
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
+	github.com/etcd-io/etcd v3.3.15+incompatible
 	github.com/forestgiant/sliceutil v0.0.0-20160425183142-94783f95db6c
 	github.com/fsnotify/fsnotify v1.4.7
 	github.com/fsouza/go-dockerclient v1.4.4

diff --git a/go.sum b/go.sum
@@ -45,6 +45,8 @@ github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
+github.com/etcd-io/etcd v3.3.15+incompatible h1:zvYyY+8vreyccOqG8XIX6sGTZLKrqkj0NowB37+c9wY=
+github.com/etcd-io/etcd v3.3.15+incompatible/go.mod h1:cdZ77EstHBwVtD6iTgzgvogwcjo9m4iOqoijouPJ4bs=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/forestgiant/sliceutil v0.0.0-20160425183142-94783f95db6c h1:pBgVXWDXju1m8W4lnEeIqTHPOzhTUO81a7yknM/xQR4=

diff --git a/registry/etcd/etcd.go b/registry/etcd/etcd.go
@@ -12,10 +12,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
+	"github.com/etcd-io/etcd/clientv3"
 	"github.com/micro/go-micro/registry"
 
-	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
+	"github.com/etcd-io/etcd/etcdserver/api/v3rpc/rpctypes"
 	hash "github.com/mitchellh/hashstructure"
 )
 

diff --git a/registry/etcd/watcher.go b/registry/etcd/watcher.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
+	"github.com/etcd-io/etcd/clientv3"
 	"github.com/micro/go-micro/registry"
 )
 

diff --git a/store/etcd/etcd.go b/store/etcd/etcd.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"log"
 
-	client "github.com/coreos/etcd/clientv3"
+	client "github.com/etcd-io/etcd/clientv3"
 	"github.com/micro/go-micro/config/options"
 	"github.com/micro/go-micro/store"
 )

diff --git a/sync/leader/etcd/etcd.go b/sync/leader/etcd/etcd.go
@@ -6,8 +6,8 @@ import (
 	"path"
 	"strings"
 
-	client "github.com/coreos/etcd/clientv3"
-	cc "github.com/coreos/etcd/clientv3/concurrency"
+	client "github.com/etcd-io/etcd/clientv3"
+	cc "github.com/etcd-io/etcd/clientv3/concurrency"
 	"github.com/micro/go-micro/sync/leader"
 )
 

diff --git a/sync/lock/etcd/etcd.go b/sync/lock/etcd/etcd.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"sync"
 
-	client "github.com/coreos/etcd/clientv3"
-	cc "github.com/coreos/etcd/clientv3/concurrency"
+	client "github.com/etcd-io/etcd/clientv3"
+	cc "github.com/etcd-io/etcd/clientv3/concurrency"
 	"github.com/micro/go-micro/sync/lock"
 )