You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ti...@apache.org on 2020/06/29 03:29:03 UTC
[servicecomb-service-center] branch master updated: delete
unnecessary pkg name (#654)
This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new 4f6ea4c delete unnecessary pkg name (#654)
4f6ea4c is described below
commit 4f6ea4cb6c23e2c925805142ffaab25d14720dd5
Author: Shawn <xi...@gmail.com>
AuthorDate: Mon Jun 29 11:28:52 2020 +0800
delete unnecessary pkg name (#654)
---
go.mod | 2 +-
pkg/client/sc/apis.go | 2 +-
pkg/etcdsync/mutex.go | 2 +-
pkg/etcdsync/mutex_test.go | 4 +-
server/admin/model/types.go | 2 +-
server/admin/service.go | 4 +-
server/admin/service_test.go | 4 +-
server/bootstrap/bootstrap.go | 30 ++++-----
server/broker/service.go | 2 +-
server/broker/store.go | 2 +-
server/broker/util.go | 2 +-
server/core/backend/addon.go | 2 +-
server/core/backend/common.go | 2 +-
server/core/backend/defer_instance.go | 2 +-
server/core/backend/defer_test.go | 2 +-
server/core/backend/discovery.go | 4 +-
server/core/backend/discovery_test.go | 4 +-
server/core/backend/lease.go | 2 +-
server/core/backend/lease_test.go | 2 +-
server/core/backend/registry.go | 2 +-
server/govern/service.go | 2 +-
server/health/health.go | 8 +--
server/notify/websocket_test.go | 4 +-
server/plugin/{pkg => }/auditlog/auditlog.go | 0
server/plugin/{pkg => }/auth/auth.go | 0
server/plugin/{pkg => }/auth/buildin/buildin.go | 0
.../{pkg => }/discovery/aggregate/adaptor.go | 2 +-
.../plugin/{pkg => }/discovery/aggregate/cache.go | 2 +-
.../plugin/{pkg => }/discovery/aggregate/common.go | 0
.../discovery/aggregate/conflict_checker.go | 4 +-
.../{pkg => }/discovery/aggregate/indexer.go | 4 +-
.../plugin/{pkg => }/discovery/aggregate/repo.go | 4 +-
server/plugin/{pkg => }/discovery/cache.go | 0
server/plugin/{pkg => }/discovery/cache_kv.go | 0
server/plugin/{pkg => }/discovery/cache_null.go | 0
server/plugin/{pkg => }/discovery/cache_test.go | 0
server/plugin/{pkg => }/discovery/cacher.go | 0
server/plugin/{pkg => }/discovery/cacher_test.go | 0
server/plugin/{pkg => }/discovery/common.go | 0
server/plugin/{pkg => }/discovery/config.go | 0
server/plugin/{pkg => }/discovery/config_test.go | 0
server/plugin/{pkg => }/discovery/defer.go | 0
server/plugin/{pkg => }/discovery/discovery.go | 0
server/plugin/{pkg => }/discovery/etcd/adaptor.go | 2 +-
.../{pkg => }/discovery/etcd/adaptor_test.go | 2 +-
.../plugin/{pkg => }/discovery/etcd/cacher_kv.go | 4 +-
.../{pkg => }/discovery/etcd/cacher_kv_test.go | 4 +-
server/plugin/{pkg => }/discovery/etcd/common.go | 2 +-
.../{pkg => }/discovery/etcd/indexer_cache.go | 4 +-
.../{pkg => }/discovery/etcd/indexer_etcd.go | 4 +-
.../{pkg => }/discovery/etcd/indexer_test.go | 4 +-
.../plugin/{pkg => }/discovery/etcd/listwatch.go | 2 +-
.../{pkg => }/discovery/etcd/listwatch_inner.go | 2 +-
.../{pkg => }/discovery/etcd/listwatch_test.go | 4 +-
server/plugin/{pkg => }/discovery/etcd/metrics.go | 0
.../{pkg => }/discovery/etcd/metrics_test.go | 0
server/plugin/{pkg => }/discovery/etcd/repo.go | 4 +-
server/plugin/{pkg => }/discovery/etcd/watcher.go | 2 +-
.../{pkg => }/discovery/etcd/watcher_inner.go | 2 +-
.../{pkg => }/discovery/etcd/watcher_test.go | 2 +-
server/plugin/{pkg => }/discovery/event_proxy.go | 0
.../plugin/{pkg => }/discovery/event_proxy_test.go | 0
server/plugin/{pkg => }/discovery/indexer.go | 2 +-
server/plugin/{pkg => }/discovery/indexer_cache.go | 2 +-
server/plugin/{pkg => }/discovery/indexer_test.go | 2 +-
.../{pkg => }/discovery/k8s/adaptor/adaptor.go | 2 +-
.../{pkg => }/discovery/k8s/adaptor/cacher.go | 2 +-
.../discovery/k8s/adaptor/cacher_index.go | 2 +-
.../discovery/k8s/adaptor/cacher_instance.go | 2 +-
.../discovery/k8s/adaptor/cacher_service.go | 2 +-
.../{pkg => }/discovery/k8s/adaptor/common.go | 2 +-
.../{pkg => }/discovery/k8s/adaptor/convertor.go | 2 +-
.../{pkg => }/discovery/k8s/adaptor/kube_client.go | 0
.../{pkg => }/discovery/k8s/adaptor/listwatcher.go | 0
server/plugin/{pkg => }/discovery/k8s/nok8s.go | 0
server/plugin/{pkg => }/discovery/k8s/repo.go | 4 +-
server/plugin/{pkg => }/discovery/metrics.go | 0
server/plugin/{pkg => }/discovery/service.go | 0
.../{pkg => }/discovery/servicecenter/adaptor.go | 2 +-
.../{pkg => }/discovery/servicecenter/aggregate.go | 4 +-
.../discovery/servicecenter/aggregate_test.go | 2 +-
.../{pkg => }/discovery/servicecenter/cacher.go | 2 +-
.../{pkg => }/discovery/servicecenter/common.go | 0
.../{pkg => }/discovery/servicecenter/indexer.go | 4 +-
.../{pkg => }/discovery/servicecenter/repo.go | 4 +-
.../{pkg => }/discovery/servicecenter/syncer.go | 4 +-
.../discovery/servicecenter/syncer_test.go | 4 +-
server/plugin/{pkg => }/discovery/types.go | 2 +-
server/plugin/{pkg => }/discovery/types_test.go | 0
server/plugin/export.go | 16 ++---
server/plugin/{pkg => }/quota/buildin/buildin.go | 4 +-
server/plugin/{pkg => }/quota/buildin/common.go | 6 +-
.../plugin/{pkg => }/quota/buildin/common_test.go | 2 +-
server/plugin/{pkg => }/quota/buildin/counter.go | 4 +-
.../plugin/{pkg => }/quota/buildin/counter_test.go | 0
server/plugin/{pkg => }/quota/counter/counter.go | 2 +-
server/plugin/{pkg => }/quota/counter/event.go | 2 +-
.../plugin/{pkg => }/quota/counter/event_test.go | 2 +-
server/plugin/{pkg => }/quota/quota.go | 0
server/plugin/{pkg => }/quota/unlimit/unlimit.go | 2 +-
.../plugin/{pkg => }/registry/buildin/buildin.go | 2 +-
server/plugin/{pkg => }/registry/common.go | 0
server/plugin/{pkg => }/registry/config.go | 0
.../{pkg => }/registry/embededetcd/embededetcd.go | 2 +-
server/plugin/{pkg => }/registry/etcd/common.go | 0
server/plugin/{pkg => }/registry/etcd/etcd.go | 2 +-
server/plugin/{pkg => }/registry/etcd/etcd_test.go | 10 +--
server/plugin/{pkg => }/registry/etcd/logger.go | 0
.../plugin/{pkg => }/registry/etcd/logger_test.go | 0
server/plugin/{pkg => }/registry/etcd/tracing.go | 4 +-
server/plugin/{pkg => }/registry/metrics.go | 0
server/plugin/{pkg => }/registry/option.go | 0
server/plugin/{pkg => }/registry/registry.go | 0
server/plugin/{pkg => }/registry/types.go | 0
.../plugin/{pkg => }/security/buildin/buildin.go | 0
server/plugin/{pkg => }/tls/buildin/buildin.go | 0
server/plugin/{pkg => }/tls/buildin/tls.go | 0
server/plugin/{pkg => }/tls/buildin/tls_test.go | 6 +-
server/plugin/{pkg => }/tls/tls.go | 0
server/plugin/{pkg => }/tracing/buildin/buildin.go | 2 +-
.../{pkg => }/tracing/buildin/buildin_test.go | 4 +-
server/plugin/{pkg => }/tracing/buildin/common.go | 0
.../{pkg => }/tracing/buildin/common_test.go | 0
.../{pkg => }/tracing/buildin/file_collector.go | 0
.../tracing/buildin/file_collector_test.go | 0
server/plugin/{pkg => }/tracing/buildin/span.go | 0
.../plugin/{pkg => }/tracing/buildin/span_test.go | 0
server/plugin/{pkg => }/tracing/tracing.go | 2 +-
server/plugin/{pkg => }/uuid/buildin/buildin.go | 0
server/plugin/{pkg => }/uuid/context/context.go | 4 +-
server/plugin/{pkg => }/uuid/uuid.go | 0
server/rest/controller/v4/instance_watcher.go | 4 --
server/service/cache/filter_instances.go | 2 +-
server/service/dependency.go | 2 +-
server/service/event/dependency_event_handler.go | 4 +-
.../service/event/dependency_rule_event_handler.go | 2 +-
.../event/dependency_rule_event_handler_test.go | 2 +-
server/service/event/domain_event_handler.go | 2 +-
server/service/event/event.go | 2 +-
server/service/event/instance_event_handler.go | 2 +-
server/service/event/rule_event_handler.go | 2 +-
.../service/event/schema_summary_event_handler.go | 2 +-
server/service/event/service_event_handler.go | 2 +-
server/service/event/tag_event_handler.go | 2 +-
server/service/instance.go | 4 +-
server/service/kv/store.go | 2 +-
server/service/kv/store_test.go | 6 +-
server/service/microservice.go | 6 +-
server/service/microservice_test.go | 2 +-
server/service/microservice_validator.go | 2 +-
server/service/rbac/dao/account_dao_test.go | 6 +-
server/service/rbac/password.go | 75 ++++++++++++++++++++++
server/service/rbac/rbac.go | 48 --------------
server/service/rbac/rbca_test.go | 8 +--
server/service/rule.go | 4 +-
server/service/rule_test.go | 2 +-
server/service/rule_validator.go | 2 +-
server/service/schema.go | 6 +-
server/service/schema_test.go | 2 +-
server/service/schema_validator.go | 2 +-
server/service/tag.go | 4 +-
server/service/tag_test.go | 2 +-
server/service/tag_validator.go | 2 +-
server/service/util/dependency.go | 2 +-
server/service/util/dependency_query.go | 2 +-
server/service/util/dependency_util.go | 2 +-
server/service/util/domain_util.go | 4 +-
server/service/util/heartbeat_util.go | 2 +-
server/service/util/instance_util.go | 4 +-
server/service/util/microservice_util.go | 6 +-
server/service/util/rule_util.go | 2 +-
server/service/util/schema_util.go | 2 +-
server/service/util/tag_util.go | 2 +-
server/service/util/util.go | 2 +-
server/service/util/util_suite_test.go | 8 +--
server/service/util/versionrule.go | 2 +-
server/service/util/versionrule_test.go | 2 +-
server/version.go | 2 +-
178 files changed, 282 insertions(+), 259 deletions(-)
diff --git a/go.mod b/go.mod
index 887c0d7..34c439d 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
github.com/eapache/queue v1.1.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-chassis/foundation v0.1.1-0.20191113114104-2b05871e9ec4
- github.com/go-chassis/go-archaius v1.3.1
+ github.com/go-chassis/go-archaius v1.3.2
github.com/go-chassis/go-chassis v0.0.0-20200624080301-8af281f0f75b
github.com/go-chassis/paas-lager v1.1.1
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d
diff --git a/pkg/client/sc/apis.go b/pkg/client/sc/apis.go
index 2bfd6dc..54af341 100644
--- a/pkg/client/sc/apis.go
+++ b/pkg/client/sc/apis.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/admin/model"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"github.com/apache/servicecomb-service-center/version"
)
diff --git a/pkg/etcdsync/mutex.go b/pkg/etcdsync/mutex.go
index a6b8459..5477ced 100644
--- a/pkg/etcdsync/mutex.go
+++ b/pkg/etcdsync/mutex.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"github.com/coreos/etcd/client"
"os"
"sync"
diff --git a/pkg/etcdsync/mutex_test.go b/pkg/etcdsync/mutex_test.go
index bef2fee..011ceed 100644
--- a/pkg/etcdsync/mutex_test.go
+++ b/pkg/etcdsync/mutex_test.go
@@ -23,8 +23,8 @@ import (
"github.com/stretchr/testify/assert"
"testing"
- _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/etcd"
- _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/tracing/buildin"
+ _ "github.com/apache/servicecomb-service-center/server/plugin/registry/etcd"
+ _ "github.com/apache/servicecomb-service-center/server/plugin/tracing/buildin"
)
func init() {
diff --git a/server/admin/model/types.go b/server/admin/model/types.go
index 2dc1ccb..3447aa9 100644
--- a/server/admin/model/types.go
+++ b/server/admin/model/types.go
@@ -18,7 +18,7 @@ package model
import (
"github.com/apache/servicecomb-service-center/server/alarm/model"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
type AlarmListRequest struct {
diff --git a/server/admin/service.go b/server/admin/service.go
index 7d4c02d..aef5bc1 100644
--- a/server/admin/service.go
+++ b/server/admin/service.go
@@ -26,8 +26,8 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"github.com/apache/servicecomb-service-center/version"
"github.com/astaxie/beego"
diff --git a/server/admin/service_test.go b/server/admin/service_test.go
index b9a3902..1b70469 100644
--- a/server/admin/service_test.go
+++ b/server/admin/service_test.go
@@ -23,8 +23,8 @@ import (
"github.com/apache/servicecomb-service-center/server/admin/model"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery/etcd"
- etcd2 "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/etcd"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery/etcd"
+ etcd2 "github.com/apache/servicecomb-service-center/server/plugin/registry/etcd"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
"github.com/astaxie/beego"
diff --git a/server/bootstrap/bootstrap.go b/server/bootstrap/bootstrap.go
index 985bcd3..991f8f8 100644
--- a/server/bootstrap/bootstrap.go
+++ b/server/bootstrap/bootstrap.go
@@ -21,35 +21,35 @@ import _ "github.com/apache/servicecomb-service-center/server/rest/controller/v3
import _ "github.com/apache/servicecomb-service-center/server/rest/controller/v4"
// registry
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/buildin"
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/etcd"
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/embededetcd"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/registry/buildin"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/registry/etcd"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/registry/embededetcd"
// discovery
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery/aggregate"
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery/servicecenter"
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery/etcd"
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery/k8s"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/discovery/aggregate"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/discovery/servicecenter"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/discovery/etcd"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/discovery/k8s"
// cipher
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/security/buildin"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/security/buildin"
// quota
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota/buildin"
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota/unlimit"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/quota/buildin"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/quota/unlimit"
// auth
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/auth/buildin"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/auth/buildin"
// uuid
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/uuid/buildin"
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/uuid/context"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/uuid/buildin"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/uuid/context"
// tracing
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/tracing/buildin"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/tracing/buildin"
// tls
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/tls/buildin"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/tls/buildin"
// module 'govern'
import _ "github.com/apache/servicecomb-service-center/server/govern"
diff --git a/server/broker/service.go b/server/broker/service.go
index 799c1fe..2453e87 100644
--- a/server/broker/service.go
+++ b/server/broker/service.go
@@ -30,7 +30,7 @@ import (
"github.com/apache/servicecomb-service-center/server/broker/brokerpb"
apt "github.com/apache/servicecomb-service-center/server/core"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
)
diff --git a/server/broker/store.go b/server/broker/store.go
index d57071f..69bc516 100644
--- a/server/broker/store.go
+++ b/server/broker/store.go
@@ -18,7 +18,7 @@ package broker
import (
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
)
var (
diff --git a/server/broker/util.go b/server/broker/util.go
index ba25d45..3b4ba3f 100644
--- a/server/broker/util.go
+++ b/server/broker/util.go
@@ -31,7 +31,7 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
"path/filepath"
diff --git a/server/core/backend/addon.go b/server/core/backend/addon.go
index 0acf280..5cff89e 100644
--- a/server/core/backend/addon.go
+++ b/server/core/backend/addon.go
@@ -17,7 +17,7 @@
package backend
import (
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
)
type AddOn interface {
diff --git a/server/core/backend/common.go b/server/core/backend/common.go
index 95659a5..24373cf 100644
--- a/server/core/backend/common.go
+++ b/server/core/backend/common.go
@@ -18,7 +18,7 @@ package backend
import (
"github.com/apache/servicecomb-service-center/server/core"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"time"
)
diff --git a/server/core/backend/defer_instance.go b/server/core/backend/defer_instance.go
index f828d6d..284b684 100644
--- a/server/core/backend/defer_instance.go
+++ b/server/core/backend/defer_instance.go
@@ -22,7 +22,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"sync"
"time"
)
diff --git a/server/core/backend/defer_test.go b/server/core/backend/defer_test.go
index deb3172..66815b5 100644
--- a/server/core/backend/defer_test.go
+++ b/server/core/backend/defer_test.go
@@ -20,7 +20,7 @@ import (
"fmt"
"github.com/apache/servicecomb-service-center/pkg/util"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"testing"
"time"
)
diff --git a/server/core/backend/discovery.go b/server/core/backend/discovery.go
index 1acae3f..34ec692 100644
--- a/server/core/backend/discovery.go
+++ b/server/core/backend/discovery.go
@@ -25,8 +25,8 @@ import (
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"sync"
"time"
)
diff --git a/server/core/backend/discovery_test.go b/server/core/backend/discovery_test.go
index 7f3cf39..f5ddd01 100644
--- a/server/core/backend/discovery_test.go
+++ b/server/core/backend/discovery_test.go
@@ -20,8 +20,8 @@ import (
"context"
"errors"
"github.com/apache/servicecomb-service-center/pkg/task"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"testing"
)
diff --git a/server/core/backend/lease.go b/server/core/backend/lease.go
index 442fa6e..4ad045f 100644
--- a/server/core/backend/lease.go
+++ b/server/core/backend/lease.go
@@ -22,7 +22,7 @@ import (
"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/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"time"
)
diff --git a/server/core/backend/lease_test.go b/server/core/backend/lease_test.go
index 62fd549..db8c28d 100644
--- a/server/core/backend/lease_test.go
+++ b/server/core/backend/lease_test.go
@@ -21,7 +21,7 @@ import (
"fmt"
errorsEx "github.com/apache/servicecomb-service-center/pkg/errors"
simple "github.com/apache/servicecomb-service-center/pkg/time"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/buildin"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry/buildin"
"testing"
"time"
)
diff --git a/server/core/backend/registry.go b/server/core/backend/registry.go
index c9e3489..f906866 100644
--- a/server/core/backend/registry.go
+++ b/server/core/backend/registry.go
@@ -26,7 +26,7 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"sync"
"time"
)
diff --git a/server/govern/service.go b/server/govern/service.go
index bd20134..75aa4a0 100644
--- a/server/govern/service.go
+++ b/server/govern/service.go
@@ -24,7 +24,7 @@ import (
apt "github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"github.com/apache/servicecomb-service-center/server/service"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
diff --git a/server/health/health.go b/server/health/health.go
index e73b89e..c2135e2 100644
--- a/server/health/health.go
+++ b/server/health/health.go
@@ -20,9 +20,9 @@ import (
"github.com/apache/servicecomb-service-center/server/alarm"
)
-var healthChecker HealthChecker = &DefaultHealthChecker{}
+var healthChecker Checker = &DefaultHealthChecker{}
-type HealthChecker interface {
+type Checker interface {
Healthy() error
}
@@ -38,10 +38,10 @@ func (hc *DefaultHealthChecker) Healthy() error {
return nil
}
-func SetGlobalHealthChecker(hc HealthChecker) {
+func SetGlobalHealthChecker(hc Checker) {
healthChecker = hc
}
-func GlobalHealthChecker() HealthChecker {
+func GlobalHealthChecker() Checker {
return healthChecker
}
diff --git a/server/notify/websocket_test.go b/server/notify/websocket_test.go
index fc8be6d..9796e2b 100644
--- a/server/notify/websocket_test.go
+++ b/server/notify/websocket_test.go
@@ -21,8 +21,8 @@ import (
"errors"
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/proto"
- _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery/etcd"
- _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/buildin"
+ _ "github.com/apache/servicecomb-service-center/server/plugin/discovery/etcd"
+ _ "github.com/apache/servicecomb-service-center/server/plugin/registry/buildin"
"github.com/gorilla/websocket"
"net/http"
"net/http/httptest"
diff --git a/server/plugin/pkg/auditlog/auditlog.go b/server/plugin/auditlog/auditlog.go
similarity index 100%
rename from server/plugin/pkg/auditlog/auditlog.go
rename to server/plugin/auditlog/auditlog.go
diff --git a/server/plugin/pkg/auth/auth.go b/server/plugin/auth/auth.go
similarity index 100%
rename from server/plugin/pkg/auth/auth.go
rename to server/plugin/auth/auth.go
diff --git a/server/plugin/pkg/auth/buildin/buildin.go b/server/plugin/auth/buildin/buildin.go
similarity index 100%
rename from server/plugin/pkg/auth/buildin/buildin.go
rename to server/plugin/auth/buildin/buildin.go
diff --git a/server/plugin/pkg/discovery/aggregate/adaptor.go b/server/plugin/discovery/aggregate/adaptor.go
similarity index 97%
rename from server/plugin/pkg/discovery/aggregate/adaptor.go
rename to server/plugin/discovery/aggregate/adaptor.go
index 367e7dc..44b3b2c 100644
--- a/server/plugin/pkg/discovery/aggregate/adaptor.go
+++ b/server/plugin/discovery/aggregate/adaptor.go
@@ -20,7 +20,7 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
)
// Aggregator implements discovery.Adaptor.
diff --git a/server/plugin/pkg/discovery/aggregate/cache.go b/server/plugin/discovery/aggregate/cache.go
similarity index 97%
rename from server/plugin/pkg/discovery/aggregate/cache.go
rename to server/plugin/discovery/aggregate/cache.go
index ee375a6..82de3b8 100644
--- a/server/plugin/pkg/discovery/aggregate/cache.go
+++ b/server/plugin/discovery/aggregate/cache.go
@@ -17,7 +17,7 @@ package aggregate
import (
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
)
// Cache implements CacheReader.
diff --git a/server/plugin/pkg/discovery/aggregate/common.go b/server/plugin/discovery/aggregate/common.go
similarity index 100%
rename from server/plugin/pkg/discovery/aggregate/common.go
rename to server/plugin/discovery/aggregate/common.go
diff --git a/server/plugin/pkg/discovery/aggregate/conflict_checker.go b/server/plugin/discovery/aggregate/conflict_checker.go
similarity index 92%
rename from server/plugin/pkg/discovery/aggregate/conflict_checker.go
rename to server/plugin/discovery/aggregate/conflict_checker.go
index 26da49d..2596d2b 100644
--- a/server/plugin/pkg/discovery/aggregate/conflict_checker.go
+++ b/server/plugin/discovery/aggregate/conflict_checker.go
@@ -19,8 +19,8 @@ import (
"context"
"github.com/apache/servicecomb-service-center/pkg/gopool"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"time"
)
diff --git a/server/plugin/pkg/discovery/aggregate/indexer.go b/server/plugin/discovery/aggregate/indexer.go
similarity index 96%
rename from server/plugin/pkg/discovery/aggregate/indexer.go
rename to server/plugin/discovery/aggregate/indexer.go
index d44fd14..3d7a72f 100644
--- a/server/plugin/pkg/discovery/aggregate/indexer.go
+++ b/server/plugin/discovery/aggregate/indexer.go
@@ -17,8 +17,8 @@ package aggregate
import (
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"context"
)
diff --git a/server/plugin/pkg/discovery/aggregate/repo.go b/server/plugin/discovery/aggregate/repo.go
similarity index 90%
rename from server/plugin/pkg/discovery/aggregate/repo.go
rename to server/plugin/discovery/aggregate/repo.go
index 4393bd5..6d772f8 100644
--- a/server/plugin/pkg/discovery/aggregate/repo.go
+++ b/server/plugin/discovery/aggregate/repo.go
@@ -17,8 +17,8 @@ package aggregate
import (
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
func init() {
diff --git a/server/plugin/pkg/discovery/cache.go b/server/plugin/discovery/cache.go
similarity index 100%
rename from server/plugin/pkg/discovery/cache.go
rename to server/plugin/discovery/cache.go
diff --git a/server/plugin/pkg/discovery/cache_kv.go b/server/plugin/discovery/cache_kv.go
similarity index 100%
rename from server/plugin/pkg/discovery/cache_kv.go
rename to server/plugin/discovery/cache_kv.go
diff --git a/server/plugin/pkg/discovery/cache_null.go b/server/plugin/discovery/cache_null.go
similarity index 100%
rename from server/plugin/pkg/discovery/cache_null.go
rename to server/plugin/discovery/cache_null.go
diff --git a/server/plugin/pkg/discovery/cache_test.go b/server/plugin/discovery/cache_test.go
similarity index 100%
rename from server/plugin/pkg/discovery/cache_test.go
rename to server/plugin/discovery/cache_test.go
diff --git a/server/plugin/pkg/discovery/cacher.go b/server/plugin/discovery/cacher.go
similarity index 100%
rename from server/plugin/pkg/discovery/cacher.go
rename to server/plugin/discovery/cacher.go
diff --git a/server/plugin/pkg/discovery/cacher_test.go b/server/plugin/discovery/cacher_test.go
similarity index 100%
rename from server/plugin/pkg/discovery/cacher_test.go
rename to server/plugin/discovery/cacher_test.go
diff --git a/server/plugin/pkg/discovery/common.go b/server/plugin/discovery/common.go
similarity index 100%
rename from server/plugin/pkg/discovery/common.go
rename to server/plugin/discovery/common.go
diff --git a/server/plugin/pkg/discovery/config.go b/server/plugin/discovery/config.go
similarity index 100%
rename from server/plugin/pkg/discovery/config.go
rename to server/plugin/discovery/config.go
diff --git a/server/plugin/pkg/discovery/config_test.go b/server/plugin/discovery/config_test.go
similarity index 100%
rename from server/plugin/pkg/discovery/config_test.go
rename to server/plugin/discovery/config_test.go
diff --git a/server/plugin/pkg/discovery/defer.go b/server/plugin/discovery/defer.go
similarity index 100%
rename from server/plugin/pkg/discovery/defer.go
rename to server/plugin/discovery/defer.go
diff --git a/server/plugin/pkg/discovery/discovery.go b/server/plugin/discovery/discovery.go
similarity index 100%
rename from server/plugin/pkg/discovery/discovery.go
rename to server/plugin/discovery/discovery.go
diff --git a/server/plugin/pkg/discovery/etcd/adaptor.go b/server/plugin/discovery/etcd/adaptor.go
similarity index 96%
rename from server/plugin/pkg/discovery/etcd/adaptor.go
rename to server/plugin/discovery/etcd/adaptor.go
index 5a73e75..4b13517 100644
--- a/server/plugin/pkg/discovery/etcd/adaptor.go
+++ b/server/plugin/discovery/etcd/adaptor.go
@@ -19,7 +19,7 @@ package etcd
import (
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
)
// EtcdAdaptor implements discovery.Adaptor.
diff --git a/server/plugin/pkg/discovery/etcd/adaptor_test.go b/server/plugin/discovery/etcd/adaptor_test.go
similarity index 95%
rename from server/plugin/pkg/discovery/etcd/adaptor_test.go
rename to server/plugin/discovery/etcd/adaptor_test.go
index 22e7a66..64f1011 100644
--- a/server/plugin/pkg/discovery/etcd/adaptor_test.go
+++ b/server/plugin/discovery/etcd/adaptor_test.go
@@ -18,7 +18,7 @@ package etcd
import (
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"testing"
)
diff --git a/server/plugin/pkg/discovery/etcd/cacher_kv.go b/server/plugin/discovery/etcd/cacher_kv.go
similarity index 98%
rename from server/plugin/pkg/discovery/etcd/cacher_kv.go
rename to server/plugin/discovery/etcd/cacher_kv.go
index d06de32..2015466 100644
--- a/server/plugin/pkg/discovery/etcd/cacher_kv.go
+++ b/server/plugin/discovery/etcd/cacher_kv.go
@@ -27,8 +27,8 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
"github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"github.com/coreos/etcd/mvcc/mvccpb"
"sync"
"time"
diff --git a/server/plugin/pkg/discovery/etcd/cacher_kv_test.go b/server/plugin/discovery/etcd/cacher_kv_test.go
similarity index 98%
rename from server/plugin/pkg/discovery/etcd/cacher_kv_test.go
rename to server/plugin/discovery/etcd/cacher_kv_test.go
index bbc1c2f..67b183c 100644
--- a/server/plugin/pkg/discovery/etcd/cacher_kv_test.go
+++ b/server/plugin/discovery/etcd/cacher_kv_test.go
@@ -23,8 +23,8 @@ import (
"github.com/apache/servicecomb-service-center/pkg/gopool"
"github.com/apache/servicecomb-service-center/pkg/util"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"github.com/coreos/etcd/mvcc/mvccpb"
"math/rand"
"strconv"
diff --git a/server/plugin/pkg/discovery/etcd/common.go b/server/plugin/discovery/etcd/common.go
similarity index 95%
rename from server/plugin/pkg/discovery/etcd/common.go
rename to server/plugin/discovery/etcd/common.go
index bf4bf01..755523d 100644
--- a/server/plugin/pkg/discovery/etcd/common.go
+++ b/server/plugin/discovery/etcd/common.go
@@ -17,7 +17,7 @@ package etcd
import (
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"github.com/coreos/etcd/mvcc/mvccpb"
"time"
)
diff --git a/server/plugin/pkg/discovery/etcd/indexer_cache.go b/server/plugin/discovery/etcd/indexer_cache.go
similarity index 93%
rename from server/plugin/pkg/discovery/etcd/indexer_cache.go
rename to server/plugin/discovery/etcd/indexer_cache.go
index be9cd67..0c37d05 100644
--- a/server/plugin/pkg/discovery/etcd/indexer_cache.go
+++ b/server/plugin/discovery/etcd/indexer_cache.go
@@ -20,8 +20,8 @@ import (
"fmt"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"context"
)
diff --git a/server/plugin/pkg/discovery/etcd/indexer_etcd.go b/server/plugin/discovery/etcd/indexer_etcd.go
similarity index 94%
rename from server/plugin/pkg/discovery/etcd/indexer_etcd.go
rename to server/plugin/discovery/etcd/indexer_etcd.go
index 0f5d4d8..57387ad 100644
--- a/server/plugin/pkg/discovery/etcd/indexer_etcd.go
+++ b/server/plugin/discovery/etcd/indexer_etcd.go
@@ -24,8 +24,8 @@ import (
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"context"
)
diff --git a/server/plugin/pkg/discovery/etcd/indexer_test.go b/server/plugin/discovery/etcd/indexer_test.go
similarity index 97%
rename from server/plugin/pkg/discovery/etcd/indexer_test.go
rename to server/plugin/discovery/etcd/indexer_test.go
index 35871ba..a6a567d 100644
--- a/server/plugin/pkg/discovery/etcd/indexer_test.go
+++ b/server/plugin/discovery/etcd/indexer_test.go
@@ -19,8 +19,8 @@ package etcd
import (
"context"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"github.com/coreos/etcd/mvcc/mvccpb"
"testing"
)
diff --git a/server/plugin/pkg/discovery/etcd/listwatch.go b/server/plugin/discovery/etcd/listwatch.go
similarity index 94%
rename from server/plugin/pkg/discovery/etcd/listwatch.go
rename to server/plugin/discovery/etcd/listwatch.go
index ac817ef..b7f7470 100644
--- a/server/plugin/pkg/discovery/etcd/listwatch.go
+++ b/server/plugin/discovery/etcd/listwatch.go
@@ -19,7 +19,7 @@ package etcd
import (
"context"
"fmt"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"time"
)
diff --git a/server/plugin/pkg/discovery/etcd/listwatch_inner.go b/server/plugin/discovery/etcd/listwatch_inner.go
similarity index 96%
rename from server/plugin/pkg/discovery/etcd/listwatch_inner.go
rename to server/plugin/discovery/etcd/listwatch_inner.go
index 153f41d..2d2529b 100644
--- a/server/plugin/pkg/discovery/etcd/listwatch_inner.go
+++ b/server/plugin/discovery/etcd/listwatch_inner.go
@@ -20,7 +20,7 @@ import (
"context"
"fmt"
"github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
type innerListWatch struct {
diff --git a/server/plugin/pkg/discovery/etcd/listwatch_test.go b/server/plugin/discovery/etcd/listwatch_test.go
similarity index 95%
rename from server/plugin/pkg/discovery/etcd/listwatch_test.go
rename to server/plugin/discovery/etcd/listwatch_test.go
index 75c9283..cc51475 100644
--- a/server/plugin/pkg/discovery/etcd/listwatch_test.go
+++ b/server/plugin/discovery/etcd/listwatch_test.go
@@ -19,8 +19,8 @@ package etcd
import (
"context"
"fmt"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/buildin"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry/buildin"
"github.com/coreos/etcd/mvcc/mvccpb"
"testing"
"time"
diff --git a/server/plugin/pkg/discovery/etcd/metrics.go b/server/plugin/discovery/etcd/metrics.go
similarity index 100%
rename from server/plugin/pkg/discovery/etcd/metrics.go
rename to server/plugin/discovery/etcd/metrics.go
diff --git a/server/plugin/pkg/discovery/etcd/metrics_test.go b/server/plugin/discovery/etcd/metrics_test.go
similarity index 100%
rename from server/plugin/pkg/discovery/etcd/metrics_test.go
rename to server/plugin/discovery/etcd/metrics_test.go
diff --git a/server/plugin/pkg/discovery/etcd/repo.go b/server/plugin/discovery/etcd/repo.go
similarity index 90%
rename from server/plugin/pkg/discovery/etcd/repo.go
rename to server/plugin/discovery/etcd/repo.go
index 8239fa1..a1ce66c 100644
--- a/server/plugin/pkg/discovery/etcd/repo.go
+++ b/server/plugin/discovery/etcd/repo.go
@@ -17,8 +17,8 @@ package etcd
import (
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
func init() {
diff --git a/server/plugin/pkg/discovery/etcd/watcher.go b/server/plugin/discovery/etcd/watcher.go
similarity index 92%
rename from server/plugin/pkg/discovery/etcd/watcher.go
rename to server/plugin/discovery/etcd/watcher.go
index 0d69c1e..6c9e5dc 100644
--- a/server/plugin/pkg/discovery/etcd/watcher.go
+++ b/server/plugin/discovery/etcd/watcher.go
@@ -17,7 +17,7 @@
package etcd
import (
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
type Watcher interface {
diff --git a/server/plugin/pkg/discovery/etcd/watcher_inner.go b/server/plugin/discovery/etcd/watcher_inner.go
similarity index 96%
rename from server/plugin/pkg/discovery/etcd/watcher_inner.go
rename to server/plugin/discovery/etcd/watcher_inner.go
index aa1d40b..0b434d2 100644
--- a/server/plugin/pkg/discovery/etcd/watcher_inner.go
+++ b/server/plugin/discovery/etcd/watcher_inner.go
@@ -20,7 +20,7 @@ import (
"context"
"github.com/apache/servicecomb-service-center/pkg/gopool"
"github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"sync"
)
diff --git a/server/plugin/pkg/discovery/etcd/watcher_test.go b/server/plugin/discovery/etcd/watcher_test.go
similarity index 96%
rename from server/plugin/pkg/discovery/etcd/watcher_test.go
rename to server/plugin/discovery/etcd/watcher_test.go
index a5f47b1..2576193 100644
--- a/server/plugin/pkg/discovery/etcd/watcher_test.go
+++ b/server/plugin/discovery/etcd/watcher_test.go
@@ -19,7 +19,7 @@ package etcd
import (
"context"
"fmt"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"testing"
"time"
)
diff --git a/server/plugin/pkg/discovery/event_proxy.go b/server/plugin/discovery/event_proxy.go
similarity index 100%
rename from server/plugin/pkg/discovery/event_proxy.go
rename to server/plugin/discovery/event_proxy.go
diff --git a/server/plugin/pkg/discovery/event_proxy_test.go b/server/plugin/discovery/event_proxy_test.go
similarity index 100%
rename from server/plugin/pkg/discovery/event_proxy_test.go
rename to server/plugin/discovery/event_proxy_test.go
diff --git a/server/plugin/pkg/discovery/indexer.go b/server/plugin/discovery/indexer.go
similarity index 94%
rename from server/plugin/pkg/discovery/indexer.go
rename to server/plugin/discovery/indexer.go
index fa1742e..533e1f8 100644
--- a/server/plugin/pkg/discovery/indexer.go
+++ b/server/plugin/discovery/indexer.go
@@ -17,7 +17,7 @@
package discovery
import (
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"context"
)
diff --git a/server/plugin/pkg/discovery/indexer_cache.go b/server/plugin/discovery/indexer_cache.go
similarity index 96%
rename from server/plugin/pkg/discovery/indexer_cache.go
rename to server/plugin/discovery/indexer_cache.go
index 988b20d..170a4e2 100644
--- a/server/plugin/pkg/discovery/indexer_cache.go
+++ b/server/plugin/discovery/indexer_cache.go
@@ -21,7 +21,7 @@ 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/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"context"
)
diff --git a/server/plugin/pkg/discovery/indexer_test.go b/server/plugin/discovery/indexer_test.go
similarity index 97%
rename from server/plugin/pkg/discovery/indexer_test.go
rename to server/plugin/discovery/indexer_test.go
index d421719..9adaa3c 100644
--- a/server/plugin/pkg/discovery/indexer_test.go
+++ b/server/plugin/discovery/indexer_test.go
@@ -17,7 +17,7 @@ package discovery
import (
"context"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"testing"
)
diff --git a/server/plugin/pkg/discovery/k8s/adaptor/adaptor.go b/server/plugin/discovery/k8s/adaptor/adaptor.go
similarity index 95%
rename from server/plugin/pkg/discovery/k8s/adaptor/adaptor.go
rename to server/plugin/discovery/k8s/adaptor/adaptor.go
index d5c88bd..bb4360f 100644
--- a/server/plugin/pkg/discovery/k8s/adaptor/adaptor.go
+++ b/server/plugin/discovery/k8s/adaptor/adaptor.go
@@ -16,7 +16,7 @@
package adaptor
import (
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
)
// K8sAdaptor implements discovery.Adaptor.
diff --git a/server/plugin/pkg/discovery/k8s/adaptor/cacher.go b/server/plugin/discovery/k8s/adaptor/cacher.go
similarity index 94%
rename from server/plugin/pkg/discovery/k8s/adaptor/cacher.go
rename to server/plugin/discovery/k8s/adaptor/cacher.go
index 3afd038..27bfd39 100644
--- a/server/plugin/pkg/discovery/k8s/adaptor/cacher.go
+++ b/server/plugin/discovery/k8s/adaptor/cacher.go
@@ -17,7 +17,7 @@ package adaptor
import (
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
)
func BuildCacher(t discovery.Type, cfg *discovery.Config, cache discovery.Cache) discovery.Cacher {
diff --git a/server/plugin/pkg/discovery/k8s/adaptor/cacher_index.go b/server/plugin/discovery/k8s/adaptor/cacher_index.go
similarity index 96%
rename from server/plugin/pkg/discovery/k8s/adaptor/cacher_index.go
rename to server/plugin/discovery/k8s/adaptor/cacher_index.go
index 359d109..18f42a3 100644
--- a/server/plugin/pkg/discovery/k8s/adaptor/cacher_index.go
+++ b/server/plugin/discovery/k8s/adaptor/cacher_index.go
@@ -18,7 +18,7 @@ package adaptor
import (
"github.com/apache/servicecomb-service-center/server/core"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"k8s.io/api/core/v1"
)
diff --git a/server/plugin/pkg/discovery/k8s/adaptor/cacher_instance.go b/server/plugin/discovery/k8s/adaptor/cacher_instance.go
similarity index 98%
rename from server/plugin/pkg/discovery/k8s/adaptor/cacher_instance.go
rename to server/plugin/discovery/k8s/adaptor/cacher_instance.go
index c2ced3a..71378d9 100644
--- a/server/plugin/pkg/discovery/k8s/adaptor/cacher_instance.go
+++ b/server/plugin/discovery/k8s/adaptor/cacher_instance.go
@@ -19,7 +19,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"k8s.io/api/core/v1"
"reflect"
"strconv"
diff --git a/server/plugin/pkg/discovery/k8s/adaptor/cacher_service.go b/server/plugin/discovery/k8s/adaptor/cacher_service.go
similarity index 96%
rename from server/plugin/pkg/discovery/k8s/adaptor/cacher_service.go
rename to server/plugin/discovery/k8s/adaptor/cacher_service.go
index 27ee845..fdeafd1 100644
--- a/server/plugin/pkg/discovery/k8s/adaptor/cacher_service.go
+++ b/server/plugin/discovery/k8s/adaptor/cacher_service.go
@@ -18,7 +18,7 @@ package adaptor
import (
"github.com/apache/servicecomb-service-center/server/core"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"k8s.io/api/core/v1"
)
diff --git a/server/plugin/pkg/discovery/k8s/adaptor/common.go b/server/plugin/discovery/k8s/adaptor/common.go
similarity index 97%
rename from server/plugin/pkg/discovery/k8s/adaptor/common.go
rename to server/plugin/discovery/k8s/adaptor/common.go
index f4bf365..990b8c3 100644
--- a/server/plugin/pkg/discovery/k8s/adaptor/common.go
+++ b/server/plugin/discovery/k8s/adaptor/common.go
@@ -21,7 +21,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/uuid"
+ "github.com/apache/servicecomb-service-center/server/plugin/uuid"
"k8s.io/api/core/v1"
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
diff --git a/server/plugin/pkg/discovery/k8s/adaptor/convertor.go b/server/plugin/discovery/k8s/adaptor/convertor.go
similarity index 97%
rename from server/plugin/pkg/discovery/k8s/adaptor/convertor.go
rename to server/plugin/discovery/k8s/adaptor/convertor.go
index 733aa3e..bc19b1e 100644
--- a/server/plugin/pkg/discovery/k8s/adaptor/convertor.go
+++ b/server/plugin/discovery/k8s/adaptor/convertor.go
@@ -18,7 +18,7 @@ package adaptor
import (
"github.com/apache/servicecomb-service-center/pkg/util"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"k8s.io/api/core/v1"
"net/url"
"strconv"
diff --git a/server/plugin/pkg/discovery/k8s/adaptor/kube_client.go b/server/plugin/discovery/k8s/adaptor/kube_client.go
similarity index 100%
rename from server/plugin/pkg/discovery/k8s/adaptor/kube_client.go
rename to server/plugin/discovery/k8s/adaptor/kube_client.go
diff --git a/server/plugin/pkg/discovery/k8s/adaptor/listwatcher.go b/server/plugin/discovery/k8s/adaptor/listwatcher.go
similarity index 100%
rename from server/plugin/pkg/discovery/k8s/adaptor/listwatcher.go
rename to server/plugin/discovery/k8s/adaptor/listwatcher.go
diff --git a/server/plugin/pkg/discovery/k8s/nok8s.go b/server/plugin/discovery/k8s/nok8s.go
similarity index 100%
rename from server/plugin/pkg/discovery/k8s/nok8s.go
rename to server/plugin/discovery/k8s/nok8s.go
diff --git a/server/plugin/pkg/discovery/k8s/repo.go b/server/plugin/discovery/k8s/repo.go
similarity index 88%
rename from server/plugin/pkg/discovery/k8s/repo.go
rename to server/plugin/discovery/k8s/repo.go
index b3fc081..493df21 100644
--- a/server/plugin/pkg/discovery/k8s/repo.go
+++ b/server/plugin/discovery/k8s/repo.go
@@ -19,8 +19,8 @@ package k8s
import (
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery/k8s/adaptor"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery/k8s/adaptor"
)
func init() {
diff --git a/server/plugin/pkg/discovery/metrics.go b/server/plugin/discovery/metrics.go
similarity index 100%
rename from server/plugin/pkg/discovery/metrics.go
rename to server/plugin/discovery/metrics.go
diff --git a/server/plugin/pkg/discovery/service.go b/server/plugin/discovery/service.go
similarity index 100%
rename from server/plugin/pkg/discovery/service.go
rename to server/plugin/discovery/service.go
diff --git a/server/plugin/pkg/discovery/servicecenter/adaptor.go b/server/plugin/discovery/servicecenter/adaptor.go
similarity index 96%
rename from server/plugin/pkg/discovery/servicecenter/adaptor.go
rename to server/plugin/discovery/servicecenter/adaptor.go
index ec268ba..eded1dc 100644
--- a/server/plugin/pkg/discovery/servicecenter/adaptor.go
+++ b/server/plugin/discovery/servicecenter/adaptor.go
@@ -17,7 +17,7 @@ package servicecenter
import (
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
)
// ServiceCenterAdaptor implements discovery.Adaptor.
diff --git a/server/plugin/pkg/discovery/servicecenter/aggregate.go b/server/plugin/discovery/servicecenter/aggregate.go
similarity index 97%
rename from server/plugin/pkg/discovery/servicecenter/aggregate.go
rename to server/plugin/discovery/servicecenter/aggregate.go
index e5c8d52..9e5f412 100644
--- a/server/plugin/pkg/discovery/servicecenter/aggregate.go
+++ b/server/plugin/discovery/servicecenter/aggregate.go
@@ -24,8 +24,8 @@ import (
"github.com/apache/servicecomb-service-center/server/admin/model"
"github.com/apache/servicecomb-service-center/server/core"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"strings"
"sync"
diff --git a/server/plugin/pkg/discovery/servicecenter/aggregate_test.go b/server/plugin/discovery/servicecenter/aggregate_test.go
similarity index 93%
rename from server/plugin/pkg/discovery/servicecenter/aggregate_test.go
rename to server/plugin/discovery/servicecenter/aggregate_test.go
index b13014f..793809e 100644
--- a/server/plugin/pkg/discovery/servicecenter/aggregate_test.go
+++ b/server/plugin/discovery/servicecenter/aggregate_test.go
@@ -16,7 +16,7 @@
package servicecenter
import (
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"testing"
)
diff --git a/server/plugin/pkg/discovery/servicecenter/cacher.go b/server/plugin/discovery/servicecenter/cacher.go
similarity index 94%
rename from server/plugin/pkg/discovery/servicecenter/cacher.go
rename to server/plugin/discovery/servicecenter/cacher.go
index 73faae6..9ce955d 100644
--- a/server/plugin/pkg/discovery/servicecenter/cacher.go
+++ b/server/plugin/discovery/servicecenter/cacher.go
@@ -16,7 +16,7 @@
package servicecenter
import (
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
)
type ServiceCenterCacher struct {
diff --git a/server/plugin/pkg/discovery/servicecenter/common.go b/server/plugin/discovery/servicecenter/common.go
similarity index 100%
rename from server/plugin/pkg/discovery/servicecenter/common.go
rename to server/plugin/discovery/servicecenter/common.go
diff --git a/server/plugin/pkg/discovery/servicecenter/indexer.go b/server/plugin/discovery/servicecenter/indexer.go
similarity index 96%
rename from server/plugin/pkg/discovery/servicecenter/indexer.go
rename to server/plugin/discovery/servicecenter/indexer.go
index 86a4cdd..ea502f9 100644
--- a/server/plugin/pkg/discovery/servicecenter/indexer.go
+++ b/server/plugin/discovery/servicecenter/indexer.go
@@ -21,8 +21,8 @@ import (
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"context"
diff --git a/server/plugin/pkg/discovery/servicecenter/repo.go b/server/plugin/discovery/servicecenter/repo.go
similarity index 90%
rename from server/plugin/pkg/discovery/servicecenter/repo.go
rename to server/plugin/discovery/servicecenter/repo.go
index a15a3ea..eb2569f 100644
--- a/server/plugin/pkg/discovery/servicecenter/repo.go
+++ b/server/plugin/discovery/servicecenter/repo.go
@@ -17,8 +17,8 @@ package servicecenter
import (
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
func init() {
diff --git a/server/plugin/pkg/discovery/servicecenter/syncer.go b/server/plugin/discovery/servicecenter/syncer.go
similarity index 98%
rename from server/plugin/pkg/discovery/servicecenter/syncer.go
rename to server/plugin/discovery/servicecenter/syncer.go
index 925760c..ee76407 100644
--- a/server/plugin/pkg/discovery/servicecenter/syncer.go
+++ b/server/plugin/discovery/servicecenter/syncer.go
@@ -28,8 +28,8 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"context"
)
diff --git a/server/plugin/pkg/discovery/servicecenter/syncer_test.go b/server/plugin/discovery/servicecenter/syncer_test.go
similarity index 97%
rename from server/plugin/pkg/discovery/servicecenter/syncer_test.go
rename to server/plugin/discovery/servicecenter/syncer_test.go
index f465832..4667162 100644
--- a/server/plugin/pkg/discovery/servicecenter/syncer_test.go
+++ b/server/plugin/discovery/servicecenter/syncer_test.go
@@ -20,8 +20,8 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/server/admin/model"
"github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"testing"
)
diff --git a/server/plugin/pkg/discovery/types.go b/server/plugin/discovery/types.go
similarity index 97%
rename from server/plugin/pkg/discovery/types.go
rename to server/plugin/discovery/types.go
index d83856d..d3f2cde 100644
--- a/server/plugin/pkg/discovery/types.go
+++ b/server/plugin/discovery/types.go
@@ -21,7 +21,7 @@ import (
simple "github.com/apache/servicecomb-service-center/pkg/time"
"github.com/apache/servicecomb-service-center/pkg/util"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"strconv"
"time"
)
diff --git a/server/plugin/pkg/discovery/types_test.go b/server/plugin/discovery/types_test.go
similarity index 100%
rename from server/plugin/pkg/discovery/types_test.go
rename to server/plugin/discovery/types_test.go
diff --git a/server/plugin/export.go b/server/plugin/export.go
index 97a4dc9..458d003 100644
--- a/server/plugin/export.go
+++ b/server/plugin/export.go
@@ -16,14 +16,14 @@
package plugin
import (
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/auditlog"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/auth"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/tls"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/tracing"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/uuid"
+ "github.com/apache/servicecomb-service-center/server/plugin/auditlog"
+ "github.com/apache/servicecomb-service-center/server/plugin/auth"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/tls"
+ "github.com/apache/servicecomb-service-center/server/plugin/tracing"
+ "github.com/apache/servicecomb-service-center/server/plugin/uuid"
"github.com/go-chassis/foundation/security"
)
diff --git a/server/plugin/pkg/quota/buildin/buildin.go b/server/plugin/quota/buildin/buildin.go
similarity index 93%
rename from server/plugin/pkg/quota/buildin/buildin.go
rename to server/plugin/quota/buildin/buildin.go
index 7634080..1221c54 100644
--- a/server/plugin/pkg/quota/buildin/buildin.go
+++ b/server/plugin/quota/buildin/buildin.go
@@ -20,8 +20,8 @@ import (
"context"
"github.com/apache/servicecomb-service-center/pkg/log"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota/counter"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota/counter"
)
func init() {
diff --git a/server/plugin/pkg/quota/buildin/common.go b/server/plugin/quota/buildin/common.go
similarity index 94%
rename from server/plugin/pkg/quota/buildin/common.go
rename to server/plugin/quota/buildin/common.go
index dd965ba..60cdea1 100644
--- a/server/plugin/pkg/quota/buildin/common.go
+++ b/server/plugin/quota/buildin/common.go
@@ -24,9 +24,9 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
)
diff --git a/server/plugin/pkg/quota/buildin/common_test.go b/server/plugin/quota/buildin/common_test.go
similarity index 97%
rename from server/plugin/pkg/quota/buildin/common_test.go
rename to server/plugin/quota/buildin/common_test.go
index 6cb6050..9c1cb22 100644
--- a/server/plugin/pkg/quota/buildin/common_test.go
+++ b/server/plugin/quota/buildin/common_test.go
@@ -18,7 +18,7 @@ package buildin
import (
"context"
"errors"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
"testing"
)
diff --git a/server/plugin/pkg/quota/buildin/counter.go b/server/plugin/quota/buildin/counter.go
similarity index 90%
rename from server/plugin/pkg/quota/buildin/counter.go
rename to server/plugin/quota/buildin/counter.go
index 86eb066..c0d0947 100644
--- a/server/plugin/pkg/quota/buildin/counter.go
+++ b/server/plugin/quota/buildin/counter.go
@@ -17,8 +17,8 @@ package buildin
import (
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota/counter"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota/counter"
)
var globalCounter = &GlobalCounter{}
diff --git a/server/plugin/pkg/quota/buildin/counter_test.go b/server/plugin/quota/buildin/counter_test.go
similarity index 100%
rename from server/plugin/pkg/quota/buildin/counter_test.go
rename to server/plugin/quota/buildin/counter_test.go
diff --git a/server/plugin/pkg/quota/counter/counter.go b/server/plugin/quota/counter/counter.go
similarity index 94%
rename from server/plugin/pkg/quota/counter/counter.go
rename to server/plugin/quota/counter/counter.go
index 6aa7a63..768fde2 100644
--- a/server/plugin/pkg/quota/counter/counter.go
+++ b/server/plugin/quota/counter/counter.go
@@ -16,7 +16,7 @@
package counter
import (
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
)
var counters = Counters{}
diff --git a/server/plugin/pkg/quota/counter/event.go b/server/plugin/quota/counter/event.go
similarity index 97%
rename from server/plugin/pkg/quota/counter/event.go
rename to server/plugin/quota/counter/event.go
index e002ad5..948c10e 100644
--- a/server/plugin/pkg/quota/counter/event.go
+++ b/server/plugin/quota/counter/event.go
@@ -22,7 +22,7 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
"github.com/astaxie/beego"
)
diff --git a/server/plugin/pkg/quota/counter/event_test.go b/server/plugin/quota/counter/event_test.go
similarity index 98%
rename from server/plugin/pkg/quota/counter/event_test.go
rename to server/plugin/quota/counter/event_test.go
index 9254b8e..fd371d9 100644
--- a/server/plugin/pkg/quota/counter/event_test.go
+++ b/server/plugin/quota/counter/event_test.go
@@ -19,7 +19,7 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
"github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"testing"
)
diff --git a/server/plugin/pkg/quota/quota.go b/server/plugin/quota/quota.go
similarity index 100%
rename from server/plugin/pkg/quota/quota.go
rename to server/plugin/quota/quota.go
diff --git a/server/plugin/pkg/quota/unlimit/unlimit.go b/server/plugin/quota/unlimit/unlimit.go
similarity index 95%
rename from server/plugin/pkg/quota/unlimit/unlimit.go
rename to server/plugin/quota/unlimit/unlimit.go
index 9d56ac2..ff82d08 100644
--- a/server/plugin/pkg/quota/unlimit/unlimit.go
+++ b/server/plugin/quota/unlimit/unlimit.go
@@ -20,7 +20,7 @@ import (
"context"
"github.com/apache/servicecomb-service-center/pkg/log"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
"github.com/astaxie/beego"
)
diff --git a/server/plugin/pkg/registry/buildin/buildin.go b/server/plugin/registry/buildin/buildin.go
similarity index 97%
rename from server/plugin/pkg/registry/buildin/buildin.go
rename to server/plugin/registry/buildin/buildin.go
index 5fcc83f..5ab08d2 100644
--- a/server/plugin/pkg/registry/buildin/buildin.go
+++ b/server/plugin/registry/buildin/buildin.go
@@ -19,7 +19,7 @@ package buildin
import (
"context"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
var (
diff --git a/server/plugin/pkg/registry/common.go b/server/plugin/registry/common.go
similarity index 100%
rename from server/plugin/pkg/registry/common.go
rename to server/plugin/registry/common.go
diff --git a/server/plugin/pkg/registry/config.go b/server/plugin/registry/config.go
similarity index 100%
rename from server/plugin/pkg/registry/config.go
rename to server/plugin/registry/config.go
diff --git a/server/plugin/pkg/registry/embededetcd/embededetcd.go b/server/plugin/registry/embededetcd/embededetcd.go
similarity index 99%
rename from server/plugin/pkg/registry/embededetcd/embededetcd.go
rename to server/plugin/registry/embededetcd/embededetcd.go
index 97938a0..cd81777 100644
--- a/server/plugin/pkg/registry/embededetcd/embededetcd.go
+++ b/server/plugin/registry/embededetcd/embededetcd.go
@@ -26,7 +26,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"github.com/coreos/etcd/compactor"
"github.com/coreos/etcd/embed"
"github.com/coreos/etcd/etcdserver"
diff --git a/server/plugin/pkg/registry/etcd/common.go b/server/plugin/registry/etcd/common.go
similarity index 100%
rename from server/plugin/pkg/registry/etcd/common.go
rename to server/plugin/registry/etcd/common.go
diff --git a/server/plugin/pkg/registry/etcd/etcd.go b/server/plugin/registry/etcd/etcd.go
similarity index 99%
rename from server/plugin/pkg/registry/etcd/etcd.go
rename to server/plugin/registry/etcd/etcd.go
index 0031c76..c62d6f1 100644
--- a/server/plugin/pkg/registry/etcd/etcd.go
+++ b/server/plugin/registry/etcd/etcd.go
@@ -32,7 +32,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/alarm"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"context"
"github.com/coreos/etcd/clientv3"
diff --git a/server/plugin/pkg/registry/etcd/etcd_test.go b/server/plugin/registry/etcd/etcd_test.go
similarity index 99%
rename from server/plugin/pkg/registry/etcd/etcd_test.go
rename to server/plugin/registry/etcd/etcd_test.go
index e8f484c..9877aaa 100644
--- a/server/plugin/pkg/registry/etcd/etcd_test.go
+++ b/server/plugin/registry/etcd/etcd_test.go
@@ -17,11 +17,11 @@
package etcd
import (
- _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/tracing/buildin"
+ _ "github.com/apache/servicecomb-service-center/server/plugin/tracing/buildin"
"github.com/stretchr/testify/assert"
)
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/security/buildin"
-import _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/tls/buildin"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/security/buildin"
+import _ "github.com/apache/servicecomb-service-center/server/plugin/tls/buildin"
import (
context2 "context"
"fmt"
@@ -33,7 +33,7 @@ import (
"time"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"github.com/apache/servicecomb-service-center/server/rpc"
"context"
@@ -856,7 +856,7 @@ func TestNewRegistry(t *testing.T) {
}
func TestWithTLS(t *testing.T) {
- sslRoot := "../../../../../examples/service_center/ssl/"
+ sslRoot := "../../../../examples/service_center/ssl/"
os.Setenv("SSL_ROOT", sslRoot)
core.ServerInfo.Config.SslEnabled = true
diff --git a/server/plugin/pkg/registry/etcd/logger.go b/server/plugin/registry/etcd/logger.go
similarity index 100%
rename from server/plugin/pkg/registry/etcd/logger.go
rename to server/plugin/registry/etcd/logger.go
diff --git a/server/plugin/pkg/registry/etcd/logger_test.go b/server/plugin/registry/etcd/logger_test.go
similarity index 100%
rename from server/plugin/pkg/registry/etcd/logger_test.go
rename to server/plugin/registry/etcd/logger_test.go
diff --git a/server/plugin/pkg/registry/etcd/tracing.go b/server/plugin/registry/etcd/tracing.go
similarity index 90%
rename from server/plugin/pkg/registry/etcd/tracing.go
rename to server/plugin/registry/etcd/tracing.go
index db4408d..72c34ab 100644
--- a/server/plugin/pkg/registry/etcd/tracing.go
+++ b/server/plugin/registry/etcd/tracing.go
@@ -19,8 +19,8 @@ package etcd
import (
"context"
"github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/tracing"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/tracing"
"net/http"
)
diff --git a/server/plugin/pkg/registry/metrics.go b/server/plugin/registry/metrics.go
similarity index 100%
rename from server/plugin/pkg/registry/metrics.go
rename to server/plugin/registry/metrics.go
diff --git a/server/plugin/pkg/registry/option.go b/server/plugin/registry/option.go
similarity index 100%
rename from server/plugin/pkg/registry/option.go
rename to server/plugin/registry/option.go
diff --git a/server/plugin/pkg/registry/registry.go b/server/plugin/registry/registry.go
similarity index 100%
rename from server/plugin/pkg/registry/registry.go
rename to server/plugin/registry/registry.go
diff --git a/server/plugin/pkg/registry/types.go b/server/plugin/registry/types.go
similarity index 100%
rename from server/plugin/pkg/registry/types.go
rename to server/plugin/registry/types.go
diff --git a/server/plugin/pkg/security/buildin/buildin.go b/server/plugin/security/buildin/buildin.go
similarity index 100%
rename from server/plugin/pkg/security/buildin/buildin.go
rename to server/plugin/security/buildin/buildin.go
diff --git a/server/plugin/pkg/tls/buildin/buildin.go b/server/plugin/tls/buildin/buildin.go
similarity index 100%
rename from server/plugin/pkg/tls/buildin/buildin.go
rename to server/plugin/tls/buildin/buildin.go
diff --git a/server/plugin/pkg/tls/buildin/tls.go b/server/plugin/tls/buildin/tls.go
similarity index 100%
rename from server/plugin/pkg/tls/buildin/tls.go
rename to server/plugin/tls/buildin/tls.go
diff --git a/server/plugin/pkg/tls/buildin/tls_test.go b/server/plugin/tls/buildin/tls_test.go
similarity index 91%
rename from server/plugin/pkg/tls/buildin/tls_test.go
rename to server/plugin/tls/buildin/tls_test.go
index 3a737b8..4805dd2 100644
--- a/server/plugin/pkg/tls/buildin/tls_test.go
+++ b/server/plugin/tls/buildin/tls_test.go
@@ -19,8 +19,8 @@ package buildin_test
import (
"crypto/tls"
"github.com/apache/servicecomb-service-center/server/core"
- _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/security/buildin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/tls/buildin"
+ _ "github.com/apache/servicecomb-service-center/server/plugin/security/buildin"
+ "github.com/apache/servicecomb-service-center/server/plugin/tls/buildin"
"github.com/stretchr/testify/assert"
"os"
"testing"
@@ -29,7 +29,7 @@ import (
func init() {
testing.Init()
core.Initialize()
- sslRoot := "../../../../../examples/service_center/ssl/"
+ sslRoot := "../../../../examples/service_center/ssl/"
os.Setenv("SSL_ROOT", sslRoot)
}
diff --git a/server/plugin/pkg/tls/tls.go b/server/plugin/tls/tls.go
similarity index 100%
rename from server/plugin/pkg/tls/tls.go
rename to server/plugin/tls/tls.go
diff --git a/server/plugin/pkg/tracing/buildin/buildin.go b/server/plugin/tracing/buildin/buildin.go
similarity index 98%
rename from server/plugin/pkg/tracing/buildin/buildin.go
rename to server/plugin/tracing/buildin/buildin.go
index cb4c0bc..1b6c20e 100644
--- a/server/plugin/pkg/tracing/buildin/buildin.go
+++ b/server/plugin/tracing/buildin/buildin.go
@@ -21,7 +21,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/tracing"
+ "github.com/apache/servicecomb-service-center/server/plugin/tracing"
"github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/ext"
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
diff --git a/server/plugin/pkg/tracing/buildin/buildin_test.go b/server/plugin/tracing/buildin/buildin_test.go
similarity index 93%
rename from server/plugin/pkg/tracing/buildin/buildin_test.go
rename to server/plugin/tracing/buildin/buildin_test.go
index edfd748..2d02b55 100644
--- a/server/plugin/pkg/tracing/buildin/buildin_test.go
+++ b/server/plugin/tracing/buildin/buildin_test.go
@@ -19,8 +19,8 @@ package buildin
import (
"context"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/tracing"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/tracing"
"net/http"
"os"
"testing"
diff --git a/server/plugin/pkg/tracing/buildin/common.go b/server/plugin/tracing/buildin/common.go
similarity index 100%
rename from server/plugin/pkg/tracing/buildin/common.go
rename to server/plugin/tracing/buildin/common.go
diff --git a/server/plugin/pkg/tracing/buildin/common_test.go b/server/plugin/tracing/buildin/common_test.go
similarity index 100%
rename from server/plugin/pkg/tracing/buildin/common_test.go
rename to server/plugin/tracing/buildin/common_test.go
diff --git a/server/plugin/pkg/tracing/buildin/file_collector.go b/server/plugin/tracing/buildin/file_collector.go
similarity index 100%
rename from server/plugin/pkg/tracing/buildin/file_collector.go
rename to server/plugin/tracing/buildin/file_collector.go
diff --git a/server/plugin/pkg/tracing/buildin/file_collector_test.go b/server/plugin/tracing/buildin/file_collector_test.go
similarity index 100%
rename from server/plugin/pkg/tracing/buildin/file_collector_test.go
rename to server/plugin/tracing/buildin/file_collector_test.go
diff --git a/server/plugin/pkg/tracing/buildin/span.go b/server/plugin/tracing/buildin/span.go
similarity index 100%
rename from server/plugin/pkg/tracing/buildin/span.go
rename to server/plugin/tracing/buildin/span.go
diff --git a/server/plugin/pkg/tracing/buildin/span_test.go b/server/plugin/tracing/buildin/span_test.go
similarity index 100%
rename from server/plugin/pkg/tracing/buildin/span_test.go
rename to server/plugin/tracing/buildin/span_test.go
diff --git a/server/plugin/pkg/tracing/tracing.go b/server/plugin/tracing/tracing.go
similarity index 94%
rename from server/plugin/pkg/tracing/tracing.go
rename to server/plugin/tracing/tracing.go
index f9fdbc1..cd7343e 100644
--- a/server/plugin/pkg/tracing/tracing.go
+++ b/server/plugin/tracing/tracing.go
@@ -18,7 +18,7 @@ package tracing
import (
"context"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
const CTX_TRACE_SPAN = "x-trace-span"
diff --git a/server/plugin/pkg/uuid/buildin/buildin.go b/server/plugin/uuid/buildin/buildin.go
similarity index 100%
rename from server/plugin/pkg/uuid/buildin/buildin.go
rename to server/plugin/uuid/buildin/buildin.go
diff --git a/server/plugin/pkg/uuid/context/context.go b/server/plugin/uuid/context/context.go
similarity index 91%
rename from server/plugin/pkg/uuid/context/context.go
rename to server/plugin/uuid/context/context.go
index 3a76893..6242870 100644
--- a/server/plugin/pkg/uuid/context/context.go
+++ b/server/plugin/uuid/context/context.go
@@ -23,8 +23,8 @@ import (
"fmt"
"github.com/apache/servicecomb-service-center/pkg/util"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/uuid"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/uuid/buildin"
+ "github.com/apache/servicecomb-service-center/server/plugin/uuid"
+ "github.com/apache/servicecomb-service-center/server/plugin/uuid/buildin"
)
func init() {
diff --git a/server/plugin/pkg/uuid/uuid.go b/server/plugin/uuid/uuid.go
similarity index 100%
rename from server/plugin/pkg/uuid/uuid.go
rename to server/plugin/uuid/uuid.go
diff --git a/server/rest/controller/v4/instance_watcher.go b/server/rest/controller/v4/instance_watcher.go
index d2c59c3..73ffea3 100644
--- a/server/rest/controller/v4/instance_watcher.go
+++ b/server/rest/controller/v4/instance_watcher.go
@@ -41,14 +41,10 @@ func upgrade(w http.ResponseWriter, r *http.Request) (*websocket.Conn, error) {
CheckOrigin: func(r *http.Request) bool {
return true
},
- /*Error: func(w http.ResponseWriter, r *http.Request, status int, reason error) {
-
- },*/
}
conn, err := upgrader.Upgrade(w, r, nil)
if err != nil {
log.Error("upgrade failed", err)
- // controller.WriteError(w, scerr.ErrInternal, "Upgrade error")
}
return conn, err
}
diff --git a/server/service/cache/filter_instances.go b/server/service/cache/filter_instances.go
index 38f9f9b..224cb1f 100644
--- a/server/service/cache/filter_instances.go
+++ b/server/service/cache/filter_instances.go
@@ -24,7 +24,7 @@ import (
apt "github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
"sort"
)
diff --git a/server/service/dependency.go b/server/service/dependency.go
index f811868..103ff01 100644
--- a/server/service/dependency.go
+++ b/server/service/dependency.go
@@ -25,7 +25,7 @@ import (
apt "github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
)
diff --git a/server/service/event/dependency_event_handler.go b/server/service/event/dependency_event_handler.go
index c4e148e..bd2638d 100644
--- a/server/service/event/dependency_event_handler.go
+++ b/server/service/event/dependency_event_handler.go
@@ -28,8 +28,8 @@ import (
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/mux"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
"time"
)
diff --git a/server/service/event/dependency_rule_event_handler.go b/server/service/event/dependency_rule_event_handler.go
index 5dfda11..5d2251d 100644
--- a/server/service/event/dependency_rule_event_handler.go
+++ b/server/service/event/dependency_rule_event_handler.go
@@ -21,7 +21,7 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"github.com/apache/servicecomb-service-center/server/service/cache"
)
diff --git a/server/service/event/dependency_rule_event_handler_test.go b/server/service/event/dependency_rule_event_handler_test.go
index c959e77..0ac317e 100644
--- a/server/service/event/dependency_rule_event_handler_test.go
+++ b/server/service/event/dependency_rule_event_handler_test.go
@@ -20,7 +20,7 @@ import (
"context"
"github.com/apache/servicecomb-service-center/server/core"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"github.com/apache/servicecomb-service-center/server/service/cache"
"testing"
)
diff --git a/server/service/event/domain_event_handler.go b/server/service/event/domain_event_handler.go
index ca34e97..9b5a29c 100644
--- a/server/service/event/domain_event_handler.go
+++ b/server/service/event/domain_event_handler.go
@@ -19,7 +19,7 @@ package event
import (
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"github.com/apache/servicecomb-service-center/server/service/metrics"
)
diff --git a/server/service/event/event.go b/server/service/event/event.go
index 9399105..8fe602f 100644
--- a/server/service/event/event.go
+++ b/server/service/event/event.go
@@ -17,7 +17,7 @@
package event
import (
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
)
func init() {
diff --git a/server/service/event/instance_event_handler.go b/server/service/event/instance_event_handler.go
index a4c8fc5..8905dc6 100644
--- a/server/service/event/instance_event_handler.go
+++ b/server/service/event/instance_event_handler.go
@@ -24,7 +24,7 @@ import (
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/notify"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"github.com/apache/servicecomb-service-center/server/service/cache"
"github.com/apache/servicecomb-service-center/server/service/metrics"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
diff --git a/server/service/event/rule_event_handler.go b/server/service/event/rule_event_handler.go
index a2e239c..35194c0 100644
--- a/server/service/event/rule_event_handler.go
+++ b/server/service/event/rule_event_handler.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/notify"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
)
diff --git a/server/service/event/schema_summary_event_handler.go b/server/service/event/schema_summary_event_handler.go
index fe0ac94..da8ed59 100644
--- a/server/service/event/schema_summary_event_handler.go
+++ b/server/service/event/schema_summary_event_handler.go
@@ -20,7 +20,7 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"github.com/apache/servicecomb-service-center/server/service/metrics"
"strings"
)
diff --git a/server/service/event/service_event_handler.go b/server/service/event/service_event_handler.go
index aa0a943..6995f95 100644
--- a/server/service/event/service_event_handler.go
+++ b/server/service/event/service_event_handler.go
@@ -22,7 +22,7 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"github.com/apache/servicecomb-service-center/server/service/cache"
"github.com/apache/servicecomb-service-center/server/service/metrics"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
diff --git a/server/service/event/tag_event_handler.go b/server/service/event/tag_event_handler.go
index b6a0e44..db4be2f 100644
--- a/server/service/event/tag_event_handler.go
+++ b/server/service/event/tag_event_handler.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/notify"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"github.com/apache/servicecomb-service-center/server/service/cache"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
)
diff --git a/server/service/instance.go b/server/service/instance.go
index 5146cb0..017156f 100644
--- a/server/service/instance.go
+++ b/server/service/instance.go
@@ -30,8 +30,8 @@ import (
pb "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/health"
"github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"github.com/apache/servicecomb-service-center/server/service/cache"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
diff --git a/server/service/kv/store.go b/server/service/kv/store.go
index d36c84e..fc72e92 100644
--- a/server/service/kv/store.go
+++ b/server/service/kv/store.go
@@ -24,7 +24,7 @@ import (
"github.com/coreos/etcd/mvcc/mvccpb"
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
var ErrNotUnique = errors.New("kv result is not unique")
diff --git a/server/service/kv/store_test.go b/server/service/kv/store_test.go
index 02bd2bc..493e97f 100644
--- a/server/service/kv/store_test.go
+++ b/server/service/kv/store_test.go
@@ -20,9 +20,9 @@ package kv_test
import (
"context"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery/etcd"
- etcd2 "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/etcd"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/tracing/buildin"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery/etcd"
+ etcd2 "github.com/apache/servicecomb-service-center/server/plugin/registry/etcd"
+ "github.com/apache/servicecomb-service-center/server/plugin/tracing/buildin"
"github.com/apache/servicecomb-service-center/server/service/kv"
"github.com/astaxie/beego"
"github.com/stretchr/testify/assert"
diff --git a/server/service/microservice.go b/server/service/microservice.go
index a100666..315947b 100644
--- a/server/service/microservice.go
+++ b/server/service/microservice.go
@@ -31,9 +31,9 @@ import (
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/uuid"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/uuid"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
diff --git a/server/service/microservice_test.go b/server/service/microservice_test.go
index afe6713..e93e553 100644
--- a/server/service/microservice_test.go
+++ b/server/service/microservice_test.go
@@ -19,7 +19,7 @@ package service_test
import (
"github.com/apache/servicecomb-service-center/server/core"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
diff --git a/server/service/microservice_validator.go b/server/service/microservice_validator.go
index 89e7c64..31126ad 100644
--- a/server/service/microservice_validator.go
+++ b/server/service/microservice_validator.go
@@ -20,7 +20,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/pkg/validate"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
"regexp"
)
diff --git a/server/service/rbac/dao/account_dao_test.go b/server/service/rbac/dao/account_dao_test.go
index d557c69..9bf8b65 100644
--- a/server/service/rbac/dao/account_dao_test.go
+++ b/server/service/rbac/dao/account_dao_test.go
@@ -21,9 +21,9 @@ import (
"context"
"github.com/apache/servicecomb-service-center/pkg/model"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery/etcd"
- etcd2 "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/etcd"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/tracing/buildin"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery/etcd"
+ etcd2 "github.com/apache/servicecomb-service-center/server/plugin/registry/etcd"
+ "github.com/apache/servicecomb-service-center/server/plugin/tracing/buildin"
"github.com/apache/servicecomb-service-center/server/service/rbac/dao"
"github.com/astaxie/beego"
"github.com/stretchr/testify/assert"
diff --git a/server/service/rbac/password.go b/server/service/rbac/password.go
new file mode 100644
index 0000000..3e729ca
--- /dev/null
+++ b/server/service/rbac/password.go
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package rbac
+
+import (
+ "context"
+ "errors"
+
+ "github.com/apache/servicecomb-service-center/pkg/log"
+ "github.com/apache/servicecomb-service-center/pkg/model"
+ "github.com/apache/servicecomb-service-center/server/service/rbac/dao"
+)
+
+func ChangePassword(ctx context.Context, changerRole, changerName string, a *model.Account) error {
+ if a.Name != "" {
+ if changerRole != model.RoleAdmin { //need to check password mismatch. but admin role can change any user password without supply current password
+ log.Error("can not change other account pwd", nil)
+ return ErrInputChangeAccount
+ }
+ return changePasswordForcibly(ctx, a.Name, a.Password)
+ } else {
+ if a.CurrentPassword == "" {
+ log.Error("current pwd is empty", nil)
+ return ErrInputCurrentPassword
+ }
+ return changePassword(ctx, changerName, a.CurrentPassword, a.Password)
+ }
+}
+func changePasswordForcibly(ctx context.Context, name, pwd string) error {
+ old, err := dao.GetAccount(ctx, name)
+ if err != nil {
+ log.Error("can not change pwd", err)
+ return err
+ }
+ old.Password = pwd
+ err = dao.EditAccount(ctx, old)
+ if err != nil {
+ log.Error("can not change pwd", err)
+ return err
+ }
+ return nil
+}
+func changePassword(ctx context.Context, name, currentPassword, pwd string) error {
+ old, err := dao.GetAccount(ctx, name)
+ if err != nil {
+ log.Error("can not change pwd", err)
+ return err
+ }
+ if old.Password != currentPassword {
+ log.Error("current pwd is wrong", nil)
+ return errors.New("can not change pwd")
+ }
+ old.Password = pwd
+ err = dao.EditAccount(ctx, old)
+ if err != nil {
+ log.Error("can not change pwd", err)
+ return err
+ }
+ return nil
+}
diff --git a/server/service/rbac/rbac.go b/server/service/rbac/rbac.go
index 5cef488..3d6d953 100644
--- a/server/service/rbac/rbac.go
+++ b/server/service/rbac/rbac.go
@@ -143,51 +143,3 @@ func GetPrivateKey() (*rsa.PrivateKey, error) {
}
return p, nil
}
-
-func ChangePassword(ctx context.Context, changerRole, changerName string, a *model.Account) error {
- if a.Name != "" {
- if changerRole != model.RoleAdmin { //need to check password mismatch. but admin role can change any user password without supply current password
- log.Error("can not change other account pwd", nil)
- return ErrInputChangeAccount
- }
- return changePasswordForcibly(ctx, a.Name, a.Password)
- } else {
- if a.CurrentPassword == "" {
- log.Error("current pwd is empty", nil)
- return ErrInputCurrentPassword
- }
- return changePassword(ctx, changerName, a.CurrentPassword, a.Password)
- }
-}
-func changePasswordForcibly(ctx context.Context, name, pwd string) error {
- old, err := dao.GetAccount(ctx, name)
- if err != nil {
- log.Error("can not change pwd", err)
- return err
- }
- old.Password = pwd
- err = dao.EditAccount(ctx, old)
- if err != nil {
- log.Error("can not change pwd", err)
- return err
- }
- return nil
-}
-func changePassword(ctx context.Context, name, currentPassword, pwd string) error {
- old, err := dao.GetAccount(ctx, name)
- if err != nil {
- log.Error("can not change pwd", err)
- return err
- }
- if old.Password != currentPassword {
- log.Error("current pwd is wrong", nil)
- return errors.New("can not change pwd")
- }
- old.Password = pwd
- err = dao.EditAccount(ctx, old)
- if err != nil {
- log.Error("can not change pwd", err)
- return err
- }
- return nil
-}
diff --git a/server/service/rbac/rbca_test.go b/server/service/rbac/rbca_test.go
index b01aa28..f2b9dab 100644
--- a/server/service/rbac/rbca_test.go
+++ b/server/service/rbac/rbca_test.go
@@ -21,10 +21,10 @@ import (
"context"
"github.com/apache/servicecomb-service-center/pkg/model"
mgr "github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery/etcd"
- etcd2 "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/etcd"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/security/buildin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/tracing/buildin"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery/etcd"
+ etcd2 "github.com/apache/servicecomb-service-center/server/plugin/registry/etcd"
+ "github.com/apache/servicecomb-service-center/server/plugin/security/buildin"
+ "github.com/apache/servicecomb-service-center/server/plugin/tracing/buildin"
"github.com/apache/servicecomb-service-center/server/service/rbac"
"github.com/apache/servicecomb-service-center/server/service/rbac/dao"
"github.com/astaxie/beego"
diff --git a/server/service/rule.go b/server/service/rule.go
index f4443b0..6539d65 100644
--- a/server/service/rule.go
+++ b/server/service/rule.go
@@ -25,8 +25,8 @@ import (
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
"strconv"
diff --git a/server/service/rule_test.go b/server/service/rule_test.go
index 0c8c308..72dd72a 100644
--- a/server/service/rule_test.go
+++ b/server/service/rule_test.go
@@ -18,7 +18,7 @@ package service_test
import (
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
diff --git a/server/service/rule_validator.go b/server/service/rule_validator.go
index 6716b02..bc470fb 100644
--- a/server/service/rule_validator.go
+++ b/server/service/rule_validator.go
@@ -18,7 +18,7 @@ package service
import (
"github.com/apache/servicecomb-service-center/pkg/validate"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
"regexp"
)
diff --git a/server/service/schema.go b/server/service/schema.go
index 52ef18a..0157448 100644
--- a/server/service/schema.go
+++ b/server/service/schema.go
@@ -26,9 +26,9 @@ import (
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
diff --git a/server/service/schema_test.go b/server/service/schema_test.go
index 0086ed5..28826bc 100644
--- a/server/service/schema_test.go
+++ b/server/service/schema_test.go
@@ -21,7 +21,7 @@ import (
"strings"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"github.com/apache/servicecomb-service-center/server/service"
diff --git a/server/service/schema_validator.go b/server/service/schema_validator.go
index a138109..25ef157 100644
--- a/server/service/schema_validator.go
+++ b/server/service/schema_validator.go
@@ -18,7 +18,7 @@ package service
import (
"github.com/apache/servicecomb-service-center/pkg/validate"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
"regexp"
)
diff --git a/server/service/tag.go b/server/service/tag.go
index 95c76d7..3dd4ff0 100644
--- a/server/service/tag.go
+++ b/server/service/tag.go
@@ -25,8 +25,8 @@ import (
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
)
diff --git a/server/service/tag_test.go b/server/service/tag_test.go
index ac4d8f7..0664ad1 100644
--- a/server/service/tag_test.go
+++ b/server/service/tag_test.go
@@ -18,7 +18,7 @@ package service_test
import (
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
diff --git a/server/service/tag_validator.go b/server/service/tag_validator.go
index edb0385..b764ea0 100644
--- a/server/service/tag_validator.go
+++ b/server/service/tag_validator.go
@@ -18,7 +18,7 @@ package service
import (
"github.com/apache/servicecomb-service-center/pkg/validate"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
"regexp"
)
diff --git a/server/service/util/dependency.go b/server/service/util/dependency.go
index 27b3dfe..23c247e 100644
--- a/server/service/util/dependency.go
+++ b/server/service/util/dependency.go
@@ -23,7 +23,7 @@ import (
apt "github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
type Dependency struct {
diff --git a/server/service/util/dependency_query.go b/server/service/util/dependency_query.go
index 7003a54..a1ccf64 100644
--- a/server/service/util/dependency_query.go
+++ b/server/service/util/dependency_query.go
@@ -24,7 +24,7 @@ import (
apt "github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"strings"
)
diff --git a/server/service/util/dependency_util.go b/server/service/util/dependency_util.go
index 7a4d01b..2f1ea3c 100644
--- a/server/service/util/dependency_util.go
+++ b/server/service/util/dependency_util.go
@@ -26,7 +26,7 @@ import (
apt "github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"strings"
)
diff --git a/server/service/util/domain_util.go b/server/service/util/domain_util.go
index 55100f9..e462a69 100644
--- a/server/service/util/domain_util.go
+++ b/server/service/util/domain_util.go
@@ -22,8 +22,8 @@ import (
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"strings"
)
diff --git a/server/service/util/heartbeat_util.go b/server/service/util/heartbeat_util.go
index b6b7697..89da670 100644
--- a/server/service/util/heartbeat_util.go
+++ b/server/service/util/heartbeat_util.go
@@ -21,7 +21,7 @@ import (
"errors"
apt "github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
)
diff --git a/server/service/util/instance_util.go b/server/service/util/instance_util.go
index d762e66..df95676 100644
--- a/server/service/util/instance_util.go
+++ b/server/service/util/instance_util.go
@@ -26,8 +26,8 @@ import (
apt "github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"strconv"
"strings"
diff --git a/server/service/util/microservice_util.go b/server/service/util/microservice_util.go
index 772ee67..05a44d3 100644
--- a/server/service/util/microservice_util.go
+++ b/server/service/util/microservice_util.go
@@ -26,9 +26,9 @@ import (
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/plugin"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/quota"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
"context"
)
diff --git a/server/service/util/rule_util.go b/server/service/util/rule_util.go
index 999c37c..6ee747b 100644
--- a/server/service/util/rule_util.go
+++ b/server/service/util/rule_util.go
@@ -24,7 +24,7 @@ import (
apt "github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
pb "github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"reflect"
"regexp"
diff --git a/server/service/util/schema_util.go b/server/service/util/schema_util.go
index 0c86127..6fdbc0a 100644
--- a/server/service/util/schema_util.go
+++ b/server/service/util/schema_util.go
@@ -19,7 +19,7 @@ package util
import (
"context"
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
func CheckSchemaInfoExist(ctx context.Context, key string) (bool, error) {
diff --git a/server/service/util/tag_util.go b/server/service/util/tag_util.go
index 6b8ede7..e57b275 100644
--- a/server/service/util/tag_util.go
+++ b/server/service/util/tag_util.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
)
diff --git a/server/service/util/util.go b/server/service/util/util.go
index afeddfe..02ae056 100644
--- a/server/service/util/util.go
+++ b/server/service/util/util.go
@@ -18,7 +18,7 @@ package util
import (
"context"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
func FromContext(ctx context.Context) []registry.PluginOpOption {
diff --git a/server/service/util/util_suite_test.go b/server/service/util/util_suite_test.go
index e7f4b4b..4a3af0f 100644
--- a/server/service/util/util_suite_test.go
+++ b/server/service/util/util_suite_test.go
@@ -17,16 +17,16 @@
package util_test
import (
- _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery/etcd"
- _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/quota/buildin"
- _ "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/buildin"
+ _ "github.com/apache/servicecomb-service-center/server/plugin/discovery/etcd"
+ _ "github.com/apache/servicecomb-service-center/server/plugin/quota/buildin"
+ _ "github.com/apache/servicecomb-service-center/server/plugin/registry/buildin"
)
import (
"context"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core/proto"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
. "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/reporters"
diff --git a/server/service/util/versionrule.go b/server/service/util/versionrule.go
index ed7f360..96d392c 100644
--- a/server/service/util/versionrule.go
+++ b/server/service/util/versionrule.go
@@ -18,7 +18,7 @@ package util
import (
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
"regexp"
"sort"
"strconv"
diff --git a/server/service/util/versionrule_test.go b/server/service/util/versionrule_test.go
index 8d1f105..47690b4 100644
--- a/server/service/util/versionrule_test.go
+++ b/server/service/util/versionrule_test.go
@@ -18,7 +18,7 @@ package util
import (
"fmt"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/discovery"
+ "github.com/apache/servicecomb-service-center/server/plugin/discovery"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"sort"
diff --git a/server/version.go b/server/version.go
index eb6aea8..a343b33 100644
--- a/server/version.go
+++ b/server/version.go
@@ -22,7 +22,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/core/backend"
- "github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
+ "github.com/apache/servicecomb-service-center/server/plugin/registry"
)
func LoadServerVersion() error {