[fix] center fix the transfer of etcdadpt (#1465)

Co-authored-by: songshiyuan 00649746 <[email protected]>

client/apis.go

@@ -23,12 +23,13 @@ import (
 	"io"
 	"net/http"
 
+	"github.com/go-chassis/cari/discovery"
+	"github.com/go-chassis/cari/pkg/errsvc"
+	"github.com/go-chassis/etcdadpt"
+
 	"github.com/apache/servicecomb-service-center/pkg/dump"
 	"github.com/apache/servicecomb-service-center/pkg/util"
 	"github.com/apache/servicecomb-service-center/version"
-	"github.com/go-chassis/cari/discovery"
-	"github.com/go-chassis/cari/pkg/errsvc"
-	"github.com/little-cui/etcdadpt"
 )
 
 const (

datasource/engine.go

@@ -20,7 +20,7 @@ package datasource
 import (
 	"context"
 
-	"github.com/little-cui/etcdadpt"
+	"github.com/go-chassis/etcdadpt"
 )
 
 // SCManager contains the APIs of registration of SC itself

datasource/etcd/account.go

@@ -24,8 +24,8 @@ import (
 	"time"
 
 	crbac "github.com/go-chassis/cari/rbac"
+	"github.com/go-chassis/etcdadpt"
 	"github.com/go-chassis/foundation/stringutil"
-	"github.com/little-cui/etcdadpt"
 
 	"github.com/apache/servicecomb-service-center/datasource"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/path"
@@ -142,7 +142,7 @@ func (ds *RbacDAO) ListAccount(ctx context.Context) ([]*crbac.Account, int64, er
 		err = json.Unmarshal(v.Value, a)
 		if err != nil {
 			log.Error("account info format invalid:", err)
-			continue //do not fail if some account is invalid
+			continue // do not fail if some account is invalid
 		}
 		a.Password = ""
 		ds.compatibleOldVersionAccount(a)
@@ -159,7 +159,7 @@ func (ds *RbacDAO) DeleteAccount(ctx context.Context, names []string) (bool, err
 		a, err := ds.GetAccount(ctx, name)
 		if err != nil {
 			log.Error("", err)
-			continue //do not fail if some account is invalid
+			continue // do not fail if some account is invalid
 		}
 		if a == nil {
 			log.Warn("can not find account")
@@ -168,7 +168,7 @@ func (ds *RbacDAO) DeleteAccount(ctx context.Context, names []string) (bool, err
 		opts, err := GenAccountOpts(a, etcdadpt.ActionDelete)
 		if err != nil {
 			log.Error("", err)
-			continue //do not fail if some account is invalid
+			continue // do not fail if some account is invalid
 
 		}
 		allOpts = append(allOpts, opts...)

datasource/etcd/account_lock.go

@@ -22,10 +22,11 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"github.com/go-chassis/etcdadpt"
+
 	"github.com/apache/servicecomb-service-center/datasource/etcd/path"
 	"github.com/apache/servicecomb-service-center/datasource/rbac"
 	"github.com/apache/servicecomb-service-center/pkg/log"
-	"github.com/little-cui/etcdadpt"
 )
 
 func (al *RbacDAO) UpsertLock(ctx context.Context, lock *rbac.Lock) error {
@@ -73,7 +74,7 @@ func (al *RbacDAO) ListLock(ctx context.Context) ([]*rbac.Lock, int64, error) {
 		err = json.Unmarshal(v.Value, lock)
 		if err != nil {
 			log.Error("account lock info format invalid:", err)
-			continue //do not fail if some account is invalid
+			continue // do not fail if some account is invalid
 		}
 		locks = append(locks, lock)
 	}

datasource/etcd/bootstrap/bootstrap.go

@@ -18,12 +18,12 @@
 package bootstrap
 
 import (
-	//registry
-	_ "github.com/little-cui/etcdadpt/buildin"
-	_ "github.com/little-cui/etcdadpt/embedded"
-	_ "github.com/little-cui/etcdadpt/remote"
+	// registry
+	_ "github.com/go-chassis/etcdadpt/buildin"
+	_ "github.com/go-chassis/etcdadpt/embedded"
+	_ "github.com/go-chassis/etcdadpt/remote"
 
-	//discovery
+	// discovery
 	_ "github.com/apache/servicecomb-service-center/datasource/etcd/sd/aggregate"
 	_ "github.com/apache/servicecomb-service-center/datasource/etcd/sd/k8s"
 	_ "github.com/apache/servicecomb-service-center/datasource/etcd/sd/servicecenter"

datasource/etcd/cache/filter_instances.go

@@ -21,13 +21,14 @@ import (
 	"context"
 	"fmt"
 
+	pb "github.com/go-chassis/cari/discovery"
+	"github.com/go-chassis/etcdadpt"
+
 	"github.com/apache/servicecomb-service-center/datasource/etcd/path"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/util"
 	"github.com/apache/servicecomb-service-center/pkg/cache"
 	"github.com/apache/servicecomb-service-center/pkg/log"
-	pb "github.com/go-chassis/cari/discovery"
-	"github.com/little-cui/etcdadpt"
 )
 
 type InstancesFilter struct {

datasource/etcd/client/client.go

@@ -21,9 +21,10 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/go-chassis/etcdadpt"
+
 	"github.com/apache/servicecomb-service-center/pkg/log"
 	"github.com/apache/servicecomb-service-center/pkg/task"
-	"github.com/little-cui/etcdadpt"
 )
 
 // KeepAlive will always return ok when cache is unavailable

datasource/etcd/client/client_test.go

@@ -22,8 +22,9 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/go-chassis/etcdadpt"
+
 	"github.com/apache/servicecomb-service-center/pkg/task"
-	"github.com/little-cui/etcdadpt"
 )
 
 var closedCh = make(chan struct{})

datasource/etcd/client/lease_task.go

@@ -22,11 +22,12 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/go-chassis/etcdadpt"
+
 	"github.com/apache/servicecomb-service-center/pkg/log"
 	simple "github.com/apache/servicecomb-service-center/pkg/time"
 	"github.com/apache/servicecomb-service-center/pkg/util"
 	"github.com/apache/servicecomb-service-center/server/metrics"
-	"github.com/little-cui/etcdadpt"
 )
 
 const leaseProfTimeFmt = "15:04:05.000"

datasource/etcd/client/lease_task_test.go

@@ -21,10 +21,11 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/apache/servicecomb-service-center/datasource/etcd/client"
-	"github.com/little-cui/etcdadpt"
-	"github.com/little-cui/etcdadpt/buildin"
+	"github.com/go-chassis/etcdadpt"
+	"github.com/go-chassis/etcdadpt/buildin"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/apache/servicecomb-service-center/datasource/etcd/client"
 )
 
 type mockRegistry struct {

datasource/etcd/config.go

@@ -20,8 +20,9 @@ package etcd
 import (
 	"time"
 
+	"github.com/go-chassis/etcdadpt"
+
 	"github.com/apache/servicecomb-service-center/server/config"
-	"github.com/little-cui/etcdadpt"
 )
 
 func Configuration() etcdadpt.Config {

datasource/etcd/dep.go

@@ -24,7 +24,7 @@ import (
 	"fmt"
 
 	pb "github.com/go-chassis/cari/discovery"
-	"github.com/little-cui/etcdadpt"
+	"github.com/go-chassis/etcdadpt"
 
 	"github.com/apache/servicecomb-service-center/datasource"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/event"

datasource/etcd/engine.go

@@ -22,12 +22,13 @@ import (
 	"encoding/json"
 	"os"
 
+	"github.com/go-chassis/cari/dlock"
+	"github.com/go-chassis/etcdadpt"
+
 	"github.com/apache/servicecomb-service-center/datasource/etcd/path"
 	"github.com/apache/servicecomb-service-center/pkg/log"
 	"github.com/apache/servicecomb-service-center/server/config"
 	"github.com/apache/servicecomb-service-center/version"
-	"github.com/go-chassis/cari/dlock"
-	"github.com/little-cui/etcdadpt"
 )
 
 const versionLockKey = "/version-upgrade"

datasource/etcd/etcd.go

@@ -24,17 +24,18 @@ import (
 	"strings"
 	"time"
 
+	"github.com/go-chassis/cari/dlock"
+	"github.com/go-chassis/etcdadpt"
+	"github.com/go-chassis/etcdadpt/middleware/tracing"
+	"github.com/go-chassis/foundation/gopool"
+
 	"github.com/apache/servicecomb-service-center/datasource"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/event"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/state"
 	tracer "github.com/apache/servicecomb-service-center/datasource/etcd/tracing"
 	"github.com/apache/servicecomb-service-center/pkg/log"
 	"github.com/apache/servicecomb-service-center/server/config"
-	"github.com/go-chassis/cari/dlock"
-	"github.com/go-chassis/foundation/gopool"
-	"github.com/little-cui/etcdadpt"
-	"github.com/little-cui/etcdadpt/middleware/tracing"
 )
 
 const compactLockKey = "/etcd-compact"
@@ -43,7 +44,7 @@ var clustersIndex = make(map[string]int)
 
 func init() {
 	datasource.Install("etcd", NewDataSource)
-	datasource.Install("embeded_etcd", NewDataSource) //TODO remove misspell in future
+	datasource.Install("embeded_etcd", NewDataSource) // TODO remove misspell in future
 	datasource.Install("embedded_etcd", NewDataSource)
 
 	sd.RegisterInnerTypes()

datasource/etcd/event/dependency_event_handler.go

@@ -23,6 +23,14 @@ import (
 	"sync"
 	"time"
 
+	pb "github.com/go-chassis/cari/discovery"
+	"github.com/go-chassis/cari/dlock"
+	"github.com/go-chassis/etcdadpt"
+	"github.com/go-chassis/foundation/backoff"
+	"github.com/go-chassis/foundation/gopool"
+	"github.com/go-chassis/foundation/stringutil"
+	"github.com/go-chassis/foundation/timeutil"
+
 	"github.com/apache/servicecomb-service-center/datasource"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/path"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
@@ -32,13 +40,6 @@ import (
 	"github.com/apache/servicecomb-service-center/pkg/queue"
 	"github.com/apache/servicecomb-service-center/pkg/util"
 	"github.com/apache/servicecomb-service-center/server/config"
-	pb "github.com/go-chassis/cari/discovery"
-	"github.com/go-chassis/cari/dlock"
-	"github.com/go-chassis/foundation/backoff"
-	"github.com/go-chassis/foundation/gopool"
-	"github.com/go-chassis/foundation/stringutil"
-	"github.com/go-chassis/foundation/timeutil"
-	"github.com/little-cui/etcdadpt"
 )
 
 const depQueueLockKey = "/dep-queue"

datasource/etcd/metrics.go

@@ -21,12 +21,13 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/go-chassis/cari/discovery"
+	"github.com/go-chassis/etcdadpt"
+
 	"github.com/apache/servicecomb-service-center/datasource"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/path"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
 	"github.com/apache/servicecomb-service-center/pkg/log"
-	"github.com/go-chassis/cari/discovery"
-	"github.com/little-cui/etcdadpt"
 )
 
 type MetricsManager struct {

datasource/etcd/ms.go

@@ -27,6 +27,12 @@ import (
 	"strconv"
 	"time"
 
+	pb "github.com/go-chassis/cari/discovery"
+	"github.com/go-chassis/cari/pkg/errsvc"
+	"github.com/go-chassis/cari/sync"
+	"github.com/go-chassis/etcdadpt"
+	"github.com/go-chassis/foundation/gopool"
+
 	"github.com/apache/servicecomb-service-center/datasource"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/cache"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/path"
@@ -43,11 +49,6 @@ import (
 	"github.com/apache/servicecomb-service-center/server/plugin/uuid"
 	quotasvc "github.com/apache/servicecomb-service-center/server/service/quota"
 	"github.com/apache/servicecomb-service-center/syncer/service/event"
-	pb "github.com/go-chassis/cari/discovery"
-	"github.com/go-chassis/cari/pkg/errsvc"
-	"github.com/go-chassis/cari/sync"
-	"github.com/go-chassis/foundation/gopool"
-	"github.com/little-cui/etcdadpt"
 )
 
 type MetadataManager struct {
@@ -391,7 +392,7 @@ func (ds *MetadataManager) registerInstance(ctx context.Context, request *pb.Reg
 	remoteIP := util.GetIPFromContext(ctx)
 	instance := request.Instance
 
-	//允许自定义id
+	// 允许自定义id
 	if len(instance.InstanceId) > 0 {
 		needRegister, err := ds.sendHeartbeatInstead(ctx, instance)
 		if err != nil {
@@ -408,7 +409,7 @@ func (ds *MetadataManager) registerInstance(ctx context.Context, request *pb.Reg
 	instanceFlag := fmt.Sprintf("ttl %ds, endpoints %v, host '%s', serviceID %s",
 		ttl, instance.Endpoints, instance.HostName, instance.ServiceId)
 
-	//先以domain/project的方式组装
+	// 先以domain/project的方式组装
 	domainProject := util.ParseDomainProject(ctx)
 
 	instanceID := instance.InstanceId
@@ -1251,7 +1252,7 @@ func (ds *MetadataManager) PutTag(ctx context.Context, request *pb.UpdateService
 		return pb.NewError(pb.ErrInternal, err.Error())
 	}
 
-	//check if the tag exists
+	// check if the tag exists
 	if _, ok := tags[request.Key]; !ok {
 		log.Error(fmt.Sprintf("update service[%s]'s tag[%s] failed, tag does not exist, operator: %s",
 			request.ServiceId, tagFlag, remoteIP), nil)
@@ -1580,7 +1581,7 @@ func (ds *MetadataManager) UnregisterService(ctx context.Context, request *pb.De
 	}
 	opts = append(opts, syncOpts...)
 
-	//删除依赖规则
+	// 删除依赖规则
 	optDeleteDep, err := eutil.DeleteDependencyForDeleteService(domainProject, serviceID, serviceKey)
 	if err != nil {
 		log.Error(fmt.Sprintf("%s micro-service[%s] failed, delete dependency failed, operator: %s",
@@ -1600,19 +1601,19 @@ func (ds *MetadataManager) UnregisterService(ctx context.Context, request *pb.De
 		etcdadpt.WithStrKey(path.GenerateServiceSchemaRefKey(domainProject, serviceID, "")),
 		etcdadpt.WithPrefix()))
 
-	//删除tags
+	// 删除tags
 	opts = append(opts, etcdadpt.OpDel(
 		etcdadpt.WithStrKey(path.GenerateServiceTagKey(domainProject, serviceID))))
 
-	//删除instances
+	// 删除instances
 	opts = append(opts, etcdadpt.OpDel(
 		etcdadpt.WithStrKey(path.GenerateInstanceKey(domainProject, serviceID, "")),
 		etcdadpt.WithPrefix()))
 	opts = append(opts, etcdadpt.OpDel(
 		etcdadpt.WithStrKey(path.GenerateInstanceLeaseKey(domainProject, serviceID, "")),
 		etcdadpt.WithPrefix()))
 
-	//删除实例
+	// 删除实例
 	err = eutil.DeleteServiceAllInstances(ctx, serviceID)
 	if err != nil {
 		log.Error(fmt.Sprintf("%s micro-service[%s] failed, revoke all instances failed, operator: %s",
@@ -1668,7 +1669,7 @@ func (ds *MetadataManager) UpdateManyInstanceStatus(ctx context.Context, match *
 		}
 		if t {
 			key := path.GenerateInstanceKey(domainProject, instance.ServiceId, instance.InstanceId)
-			//更新状态
+			// 更新状态
 			instance.Status = status
 			data, _ := json.Marshal(instance)
 			leaseID, err := serviceUtil.GetLeaseID(ctx, domainProject, instance.ServiceId, instance.InstanceId)

datasource/etcd/retire.go

@@ -22,6 +22,10 @@ import (
 	"fmt"
 	"sync/atomic"
 
+	pb "github.com/go-chassis/cari/discovery"
+	"github.com/go-chassis/etcdadpt"
+	"github.com/go-chassis/foundation/gopool"
+
 	"github.com/apache/servicecomb-service-center/datasource"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/path"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
@@ -30,9 +34,6 @@ import (
 	"github.com/apache/servicecomb-service-center/pkg/goutil"
 	"github.com/apache/servicecomb-service-center/pkg/log"
 	"github.com/apache/servicecomb-service-center/pkg/util"
-	pb "github.com/go-chassis/cari/discovery"
-	"github.com/go-chassis/foundation/gopool"
-	"github.com/little-cui/etcdadpt"
 )
 
 const poolSizeOfRotation = 5