Merge pull request #84 from org0000h/master

for updating etcd
zeromicro · Jun 23, 2021 · 489048d · 489048d
2 parents d429399 + aab5e29
commit 489048d
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/cmd/dm/cmd/sync/dm.go b/cmd/dm/cmd/sync/dm.go
@@ -6,14 +6,14 @@ import (
 	"flag"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/tal-tech/cds/cmd/dm/cmd/sync/config"
 	"github.com/tal-tech/cds/cmd/dm/module"
 	"github.com/tal-tech/cds/pkg/strx"
 	"github.com/tal-tech/go-zero/core/conf"
 	"github.com/tal-tech/go-zero/core/logx"
-	"go.etcd.io/etcd/clientv3/concurrency"
+	clientv3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 var (

diff --git a/cmd/dm/module/jobstatus.go b/cmd/dm/module/jobstatus.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/tal-tech/cds/cmd/dm/cmd/sync/config"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 const (

diff --git a/cmd/dm/module/manager.go b/cmd/dm/module/manager.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/tal-tech/cds/cmd/dm/cmd/sync/config"
 	"github.com/tal-tech/go-zero/core/logx"
-	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 type Manager struct {

diff --git a/cmd/dm/module/service.go b/cmd/dm/module/service.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 
 	"github.com/tal-tech/go-zero/core/logx"
-	"go.etcd.io/etcd/clientv3/concurrency"
+	"go.etcd.io/etcd/client/v3/concurrency"
 	"gopkg.in/mgo.v2/bson"
 
 	"github.com/tal-tech/cds/cmd/dm/choperator"

diff --git a/cmd/galaxy/internal/clients/dmclient.go b/cmd/galaxy/internal/clients/dmclient.go
@@ -9,7 +9,7 @@ import (
 	"github.com/tal-tech/cds/cmd/dm/cmd/sync/config"
 	"github.com/tal-tech/cds/pkg/strx"
 	"github.com/tal-tech/go-zero/core/logx"
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 type DmClient struct {

diff --git a/cmd/galaxy/internal/clients/rtuclient.go b/cmd/galaxy/internal/clients/rtuclient.go
@@ -9,7 +9,7 @@ import (
 	"github.com/tal-tech/cds/cmd/rtu/cmd/sync/config"
 	"github.com/tal-tech/cds/pkg/strx"
 	"github.com/tal-tech/go-zero/core/logx"
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 type RtuClient struct {

diff --git a/cmd/galaxy/internal/svc/servicecontext.go b/cmd/galaxy/internal/svc/servicecontext.go
@@ -7,7 +7,7 @@ import (
 	"github.com/tal-tech/cds/cmd/galaxy/internal/model"
 	"github.com/tal-tech/cds/pkg/canalx"
 	"github.com/tal-tech/cds/pkg/debeziumx"
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 type ServiceContext struct {

diff --git a/cmd/rtu/handle/common.go b/cmd/rtu/handle/common.go
@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/tal-tech/go-zero/core/logx"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/atomic"
 
 	"github.com/tal-tech/cds/cmd/rtu/cmd/sync/config"

diff --git a/cmd/rtu/handle/etcdjob.go b/cmd/rtu/handle/etcdjob.go
@@ -8,11 +8,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/clientv3/concurrency"
 	"github.com/tal-tech/cds/cmd/rtu/cmd/sync/config"
 	"github.com/tal-tech/cds/pkg/strx"
 	"github.com/tal-tech/go-zero/core/logx"
+	clientv3 "go.etcd.io/etcd/client/v3"
+	"go.etcd.io/etcd/client/v3/concurrency"
 )
 
 var (

diff --git a/cmd/rtu/handle/rtujob.go b/cmd/rtu/handle/rtujob.go
@@ -6,8 +6,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/tal-tech/go-zero/core/logx"
+	clientv3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/tal-tech/cds/cmd/rtu/cmd/sync/config"
 	"github.com/tal-tech/cds/cmd/rtu/model"

diff --git a/cmd/rtu/handle/run.go b/cmd/rtu/handle/run.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/tal-tech/cds/cmd/rtu/cmd/sync/config"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/tal-tech/go-zero/core/logx"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 var (