This is an automated email from the ASF dual-hosted git repository.
littlecui pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/dev by this push:
new 05340414 [fix] center fix the transfer of etcdadpt (#1465)
05340414 is described below
commit 05340414c16a2519f4e1f1961f6349792ca0cc9c
Author: tornado-ssy <[email protected]>
AuthorDate: Fri Mar 29 15:57:57 2024 +0800
[fix] center fix the transfer of etcdadpt (#1465)
Co-authored-by: songshiyuan 00649746 <[email protected]>
---
client/apis.go | 7 +++---
datasource/engine.go | 2 +-
datasource/etcd/account.go | 8 +++----
datasource/etcd/account_lock.go | 5 +++--
datasource/etcd/bootstrap/bootstrap.go | 10 ++++-----
datasource/etcd/cache/filter_instances.go | 5 +++--
datasource/etcd/client/client.go | 3 ++-
datasource/etcd/client/client_test.go | 3 ++-
datasource/etcd/client/lease_task.go | 3 ++-
datasource/etcd/client/lease_task_test.go | 7 +++---
datasource/etcd/config.go | 3 ++-
datasource/etcd/dep.go | 2 +-
datasource/etcd/engine.go | 5 +++--
datasource/etcd/etcd.go | 11 ++++-----
datasource/etcd/event/dependency_event_handler.go | 15 +++++++------
datasource/etcd/metrics.go | 5 +++--
datasource/etcd/ms.go | 27 ++++++++++++-----------
datasource/etcd/retire.go | 7 +++---
datasource/etcd/retire_test.go | 7 +++---
datasource/etcd/role.go | 4 ++--
datasource/etcd/role_test.go | 11 ++++-----
datasource/etcd/schema.go | 2 +-
datasource/etcd/sd/aggregate/indexer.go | 3 ++-
datasource/etcd/sd/servicecenter/aggregate.go | 5 +++--
datasource/etcd/sd/servicecenter/indexer.go | 5 +++--
datasource/etcd/state/etcd/cacher_kv.go | 11 ++++-----
datasource/etcd/state/etcd/indexer_cache.go | 3 ++-
datasource/etcd/state/etcd/indexer_etcd.go | 3 ++-
datasource/etcd/state/etcd/indexer_test.go | 5 +++--
datasource/etcd/state/etcd/listwatch_inner.go | 3 ++-
datasource/etcd/state/etcd/listwatch_test.go | 5 +++--
datasource/etcd/state/kvstore/indexer.go | 2 +-
datasource/etcd/state/kvstore/indexer_cache.go | 3 ++-
datasource/etcd/state/kvstore/indexer_test.go | 2 +-
datasource/etcd/state/kvstore/types.go | 5 +++--
datasource/etcd/state/manager_test.go | 5 +++--
datasource/etcd/sync.go | 2 +-
datasource/etcd/sync/sync.go | 3 ++-
datasource/etcd/sync_test.go | 9 ++++----
datasource/etcd/tracing/tracer.go | 3 ++-
datasource/etcd/util.go | 2 +-
datasource/etcd/util/dependency.go | 7 +++---
datasource/etcd/util/dependency_query.go | 5 +++--
datasource/etcd/util/dependency_util.go | 8 +++----
datasource/etcd/util/domain_util.go | 3 ++-
datasource/etcd/util/instance_util.go | 7 +++---
datasource/etcd/util/microservice_util.go | 2 +-
datasource/etcd/util/schema_util.go | 3 ++-
datasource/etcd/util/tag_util.go | 2 +-
datasource/etcd/util/util.go | 3 ++-
datasource/etcd/util/util_test.go | 13 ++++++-----
datasource/etcd/version.go | 3 ++-
datasource/local/schema.go | 7 +++---
datasource/mongo/engine.go | 2 +-
eventbase/go.sum | 2 +-
go.mod | 10 ++++-----
go.sum | 14 +++++-------
pkg/dump/types.go | 5 +++--
server/plugin/tracing/pzipkin/buildin_test.go | 5 +++--
syncer/service/replicator/resource/kv.go | 2 +-
60 files changed, 187 insertions(+), 147 deletions(-)
diff --git a/client/apis.go b/client/apis.go
index 7f7629aa..41338a92 100644
--- a/client/apis.go
+++ b/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 (
diff --git a/datasource/engine.go b/datasource/engine.go
index 1c2d6d57..001fcfcf 100644
--- a/datasource/engine.go
+++ b/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
diff --git a/datasource/etcd/account.go b/datasource/etcd/account.go
index 280eaa74..c0f908d1 100644
--- a/datasource/etcd/account.go
+++ b/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...)
diff --git a/datasource/etcd/account_lock.go b/datasource/etcd/account_lock.go
index edb96e3d..5d92163f 100644
--- a/datasource/etcd/account_lock.go
+++ b/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)
}
diff --git a/datasource/etcd/bootstrap/bootstrap.go
b/datasource/etcd/bootstrap/bootstrap.go
index 2584f370..be2f3885 100644
--- a/datasource/etcd/bootstrap/bootstrap.go
+++ b/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"
diff --git a/datasource/etcd/cache/filter_instances.go
b/datasource/etcd/cache/filter_instances.go
index da03d0b9..9b49c2c5 100644
--- a/datasource/etcd/cache/filter_instances.go
+++ b/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 {
diff --git a/datasource/etcd/client/client.go b/datasource/etcd/client/client.go
index 7ea8354b..103fae65 100644
--- a/datasource/etcd/client/client.go
+++ b/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
diff --git a/datasource/etcd/client/client_test.go
b/datasource/etcd/client/client_test.go
index 4943c7b5..16e95e1f 100644
--- a/datasource/etcd/client/client_test.go
+++ b/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{})
diff --git a/datasource/etcd/client/lease_task.go
b/datasource/etcd/client/lease_task.go
index 8985a231..70f0082e 100644
--- a/datasource/etcd/client/lease_task.go
+++ b/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"
diff --git a/datasource/etcd/client/lease_task_test.go
b/datasource/etcd/client/lease_task_test.go
index a7dff3ed..905574f1 100644
--- a/datasource/etcd/client/lease_task_test.go
+++ b/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 {
diff --git a/datasource/etcd/config.go b/datasource/etcd/config.go
index 76d2b347..f163c1bd 100644
--- a/datasource/etcd/config.go
+++ b/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 {
diff --git a/datasource/etcd/dep.go b/datasource/etcd/dep.go
index 1f7e33a5..37da6acd 100644
--- a/datasource/etcd/dep.go
+++ b/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"
diff --git a/datasource/etcd/engine.go b/datasource/etcd/engine.go
index a0d03da0..1d10a87e 100644
--- a/datasource/etcd/engine.go
+++ b/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"
diff --git a/datasource/etcd/etcd.go b/datasource/etcd/etcd.go
index 684beaed..0b91006e 100644
--- a/datasource/etcd/etcd.go
+++ b/datasource/etcd/etcd.go
@@ -24,6 +24,11 @@ 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"
@@ -31,10 +36,6 @@ import (
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()
diff --git a/datasource/etcd/event/dependency_event_handler.go
b/datasource/etcd/event/dependency_event_handler.go
index 4b3b91d8..12127950 100644
--- a/datasource/etcd/event/dependency_event_handler.go
+++ b/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"
diff --git a/datasource/etcd/metrics.go b/datasource/etcd/metrics.go
index 465501b6..9a30c11d 100644
--- a/datasource/etcd/metrics.go
+++ b/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 {
diff --git a/datasource/etcd/ms.go b/datasource/etcd/ms.go
index f3b1499e..d98889c5 100644
--- a/datasource/etcd/ms.go
+++ b/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,11 +1601,11 @@ 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()))
@@ -1612,7 +1613,7 @@ func (ds *MetadataManager) UnregisterService(ctx
context.Context, request *pb.De
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)
diff --git a/datasource/etcd/retire.go b/datasource/etcd/retire.go
index 772af682..97152892 100644
--- a/datasource/etcd/retire.go
+++ b/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
diff --git a/datasource/etcd/retire_test.go b/datasource/etcd/retire_test.go
index 5f9bbd2e..6a77e75d 100644
--- a/datasource/etcd/retire_test.go
+++ b/datasource/etcd/retire_test.go
@@ -22,13 +22,14 @@ import (
"reflect"
"testing"
+ pb "github.com/go-chassis/cari/discovery"
+ "github.com/go-chassis/etcdadpt"
+ "github.com/stretchr/testify/assert"
+
"github.com/apache/servicecomb-service-center/datasource"
"github.com/apache/servicecomb-service-center/datasource/etcd"
"github.com/apache/servicecomb-service-center/datasource/etcd/path"
"github.com/apache/servicecomb-service-center/datasource/etcd/state/kvstore"
- pb "github.com/go-chassis/cari/discovery"
- "github.com/little-cui/etcdadpt"
- "github.com/stretchr/testify/assert"
)
const domainProject = "default/default"
diff --git a/datasource/etcd/role.go b/datasource/etcd/role.go
index ec2233cb..17a8ab9f 100644
--- a/datasource/etcd/role.go
+++ b/datasource/etcd/role.go
@@ -25,7 +25,7 @@ import (
"time"
crbac "github.com/go-chassis/cari/rbac"
- "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/path"
@@ -113,7 +113,7 @@ func (rm *RbacDAO) ListRole(ctx context.Context)
([]*crbac.Role, int64, error) {
err = json.Unmarshal(v.Value, r)
if err != nil {
log.Error("role info format invalid:", err)
- continue //do not fail if some role is invalid
+ continue // do not fail if some role is invalid
}
roles = append(roles, r)
diff --git a/datasource/etcd/role_test.go b/datasource/etcd/role_test.go
index a5848957..29312d1c 100644
--- a/datasource/etcd/role_test.go
+++ b/datasource/etcd/role_test.go
@@ -22,16 +22,17 @@ import (
"strconv"
"testing"
- "github.com/apache/servicecomb-service-center/datasource"
- "github.com/apache/servicecomb-service-center/datasource/rbac"
"github.com/apache/servicecomb-service-center/eventbase/model"
"github.com/apache/servicecomb-service-center/eventbase/service/task"
"github.com/apache/servicecomb-service-center/eventbase/service/tombstone"
- "github.com/apache/servicecomb-service-center/pkg/util"
- _ "github.com/apache/servicecomb-service-center/test"
crbac "github.com/go-chassis/cari/rbac"
- "github.com/little-cui/etcdadpt"
+ "github.com/go-chassis/etcdadpt"
"github.com/stretchr/testify/assert"
+
+ "github.com/apache/servicecomb-service-center/datasource"
+ "github.com/apache/servicecomb-service-center/datasource/rbac"
+ "github.com/apache/servicecomb-service-center/pkg/util"
+ _ "github.com/apache/servicecomb-service-center/test"
)
func roleContext() context.Context {
diff --git a/datasource/etcd/schema.go b/datasource/etcd/schema.go
index 32488f08..123ae3fe 100644
--- a/datasource/etcd/schema.go
+++ b/datasource/etcd/schema.go
@@ -24,7 +24,7 @@ import (
mapset "github.com/deckarep/golang-set"
"github.com/go-chassis/cari/discovery"
- "github.com/little-cui/etcdadpt"
+ "github.com/go-chassis/etcdadpt"
"go.etcd.io/etcd/api/v3/mvccpb"
"github.com/apache/servicecomb-service-center/datasource"
diff --git a/datasource/etcd/sd/aggregate/indexer.go
b/datasource/etcd/sd/aggregate/indexer.go
index 005e7011..2cbae356 100644
--- a/datasource/etcd/sd/aggregate/indexer.go
+++ b/datasource/etcd/sd/aggregate/indexer.go
@@ -20,10 +20,11 @@ package aggregate
import (
"context"
+ "github.com/go-chassis/etcdadpt"
+
"github.com/apache/servicecomb-service-center/datasource/etcd/state"
"github.com/apache/servicecomb-service-center/datasource/etcd/state/kvstore"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/little-cui/etcdadpt"
)
// AdaptorsIndexer implements kvstore.Indexer.
diff --git a/datasource/etcd/sd/servicecenter/aggregate.go
b/datasource/etcd/sd/servicecenter/aggregate.go
index 5421e048..f058e64c 100644
--- a/datasource/etcd/sd/servicecenter/aggregate.go
+++ b/datasource/etcd/sd/servicecenter/aggregate.go
@@ -24,6 +24,9 @@ import (
"strings"
"sync"
+ "github.com/go-chassis/cari/pkg/errsvc"
+ "github.com/go-chassis/etcdadpt"
+
"github.com/apache/servicecomb-service-center/client"
"github.com/apache/servicecomb-service-center/datasource/etcd"
"github.com/apache/servicecomb-service-center/datasource/etcd/path"
@@ -32,8 +35,6 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/plugin/security/tlsconf"
- "github.com/go-chassis/cari/pkg/errsvc"
- "github.com/little-cui/etcdadpt"
)
var (
diff --git a/datasource/etcd/sd/servicecenter/indexer.go
b/datasource/etcd/sd/servicecenter/indexer.go
index 26e5185b..c92c194b 100644
--- a/datasource/etcd/sd/servicecenter/indexer.go
+++ b/datasource/etcd/sd/servicecenter/indexer.go
@@ -22,14 +22,15 @@ import (
"fmt"
"strings"
+ "github.com/go-chassis/cari/pkg/errsvc"
+ "github.com/go-chassis/etcdadpt"
+
"github.com/apache/servicecomb-service-center/client"
"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/state/kvstore"
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/go-chassis/cari/pkg/errsvc"
- "github.com/little-cui/etcdadpt"
)
// ClusterIndexer implements kvstore.Indexer.
diff --git a/datasource/etcd/state/etcd/cacher_kv.go
b/datasource/etcd/state/etcd/cacher_kv.go
index acadc386..a89dc3d5 100644
--- a/datasource/etcd/state/etcd/cacher_kv.go
+++ b/datasource/etcd/state/etcd/cacher_kv.go
@@ -25,17 +25,18 @@ import (
"sync"
"time"
+ rmodel "github.com/go-chassis/cari/discovery"
+ "github.com/go-chassis/etcdadpt"
+ "github.com/go-chassis/foundation/backoff"
+ "github.com/go-chassis/foundation/gopool"
+ "github.com/go-chassis/foundation/timeutil"
+
"github.com/apache/servicecomb-service-center/datasource/etcd/state/kvstore"
"github.com/apache/servicecomb-service-center/datasource/sdcommon"
"github.com/apache/servicecomb-service-center/pkg/goutil"
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/config"
- rmodel "github.com/go-chassis/cari/discovery"
- "github.com/go-chassis/foundation/backoff"
- "github.com/go-chassis/foundation/gopool"
- "github.com/go-chassis/foundation/timeutil"
- "github.com/little-cui/etcdadpt"
)
// KvCacher implements kvstore.Cacher.
diff --git a/datasource/etcd/state/etcd/indexer_cache.go
b/datasource/etcd/state/etcd/indexer_cache.go
index 5bd1d97a..c19a2651 100644
--- a/datasource/etcd/state/etcd/indexer_cache.go
+++ b/datasource/etcd/state/etcd/indexer_cache.go
@@ -21,9 +21,10 @@ import (
"context"
"fmt"
+ "github.com/go-chassis/etcdadpt"
+
"github.com/apache/servicecomb-service-center/datasource/etcd/state/kvstore"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/little-cui/etcdadpt"
)
// CacheIndexer implements kvstore.Indexer.
diff --git a/datasource/etcd/state/etcd/indexer_etcd.go
b/datasource/etcd/state/etcd/indexer_etcd.go
index 74a0c9c7..2e3a3603 100644
--- a/datasource/etcd/state/etcd/indexer_etcd.go
+++ b/datasource/etcd/state/etcd/indexer_etcd.go
@@ -22,11 +22,12 @@ import (
"fmt"
"strings"
+ "github.com/go-chassis/etcdadpt"
+
"github.com/apache/servicecomb-service-center/datasource/etcd/state/kvstore"
"github.com/apache/servicecomb-service-center/datasource/etcd/state/parser"
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/little-cui/etcdadpt"
)
// Indexer implements kvstore.Indexer.
diff --git a/datasource/etcd/state/etcd/indexer_test.go
b/datasource/etcd/state/etcd/indexer_test.go
index 932bc178..e446e9bb 100644
--- a/datasource/etcd/state/etcd/indexer_test.go
+++ b/datasource/etcd/state/etcd/indexer_test.go
@@ -21,10 +21,11 @@ import (
"context"
"testing"
+ "github.com/go-chassis/etcdadpt"
+ "go.etcd.io/etcd/api/v3/mvccpb"
+
"github.com/apache/servicecomb-service-center/datasource/etcd/state/kvstore"
"github.com/apache/servicecomb-service-center/datasource/etcd/state/parser"
- "github.com/little-cui/etcdadpt"
- "go.etcd.io/etcd/api/v3/mvccpb"
)
func TestEtcdIndexer_Search(t *testing.T) {
diff --git a/datasource/etcd/state/etcd/listwatch_inner.go
b/datasource/etcd/state/etcd/listwatch_inner.go
index 571cf76d..a53aeb84 100644
--- a/datasource/etcd/state/etcd/listwatch_inner.go
+++ b/datasource/etcd/state/etcd/listwatch_inner.go
@@ -21,10 +21,11 @@ import (
"context"
"fmt"
+ "github.com/go-chassis/etcdadpt"
+
"github.com/apache/servicecomb-service-center/datasource/sdcommon"
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/little-cui/etcdadpt"
)
type innerListWatch struct {
diff --git a/datasource/etcd/state/etcd/listwatch_test.go
b/datasource/etcd/state/etcd/listwatch_test.go
index 06e2d288..72a419d4 100644
--- a/datasource/etcd/state/etcd/listwatch_test.go
+++ b/datasource/etcd/state/etcd/listwatch_test.go
@@ -25,9 +25,10 @@ import (
"go.etcd.io/etcd/api/v3/mvccpb"
+ "github.com/go-chassis/etcdadpt"
+ "github.com/go-chassis/etcdadpt/buildin"
+
"github.com/apache/servicecomb-service-center/datasource/sdcommon"
- "github.com/little-cui/etcdadpt"
- "github.com/little-cui/etcdadpt/buildin"
)
type mockRegistry struct {
diff --git a/datasource/etcd/state/kvstore/indexer.go
b/datasource/etcd/state/kvstore/indexer.go
index a916ae9c..88630454 100644
--- a/datasource/etcd/state/kvstore/indexer.go
+++ b/datasource/etcd/state/kvstore/indexer.go
@@ -20,7 +20,7 @@ package kvstore
import (
"context"
- "github.com/little-cui/etcdadpt"
+ "github.com/go-chassis/etcdadpt"
)
// Indexer searches k-v data.
diff --git a/datasource/etcd/state/kvstore/indexer_cache.go
b/datasource/etcd/state/kvstore/indexer_cache.go
index fa6ca68b..99f313a9 100644
--- a/datasource/etcd/state/kvstore/indexer_cache.go
+++ b/datasource/etcd/state/kvstore/indexer_cache.go
@@ -22,9 +22,10 @@ import (
"fmt"
"time"
+ "github.com/go-chassis/etcdadpt"
+
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/little-cui/etcdadpt"
)
// CacheIndexer implements kvstore.Indexer.
diff --git a/datasource/etcd/state/kvstore/indexer_test.go
b/datasource/etcd/state/kvstore/indexer_test.go
index 8e7df21d..1ea51a91 100644
--- a/datasource/etcd/state/kvstore/indexer_test.go
+++ b/datasource/etcd/state/kvstore/indexer_test.go
@@ -21,7 +21,7 @@ import (
"context"
"testing"
- "github.com/little-cui/etcdadpt"
+ "github.com/go-chassis/etcdadpt"
)
type mockCache struct {
diff --git a/datasource/etcd/state/kvstore/types.go
b/datasource/etcd/state/kvstore/types.go
index fbe6d535..4ac17acf 100644
--- a/datasource/etcd/state/kvstore/types.go
+++ b/datasource/etcd/state/kvstore/types.go
@@ -23,10 +23,11 @@ import (
"strconv"
"time"
+ "github.com/go-chassis/cari/discovery"
+ "github.com/go-chassis/etcdadpt"
+
simple "github.com/apache/servicecomb-service-center/pkg/time"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/go-chassis/cari/discovery"
- "github.com/little-cui/etcdadpt"
)
var (
diff --git a/datasource/etcd/state/manager_test.go
b/datasource/etcd/state/manager_test.go
index d88fe19d..e7916c6f 100644
--- a/datasource/etcd/state/manager_test.go
+++ b/datasource/etcd/state/manager_test.go
@@ -22,9 +22,10 @@ import (
_ "github.com/apache/servicecomb-service-center/test"
- "github.com/apache/servicecomb-service-center/datasource/etcd/state"
- "github.com/little-cui/etcdadpt"
+ "github.com/go-chassis/etcdadpt"
"github.com/stretchr/testify/assert"
+
+ "github.com/apache/servicecomb-service-center/datasource/etcd/state"
)
func TestInit(t *testing.T) {
diff --git a/datasource/etcd/sync.go b/datasource/etcd/sync.go
index 2546e369..75c20f04 100644
--- a/datasource/etcd/sync.go
+++ b/datasource/etcd/sync.go
@@ -26,7 +26,7 @@ import (
"github.com/go-chassis/cari/discovery"
crbac "github.com/go-chassis/cari/rbac"
- "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/path"
diff --git a/datasource/etcd/sync/sync.go b/datasource/etcd/sync/sync.go
index 6f826aeb..767b8adc 100644
--- a/datasource/etcd/sync/sync.go
+++ b/datasource/etcd/sync/sync.go
@@ -22,9 +22,10 @@ import (
"encoding/json"
"github.com/go-chassis/cari/sync"
- "github.com/little-cui/etcdadpt"
+ "github.com/go-chassis/etcdadpt"
"github.com/apache/servicecomb-service-center/eventbase/datasource/etcd/key"
+
"github.com/apache/servicecomb-service-center/pkg/util"
)
diff --git a/datasource/etcd/sync_test.go b/datasource/etcd/sync_test.go
index 08da7646..7646797c 100644
--- a/datasource/etcd/sync_test.go
+++ b/datasource/etcd/sync_test.go
@@ -25,17 +25,18 @@ import (
pb "github.com/go-chassis/cari/discovery"
crbac "github.com/go-chassis/cari/rbac"
"github.com/go-chassis/cari/sync"
+ "github.com/go-chassis/etcdadpt"
"github.com/go-chassis/go-archaius"
- "github.com/little-cui/etcdadpt"
"github.com/stretchr/testify/assert"
+ "github.com/apache/servicecomb-service-center/eventbase/model"
+ "github.com/apache/servicecomb-service-center/eventbase/service/task"
+
"github.com/apache/servicecomb-service-center/eventbase/service/tombstone"
+
"github.com/apache/servicecomb-service-center/datasource"
"github.com/apache/servicecomb-service-center/datasource/etcd"
"github.com/apache/servicecomb-service-center/datasource/rbac"
"github.com/apache/servicecomb-service-center/datasource/schema"
- "github.com/apache/servicecomb-service-center/eventbase/model"
- "github.com/apache/servicecomb-service-center/eventbase/service/task"
-
"github.com/apache/servicecomb-service-center/eventbase/service/tombstone"
"github.com/apache/servicecomb-service-center/pkg/util"
_ "github.com/apache/servicecomb-service-center/test"
)
diff --git a/datasource/etcd/tracing/tracer.go
b/datasource/etcd/tracing/tracer.go
index 5514a1cc..84197d23 100644
--- a/datasource/etcd/tracing/tracer.go
+++ b/datasource/etcd/tracing/tracer.go
@@ -18,8 +18,9 @@
package tracing
import (
+ "github.com/go-chassis/etcdadpt/middleware/tracing"
+
tracesvc
"github.com/apache/servicecomb-service-center/server/plugin/tracing"
- "github.com/little-cui/etcdadpt/middleware/tracing"
)
type Tracer struct{}
diff --git a/datasource/etcd/util.go b/datasource/etcd/util.go
index d41215f4..741e05f6 100644
--- a/datasource/etcd/util.go
+++ b/datasource/etcd/util.go
@@ -24,8 +24,8 @@ import (
pb "github.com/go-chassis/cari/discovery"
"github.com/go-chassis/cari/pkg/errsvc"
+ "github.com/go-chassis/etcdadpt"
"github.com/go-chassis/foundation/gopool"
- "github.com/little-cui/etcdadpt"
"github.com/apache/servicecomb-service-center/datasource"
"github.com/apache/servicecomb-service-center/datasource/etcd/path"
diff --git a/datasource/etcd/util/dependency.go
b/datasource/etcd/util/dependency.go
index cf99dbe1..7e6852d9 100644
--- a/datasource/etcd/util/dependency.go
+++ b/datasource/etcd/util/dependency.go
@@ -22,10 +22,11 @@ import (
"encoding/json"
"fmt"
+ "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/pkg/log"
- "github.com/go-chassis/cari/discovery"
- "github.com/little-cui/etcdadpt"
)
// Dependency contains dependency rules
@@ -54,7 +55,7 @@ func (dep *Dependency) removeConsumerOfProviderRule(ctx
context.Context) ([]etcd
}
log.Debug(fmt.Sprintf("tmp and dep.Consumer not equal,
tmp %v, consumer %v", tmp, dep.Consumer))
}
- //删除后，如果不存在依赖规则了，就删除该provider的依赖规则，如果有，则更新该依赖规则
+ // 删除后，如果不存在依赖规则了，就删除该provider的依赖规则，如果有，则更新该依赖规则
if len(consumerValue.Dependency) == 0 {
opts = append(opts,
etcdadpt.OpDel(etcdadpt.WithStrKey(proProkey)))
continue
diff --git a/datasource/etcd/util/dependency_query.go
b/datasource/etcd/util/dependency_query.go
index f47a2f69..eed4e39e 100644
--- a/datasource/etcd/util/dependency_query.go
+++ b/datasource/etcd/util/dependency_query.go
@@ -22,12 +22,13 @@ import (
"errors"
"fmt"
+ pb "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"
- pb "github.com/go-chassis/cari/discovery"
- "github.com/little-cui/etcdadpt"
)
// DependencyRelationFilterOpt contains SameDomainProject and NonSelf flag
diff --git a/datasource/etcd/util/dependency_util.go
b/datasource/etcd/util/dependency_util.go
index cd34a01b..4e445b0a 100644
--- a/datasource/etcd/util/dependency_util.go
+++ b/datasource/etcd/util/dependency_util.go
@@ -25,7 +25,7 @@ import (
"strings"
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/path"
@@ -96,7 +96,7 @@ func DependencyRuleExistWithKey(ctx context.Context, key
string, target *pb.Micr
return false, err
}
if isEqual {
- //删除之前的依赖
+ // 删除之前的依赖
return true, nil
}
}
@@ -104,7 +104,7 @@ func DependencyRuleExistWithKey(ctx context.Context, key
string, target *pb.Micr
}
func AddServiceVersionRule(ctx context.Context, domainProject string, consumer
*pb.MicroService, provider *pb.MicroServiceKey) error {
- //创建依赖一致
+ // 创建依赖一致
consumerKey := pb.MicroServiceToKey(domainProject, consumer)
exist, err := DependencyRuleExist(ctx, provider, consumerKey)
if exist || err != nil {
@@ -241,7 +241,7 @@ func parseOverrideRules(ctx context.Context, dep
*Dependency) (createDependencyR
}
func syncDependencyRule(ctx context.Context, dep *Dependency, filter
func(context.Context, *Dependency) (_, _, _ []*pb.MicroServiceKey)) error {
- //更新consumer的providers的值,consumer的版本是确定的
+ // 更新consumer的providers的值,consumer的版本是确定的
consumerFlag := strings.Join([]string{dep.Consumer.Environment,
dep.Consumer.AppId, dep.Consumer.ServiceName, dep.Consumer.Version}, "/")
createDependencyRuleList, existDependencyRuleList,
deleteDependencyRuleList := filter(ctx, dep)
diff --git a/datasource/etcd/util/domain_util.go
b/datasource/etcd/util/domain_util.go
index bf67a343..b37ea7c4 100644
--- a/datasource/etcd/util/domain_util.go
+++ b/datasource/etcd/util/domain_util.go
@@ -22,12 +22,13 @@ import (
"fmt"
"strings"
+ "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/state/kvstore"
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/little-cui/etcdadpt"
)
func GetAllDomainRawData(ctx context.Context) ([]*kvstore.KeyValue, error) {
diff --git a/datasource/etcd/util/instance_util.go
b/datasource/etcd/util/instance_util.go
index a12562d7..8f606efc 100644
--- a/datasource/etcd/util/instance_util.go
+++ b/datasource/etcd/util/instance_util.go
@@ -26,14 +26,15 @@ import (
"strings"
"time"
+ pb "github.com/go-chassis/cari/discovery"
+ "github.com/go-chassis/cari/pkg/errsvc"
+ "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/state/kvstore"
"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/cari/pkg/errsvc"
- "github.com/little-cui/etcdadpt"
)
func GetLeaseID(ctx context.Context, domainProject string, serviceID string,
instanceID string) (int64, error) {
diff --git a/datasource/etcd/util/microservice_util.go
b/datasource/etcd/util/microservice_util.go
index 79077477..58273657 100644
--- a/datasource/etcd/util/microservice_util.go
+++ b/datasource/etcd/util/microservice_util.go
@@ -25,7 +25,7 @@ import (
"strings"
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/path"
diff --git a/datasource/etcd/util/schema_util.go
b/datasource/etcd/util/schema_util.go
index 94cac775..8980ebb6 100644
--- a/datasource/etcd/util/schema_util.go
+++ b/datasource/etcd/util/schema_util.go
@@ -20,8 +20,9 @@ package util
import (
"context"
+ "github.com/go-chassis/etcdadpt"
+
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
- "github.com/little-cui/etcdadpt"
)
func CheckSchemaInfoExist(ctx context.Context, key string) (bool, error) {
diff --git a/datasource/etcd/util/tag_util.go b/datasource/etcd/util/tag_util.go
index 1b33f803..b103ed7e 100644
--- a/datasource/etcd/util/tag_util.go
+++ b/datasource/etcd/util/tag_util.go
@@ -24,7 +24,7 @@ import (
"github.com/go-chassis/cari/discovery"
"github.com/go-chassis/cari/pkg/errsvc"
- "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/path"
diff --git a/datasource/etcd/util/util.go b/datasource/etcd/util/util.go
index e611fea2..3f5a9377 100644
--- a/datasource/etcd/util/util.go
+++ b/datasource/etcd/util/util.go
@@ -20,8 +20,9 @@ package util
import (
"context"
+ "github.com/go-chassis/etcdadpt"
+
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/little-cui/etcdadpt"
)
func FromContext(ctx context.Context) []etcdadpt.OpOption {
diff --git a/datasource/etcd/util/util_test.go
b/datasource/etcd/util/util_test.go
index 394dc56a..cc675063 100644
--- a/datasource/etcd/util/util_test.go
+++ b/datasource/etcd/util/util_test.go
@@ -25,12 +25,13 @@ import (
_ "github.com/apache/servicecomb-service-center/test"
+ proto "github.com/go-chassis/cari/discovery"
+ "github.com/go-chassis/etcdadpt"
+ "github.com/stretchr/testify/assert"
+
"github.com/apache/servicecomb-service-center/datasource"
serviceUtil
"github.com/apache/servicecomb-service-center/datasource/etcd/util"
"github.com/apache/servicecomb-service-center/pkg/util"
- proto "github.com/go-chassis/cari/discovery"
- "github.com/little-cui/etcdadpt"
- "github.com/stretchr/testify/assert"
)
func getContextWith(domain string, project string) context.Context {
@@ -132,10 +133,10 @@ func TestGetService(t *testing.T) {
assert.Equal(t, datasource.ErrNoData, err)
})
- //_, err = serviceUtil.GetServiceWithRev(context.Background(), "", "",
1)
- //if err != nil {
+ // _, err = serviceUtil.GetServiceWithRev(context.Background(), "", "",
1)
+ // if err != nil {
// t.Fatalf("TestGetService failed")
- //}
+ // }
}
func TestServiceExist(t *testing.T) {
diff --git a/datasource/etcd/version.go b/datasource/etcd/version.go
index bd2a73b5..0f17e9e7 100644
--- a/datasource/etcd/version.go
+++ b/datasource/etcd/version.go
@@ -22,12 +22,13 @@ import (
"encoding/json"
"fmt"
+ "github.com/go-chassis/etcdadpt"
+
"github.com/apache/servicecomb-service-center/datasource/etcd/path"
serviceUtil
"github.com/apache/servicecomb-service-center/datasource/etcd/util"
"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/little-cui/etcdadpt"
)
func loadServerVersion(ctx context.Context) error {
diff --git a/datasource/local/schema.go b/datasource/local/schema.go
index 0c7d6fbe..88fa3a9d 100644
--- a/datasource/local/schema.go
+++ b/datasource/local/schema.go
@@ -28,15 +28,16 @@ import (
"strings"
"sync"
+ "github.com/go-chassis/cari/discovery"
+ "github.com/go-chassis/etcdadpt"
+ "github.com/go-chassis/openlog"
+
"github.com/apache/servicecomb-service-center/datasource"
"github.com/apache/servicecomb-service-center/datasource/etcd/path"
etcdsync
"github.com/apache/servicecomb-service-center/datasource/etcd/sync"
"github.com/apache/servicecomb-service-center/datasource/schema"
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/go-chassis/cari/discovery"
- "github.com/go-chassis/openlog"
- "github.com/little-cui/etcdadpt"
)
var MutexMap = make(map[string]*sync.RWMutex)
diff --git a/datasource/mongo/engine.go b/datasource/mongo/engine.go
index f50cc5c1..4f2aefbf 100644
--- a/datasource/mongo/engine.go
+++ b/datasource/mongo/engine.go
@@ -20,7 +20,7 @@ package mongo
import (
"context"
- "github.com/little-cui/etcdadpt"
+ "github.com/go-chassis/etcdadpt"
)
type SCManager struct {
diff --git a/eventbase/go.sum b/eventbase/go.sum
index 6216c85d..adebbb12 100644
--- a/eventbase/go.sum
+++ b/eventbase/go.sum
@@ -367,7 +367,7 @@ github.com/kr/text v0.1.0/go.mod
h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod
h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/leodido/go-urn v1.2.1/go.mod
h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/little-cui/etcdadpt v0.3.2/go.mod
h1:HnRRpIrVEVNWobkiCvG2EHLWKKZ+L047EcI29ma2zA4=
+github.com/go-chassis/etcdadpt v0.3.2/go.mod
h1:HnRRpIrVEVNWobkiCvG2EHLWKKZ+L047EcI29ma2zA4=
github.com/magiconair/properties v1.8.1/go.mod
h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod
h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod
h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
diff --git a/go.mod b/go.mod
index bdfad88e..70c135f6 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module github.com/apache/servicecomb-service-center
replace (
github.com/apache/servicecomb-service-center/api => ./api
- //github.com/apache/servicecomb-service-center/eventbase => ./eventbase
+ github.com/apache/servicecomb-service-center/eventbase => ./eventbase
// github.com/openzipkin/zipkin-go-opentracing depends on
github.com/apache/thrift => github.com/apache/thrift
v0.0.0-20180125231006-3d556248a8b9
github.com/go-logr/logr => github.com/go-logr/logr v0.2.0
@@ -14,14 +14,15 @@ replace (
require (
github.com/NYTimes/gziphandler v1.1.1
- github.com/apache/servicecomb-kie v0.2.1-0.20230916085640-4d917719ec79
- github.com/apache/servicecomb-service-center/eventbase
v0.0.0-20240318132810-b133e42a18f1
+ github.com/apache/servicecomb-kie v0.2.1-0.20240329063729-0a30c3ff4b7f
+ github.com/apache/servicecomb-service-center/eventbase
v0.0.0-20240328150344-01abe81dc5d0
github.com/beego/beego/v2 v2.0.4
github.com/cheggaaa/pb v1.0.25
github.com/cloudflare/gokey v0.1.2
github.com/deckarep/golang-set v1.8.0
github.com/elithrar/simple-scrypt v1.3.0
- github.com/go-chassis/cari v0.9.0
+ github.com/go-chassis/cari v0.9.1-0.20240328115504-88da93faaca7
+ github.com/go-chassis/etcdadpt v0.5.3-0.20240328092602-984e34b756fe
github.com/go-chassis/foundation v0.4.0
github.com/go-chassis/go-archaius v1.5.6
github.com/go-chassis/go-chassis-extension/codec/gojson
v0.0.0-20220816060440-fe98a5615d3f
@@ -37,7 +38,6 @@ require (
github.com/jinzhu/copier v0.3.5
github.com/karlseguin/ccache
v2.0.3-0.20170217060820-3ba9789cfd2c+incompatible
github.com/labstack/echo/v4 v4.9.0
- github.com/little-cui/etcdadpt v0.4.0
github.com/olekukonko/tablewriter v0.0.5
github.com/onsi/ginkgo v1.15.0
github.com/onsi/gomega v1.10.5
diff --git a/go.sum b/go.sum
index 2a6d84b4..5322f66f 100644
--- a/go.sum
+++ b/go.sum
@@ -88,10 +88,8 @@ github.com/alecthomas/units
v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
github.com/andybalholm/brotli v1.0.4
h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
github.com/andybalholm/brotli v1.0.4/go.mod
h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/antihax/optional v1.0.0/go.mod
h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/apache/servicecomb-kie v0.2.1-0.20230916085640-4d917719ec79
h1:Zgm7NEeV3zilo5lx6bJQg37J+h8WlU2/vzKme7b3VRU=
-github.com/apache/servicecomb-kie v0.2.1-0.20230916085640-4d917719ec79/go.mod
h1:VmyMIucS8JY0lrv55ZUonj6E1m5ximDVzdiAKGmDU48=
-github.com/apache/servicecomb-service-center/eventbase
v0.0.0-20240318132810-b133e42a18f1
h1:BL+ehaSIdaaF68y1cS9BOmpakkebhU7I2qEj0DKtfo0=
-github.com/apache/servicecomb-service-center/eventbase
v0.0.0-20240318132810-b133e42a18f1/go.mod
h1:taHEYQulRNTvIpAPsksqfrtZ+pRwQE6x4QK+pgmEk/o=
+github.com/apache/servicecomb-kie v0.2.1-0.20240329063729-0a30c3ff4b7f
h1:rcZ9+qGCvaL+7y9ZWZlXyrsBWLzz3ASv23kz772IJGY=
+github.com/apache/servicecomb-kie v0.2.1-0.20240329063729-0a30c3ff4b7f/go.mod
h1:wsulAgXNA7Uh5UbwymmbI2K0ZpviDEzNnM1sv5hXNmQ=
github.com/apache/thrift v0.0.0-20180125231006-3d556248a8b9
h1:ymi1nHra1RZXqjg5xvka4YVyK+3uKPk2B9HUlPRIiBc=
github.com/apache/thrift v0.0.0-20180125231006-3d556248a8b9/go.mod
h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e
h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=
@@ -237,8 +235,10 @@ github.com/go-chassis/cari v0.4.0/go.mod
h1:av/19fqwEP4eOC8unL/z67AAbFDwXUCko6SK
github.com/go-chassis/cari v0.5.0/go.mod
h1:av/19fqwEP4eOC8unL/z67AAbFDwXUCko6SKa4Avrd8=
github.com/go-chassis/cari v0.5.1-0.20210823023004-74041d1363c4/go.mod
h1:av/19fqwEP4eOC8unL/z67AAbFDwXUCko6SKa4Avrd8=
github.com/go-chassis/cari v0.6.0/go.mod
h1:mSDRCOQXGmlD69A6NG0hsv0UP1xbVPtL6HCGI6X1tqs=
-github.com/go-chassis/cari v0.9.0
h1:skvo2PX8nLyu26CCg7qUMv7yP2DY73GrBW9M5tWj63c=
-github.com/go-chassis/cari v0.9.0/go.mod
h1:vM13BN0TT505ZKqeJ+hUfzZvfn4nN0vgE6IpBOTWcTc=
+github.com/go-chassis/cari v0.9.1-0.20240328115504-88da93faaca7
h1:XlCtMt+l1hcpfbiFRoSYWYr0q6Ak9g/UGFXSKoqmbT4=
+github.com/go-chassis/cari v0.9.1-0.20240328115504-88da93faaca7/go.mod
h1:ibqLyh+Q+1n9PlldW3glD9G+2s/yeSyVMCCkQWKRwuE=
+github.com/go-chassis/etcdadpt v0.5.3-0.20240328092602-984e34b756fe
h1:peLHEt3wzab6nKVcmcu0qkj1+ZXK6D1ymtiyyMBv/XA=
+github.com/go-chassis/etcdadpt v0.5.3-0.20240328092602-984e34b756fe/go.mod
h1:HV8OZ1Npu+lttD+pJA5nUxWZR3/SBFetTh7w8nYFkUA=
github.com/go-chassis/foundation v0.2.2-0.20201210043510-9f6d3de40234/go.mod
h1:2PjwqpVwYEVaAldl5A58a08viH8p27pNeYaiE3ZxOBA=
github.com/go-chassis/foundation v0.2.2/go.mod
h1:2PjwqpVwYEVaAldl5A58a08viH8p27pNeYaiE3ZxOBA=
github.com/go-chassis/foundation v0.3.0/go.mod
h1:2PjwqpVwYEVaAldl5A58a08viH8p27pNeYaiE3ZxOBA=
@@ -574,8 +574,6 @@ github.com/labstack/gommon v0.3.1/go.mod
h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3
github.com/leodido/go-urn v1.2.1
h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
github.com/leodido/go-urn v1.2.1/go.mod
h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
github.com/little-cui/etcdadpt v0.3.2/go.mod
h1:HnRRpIrVEVNWobkiCvG2EHLWKKZ+L047EcI29ma2zA4=
-github.com/little-cui/etcdadpt v0.4.0
h1:IIoRv+lIxFBsM1ptn9mGpdmBMqEafMnQF3UuE7ekDFg=
-github.com/little-cui/etcdadpt v0.4.0/go.mod
h1:wt9bqwpcPP3fPuxQpJKtsKOyS45/jI1JCrdSrdqT9lo=
github.com/lyft/protoc-gen-star v0.5.3/go.mod
h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
github.com/magiconair/properties v1.8.1/go.mod
h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.5/go.mod
h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
diff --git a/pkg/dump/types.go b/pkg/dump/types.go
index c82995e6..fd990dc9 100644
--- a/pkg/dump/types.go
+++ b/pkg/dump/types.go
@@ -18,9 +18,10 @@
package dump
import (
- "github.com/apache/servicecomb-service-center/server/alarm/model"
"github.com/go-chassis/cari/discovery"
- "github.com/little-cui/etcdadpt"
+ "github.com/go-chassis/etcdadpt"
+
+ "github.com/apache/servicecomb-service-center/server/alarm/model"
)
type AlarmListRequest struct {
diff --git a/server/plugin/tracing/pzipkin/buildin_test.go
b/server/plugin/tracing/pzipkin/buildin_test.go
index 8ce6f23d..17a0df5a 100644
--- a/server/plugin/tracing/pzipkin/buildin_test.go
+++ b/server/plugin/tracing/pzipkin/buildin_test.go
@@ -21,12 +21,13 @@ import (
"net/http"
"testing"
- "github.com/little-cui/etcdadpt"
+ "github.com/go-chassis/etcdadpt"
+
+ "github.com/go-chassis/go-archaius"
"github.com/apache/servicecomb-service-center/server/config"
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/plugin/tracing"
- "github.com/go-chassis/go-archaius"
)
func init() {
diff --git a/syncer/service/replicator/resource/kv.go
b/syncer/service/replicator/resource/kv.go
index 1875ae40..8a554bad 100644
--- a/syncer/service/replicator/resource/kv.go
+++ b/syncer/service/replicator/resource/kv.go
@@ -27,7 +27,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
v1sync "github.com/apache/servicecomb-service-center/syncer/api/v1"
- "github.com/little-cui/etcdadpt"
+ "github.com/go-chassis/etcdadpt"
)
const (
