replace etcd deps with v3 version(github.com/coreos/etcd => go.etcd.io/etcd/v3) (#221)

Tyraelone · ziyu.duan · CMGS · commit f6c8321187c3 · 2020-07-13T11:09:59.000+08:00
Co-authored-by: ziyu.duan &lt;ziyu.duan@shopee.com&gt;
diff --git a/go.mod b/go.mod
@@ -9,29 +9,23 @@ require (
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
 	github.com/alexcesaro/statsd v2.0.0+incompatible // indirect
 	github.com/containerd/continuity v0.0.0-20180612233548-246e49050efd // indirect
-	github.com/coreos/bbolt v1.3.1-coreos.6 // indirect
-	github.com/coreos/etcd v3.3.13+incompatible
 	github.com/coreos/go-semver v0.2.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20170731111925-d21964639418 // indirect
 	github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf // indirect
-	github.com/dgrijalva/jwt-go v3.0.0+incompatible // indirect
 	github.com/docker/distribution v0.0.0-20171207180435-f4118485915a
 	github.com/docker/docker v0.0.0-20181112142024-a5e2dd2bb141
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.3.3
 	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
+	github.com/go-logfmt/logfmt v0.4.0 // indirect
 	github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
 	github.com/golang/protobuf v1.3.5
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/mux v0.0.0-20180605211556-cb4698366aa6 // indirect
 	github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20181112102510-3304cc886352 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170826090648-0dafe0d496ea // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.3.0 // indirect
 	github.com/jinzhu/configor v1.1.1
 	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/json-iterator/go v1.1.6 // indirect
 	github.com/libgit2/git2go/v30 v30.0.3
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
@@ -41,20 +35,17 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/projecteru2/libyavirt v0.0.0-20200706021408-b8f160e2f677
-	github.com/prometheus/client_golang v0.9.3
+	github.com/prometheus/client_golang v1.0.0
+	github.com/prometheus/tsdb v0.7.1 // indirect
 	github.com/sanity-io/litter v1.1.0
 	github.com/sirupsen/logrus v1.4.2
-	github.com/soheilhy/cmux v0.1.3 // indirect
 	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.6.1
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 // indirect
 	github.com/urfave/cli/v2 v2.0.0-alpha.2
 	github.com/vektra/mockery v1.1.2 // indirect
-	github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 // indirect
-	go.uber.org/atomic v1.3.2 // indirect
+	go.etcd.io/etcd/v3 v3.3.0-rc.0.0.20200707003333-58bb8ae09f8e
 	go.uber.org/automaxprocs v1.3.0
-	go.uber.org/multierr v1.1.0 // indirect
-	go.uber.org/zap v1.7.1 // indirect
 	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
 	golang.org/x/mod v0.3.0 // indirect
 	golang.org/x/net v0.0.0-20200319234117-63522dbf7eec
diff --git a/go.sum b/go.sum
diff --git a/lock/etcdlock/mutex.go b/lock/etcdlock/mutex.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/concurrency"
 	"github.com/projecteru2/core/types"
+	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/v3/clientv3/concurrency"
 	"golang.org/x/net/context"
 )
 
diff --git a/lock/etcdlock/mutex_test.go b/lock/etcdlock/mutex_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/etcd/integration"
+	"go.etcd.io/etcd/v3/integration"
 )
 
 func TestMutex(t *testing.T) {
diff --git a/store/etcdv3/container.go b/store/etcdv3/container.go
@@ -7,11 +7,11 @@ import (
 
 	"context"
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
 	"github.com/projecteru2/core/types"
 	"github.com/projecteru2/core/utils"
 	log "github.com/sirupsen/logrus"
+	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/v3/mvcc/mvccpb"
 )
 
 // AddContainer add a container
diff --git a/store/etcdv3/deploy.go b/store/etcdv3/deploy.go
@@ -5,9 +5,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/projecteru2/core/types"
 	log "github.com/sirupsen/logrus"
+	"go.etcd.io/etcd/v3/clientv3"
 )
 
 // MakeDeployStatus get deploy status from store
diff --git a/store/etcdv3/embeded/embeded.go b/store/etcdv3/embeded/embeded.go
@@ -3,9 +3,9 @@ package embeded
 import (
 	"testing"
 
-	"github.com/coreos/etcd/clientv3"
+	"go.etcd.io/etcd/v3/clientv3"
 
-	"github.com/coreos/etcd/integration"
+	"go.etcd.io/etcd/v3/integration"
 )
 
 var (
diff --git a/store/etcdv3/mercury.go b/store/etcdv3/mercury.go
@@ -7,18 +7,18 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/etcd/pkg/transport"
+	"go.etcd.io/etcd/v3/pkg/transport"
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/namespace"
-	"github.com/coreos/etcd/mvcc/mvccpb"
 	"github.com/projecteru2/core/lock"
 	"github.com/projecteru2/core/lock/etcdlock"
 	"github.com/projecteru2/core/store/etcdv3/embeded"
 	"github.com/projecteru2/core/types"
 	"github.com/projecteru2/core/utils"
+	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/v3/clientv3/namespace"
+	"go.etcd.io/etcd/v3/mvcc/mvccpb"
 )
 
 const (
diff --git a/store/etcdv3/mercury_test.go b/store/etcdv3/mercury_test.go
@@ -6,9 +6,9 @@ import (
 
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/projecteru2/core/types"
 	"github.com/stretchr/testify/assert"
+	"go.etcd.io/etcd/v3/clientv3"
 )
 
 func NewMercury(t *testing.T) *Mercury {
diff --git a/store/etcdv3/node.go b/store/etcdv3/node.go
@@ -9,13 +9,13 @@ import (
 	"github.com/projecteru2/core/engine"
 	"github.com/projecteru2/core/store"
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/mvcc/mvccpb"
 	enginefactory "github.com/projecteru2/core/engine/factory"
 	"github.com/projecteru2/core/metrics"
 	"github.com/projecteru2/core/types"
 	"github.com/projecteru2/core/utils"
 	log "github.com/sirupsen/logrus"
+	"go.etcd.io/etcd/v3/clientv3"
+	"go.etcd.io/etcd/v3/mvcc/mvccpb"
 )
 
 // AddNode save it to etcd
diff --git a/store/etcdv3/pod.go b/store/etcdv3/pod.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/projecteru2/core/types"
+	"go.etcd.io/etcd/v3/clientv3"
 )
 
 // AddPod add a pod
diff --git a/store/etcdv3/processing.go b/store/etcdv3/processing.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/sanity-io/litter"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/projecteru2/core/types"
 	log "github.com/sirupsen/logrus"
+	"go.etcd.io/etcd/v3/clientv3"
 )
 
 // SaveProcessing save processing status in etcd

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/stretchr/testify/assert"`
`9`	`9`
`10`		`- "github.com/coreos/etcd/integration"`
	`10`	`+ "go.etcd.io/etcd/v3/integration"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestMutex(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import (`
`5`	`5`	`"path/filepath"`
`6`	`6`	`"strings"`
`7`	`7`
`8`		`- "github.com/coreos/etcd/clientv3"`
`9`	`8`	`"github.com/projecteru2/core/types"`
`10`	`9`	`log "github.com/sirupsen/logrus"`
	`10`	`+ "go.etcd.io/etcd/v3/clientv3"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// MakeDeployStatus get deploy status from store`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@ package embeded`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/coreos/etcd/clientv3"`
	`6`	`+ "go.etcd.io/etcd/v3/clientv3"`
`7`	`7`
`8`		`- "github.com/coreos/etcd/integration"`
	`8`	`+ "go.etcd.io/etcd/v3/integration"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ import (`
`6`	`6`
`7`	`7`	`"time"`
`8`	`8`
`9`		`- "github.com/coreos/etcd/clientv3"`
`10`	`9`	`"github.com/projecteru2/core/types"`
`11`	`10`	`"github.com/stretchr/testify/assert"`
	`11`	`+ "go.etcd.io/etcd/v3/clientv3"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func NewMercury(t testing.T) Mercury {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`"encoding/json"`
`6`	`6`	`"fmt"`
`7`	`7`
`8`		`- "github.com/coreos/etcd/clientv3"`
`9`	`8`	`"github.com/projecteru2/core/types"`
	`9`	`+ "go.etcd.io/etcd/v3/clientv3"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// AddPod add a pod`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/sanity-io/litter"`
`11`	`11`
`12`		`- "github.com/coreos/etcd/clientv3"`
`13`	`12`	`"github.com/projecteru2/core/types"`
`14`	`13`	`log "github.com/sirupsen/logrus"`
	`14`	`+ "go.etcd.io/etcd/v3/clientv3"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`// SaveProcessing save processing status in etcd`