You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/10/15 06:51:37 UTC
[servicecomb-service-center] branch master updated: SCB-2094 The
datasource plugin management (#712)
This is an automated email from the ASF dual-hosted git repository.
littlecui 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 46bc33b SCB-2094 The datasource plugin management (#712)
46bc33b is described below
commit 46bc33b5bfe0408c30e54d4cb75a95e7d4727f2f
Author: little-cui <su...@qq.com>
AuthorDate: Thu Oct 15 14:51:28 2020 +0800
SCB-2094 The datasource plugin management (#712)
* SCB-2094 The datasource plugin management
* SCB-2094 Move service/ms package
---
datasource/{auth.go => account.go} | 3 +-
datasource/datasource.go | 7 +-
datasource/dep.go | 3 +-
datasource/etcd/{auth.go => account.go} | 0
datasource/etcd/{auth_test.go => account_test.go} | 31 +-
datasource/etcd/dep_test.go | 93 ++--
datasource/etcd/etcd.go | 14 +-
.../ms/etcd/etcd.go => datasource/etcd/ms.go | 63 +--
.../etcd_test.go => datasource/etcd/ms_test.go | 539 +++++++++++----------
{server/service/ms => datasource}/etcd/util.go | 30 +-
datasource/manager.go | 60 +++
{server/service/ms => datasource}/manager_test.go | 48 +-
.../service/ms/datasource.go => datasource/ms.go | 35 +-
datasource/{datasource.go => options.go} | 13 +-
datasource/{datasource.go => types.go} | 8 +-
server/service/auth/manager.go | 59 ---
server/service/auth/manager_test.go | 49 --
server/service/auth/options.go | 22 -
server/service/auth/types.go | 18 -
server/service/dep/manager.go | 59 ---
server/service/dep/manager_test.go | 49 --
server/service/dep/options.go | 22 -
server/service/dep/types.go | 18 -
server/service/ms/etcd/etcd_suite_test.go | 55 ---
server/service/ms/manager.go | 58 ---
server/service/ms/options.go | 25 -
server/service/ms/types.go | 18 -
27 files changed, 493 insertions(+), 906 deletions(-)
diff --git a/datasource/auth.go b/datasource/account.go
similarity index 95%
rename from datasource/auth.go
rename to datasource/account.go
index 0588eb7..5e15829 100644
--- a/datasource/auth.go
+++ b/datasource/account.go
@@ -22,7 +22,8 @@ import (
"github.com/apache/servicecomb-service-center/pkg/rbacframe"
)
-type Auth interface {
+// AccountManager contains the RBAC CRUD
+type AccountManager interface {
AccountExist(ctx context.Context, key string) (bool, error)
GetAccount(ctx context.Context, key string) (*rbacframe.Account, error)
ListAccount(ctx context.Context, key string) ([]*rbacframe.Account, int64, error)
diff --git a/datasource/datasource.go b/datasource/datasource.go
index 04d2668..bf9254b 100644
--- a/datasource/datasource.go
+++ b/datasource/datasource.go
@@ -19,8 +19,7 @@ package datasource
// DataSource is the DAO layer
type DataSource interface {
- // Auth contains RBAC CRUD
- Auth
-
- Dependency
+ AccountManager
+ DependencyManager
+ MetadataManager
}
diff --git a/datasource/dep.go b/datasource/dep.go
index 795ff76..ddfae4c 100644
--- a/datasource/dep.go
+++ b/datasource/dep.go
@@ -22,7 +22,8 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
)
-type Dependency interface {
+// DependencyManager contains the CRUD of microservice dependencies
+type DependencyManager interface {
AddDependency(ctx context.Context, request *pb.AddDependenciesRequest) (*pb.AddDependenciesResponse, error)
CreateDependency(ctx context.Context, request *pb.CreateDependenciesRequest) (*pb.CreateDependenciesResponse, error)
SearchProviderDependency(ctx context.Context, request *pb.GetDependenciesRequest) (*pb.GetProDependenciesResponse, error)
diff --git a/datasource/etcd/auth.go b/datasource/etcd/account.go
similarity index 100%
rename from datasource/etcd/auth.go
rename to datasource/etcd/account.go
diff --git a/datasource/etcd/auth_test.go b/datasource/etcd/account_test.go
similarity index 67%
rename from datasource/etcd/auth_test.go
rename to datasource/etcd/account_test.go
index c620928..7487015 100644
--- a/datasource/etcd/auth_test.go
+++ b/datasource/etcd/account_test.go
@@ -8,7 +8,6 @@ import (
"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/pzipkin"
- "github.com/apache/servicecomb-service-center/server/service/auth"
"github.com/astaxie/beego"
"github.com/stretchr/testify/assert"
"testing"
@@ -39,10 +38,10 @@ func init() {
mgr.RegisterPlugin(mgr.Plugin{PName: mgr.DISCOVERY, Name: "buildin", New: etcd.NewRepository})
mgr.RegisterPlugin(mgr.Plugin{PName: mgr.DISCOVERY, Name: "etcd", New: etcd.NewRepository})
mgr.RegisterPlugin(mgr.Plugin{PName: mgr.TRACING, Name: "buildin", New: pzipkin.New})
- auth.Install("etcd", func(opts auth.Options) (datasource.DataSource, error) {
- return NewDataSource(), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := auth.Init(auth.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
PluginImplName: "etcd",
})
@@ -53,29 +52,29 @@ func init() {
func TestAccount(t *testing.T) {
t.Run("add and get account", func(t *testing.T) {
- err := auth.Auth().UpdateAccount(context.Background(), "test-account-key", &a1)
+ err := datasource.Instance().UpdateAccount(context.Background(), "test-account-key", &a1)
assert.NoError(t, err)
- r, err := auth.Auth().GetAccount(context.Background(), "test-account-key")
+ r, err := datasource.Instance().GetAccount(context.Background(), "test-account-key")
assert.NoError(t, err)
assert.Equal(t, a1, *r)
})
t.Run("account should exist", func(t *testing.T) {
- exist, err := auth.Auth().AccountExist(context.Background(), "test-account-key")
+ exist, err := datasource.Instance().AccountExist(context.Background(), "test-account-key")
assert.NoError(t, err)
assert.True(t, exist)
})
t.Run("delete account", func(t *testing.T) {
- err := auth.Auth().UpdateAccount(context.Background(), "test-account-key222", &a1)
+ err := datasource.Instance().UpdateAccount(context.Background(), "test-account-key222", &a1)
assert.NoError(t, err)
- _, err = auth.Auth().DeleteAccount(context.Background(), "test-account-key222")
+ _, err = datasource.Instance().DeleteAccount(context.Background(), "test-account-key222")
assert.NoError(t, err)
})
t.Run("add two accounts and list", func(t *testing.T) {
- err := auth.Auth().UpdateAccount(context.Background(), "key1", &a1)
+ err := datasource.Instance().UpdateAccount(context.Background(), "key1", &a1)
assert.NoError(t, err)
- err = auth.Auth().UpdateAccount(context.Background(), "key2", &a2)
+ err = datasource.Instance().UpdateAccount(context.Background(), "key2", &a2)
assert.NoError(t, err)
- accs, n, err := auth.Auth().ListAccount(context.Background(), "key")
+ accs, n, err := datasource.Instance().ListAccount(context.Background(), "key")
assert.NoError(t, err)
assert.Equal(t, int64(2), n)
t.Log(accs)
@@ -84,9 +83,9 @@ func TestAccount(t *testing.T) {
func TestDomain(t *testing.T) {
t.Run("test domain", func(t *testing.T) {
- _, err := auth.Auth().AddDomain(context.Background(), "test-domain")
+ _, err := datasource.Instance().AddDomain(context.Background(), "test-domain")
assert.NoError(t, err)
- r, err := auth.Auth().DomainExist(context.Background(), "test-domain")
+ r, err := datasource.Instance().DomainExist(context.Background(), "test-domain")
assert.NoError(t, err)
assert.Equal(t, true, r)
})
@@ -94,9 +93,9 @@ func TestDomain(t *testing.T) {
func TestProject(t *testing.T) {
t.Run("test project", func(t *testing.T) {
- _, err := auth.Auth().AddProject(context.Background(), "test-domain", "test-project")
+ _, err := datasource.Instance().AddProject(context.Background(), "test-domain", "test-project")
assert.NoError(t, err)
- r, err := auth.Auth().ProjectExist(context.Background(), "test-domain", "test-project")
+ r, err := datasource.Instance().ProjectExist(context.Background(), "test-domain", "test-project")
assert.NoError(t, err)
assert.Equal(t, true, r)
})
diff --git a/datasource/etcd/dep_test.go b/datasource/etcd/dep_test.go
index efd31dd..f7674c8 100644
--- a/datasource/etcd/dep_test.go
+++ b/datasource/etcd/dep_test.go
@@ -22,7 +22,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/server/core/proto"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
- "github.com/apache/servicecomb-service-center/server/service/dep"
"github.com/apache/servicecomb-service-center/server/service/event"
"github.com/go-chassis/go-archaius"
"github.com/stretchr/testify/assert"
@@ -34,13 +33,13 @@ var deh event.DependencyEventHandler
func Test_Creat(t *testing.T) {
- dep.Install("etcd", func(opts dep.Options) (datasource.DataSource, error) {
- return NewDataSource(), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := dep.Init(dep.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: dep.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
})
assert.NoError(t, err)
@@ -149,7 +148,7 @@ func Test_Creat(t *testing.T) {
}
// consumer does not exist
- resp, err := dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err := datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: &pb.MicroServiceKey{
@@ -166,7 +165,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, scerr.ErrServiceNotExists, resp.Response.GetCode())
// provider version is invalid
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -185,7 +184,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, scerr.ErrInvalidParams, resp.Response.GetCode())
// consumer version is invalid
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: &pb.MicroServiceKey{
@@ -201,7 +200,7 @@ func Test_Creat(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, scerr.ErrInvalidParams, resp.Response.GetCode())
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: &pb.MicroServiceKey{
@@ -217,7 +216,7 @@ func Test_Creat(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, scerr.ErrInvalidParams, resp.Response.GetCode())
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: &pb.MicroServiceKey{
@@ -233,7 +232,7 @@ func Test_Creat(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, scerr.ErrInvalidParams, resp.Response.GetCode())
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: &pb.MicroServiceKey{
@@ -249,7 +248,7 @@ func Test_Creat(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, scerr.ErrInvalidParams, resp.Response.GetCode())
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: &pb.MicroServiceKey{
@@ -266,7 +265,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, scerr.ErrInvalidParams, resp.Response.GetCode())
// provider app is invalid
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -285,7 +284,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, scerr.ErrInvalidParams, resp.Response.GetCode())
// provider serviceName is invalid
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -304,7 +303,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, scerr.ErrInvalidParams, resp.Response.GetCode())
// provider version is invalid
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -323,7 +322,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, scerr.ErrInvalidParams, resp.Response.GetCode())
// provider in diff env
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -344,7 +343,7 @@ func Test_Creat(t *testing.T) {
// consumer in diff env
consumer.Environment = pb.ENV_PROD
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -414,7 +413,7 @@ func Test_Creat(t *testing.T) {
}
// add latest
- resp, err := dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err := datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -434,7 +433,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, nil, deh.Handle())
- respPro, err := dep.Dependency().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
+ respPro, err := datasource.Instance().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: consumerId1,
})
assert.NotNil(t, respPro)
@@ -442,7 +441,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respPro.Response.GetCode())
// add 1.0.0+
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -460,7 +459,7 @@ func Test_Creat(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
- respPro, err = dep.Dependency().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
+ respPro, err = datasource.Instance().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: consumerId1,
})
assert.NotNil(t, respPro)
@@ -468,7 +467,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respPro.Response.GetCode())
// add *
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: &pb.MicroServiceKey{
@@ -488,7 +487,7 @@ func Test_Creat(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
- respPro, err = dep.Dependency().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
+ respPro, err = datasource.Instance().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: consumerId3,
})
assert.NotNil(t, respPro)
@@ -497,7 +496,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, 0, len(respPro.Providers))
// clean all
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: &pb.MicroServiceKey{
@@ -514,7 +513,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
// add multiple providers
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -536,7 +535,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
// add 1.0.0-2.0.0 to override *
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -556,7 +555,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, nil, deh.Handle())
- respPro, err = dep.Dependency().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
+ respPro, err = datasource.Instance().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: consumerId1,
})
assert.NotNil(t, respPro)
@@ -565,7 +564,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, "1.0.0", respPro.Providers[0].Version)
// add not override
- respAdd, err := dep.Dependency().AddDependency(getContext(), &pb.AddDependenciesRequest{
+ respAdd, err := datasource.Instance().AddDependency(getContext(), &pb.AddDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -585,7 +584,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, nil, deh.Handle())
- respPro, err = dep.Dependency().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
+ respPro, err = datasource.Instance().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: consumerId1,
})
assert.NotNil(t, respPro)
@@ -593,7 +592,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respPro.Response.GetCode())
// add provider is empty
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -605,7 +604,7 @@ func Test_Creat(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
- resp, err = dep.Dependency().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
+ resp, err = datasource.Instance().CreateDependency(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
Consumer: consumer,
@@ -618,7 +617,7 @@ func Test_Creat(t *testing.T) {
assert.Equal(t, nil, deh.Handle())
- respPro, err = dep.Dependency().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
+ respPro, err = datasource.Instance().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: consumerId1,
})
assert.NotNil(t, respPro)
@@ -630,13 +629,13 @@ func Test_Creat(t *testing.T) {
}
func Test_Get(t *testing.T) {
- dep.Install("etcd", func(opts dep.Options) (datasource.DataSource, error) {
- return NewDataSource(), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := dep.Init(dep.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: dep.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
})
assert.NoError(t, err)
@@ -692,7 +691,7 @@ func Test_Get(t *testing.T) {
t.Run("when request is invalid, should be failed", func(t *testing.T) {
//service id is empty when get provider
- resp, err := dep.Dependency().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
+ resp, err := datasource.Instance().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: "",
})
assert.NotNil(t, resp)
@@ -700,7 +699,7 @@ func Test_Get(t *testing.T) {
assert.Equal(t, scerr.ErrInvalidParams, resp.Response.GetCode())
//service does not exist when get provider
- resp, err = dep.Dependency().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
+ resp, err = datasource.Instance().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: "noneservice",
})
assert.NotNil(t, resp)
@@ -708,7 +707,7 @@ func Test_Get(t *testing.T) {
assert.Equal(t, scerr.ErrServiceNotExists, resp.Response.GetCode())
//service id is empty when get consumer
- resp, err = dep.Dependency().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
+ resp, err = datasource.Instance().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: "",
})
assert.NotNil(t, resp)
@@ -716,7 +715,7 @@ func Test_Get(t *testing.T) {
assert.Equal(t, scerr.ErrInvalidParams, resp.Response.GetCode())
//service does not exist when get consumer
- resp, err = dep.Dependency().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
+ resp, err = datasource.Instance().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: "noneservice",
})
assert.NotNil(t, resp)
@@ -726,7 +725,7 @@ func Test_Get(t *testing.T) {
t.Run("when request is valid, should be passed", func(t *testing.T) {
//get provider
- resp, err := dep.Dependency().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
+ resp, err := datasource.Instance().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: providerId1,
})
assert.NotNil(t, resp)
@@ -734,7 +733,7 @@ func Test_Get(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
//get consumer
- resp, err = dep.Dependency().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
+ resp, err = datasource.Instance().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: consumerId1,
})
assert.NotNil(t, resp)
@@ -757,7 +756,7 @@ func Test_Get(t *testing.T) {
assert.Equal(t, nil, deh.Handle())
// get consumer's deps
- respGetP, err := dep.Dependency().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
+ respGetP, err := datasource.Instance().SearchProviderDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: providerId1,
})
assert.NotNil(t, respGetP)
@@ -785,7 +784,7 @@ func Test_Get(t *testing.T) {
assert.Equal(t, nil, deh.Handle())
- respGetC, err = dep.Dependency().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
+ respGetC, err = datasource.Instance().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: consumerId1,
NoSelf: true,
})
@@ -830,7 +829,7 @@ func Test_Get(t *testing.T) {
assert.Equal(t, nil, deh.Handle())
- respGetC, err = dep.Dependency().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
+ respGetC, err = datasource.Instance().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: providerId2,
})
assert.NotNil(t, respGetC)
@@ -849,7 +848,7 @@ func Test_Get(t *testing.T) {
assert.Equal(t, nil, deh.Handle())
- respGetC, err = dep.Dependency().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
+ respGetC, err = datasource.Instance().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: providerId2,
})
assert.NotNil(t, respGetC)
@@ -883,7 +882,7 @@ func Test_Get(t *testing.T) {
assert.Equal(t, nil, deh.Handle())
- respGetC, err = dep.Dependency().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
+ respGetC, err = datasource.Instance().SearchConsumerDependency(getContext(), &pb.GetDependenciesRequest{
ServiceId: providerId2,
})
assert.NotNil(t, respGetC)
diff --git a/datasource/etcd/etcd.go b/datasource/etcd/etcd.go
index d6faf90..6b5cdab 100644
--- a/datasource/etcd/etcd.go
+++ b/datasource/etcd/etcd.go
@@ -17,6 +17,7 @@ package etcd
import (
"errors"
+ "github.com/apache/servicecomb-service-center/datasource"
"github.com/apache/servicecomb-service-center/pkg/log"
)
@@ -29,13 +30,20 @@ func init() {
// TODO: register storage plugin to plugin manager
}
-type DataSource struct{}
+type DataSource struct {
+ // schemaEditable determines whether schema modification is allowed for
+ SchemaEditable bool
+ ttlFromEnv int64
+}
-func NewDataSource() *DataSource {
+func NewDataSource(opts datasource.Options) *DataSource {
// TODO: construct a reasonable DataSource instance
log.Warnf("dependency data source enable etcd mode")
- inst := &DataSource{}
+ inst := &DataSource{
+ SchemaEditable: opts.SchemaEditable,
+ ttlFromEnv: opts.TTL,
+ }
// TODO: deal with exception
if err := inst.initialize(); err != nil {
return inst
diff --git a/server/service/ms/etcd/etcd.go b/datasource/etcd/ms.go
similarity index 97%
rename from server/service/ms/etcd/etcd.go
rename to datasource/etcd/ms.go
index 31f7b3a..ff83d9f 100644
--- a/server/service/ms/etcd/etcd.go
+++ b/datasource/etcd/ms.go
@@ -1,17 +1,19 @@
-// 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.
+/*
+ * 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 etcd
@@ -32,44 +34,11 @@ import (
"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"
- "github.com/apache/servicecomb-service-center/server/service/ms"
serviceUtil "github.com/apache/servicecomb-service-center/server/service/util"
"strconv"
"time"
)
-// TODO: define error with names here
-
-func init() {
- // TODO: set logger
- // TODO: register storage plugin to plugin manager
-}
-
-type DataSource struct {
- // schemaEditable determines whether schema modification is allowed for
- SchemaEditable bool
- ttlFromEnv int64
-}
-
-func NewDataSource(opts ms.Options) *DataSource {
- // TODO: construct a reasonable DataSource instance
- log.Warnf("microservice mgt data source enable etcd mode")
-
- inst := &DataSource{
- SchemaEditable: opts.SchemaEditable,
- ttlFromEnv: opts.TTL,
- }
- if err := inst.initialize(); err != nil {
- return inst
- }
- return inst
-}
-
-func (ds *DataSource) initialize() error {
- // TODO: init DataSource members
- return nil
-}
-
// RegisterService() implement:
// 1. capsule request to etcd kv format
// 2. invoke etcd client to store data
diff --git a/server/service/ms/etcd/etcd_test.go b/datasource/etcd/ms_test.go
similarity index 76%
rename from server/service/ms/etcd/etcd_test.go
rename to datasource/etcd/ms_test.go
index 20b54ff..07a8465 100644
--- a/server/service/ms/etcd/etcd_test.go
+++ b/datasource/etcd/ms_test.go
@@ -1,21 +1,24 @@
-// 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 etcd_test
+/*
+ * 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 etcd
import (
+ "github.com/apache/servicecomb-service-center/datasource"
"github.com/apache/servicecomb-service-center/pkg/log"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
@@ -24,8 +27,6 @@ import (
"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"
- "github.com/apache/servicecomb-service-center/server/service/ms"
- "github.com/apache/servicecomb-service-center/server/service/ms/etcd"
"github.com/go-chassis/go-archaius"
"github.com/stretchr/testify/assert"
"os"
@@ -37,18 +38,18 @@ import (
func TestInit(t *testing.T) {
_ = archaius.Init(archaius.WithMemorySource())
- _ = archaius.Set("servicecomb.ms.name", "etcd")
+ _ = archaius.Set("servicecomb.datasource.name", "etcd")
}
func TestService_Register(t *testing.T) {
t.Run("Register service after init & install, should pass", func(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
@@ -80,25 +81,25 @@ func TestService_Register(t *testing.T) {
},
}
request.Service.ModTimestamp = request.Service.Timestamp
- resp, err := ms.MicroService().RegisterService(getContext(), request)
+ resp, err := datasource.Instance().RegisterService(getContext(), request)
assert.NotNil(t, resp)
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
})
t.Run("register service with same key", func(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
// serviceName: some-relay-ms-service-name
// alias: sr-ms-service-name
- resp, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceName: "some-relay-ms-service-name",
Alias: "sr-ms-service-name",
@@ -118,7 +119,7 @@ func TestService_Register(t *testing.T) {
// serviceName: some-relay-ms-service-name
// alias: sr1-ms-service-name
- resp, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceName: "some-relay-ms-service-name",
Alias: "sr1-ms-service-name",
@@ -137,7 +138,7 @@ func TestService_Register(t *testing.T) {
// serviceName: some-relay1-ms-service-name
// alias: sr-ms-service-name
- resp, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceName: "some-relay1-ms-service-name",
Alias: "sr-ms-service-name",
@@ -157,7 +158,7 @@ func TestService_Register(t *testing.T) {
// serviceName: some-relay1-ms-service-name
// alias: sr-ms-service-name
// add serviceId field: sameId
- resp, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceId: sameId,
ServiceName: "some-relay1-ms-service-name",
@@ -178,7 +179,7 @@ func TestService_Register(t *testing.T) {
// serviceName: some-relay-ms-service-name
// alias: sr1-ms-service-name
// serviceId: sameId
- resp, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceId: sameId,
ServiceName: "some-relay-ms-service-name",
@@ -199,7 +200,7 @@ func TestService_Register(t *testing.T) {
// serviceName: some-relay-ms-service-name
// alias: sr1-ms-service-name
// serviceId: custom-id-ms-service-id -- different
- resp, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceId: "custom-id-ms-service-id",
ServiceName: "some-relay-ms-service-name",
@@ -220,7 +221,7 @@ func TestService_Register(t *testing.T) {
// serviceName: some-relay1-ms-service-name
// alias: sr-ms-service-name
// serviceId: custom-id-ms-service-id -- different
- resp, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceId: "custom-id-ms-service-id",
ServiceName: "some-relay1-ms-service-name",
@@ -241,16 +242,16 @@ func TestService_Register(t *testing.T) {
t.Run("same serviceId,different service, can not register again,error is same as the service register twice",
func(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
- resp, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceId: "same-serviceId-service-ms",
ServiceName: "serviceA-service-ms",
@@ -269,7 +270,7 @@ func TestService_Register(t *testing.T) {
assert.Equal(t, resp.Response.GetCode(), proto.Response_SUCCESS)
// same serviceId with different service name
- resp, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceId: "same-serviceId-service-ms",
ServiceName: "serviceB-service-ms",
@@ -291,26 +292,26 @@ func TestService_Register(t *testing.T) {
func TestService_Get(t *testing.T) {
// get service test
t.Run("query all services, should pass", func(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
- resp, err := ms.MicroService().GetServices(getContext(), &pb.GetServicesRequest{})
+ resp, err := datasource.Instance().GetServices(getContext(), &pb.GetServicesRequest{})
assert.NoError(t, err)
assert.Greater(t, len(resp.Services), 0)
})
t.Run("get a exist service, should pass", func(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
@@ -325,12 +326,12 @@ func TestService_Get(t *testing.T) {
},
}
- resp, err := ms.MicroService().RegisterService(getContext(), request)
+ resp, err := datasource.Instance().RegisterService(getContext(), request)
assert.NoError(t, err)
assert.Equal(t, resp.Response.GetCode(), proto.Response_SUCCESS)
// search service by serviceID
- queryResp, err := ms.MicroService().GetService(getContext(), &pb.GetServiceRequest{
+ queryResp, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: "ms-service-query-id",
})
assert.NoError(t, err)
@@ -338,17 +339,17 @@ func TestService_Get(t *testing.T) {
})
t.Run("query a service by a not existed serviceId, should not pass", func(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
// not exist service
- resp, err := ms.MicroService().GetService(getContext(), &pb.GetServiceRequest{
+ resp, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: "no-exist-service",
})
assert.NoError(t, err)
@@ -362,13 +363,13 @@ func TestService_Exist(t *testing.T) {
serviceId2 string
)
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
@@ -384,7 +385,7 @@ func TestService_Exist(t *testing.T) {
},
Status: "UP",
}
- resp, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: svc,
})
assert.NoError(t, err)
@@ -393,7 +394,7 @@ func TestService_Exist(t *testing.T) {
svc.ServiceId = ""
svc.Environment = pb.ENV_PROD
- resp, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: svc,
})
assert.NoError(t, err)
@@ -403,7 +404,7 @@ func TestService_Exist(t *testing.T) {
t.Run("check exist when service does not exist", func(t *testing.T) {
log.Info("check by querying a not exist serviceName")
- resp, err := ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err := datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
AppId: "exist_appId",
ServiceName: "notExistService_service_ms",
@@ -413,7 +414,7 @@ func TestService_Exist(t *testing.T) {
assert.Equal(t, scerr.ErrServiceNotExists, resp.Response.GetCode())
log.Info("check by querying a not exist env")
- resp, err = ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
Environment: pb.ENV_TEST,
AppId: "exist_appId_service_ms",
@@ -424,7 +425,7 @@ func TestService_Exist(t *testing.T) {
assert.Equal(t, scerr.ErrServiceNotExists, resp.Response.GetCode())
log.Info("check by querying a not exist env with alias")
- resp, err = ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
Environment: pb.ENV_TEST,
AppId: "exist_appId_service_ms",
@@ -435,7 +436,7 @@ func TestService_Exist(t *testing.T) {
assert.Equal(t, scerr.ErrServiceNotExists, resp.Response.GetCode())
log.Info("check by querying with a mismatching version")
- resp, err = ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
AppId: "exist_appId_service_ms",
ServiceName: "exist_service_service_ms",
@@ -443,7 +444,7 @@ func TestService_Exist(t *testing.T) {
})
assert.NoError(t, err)
assert.Equal(t, scerr.ErrServiceNotExists, resp.Response.GetCode())
- resp, err = ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
AppId: "exist_appId_service_ms",
ServiceName: "exist_service_service_ms",
@@ -455,7 +456,7 @@ func TestService_Exist(t *testing.T) {
t.Run("check exist when service exists", func(t *testing.T) {
log.Info("search with serviceName")
- resp, err := ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err := datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
AppId: "exist_appId_service_ms",
ServiceName: "exist_service_service_ms",
@@ -465,7 +466,7 @@ func TestService_Exist(t *testing.T) {
assert.Equal(t, serviceId1, resp.ServiceId)
log.Info("check with serviceName and env")
- resp, err = ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
Environment: pb.ENV_PROD,
AppId: "exist_appId_service_ms",
@@ -476,7 +477,7 @@ func TestService_Exist(t *testing.T) {
assert.Equal(t, serviceId2, resp.ServiceId)
log.Info("check with alias")
- resp, err = ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
AppId: "exist_appId_service_ms",
ServiceName: "es_service_ms",
@@ -486,7 +487,7 @@ func TestService_Exist(t *testing.T) {
assert.Equal(t, serviceId1, resp.ServiceId)
log.Info("check with alias and env")
- resp, err = ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
Environment: pb.ENV_PROD,
AppId: "exist_appId_service_ms",
@@ -497,7 +498,7 @@ func TestService_Exist(t *testing.T) {
assert.Equal(t, serviceId2, resp.ServiceId)
log.Info("check with latest versionRule")
- resp, err = ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
AppId: "exist_appId_service_ms",
ServiceName: "es_service_ms",
@@ -507,7 +508,7 @@ func TestService_Exist(t *testing.T) {
assert.Equal(t, serviceId1, resp.ServiceId)
log.Info("check with 1.0.0+ versionRule")
- resp, err = ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
AppId: "exist_appId_service_ms",
ServiceName: "es_service_ms",
@@ -517,7 +518,7 @@ func TestService_Exist(t *testing.T) {
assert.Equal(t, serviceId1, resp.ServiceId)
log.Info("check with range versionRule")
- resp, err = ms.MicroService().ExistService(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistService(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeMicroservice,
AppId: "exist_appId_service_ms",
ServiceName: "es_service_ms",
@@ -529,20 +530,20 @@ func TestService_Exist(t *testing.T) {
}
func TestService_Update(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
var serviceId string
t.Run("create service", func(t *testing.T) {
- resp, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
Alias: "es_service_ms",
ServiceName: "update_prop_service_service_ms",
@@ -571,15 +572,15 @@ func TestService_Update(t *testing.T) {
}
request.Properties["test"] = "1"
request2.Properties["k"] = "v"
- resp, err := ms.MicroService().UpdateService(getContext(), request)
+ resp, err := datasource.Instance().UpdateService(getContext(), request)
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
- resp, err = ms.MicroService().UpdateService(getContext(), request2)
+ resp, err = datasource.Instance().UpdateService(getContext(), request2)
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
- respGetService, err := ms.MicroService().GetService(getContext(), &pb.GetServiceRequest{
+ respGetService, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceId,
})
assert.NoError(t, err)
@@ -594,7 +595,7 @@ func TestService_Update(t *testing.T) {
ServiceId: "not_exist_service_service_ms",
Properties: make(map[string]string),
}
- resp, err := ms.MicroService().UpdateService(getContext(), r)
+ resp, err := datasource.Instance().UpdateService(getContext(), r)
assert.NoError(t, err)
assert.NotEqual(t, proto.Response_SUCCESS, resp.Response.GetCode())
})
@@ -605,7 +606,7 @@ func TestService_Update(t *testing.T) {
ServiceId: serviceId,
Properties: nil,
}
- resp, err := ms.MicroService().UpdateService(getContext(), r)
+ resp, err := datasource.Instance().UpdateService(getContext(), r)
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
@@ -614,20 +615,20 @@ func TestService_Update(t *testing.T) {
ServiceId: "",
Properties: map[string]string{},
}
- resp, err = ms.MicroService().UpdateService(getContext(), r)
+ resp, err = datasource.Instance().UpdateService(getContext(), r)
assert.NoError(t, err)
assert.NotEqual(t, proto.Response_SUCCESS, resp.Response.GetCode())
})
}
func TestService_Delete(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
@@ -637,7 +638,7 @@ func TestService_Delete(t *testing.T) {
)
t.Run("create service & instance", func(t *testing.T) {
- respCreate, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreate, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceName: "delete_service_with_inst_ms",
AppId: "delete_service_ms",
@@ -659,7 +660,7 @@ func TestService_Delete(t *testing.T) {
HostName: "delete-host-ms",
Status: pb.MSI_UP,
}
- respCreateIns, err := ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateIns, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: instance,
})
assert.NoError(t, err)
@@ -673,14 +674,14 @@ func TestService_Delete(t *testing.T) {
Level: "FRONT",
Status: "UP",
}
- respCreate, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreate, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: provider,
})
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, respCreate.Response.GetCode())
serviceNoInstId = respCreate.ServiceId
- respCreate, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreate, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceName: "delete_service_consumer_ms",
AppId: "delete_service_ms",
@@ -695,7 +696,7 @@ func TestService_Delete(t *testing.T) {
t.Run("delete a service which contains instances with no force flag", func(t *testing.T) {
log.Info("should not pass")
- resp, err := ms.MicroService().UnregisterService(getContext(), &pb.DeleteServiceRequest{
+ resp, err := datasource.Instance().UnregisterService(getContext(), &pb.DeleteServiceRequest{
ServiceId: serviceContainInstId,
Force: false,
})
@@ -705,7 +706,7 @@ func TestService_Delete(t *testing.T) {
t.Run("delete a service which contains instances with force flag", func(t *testing.T) {
log.Info("should pass")
- resp, err := ms.MicroService().UnregisterService(getContext(), &pb.DeleteServiceRequest{
+ resp, err := datasource.Instance().UnregisterService(getContext(), &pb.DeleteServiceRequest{
ServiceId: serviceContainInstId,
Force: true,
})
@@ -717,7 +718,7 @@ func TestService_Delete(t *testing.T) {
t.Run("delete a service which depended by consumer with force flag", func(t *testing.T) {
log.Info("should pass")
- resp, err := ms.MicroService().UnregisterService(getContext(), &pb.DeleteServiceRequest{
+ resp, err := datasource.Instance().UnregisterService(getContext(), &pb.DeleteServiceRequest{
ServiceId: serviceNoInstId,
Force: true,
})
@@ -727,7 +728,7 @@ func TestService_Delete(t *testing.T) {
t.Run("delete a service with no force flag", func(t *testing.T) {
log.Info("should not pass")
- resp, err := ms.MicroService().UnregisterService(getContext(), &pb.DeleteServiceRequest{
+ resp, err := datasource.Instance().UnregisterService(getContext(), &pb.DeleteServiceRequest{
ServiceId: serviceNoInstId,
Force: false,
})
@@ -737,20 +738,20 @@ func TestService_Delete(t *testing.T) {
}
func TestInstance_Create(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
var serviceId string
t.Run("create service", func(t *testing.T) {
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceName: "create_instance_service_ms",
AppId: "create_instance_ms",
@@ -766,7 +767,7 @@ func TestInstance_Create(t *testing.T) {
})
t.Run("register instance", func(t *testing.T) {
- respCreateInst, err := ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInst, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId,
Endpoints: []string{
@@ -780,7 +781,7 @@ func TestInstance_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateInst.Response.GetCode())
assert.NotEqual(t, "", respCreateInst.InstanceId)
- respCreateInst, err = ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInst, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
InstanceId: "customId_ms",
ServiceId: serviceId,
@@ -805,13 +806,13 @@ func TestInstance_Create(t *testing.T) {
HostName: "UT-HOST",
Status: pb.MSI_UP,
}
- resp, err := ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ resp, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: instance,
})
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
- resp, err = ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ resp, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: instance,
})
assert.NoError(t, err)
@@ -821,12 +822,12 @@ func TestInstance_Create(t *testing.T) {
}
func TestInstance_HeartBeat(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
@@ -838,7 +839,7 @@ func TestInstance_HeartBeat(t *testing.T) {
t.Run("register service and instance, should pass", func(t *testing.T) {
log.Info("register service")
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceName: "heartbeat_service_ms",
AppId: "heartbeat_service_ms",
@@ -851,7 +852,7 @@ func TestInstance_HeartBeat(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
- respCreateInstance, err := ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInstance, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId,
HostName: "UT-HOST-MS",
@@ -865,7 +866,7 @@ func TestInstance_HeartBeat(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateInstance.Response.GetCode())
instanceId1 = respCreateInstance.InstanceId
- respCreateInstance, err = ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId,
HostName: "UT-HOST-MS",
@@ -882,7 +883,7 @@ func TestInstance_HeartBeat(t *testing.T) {
t.Run("update a lease", func(t *testing.T) {
log.Info("valid instance")
- resp, err := ms.MicroService().Heartbeat(getContext(), &pb.HeartbeatRequest{
+ resp, err := datasource.Instance().Heartbeat(getContext(), &pb.HeartbeatRequest{
ServiceId: serviceId,
InstanceId: instanceId1,
})
@@ -890,7 +891,7 @@ func TestInstance_HeartBeat(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
log.Info("serviceId does not exist")
- resp, err = ms.MicroService().Heartbeat(getContext(), &pb.HeartbeatRequest{
+ resp, err = datasource.Instance().Heartbeat(getContext(), &pb.HeartbeatRequest{
ServiceId: "100000000000",
InstanceId: instanceId1,
})
@@ -898,7 +899,7 @@ func TestInstance_HeartBeat(t *testing.T) {
assert.NotEqual(t, proto.Response_SUCCESS, resp.Response.GetCode())
log.Info("instance does not exist")
- resp, err = ms.MicroService().Heartbeat(getContext(), &pb.HeartbeatRequest{
+ resp, err = datasource.Instance().Heartbeat(getContext(), &pb.HeartbeatRequest{
ServiceId: serviceId,
InstanceId: "not-exist-ins",
})
@@ -908,7 +909,7 @@ func TestInstance_HeartBeat(t *testing.T) {
t.Run("batch update lease", func(t *testing.T) {
log.Info("request contains at least 1 instances")
- resp, err := ms.MicroService().HeartbeatSet(getContext(), &pb.HeartbeatSetRequest{
+ resp, err := datasource.Instance().HeartbeatSet(getContext(), &pb.HeartbeatSetRequest{
Instances: []*pb.HeartbeatSetElement{
{
ServiceId: serviceId,
@@ -926,12 +927,12 @@ func TestInstance_HeartBeat(t *testing.T) {
}
func TestInstance_Update(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
@@ -942,7 +943,7 @@ func TestInstance_Update(t *testing.T) {
t.Run("register service and instance, should pass", func(t *testing.T) {
log.Info("register service")
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
ServiceName: "update_instance_service_ms",
AppId: "update_instance_service_ms",
@@ -956,7 +957,7 @@ func TestInstance_Update(t *testing.T) {
serviceId = respCreateService.ServiceId
log.Info("create instance")
- respCreateInstance, err := ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInstance, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId,
Endpoints: []string{
@@ -974,7 +975,7 @@ func TestInstance_Update(t *testing.T) {
t.Run("update instance status", func(t *testing.T) {
log.Info("update instance status to DOWN")
- respUpdateStatus, err := ms.MicroService().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
+ respUpdateStatus, err := datasource.Instance().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
ServiceId: serviceId,
InstanceId: instanceId,
Status: pb.MSI_DOWN,
@@ -983,7 +984,7 @@ func TestInstance_Update(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respUpdateStatus.Response.GetCode())
log.Info("update instance status to OUTOFSERVICE")
- respUpdateStatus, err = ms.MicroService().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
+ respUpdateStatus, err = datasource.Instance().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
ServiceId: serviceId,
InstanceId: instanceId,
Status: pb.MSI_OUTOFSERVICE,
@@ -992,7 +993,7 @@ func TestInstance_Update(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respUpdateStatus.Response.GetCode())
log.Info("update instance status to STARTING")
- respUpdateStatus, err = ms.MicroService().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
+ respUpdateStatus, err = datasource.Instance().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
ServiceId: serviceId,
InstanceId: instanceId,
Status: pb.MSI_STARTING,
@@ -1001,7 +1002,7 @@ func TestInstance_Update(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respUpdateStatus.Response.GetCode())
log.Info("update instance status to TESTING")
- respUpdateStatus, err = ms.MicroService().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
+ respUpdateStatus, err = datasource.Instance().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
ServiceId: serviceId,
InstanceId: instanceId,
Status: pb.MSI_TESTING,
@@ -1010,7 +1011,7 @@ func TestInstance_Update(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respUpdateStatus.Response.GetCode())
log.Info("update instance status to UP")
- respUpdateStatus, err = ms.MicroService().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
+ respUpdateStatus, err = datasource.Instance().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
ServiceId: serviceId,
InstanceId: instanceId,
Status: pb.MSI_UP,
@@ -1019,7 +1020,7 @@ func TestInstance_Update(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respUpdateStatus.Response.GetCode())
log.Info("update instance status with a not exist instance")
- respUpdateStatus, err = ms.MicroService().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
+ respUpdateStatus, err = datasource.Instance().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
ServiceId: serviceId,
InstanceId: "notexistins",
Status: pb.MSI_STARTING,
@@ -1030,7 +1031,7 @@ func TestInstance_Update(t *testing.T) {
t.Run("update instance properties", func(t *testing.T) {
log.Info("update one properties")
- respUpdateProperties, err := ms.MicroService().UpdateInstanceProperties(getContext(),
+ respUpdateProperties, err := datasource.Instance().UpdateInstanceProperties(getContext(),
&pb.UpdateInstancePropsRequest{
ServiceId: serviceId,
InstanceId: instanceId,
@@ -1048,7 +1049,7 @@ func TestInstance_Update(t *testing.T) {
s := strconv.Itoa(i) + strings.Repeat("x", 253)
properties[s] = s
}
- respUpdateProperties, err = ms.MicroService().UpdateInstanceProperties(getContext(),
+ respUpdateProperties, err = datasource.Instance().UpdateInstanceProperties(getContext(),
&pb.UpdateInstancePropsRequest{
ServiceId: serviceId,
InstanceId: instanceId,
@@ -1058,7 +1059,7 @@ func TestInstance_Update(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respUpdateProperties.Response.GetCode())
log.Info("update instance that does not exist")
- respUpdateProperties, err = ms.MicroService().UpdateInstanceProperties(getContext(),
+ respUpdateProperties, err = datasource.Instance().UpdateInstanceProperties(getContext(),
&pb.UpdateInstancePropsRequest{
ServiceId: serviceId,
InstanceId: "not_exist_ins",
@@ -1070,7 +1071,7 @@ func TestInstance_Update(t *testing.T) {
assert.NotEqual(t, proto.Response_SUCCESS, respUpdateProperties.Response.GetCode())
log.Info("remove properties")
- respUpdateProperties, err = ms.MicroService().UpdateInstanceProperties(getContext(),
+ respUpdateProperties, err = datasource.Instance().UpdateInstanceProperties(getContext(),
&pb.UpdateInstancePropsRequest{
ServiceId: serviceId,
InstanceId: instanceId,
@@ -1079,7 +1080,7 @@ func TestInstance_Update(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respUpdateProperties.Response.GetCode())
log.Info("update service that does not exist")
- respUpdateProperties, err = ms.MicroService().UpdateInstanceProperties(getContext(),
+ respUpdateProperties, err = datasource.Instance().UpdateInstanceProperties(getContext(),
&pb.UpdateInstancePropsRequest{
ServiceId: "not_exist_service",
InstanceId: instanceId,
@@ -1093,12 +1094,12 @@ func TestInstance_Update(t *testing.T) {
}
func TestInstance_Query(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
@@ -1121,7 +1122,7 @@ func TestInstance_Query(t *testing.T) {
)
t.Run("register services and instances for testInstance_query", func(t *testing.T) {
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "query_instance_ms",
ServiceName: "query_instance_service_ms",
@@ -1134,7 +1135,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId1 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "query_instance_ms",
ServiceName: "query_instance_service_ms",
@@ -1147,7 +1148,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId2 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "query_instance_diff_app_ms",
ServiceName: "query_instance_service_ms",
@@ -1160,7 +1161,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId3 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
Environment: pb.ENV_PROD,
AppId: "query_instance_ms",
@@ -1174,7 +1175,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId4 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
Environment: pb.ENV_PROD,
AppId: "default",
@@ -1191,7 +1192,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId5 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(
+ respCreateService, err = datasource.Instance().RegisterService(
util.SetDomainProject(util.CloneContext(getContext()), "user", "user"),
&pb.CreateServiceRequest{
Service: &pb.MicroService{
@@ -1206,7 +1207,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId6 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "default",
ServiceName: "query_instance_shared_consumer_ms",
@@ -1219,7 +1220,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId7 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "query_instance_ms",
ServiceName: "query_instance_with_rev_ms",
@@ -1232,7 +1233,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId8 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "query_instance_ms",
ServiceName: "batch_query_instance_with_rev_ms",
@@ -1245,7 +1246,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId9 = respCreateService.ServiceId
- respCreateInstance, err := ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInstance, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId1,
HostName: "UT-HOST-MS",
@@ -1259,7 +1260,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateInstance.Response.GetCode())
instanceId1 = respCreateInstance.InstanceId
- respCreateInstance, err = ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId2,
HostName: "UT-HOST-MS",
@@ -1273,7 +1274,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateInstance.Response.GetCode())
instanceId2 = respCreateInstance.InstanceId
- respCreateInstance, err = ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId4,
HostName: "UT-HOST-MS",
@@ -1287,7 +1288,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateInstance.Response.GetCode())
instanceId4 = respCreateInstance.InstanceId
- respCreateInstance, err = ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId5,
HostName: "UT-HOST-MS",
@@ -1301,7 +1302,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateInstance.Response.GetCode())
instanceId5 = respCreateInstance.InstanceId
- respCreateInstance, err = ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId8,
HostName: "UT-HOST-MS",
@@ -1315,7 +1316,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateInstance.Response.GetCode())
instanceId8 = respCreateInstance.InstanceId
- respCreateInstance, err = ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId9,
HostName: "UT-HOST-MS",
@@ -1332,7 +1333,7 @@ func TestInstance_Query(t *testing.T) {
t.Run("query instance", func(t *testing.T) {
log.Info("find with version rule")
- respFind, err := ms.MicroService().FindInstances(getContext(), &pb.FindInstancesRequest{
+ respFind, err := datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
ConsumerServiceId: serviceId1,
AppId: "query_instance_ms",
ServiceName: "query_instance_service_ms",
@@ -1342,7 +1343,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respFind.Response.GetCode())
assert.Equal(t, instanceId2, respFind.Instances[0].InstanceId)
- respFind, err = ms.MicroService().FindInstances(getContext(), &pb.FindInstancesRequest{
+ respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
ConsumerServiceId: serviceId1,
AppId: "query_instance_ms",
ServiceName: "query_instance_service_ms",
@@ -1353,7 +1354,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respFind.Response.GetCode())
assert.Equal(t, instanceId2, respFind.Instances[0].InstanceId)
- respFind, err = ms.MicroService().FindInstances(getContext(), &pb.FindInstancesRequest{
+ respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
ConsumerServiceId: serviceId1,
AppId: "query_instance_ms",
ServiceName: "query_instance_service_ms",
@@ -1363,7 +1364,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respFind.Response.GetCode())
assert.Equal(t, instanceId1, respFind.Instances[0].InstanceId)
- respFind, err = ms.MicroService().FindInstances(getContext(), &pb.FindInstancesRequest{
+ respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
ConsumerServiceId: serviceId1,
AppId: "query_instance",
ServiceName: "query_instance_service",
@@ -1373,7 +1374,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, scerr.ErrServiceNotExists, respFind.Response.GetCode())
log.Info("find with env")
- respFind, err = ms.MicroService().FindInstances(getContext(), &pb.FindInstancesRequest{
+ respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
ConsumerServiceId: serviceId4,
AppId: "query_instance_ms",
ServiceName: "query_instance_diff_env_service_ms",
@@ -1384,7 +1385,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, 1, len(respFind.Instances))
assert.Equal(t, instanceId4, respFind.Instances[0].InstanceId)
- respFind, err = ms.MicroService().FindInstances(getContext(), &pb.FindInstancesRequest{
+ respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
Environment: pb.ENV_PROD,
AppId: "query_instance_ms",
ServiceName: "query_instance_diff_env_service_ms",
@@ -1397,7 +1398,7 @@ func TestInstance_Query(t *testing.T) {
log.Info("find with rev")
ctx := util.SetContext(getContext(), util.CtxNocache, "")
- respFind, err = ms.MicroService().FindInstances(ctx, &pb.FindInstancesRequest{
+ respFind, err = datasource.Instance().FindInstances(ctx, &pb.FindInstancesRequest{
ConsumerServiceId: serviceId8,
AppId: "query_instance_ms",
ServiceName: "query_instance_with_rev_ms",
@@ -1410,7 +1411,7 @@ func TestInstance_Query(t *testing.T) {
assert.NotEqual(t, 0, len(rev))
util.SetContext(ctx, util.CtxRequestRevision, "x")
- respFind, err = ms.MicroService().FindInstances(ctx, &pb.FindInstancesRequest{
+ respFind, err = datasource.Instance().FindInstances(ctx, &pb.FindInstancesRequest{
ConsumerServiceId: serviceId8,
AppId: "query_instance_ms",
ServiceName: "query_instance_with_rev_ms",
@@ -1422,7 +1423,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, ctx.Value(util.CtxResponseRevision), rev)
log.Info("find should return 200 if consumer is diff apps")
- respFind, err = ms.MicroService().FindInstances(getContext(), &pb.FindInstancesRequest{
+ respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
ConsumerServiceId: serviceId3,
AppId: "query_instance_ms",
ServiceName: "query_instance_service_ms",
@@ -1433,7 +1434,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, 0, len(respFind.Instances))
log.Info("provider tag does not exist")
- respFind, err = ms.MicroService().FindInstances(getContext(), &pb.FindInstancesRequest{
+ respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
ConsumerServiceId: serviceId1,
AppId: "query_instance_ms",
ServiceName: "query_instance_service_ms",
@@ -1448,7 +1449,7 @@ func TestInstance_Query(t *testing.T) {
_ = os.Setenv("CSE_SHARED_SERVICES", "query_instance_shared_provider_ms")
core.SetSharedMode()
core.Service.Environment = pb.ENV_PROD
- respFind, err = ms.MicroService().FindInstances(
+ respFind, err = datasource.Instance().FindInstances(
util.SetTargetDomainProject(
util.SetDomainProject(util.CloneContext(getContext()), "user", "user"),
"default", "default"),
@@ -1463,7 +1464,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, 1, len(respFind.Instances))
assert.Equal(t, instanceId5, respFind.Instances[0].InstanceId)
- respFind, err = ms.MicroService().FindInstances(getContext(), &pb.FindInstancesRequest{
+ respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
ConsumerServiceId: serviceId7,
AppId: "default",
ServiceName: "query_instance_shared_provider_ms",
@@ -1482,7 +1483,7 @@ func TestInstance_Query(t *testing.T) {
t.Run("batch query instances", func(t *testing.T) {
log.Info("find with version rule")
- respFind, err := ms.MicroService().BatchFind(getContext(), &pb.BatchFindInstancesRequest{
+ respFind, err := datasource.Instance().BatchFind(getContext(), &pb.BatchFindInstancesRequest{
ConsumerServiceId: serviceId1,
Services: []*pb.FindService{
{
@@ -1518,7 +1519,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, scerr.ErrServiceNotExists, respFind.Services.Failed[0].Error.Code)
log.Info("find with env")
- respFind, err = ms.MicroService().BatchFind(getContext(), &pb.BatchFindInstancesRequest{
+ respFind, err = datasource.Instance().BatchFind(getContext(), &pb.BatchFindInstancesRequest{
ConsumerServiceId: serviceId4,
Services: []*pb.FindService{
{
@@ -1537,7 +1538,7 @@ func TestInstance_Query(t *testing.T) {
log.Info("find with rev")
ctx := util.SetContext(getContext(), util.CtxNocache, "")
- respFind, err = ms.MicroService().BatchFind(ctx, &pb.BatchFindInstancesRequest{
+ respFind, err = datasource.Instance().BatchFind(ctx, &pb.BatchFindInstancesRequest{
ConsumerServiceId: serviceId8,
Services: []*pb.FindService{
{
@@ -1585,7 +1586,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, instanceId8, respFind.Instances.Updated[1].Instances[0].InstanceId)
assert.NotEqual(t, 0, len(instanceRev))
- respFind, err = ms.MicroService().BatchFind(ctx, &pb.BatchFindInstancesRequest{
+ respFind, err = datasource.Instance().BatchFind(ctx, &pb.BatchFindInstancesRequest{
ConsumerServiceId: serviceId8,
Services: []*pb.FindService{
{
@@ -1614,7 +1615,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, instanceId9, respFind.Instances.Updated[0].Instances[0].InstanceId)
assert.Equal(t, instanceRev, respFind.Instances.Updated[0].Rev)
- respFind, err = ms.MicroService().BatchFind(ctx, &pb.BatchFindInstancesRequest{
+ respFind, err = datasource.Instance().BatchFind(ctx, &pb.BatchFindInstancesRequest{
ConsumerServiceId: serviceId8,
Services: []*pb.FindService{
{
@@ -1642,7 +1643,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, int64(0), respFind.Instances.NotModified[0])
log.Info("find should return 200 even if consumer is diff apps")
- respFind, err = ms.MicroService().BatchFind(getContext(), &pb.BatchFindInstancesRequest{
+ respFind, err = datasource.Instance().BatchFind(getContext(), &pb.BatchFindInstancesRequest{
ConsumerServiceId: serviceId3,
Services: []*pb.FindService{
{
@@ -1662,7 +1663,7 @@ func TestInstance_Query(t *testing.T) {
_ = os.Setenv("CSE_SHARED_SERVICES", "query_instance_shared_provider_ms")
core.SetSharedMode()
core.Service.Environment = pb.ENV_PROD
- respFind, err = ms.MicroService().BatchFind(
+ respFind, err = datasource.Instance().BatchFind(
util.SetTargetDomainProject(
util.SetDomainProject(util.CloneContext(getContext()), "user", "user"),
"default", "default"),
@@ -1683,7 +1684,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, 1, len(respFind.Services.Updated[0].Instances))
assert.Equal(t, instanceId5, respFind.Services.Updated[0].Instances[0].InstanceId)
- respFind, err = ms.MicroService().BatchFind(getContext(), &pb.BatchFindInstancesRequest{
+ respFind, err = datasource.Instance().BatchFind(getContext(), &pb.BatchFindInstancesRequest{
ConsumerServiceId: serviceId7,
Services: []*pb.FindService{
{
@@ -1700,7 +1701,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, 1, len(respFind.Services.Updated[0].Instances))
assert.Equal(t, instanceId5, respFind.Services.Updated[0].Instances[0].InstanceId)
- respFind, err = ms.MicroService().BatchFind(util.SetTargetDomainProject(
+ respFind, err = datasource.Instance().BatchFind(util.SetTargetDomainProject(
util.SetDomainProject(util.CloneContext(getContext()), "user", "user"),
"default", "default"),
&pb.BatchFindInstancesRequest{
@@ -1718,7 +1719,7 @@ func TestInstance_Query(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respFind.Response.GetCode())
assert.Equal(t, scerr.ErrServiceNotExists, respFind.Instances.Failed[0].Error.Code)
- respFind, err = ms.MicroService().BatchFind(getContext(), &pb.BatchFindInstancesRequest{
+ respFind, err = datasource.Instance().BatchFind(getContext(), &pb.BatchFindInstancesRequest{
ConsumerServiceId: serviceId7,
Instances: []*pb.FindInstance{
{
@@ -1740,7 +1741,7 @@ func TestInstance_Query(t *testing.T) {
t.Run("query instances between diff dimensions", func(t *testing.T) {
log.Info("diff appId")
UTFunc := func(consumerId string, code int32) {
- respFind, err := ms.MicroService().GetInstances(getContext(), &pb.GetInstancesRequest{
+ respFind, err := datasource.Instance().GetInstances(getContext(), &pb.GetInstancesRequest{
ConsumerServiceId: consumerId,
ProviderServiceId: serviceId2,
})
@@ -1753,7 +1754,7 @@ func TestInstance_Query(t *testing.T) {
UTFunc(serviceId1, proto.Response_SUCCESS)
log.Info("diff env")
- respFind, err := ms.MicroService().GetInstances(getContext(), &pb.GetInstancesRequest{
+ respFind, err := datasource.Instance().GetInstances(getContext(), &pb.GetInstancesRequest{
ConsumerServiceId: serviceId4,
ProviderServiceId: serviceId2,
})
@@ -1763,12 +1764,12 @@ func TestInstance_Query(t *testing.T) {
}
func TestInstance_GetOne(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
@@ -1780,7 +1781,7 @@ func TestInstance_GetOne(t *testing.T) {
)
t.Run("register service and instances", func(t *testing.T) {
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "get_instance_ms",
ServiceName: "get_instance_service_ms",
@@ -1793,7 +1794,7 @@ func TestInstance_GetOne(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId1 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "get_instance_ms",
ServiceName: "get_instance_service_ms",
@@ -1806,7 +1807,7 @@ func TestInstance_GetOne(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId2 = respCreateService.ServiceId
- respCreateInstance, err := ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInstance, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId2,
HostName: "UT-HOST-MS",
@@ -1820,7 +1821,7 @@ func TestInstance_GetOne(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
instanceId2 = respCreateInstance.InstanceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "get_instance_cross_ms",
ServiceName: "get_instance_service_ms",
@@ -1836,7 +1837,7 @@ func TestInstance_GetOne(t *testing.T) {
t.Run("get one instance when invalid request", func(t *testing.T) {
log.Info("find service itself")
- resp, err := ms.MicroService().GetInstance(getContext(), &pb.GetOneInstanceRequest{
+ resp, err := datasource.Instance().GetInstance(getContext(), &pb.GetOneInstanceRequest{
ConsumerServiceId: serviceId2,
ProviderServiceId: serviceId2,
ProviderInstanceId: instanceId2,
@@ -1845,7 +1846,7 @@ func TestInstance_GetOne(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
log.Info("consumer does not exist")
- resp, err = ms.MicroService().GetInstance(getContext(), &pb.GetOneInstanceRequest{
+ resp, err = datasource.Instance().GetInstance(getContext(), &pb.GetOneInstanceRequest{
ConsumerServiceId: "not-exist-id-ms",
ProviderServiceId: serviceId2,
ProviderInstanceId: instanceId2,
@@ -1855,7 +1856,7 @@ func TestInstance_GetOne(t *testing.T) {
})
t.Run("get between diff apps", func(t *testing.T) {
- resp, err := ms.MicroService().GetInstance(getContext(), &pb.GetOneInstanceRequest{
+ resp, err := datasource.Instance().GetInstance(getContext(), &pb.GetOneInstanceRequest{
ConsumerServiceId: serviceId3,
ProviderServiceId: serviceId2,
ProviderInstanceId: instanceId2,
@@ -1863,7 +1864,7 @@ func TestInstance_GetOne(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, scerr.ErrInstanceNotExists, resp.Response.GetCode())
- respAll, err := ms.MicroService().GetInstances(getContext(), &pb.GetInstancesRequest{
+ respAll, err := datasource.Instance().GetInstances(getContext(), &pb.GetInstancesRequest{
ConsumerServiceId: serviceId3,
ProviderServiceId: serviceId2,
})
@@ -1873,7 +1874,7 @@ func TestInstance_GetOne(t *testing.T) {
t.Run("get instances when request is invalid", func(t *testing.T) {
log.Info("consumer does not exist")
- resp, err := ms.MicroService().GetInstances(getContext(), &pb.GetInstancesRequest{
+ resp, err := datasource.Instance().GetInstances(getContext(), &pb.GetInstancesRequest{
ConsumerServiceId: "not-exist-service-ms",
ProviderServiceId: serviceId2,
})
@@ -1881,7 +1882,7 @@ func TestInstance_GetOne(t *testing.T) {
assert.NotEqual(t, proto.Response_SUCCESS, resp.Response.GetCode())
log.Info("consumer does not exist")
- resp, err = ms.MicroService().GetInstances(getContext(), &pb.GetInstancesRequest{
+ resp, err = datasource.Instance().GetInstances(getContext(), &pb.GetInstancesRequest{
ConsumerServiceId: serviceId1,
ProviderServiceId: serviceId2,
})
@@ -1891,12 +1892,12 @@ func TestInstance_GetOne(t *testing.T) {
}
func TestInstance_Unregister(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
@@ -1906,7 +1907,7 @@ func TestInstance_Unregister(t *testing.T) {
)
t.Run("register service and instances", func(t *testing.T) {
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "unregister_instance_ms",
ServiceName: "unregister_instance_service_ms",
@@ -1922,7 +1923,7 @@ func TestInstance_Unregister(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
- respCreateInstance, err := ms.MicroService().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
+ respCreateInstance, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId,
HostName: "UT-HOST-MS",
@@ -1938,7 +1939,7 @@ func TestInstance_Unregister(t *testing.T) {
})
t.Run("unregister instance", func(t *testing.T) {
- resp, err := ms.MicroService().UnregisterInstance(getContext(), &pb.UnregisterInstanceRequest{
+ resp, err := datasource.Instance().UnregisterInstance(getContext(), &pb.UnregisterInstanceRequest{
ServiceId: serviceId,
InstanceId: instanceId,
})
@@ -1948,7 +1949,7 @@ func TestInstance_Unregister(t *testing.T) {
t.Run("unregister instance when request is invalid", func(t *testing.T) {
log.Info("service id does not exist")
- resp, err := ms.MicroService().UnregisterInstance(getContext(), &pb.UnregisterInstanceRequest{
+ resp, err := datasource.Instance().UnregisterInstance(getContext(), &pb.UnregisterInstanceRequest{
ServiceId: "not-exist-id-ms",
InstanceId: instanceId,
})
@@ -1956,7 +1957,7 @@ func TestInstance_Unregister(t *testing.T) {
assert.NotEqual(t, proto.Response_SUCCESS, resp.Response.GetCode())
log.Info("instance id does not exist")
- resp, err = ms.MicroService().UnregisterInstance(getContext(), &pb.UnregisterInstanceRequest{
+ resp, err = datasource.Instance().UnregisterInstance(getContext(), &pb.UnregisterInstanceRequest{
ServiceId: serviceId,
InstanceId: "not-exist-id-ms",
})
@@ -1966,12 +1967,12 @@ func TestInstance_Unregister(t *testing.T) {
}
func TestSchema_Create(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
@@ -1988,7 +1989,7 @@ func TestSchema_Create(t *testing.T) {
Status: pb.MS_UP,
Environment: pb.ENV_DEV,
}
- resp, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: svc,
})
assert.NoError(t, err)
@@ -1996,7 +1997,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
serviceIdDev = resp.ServiceId
- resp, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "create_schema_group_service_ms",
ServiceName: "create_schema_service_service_ms",
@@ -2028,7 +2029,7 @@ func TestSchema_Create(t *testing.T) {
}
log.Info("batch modify schemas 1, should failed")
- resp, err := ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ resp, err := datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdDev,
Schemas: schemas,
})
@@ -2036,7 +2037,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, scerr.ErrNotEnoughQuota, resp.Response.GetCode())
log.Info("batch modify schemas 2")
- resp, err = ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ resp, err = datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdDev,
Schemas: schemas[:quota.DefaultSchemaQuota],
})
@@ -2044,7 +2045,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
log.Info("should be failed in production env")
- resp, err = ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ resp, err = datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdDev,
Schemas: schemas,
})
@@ -2059,7 +2060,7 @@ func TestSchema_Create(t *testing.T) {
)
log.Info("register service, should pass")
- resp, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "create_schemas_dev_service_ms",
ServiceName: "create_schemas_service_service_ms",
@@ -2073,7 +2074,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
serviceIdDev1 = resp.ServiceId
- resp, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "create_schemas_dev_service_ms",
ServiceName: "create_schemas_service_service_ms",
@@ -2103,7 +2104,7 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary_service_ms",
},
}
- respCreateSchema, err := ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ respCreateSchema, err := datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdDev1,
Schemas: schemas,
})
@@ -2120,7 +2121,7 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary1change_service_ms",
},
}
- respCreateSchema, err = ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ respCreateSchema, err = datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdDev1,
Schemas: schemas,
})
@@ -2133,7 +2134,7 @@ func TestSchema_Create(t *testing.T) {
Summary: "second0summary_service_ms",
},
}
- respCreateSchema, err = ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ respCreateSchema, err = datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdDev1,
Schemas: schemas,
})
@@ -2141,7 +2142,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateSchema.Response.GetCode())
log.Info("query service by serviceID to obtain schema info")
- respGetService, err := ms.MicroService().GetService(getContext(), &pb.GetServiceRequest{
+ respGetService, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceIdDev1,
})
assert.NoError(t, err)
@@ -2156,14 +2157,14 @@ func TestSchema_Create(t *testing.T) {
Summary: "second0summary_service_ms",
},
}
- respCreateSchema, err = ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ respCreateSchema, err = datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdDev2,
Schemas: schemas,
})
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, respCreateSchema.Response.GetCode())
- respGetService, err = ms.MicroService().GetService(getContext(), &pb.GetServiceRequest{
+ respGetService, err = datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceIdDev2,
})
assert.NoError(t, err)
@@ -2178,7 +2179,7 @@ func TestSchema_Create(t *testing.T) {
)
log.Info("register service")
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "create_schemas_prod_service_ms",
ServiceName: "create_schemas_service_service_ms",
@@ -2192,7 +2193,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceIdPro1 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "create_schemas_prod_service_ms",
ServiceName: "create_schemas_service_service_ms",
@@ -2223,13 +2224,13 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary_service_ms",
},
}
- respModifySchemas, err := ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ respModifySchemas, err := datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdPro1,
Schemas: schemas,
})
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, respModifySchemas.Response.GetCode())
- respGetService, err := ms.MicroService().GetService(getContext(), &pb.GetServiceRequest{
+ respGetService, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceIdPro1,
})
assert.NoError(t, err)
@@ -2239,7 +2240,7 @@ func TestSchema_Create(t *testing.T) {
// todo: finish ut after implementing GetAllSchemaInfo, refer to schema_test.go line. 496
log.Info("modify schemas content already exists, will skip more exist schema")
- respModifySchemas, err = ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ respModifySchemas, err = datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdPro1,
Schemas: schemas,
})
@@ -2254,7 +2255,7 @@ func TestSchema_Create(t *testing.T) {
Summary: "second0summary_service_ms",
},
}
- respModifySchemas, err = ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ respModifySchemas, err = datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdPro1,
Schemas: schemas,
})
@@ -2262,7 +2263,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, scerr.ErrUndefinedSchemaID, respModifySchemas.Response.GetCode())
log.Info("add schema when summary is empty")
- respModifySchema, err := ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err := datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro2,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_service_ms",
@@ -2278,13 +2279,13 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary_service_ms",
},
}
- respModifySchemas, err = ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ respModifySchemas, err = datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdPro2,
Schemas: schemas,
})
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, respModifySchemas.Response.GetCode())
- respExist, err := ms.MicroService().ExistSchema(getContext(), &pb.GetExistenceRequest{
+ respExist, err := datasource.Instance().ExistSchema(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeSchema,
ServiceId: serviceIdPro2,
SchemaId: "first_schemaId_service_ms",
@@ -2292,7 +2293,7 @@ func TestSchema_Create(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, "first0summary_service_ms", respExist.Summary)
- respModifySchemas, err = ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ respModifySchemas, err = datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdPro2,
Schemas: schemas,
})
@@ -2307,7 +2308,7 @@ func TestSchema_Create(t *testing.T) {
)
log.Info("register service")
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "create_schema_dev_service_ms",
ServiceName: "create_schema_service_service_ms",
@@ -2321,7 +2322,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceIdDev1 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "create_schema_dev_service_ms",
ServiceName: "create_schema_service_service_ms",
@@ -2339,7 +2340,7 @@ func TestSchema_Create(t *testing.T) {
serviceIdDev2 = respCreateService.ServiceId
log.Info("create a schema for service whose schemaID is empty")
- respModifySchema, err := ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err := datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdDev1,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_service_ms",
@@ -2348,7 +2349,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("create schema for the service whose schemaId already exist")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdDev2,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_service_ms",
@@ -2357,7 +2358,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("create schema for the service whose schema summary is empty")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdDev1,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_change_service_ms",
@@ -2367,7 +2368,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("create schema for the service whose schema summary already exist")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdDev1,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_service_ms",
@@ -2377,7 +2378,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("add schema")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdDev1,
SchemaId: "second_schemaId_service_ms",
Schema: "second_schema_service_ms",
@@ -2394,7 +2395,7 @@ func TestSchema_Create(t *testing.T) {
)
log.Info("register service")
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "create_schema_prod_service_ms",
ServiceName: "create_schema_service_service_ms",
@@ -2408,7 +2409,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceIdPro1 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "create_schema_prod_service_ms",
ServiceName: "create_schema_service_service_ms",
@@ -2427,7 +2428,7 @@ func TestSchema_Create(t *testing.T) {
serviceIdPro2 = respCreateService.ServiceId
log.Info("create a schema for service whose schemaID is empty")
- respModifySchema, err := ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err := datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro1,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_service_ms",
@@ -2436,7 +2437,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schema summary is empty")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro1,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_change_service_ms",
@@ -2446,7 +2447,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schema summary already exist")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro1,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_service_ms",
@@ -2456,7 +2457,7 @@ func TestSchema_Create(t *testing.T) {
assert.NotEqual(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("add schema")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro1,
SchemaId: "second_schemaId_service_ms",
Schema: "second_schema_service_ms",
@@ -2465,7 +2466,7 @@ func TestSchema_Create(t *testing.T) {
assert.NotEqual(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schemaId already exist")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro2,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_service_ms",
@@ -2482,7 +2483,7 @@ func TestSchema_Create(t *testing.T) {
)
log.Info("register service")
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "create_schema_empty_service_ms",
ServiceName: "create_schema_service_service_ms",
@@ -2495,7 +2496,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respCreateService.Response.GetCode())
serviceIdPro1 = respCreateService.ServiceId
- respCreateService, err = ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "create_schema_empty_service_ms",
ServiceName: "create_schema_service_service_ms",
@@ -2513,7 +2514,7 @@ func TestSchema_Create(t *testing.T) {
serviceIdPro2 = respCreateService.ServiceId
log.Info("create a schema for service whose schemaID is empty")
- respModifySchema, err := ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err := datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro1,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_service_ms",
@@ -2522,7 +2523,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schema summary is empty")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro1,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_change_service_ms",
@@ -2532,7 +2533,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schema summary already exist")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro1,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_service_ms",
@@ -2542,7 +2543,7 @@ func TestSchema_Create(t *testing.T) {
assert.NotEqual(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("add schema")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro1,
SchemaId: "second_schemaId_service_ms",
Schema: "second_schema_service_ms",
@@ -2551,7 +2552,7 @@ func TestSchema_Create(t *testing.T) {
assert.NotEqual(t, proto.Response_SUCCESS, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schemaId already exist")
- respModifySchema, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro2,
SchemaId: "first_schemaId_service_ms",
Schema: "first_schema_service_ms",
@@ -2565,7 +2566,7 @@ func TestSchema_Create(t *testing.T) {
serviceIdPro1 string
)
log.Info("register service")
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "add_a_schemaId_prod_schema_lock_ms",
ServiceName: "add_a_schemaId_prod_schema_lock_service_ms",
@@ -2587,14 +2588,14 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary_ms",
},
}
- respModifySchemas, err := ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ respModifySchemas, err := datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdPro1,
Schemas: schemas,
})
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, respModifySchemas.Response.GetCode())
- respService, err := ms.MicroService().GetService(getContext(), &pb.GetServiceRequest{
+ respService, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceIdPro1,
})
assert.NoError(t, err)
@@ -2610,7 +2611,7 @@ func TestSchema_Create(t *testing.T) {
}
log.Info("schema edit not allowed, add a schema with new schemaId should fail")
- localMicroServiceDs := &etcd.DataSource{SchemaEditable: false}
+ localMicroServiceDs := &DataSource{SchemaEditable: false}
respModifySchemas, err = localMicroServiceDs.ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdPro1,
Schemas: schemas,
@@ -2619,7 +2620,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, scerr.ErrUndefinedSchemaID, respModifySchemas.Response.GetCode())
log.Info("schema edit allowed, add a schema with new schemaId, should pass")
- localMicroServiceDs = &etcd.DataSource{SchemaEditable: true}
+ localMicroServiceDs = &DataSource{SchemaEditable: true}
respModifySchemas, err = localMicroServiceDs.ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdPro1,
Schemas: schemas,
@@ -2633,7 +2634,7 @@ func TestSchema_Create(t *testing.T) {
serviceIdPro1 string
)
log.Info("register service")
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "modify_a_schema_prod_schema_lock_ms",
ServiceName: "modify_a_schema_prod_schema_lock_service_ms",
@@ -2655,21 +2656,21 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary_ms",
},
}
- respModifySchemas, err := ms.MicroService().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
+ respModifySchemas, err := datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
ServiceId: serviceIdPro1,
Schemas: schemas,
})
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, respModifySchemas.Response.GetCode())
- respService, err := ms.MicroService().GetService(getContext(), &pb.GetServiceRequest{
+ respService, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceIdPro1,
})
assert.NoError(t, err)
assert.Equal(t, []string{"first_schemaId_ms"}, respService.Service.Schemas)
log.Info("schema edit not allowed, modify schema should fail")
- localMicroServiceDs := &etcd.DataSource{SchemaEditable: false}
+ localMicroServiceDs := &DataSource{SchemaEditable: false}
respModifySchema, err := localMicroServiceDs.ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro1,
SchemaId: schemas[0].SchemaId,
@@ -2680,7 +2681,7 @@ func TestSchema_Create(t *testing.T) {
assert.Equal(t, scerr.ErrModifySchemaNotAllow, respModifySchema.Response.GetCode())
log.Info("schema edit allowed, add a schema with new schemaId, should pass")
- localMicroServiceDs = &etcd.DataSource{SchemaEditable: true}
+ localMicroServiceDs = &DataSource{SchemaEditable: true}
respModifySchema, err = localMicroServiceDs.ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceIdPro1,
SchemaId: schemas[0].SchemaId,
@@ -2693,12 +2694,12 @@ func TestSchema_Create(t *testing.T) {
}
func TestSchema_Exist(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
- return etcd.NewDataSource(opts), nil
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
+ return NewDataSource(opts), nil
})
- err := ms.Init(ms.Options{
+ err := datasource.Init(datasource.Options{
Endpoint: "",
- PluginImplName: ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd")),
+ PluginImplName: datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd")),
})
assert.NoError(t, err)
@@ -2708,7 +2709,7 @@ func TestSchema_Exist(t *testing.T) {
t.Run("register service and add schema", func(t *testing.T) {
log.Info("register service")
- respCreateService, err := ms.MicroService().RegisterService(getContext(), &pb.CreateServiceRequest{
+ respCreateService, err := datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "query_schema_group_ms",
ServiceName: "query_schema_service_ms",
@@ -2723,7 +2724,7 @@ func TestSchema_Exist(t *testing.T) {
serviceId = respCreateService.ServiceId
log.Info("add schemas, should pass")
- resp, err := ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ resp, err := datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceId,
SchemaId: "com.huawei.test.ms",
Schema: "query schema ms",
@@ -2732,7 +2733,7 @@ func TestSchema_Exist(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
- resp, err = ms.MicroService().ModifySchema(getContext(), &pb.ModifySchemaRequest{
+ resp, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceId,
SchemaId: "com.huawei.test.no.summary.ms",
Schema: "query schema ms",
@@ -2743,7 +2744,7 @@ func TestSchema_Exist(t *testing.T) {
t.Run("check exists", func(t *testing.T) {
log.Info("check schema exist, should pass")
- resp, err := ms.MicroService().ExistSchema(getContext(), &pb.GetExistenceRequest{
+ resp, err := datasource.Instance().ExistSchema(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeSchema,
ServiceId: serviceId,
SchemaId: "com.huawei.test.ms",
@@ -2752,7 +2753,7 @@ func TestSchema_Exist(t *testing.T) {
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
assert.Equal(t, "summary_ms", resp.Summary)
- resp, err = ms.MicroService().ExistSchema(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistSchema(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeSchema,
ServiceId: serviceId,
SchemaId: "com.huawei.test.ms",
@@ -2763,7 +2764,7 @@ func TestSchema_Exist(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, proto.Response_SUCCESS, resp.Response.GetCode())
- resp, err = ms.MicroService().ExistSchema(getContext(), &pb.GetExistenceRequest{
+ resp, err = datasource.Instance().ExistSchema(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeSchema,
ServiceId: serviceId,
SchemaId: "com.huawei.test.no.summary.ms",
diff --git a/server/service/ms/etcd/util.go b/datasource/etcd/util.go
similarity index 94%
rename from server/service/ms/etcd/util.go
rename to datasource/etcd/util.go
index d19fedd..320e52d 100644
--- a/server/service/ms/etcd/util.go
+++ b/datasource/etcd/util.go
@@ -1,17 +1,19 @@
-// 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.
+/*
+ * 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 etcd
diff --git a/datasource/manager.go b/datasource/manager.go
new file mode 100644
index 0000000..719f1d9
--- /dev/null
+++ b/datasource/manager.go
@@ -0,0 +1,60 @@
+/*
+ * 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 datasource
+
+import (
+ "fmt"
+ "github.com/apache/servicecomb-service-center/pkg/log"
+)
+
+type dataSourceEngine func(opts Options) (DataSource, error)
+
+var (
+ plugins = make(map[ImplName]dataSourceEngine)
+ dataSourceInst DataSource
+)
+
+// load plugins configuration into plugins
+func Install(pluginImplName string, engineFunc dataSourceEngine) {
+ plugins[ImplName(pluginImplName)] = engineFunc
+}
+
+// construct storage plugin instance
+// invoked by sc main process
+func Init(opts Options) error {
+ if opts.PluginImplName == "" {
+ return nil
+ }
+
+ dataSourceEngine, ok := plugins[opts.PluginImplName]
+ if !ok {
+ return fmt.Errorf("plugin implement not supported [%s]", opts.PluginImplName)
+ }
+ var err error
+ dataSourceInst, err = dataSourceEngine(opts)
+ if err != nil {
+ return err
+ }
+ log.Info(fmt.Sprintf("storage shim plugin [%s@%s] enabled", opts.PluginImplName, opts.Endpoint))
+ return nil
+}
+
+// Instance is the instance of DataSource
+func Instance() DataSource {
+ return dataSourceInst
+}
diff --git a/server/service/ms/manager_test.go b/datasource/manager_test.go
similarity index 56%
rename from server/service/ms/manager_test.go
rename to datasource/manager_test.go
index 4ac3031..24f2ad7 100644
--- a/server/service/ms/manager_test.go
+++ b/datasource/manager_test.go
@@ -1,24 +1,26 @@
-// 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.
+/*
+ * 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 ms_test
+package datasource_test
import (
+ "github.com/apache/servicecomb-service-center/datasource"
+ "github.com/apache/servicecomb-service-center/datasource/etcd"
"github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/apache/servicecomb-service-center/server/service/ms"
- "github.com/apache/servicecomb-service-center/server/service/ms/etcd"
"github.com/go-chassis/go-archaius"
"github.com/stretchr/testify/assert"
"strconv"
@@ -28,19 +30,19 @@ import (
func TestInit(t *testing.T) {
_ = archaius.Init(archaius.WithMemorySource())
- _ = archaius.Set("servicecomb.ms.name", "etcd")
+ _ = archaius.Set("servicecomb.datasource.name", "etcd")
_ = archaius.Set("servicecomb.instance.TTL", 1000)
_ = archaius.Set("servicecomb.instance.editable", "true")
t.Run("init microservice data source plugin, should not pass", func(t *testing.T) {
schemaEditableConfig := strings.ToLower(archaius.GetString("servicecomb.schema.editable", "true"))
schemaEditable := strings.Compare(schemaEditableConfig, "true") == 0
- pluginName := ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd"))
+ pluginName := datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd"))
TTL, err := strconv.ParseInt(archaius.GetString("servicecomb.instance.TTL", "1000"), 10, 0)
if err != nil {
log.Error("microservice etcd implement failed for INSTANCE_TTL config: %v", err)
}
- err = ms.Init(ms.Options{
+ err = datasource.Init(datasource.Options{
Endpoint: "",
PluginImplName: pluginName,
TTL: TTL,
@@ -49,19 +51,19 @@ func TestInit(t *testing.T) {
assert.Error(t, err)
})
t.Run("install and init microservice data source plugin, should pass", func(t *testing.T) {
- ms.Install("etcd", func(opts ms.Options) (ms.DataSource, error) {
+ datasource.Install("etcd", func(opts datasource.Options) (datasource.DataSource, error) {
return etcd.NewDataSource(opts), nil
})
schemaEditableConfig := strings.ToLower(archaius.GetString("servicecomb.schema.editable", "true"))
schemaEditable := strings.Compare(schemaEditableConfig, "true") == 0
- pluginName := ms.ImplName(archaius.GetString("servicecomb.ms.name", "etcd"))
+ pluginName := datasource.ImplName(archaius.GetString("servicecomb.datasource.name", "etcd"))
TTL, err := strconv.ParseInt(archaius.GetString("servicecomb.instance.TTL", "1000"), 10, 0)
if err != nil {
log.Error("microservice etcd implement failed for INSTANCE_TTL config: %v", err)
}
- err = ms.Init(ms.Options{
+ err = datasource.Init(datasource.Options{
Endpoint: "",
PluginImplName: pluginName,
TTL: TTL,
diff --git a/server/service/ms/datasource.go b/datasource/ms.go
similarity index 75%
rename from server/service/ms/datasource.go
rename to datasource/ms.go
index abf890a..7db004e 100644
--- a/server/service/ms/datasource.go
+++ b/datasource/ms.go
@@ -1,19 +1,21 @@
-// 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.
+/*
+ * 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 ms
+package datasource
import (
"context"
@@ -21,7 +23,8 @@ import (
)
// Attention: request validation must be finished before the following interface being invoked!!!
-type DataSource interface {
+// MetadataManager contains the CRUD of registry metadata
+type MetadataManager interface {
RegisterService(ctx context.Context, request *pb.CreateServiceRequest) (*pb.CreateServiceResponse, error)
GetServices(ctx context.Context, request *pb.GetServicesRequest) (*pb.GetServicesResponse, error)
GetService(ctx context.Context, request *pb.GetServiceRequest) (*pb.GetServiceResponse, error)
diff --git a/datasource/datasource.go b/datasource/options.go
similarity index 78%
copy from datasource/datasource.go
copy to datasource/options.go
index 04d2668..b2968d5 100644
--- a/datasource/datasource.go
+++ b/datasource/options.go
@@ -17,10 +17,11 @@
package datasource
-// DataSource is the DAO layer
-type DataSource interface {
- // Auth contains RBAC CRUD
- Auth
-
- Dependency
+//Options contains configuration for plugins
+type Options struct {
+ Endpoint string
+ PluginImplName ImplName
+ SchemaEditable bool
+ TTL int64
+ // TODO: pay attention to more net config like TLSConfig when coding
}
diff --git a/datasource/datasource.go b/datasource/types.go
similarity index 88%
copy from datasource/datasource.go
copy to datasource/types.go
index 04d2668..7213b03 100644
--- a/datasource/datasource.go
+++ b/datasource/types.go
@@ -17,10 +17,4 @@
package datasource
-// DataSource is the DAO layer
-type DataSource interface {
- // Auth contains RBAC CRUD
- Auth
-
- Dependency
-}
+type ImplName string
diff --git a/server/service/auth/manager.go b/server/service/auth/manager.go
deleted file mode 100644
index 66109c5..0000000
--- a/server/service/auth/manager.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// 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 auth
-
-import (
- "fmt"
- "github.com/apache/servicecomb-service-center/datasource"
- "github.com/apache/servicecomb-service-center/pkg/log"
-)
-
-type dataSourceEngine func(opts Options) (datasource.DataSource, error)
-
-var (
- plugins = make(map[ImplName]dataSourceEngine)
- authDataSourceInst datasource.DataSource
-)
-
-// load plugins configuration into plugins
-func Install(pluginImplName string, engineFunc dataSourceEngine) {
- plugins[ImplName(pluginImplName)] = engineFunc
-}
-
-// construct storage plugin instance
-// invoked by sc main process
-func Init(opts Options) error {
- if opts.PluginImplName == "" {
- return nil
- }
-
- authDataSourceEngine, ok := plugins[opts.PluginImplName]
- if !ok {
- return fmt.Errorf("plugin implement not supported [%s]", opts.PluginImplName)
- }
- var err error
- authDataSourceInst, err = authDataSourceEngine(opts)
- if err != nil {
- return err
- }
- log.Info(fmt.Sprintf("storage shim plugin [%s@%s] enabled", opts.PluginImplName, opts.Endpoint))
- return nil
-}
-
-// usage: auth.Auth().CreateAccount()
-func Auth() datasource.DataSource {
- return authDataSourceInst
-}
diff --git a/server/service/auth/manager_test.go b/server/service/auth/manager_test.go
deleted file mode 100644
index da9014e..0000000
--- a/server/service/auth/manager_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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 auth
-
-import (
- "github.com/apache/servicecomb-service-center/datasource"
- "github.com/apache/servicecomb-service-center/datasource/etcd"
- "github.com/go-chassis/go-archaius"
- "github.com/stretchr/testify/assert"
- "testing"
-)
-
-func TestInit(t *testing.T) {
- _ = archaius.Init(archaius.WithMemorySource())
- _ = archaius.Set("servicecomb.auth.name", "etcd")
- t.Run("circuit datasource auth", func(t *testing.T) {
- err := Init(Options{
- Endpoint: "",
- PluginImplName: "",
- })
- assert.NoError(t, err)
- })
- t.Run("install and init", func(t *testing.T) {
- Install("etcd",
- func(opts Options) (datasource.DataSource, error) {
- return etcd.NewDataSource(), nil
- })
-
- // sc main function initialize step
- err := Init(Options{
- Endpoint: "",
- PluginImplName: ImplName(archaius.GetString("servicecomb.auth.name", "etcd")),
- })
- assert.NoError(t, err)
- })
-}
diff --git a/server/service/auth/options.go b/server/service/auth/options.go
deleted file mode 100644
index 3166411..0000000
--- a/server/service/auth/options.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// 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 auth
-
-//Options contains configuration for plugins
-type Options struct {
- Endpoint string
- PluginImplName ImplName
-}
diff --git a/server/service/auth/types.go b/server/service/auth/types.go
deleted file mode 100644
index 01355e3..0000000
--- a/server/service/auth/types.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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 auth
-
-type ImplName string
diff --git a/server/service/dep/manager.go b/server/service/dep/manager.go
deleted file mode 100644
index 63998e8..0000000
--- a/server/service/dep/manager.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// 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 dep
-
-import (
- "fmt"
- "github.com/apache/servicecomb-service-center/datasource"
- "github.com/apache/servicecomb-service-center/pkg/log"
-)
-
-type dataSourceEngine func(opts Options) (datasource.DataSource, error)
-
-var (
- plugins = make(map[ImplName]dataSourceEngine)
- depDataSourceInst datasource.DataSource
-)
-
-// load plugins configuration into plugins
-func Install(pluginImplName string, engineFunc dataSourceEngine) {
- plugins[ImplName(pluginImplName)] = engineFunc
-}
-
-// construct storage plugin instance
-// invoked by sc main process
-func Init(opts Options) error {
- if opts.PluginImplName == "" {
- return nil
- }
-
- depDataSourceEngine, ok := plugins[opts.PluginImplName]
- if !ok {
- return fmt.Errorf("dependency datasource implementation not supported [%s]", opts.PluginImplName)
- }
- var err error
- depDataSourceInst, err = depDataSourceEngine(opts)
- if err != nil {
- return err
- }
- log.Info(fmt.Sprintf("dependency datasource mgt [%s@%s] enabled", opts.PluginImplName, opts.Endpoint))
- return nil
-}
-
-// usage: dep.Dependency()
-func Dependency() datasource.DataSource {
- return depDataSourceInst
-}
diff --git a/server/service/dep/manager_test.go b/server/service/dep/manager_test.go
deleted file mode 100644
index 24647c9..0000000
--- a/server/service/dep/manager_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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 dep
-
-import (
- "github.com/apache/servicecomb-service-center/datasource"
- etcd2 "github.com/apache/servicecomb-service-center/datasource/etcd"
- "github.com/go-chassis/go-archaius"
- "github.com/stretchr/testify/assert"
- "testing"
-)
-
-func TestInit(t *testing.T) {
- _ = archaius.Init(archaius.WithMemorySource())
- _ = archaius.Set("servicecomb.dep.name", "etcd")
- t.Run("circuit dependency data source plugin", func(t *testing.T) {
- err := Init(Options{
- Endpoint: "",
- PluginImplName: "",
- })
- assert.NoError(t, err)
- })
- t.Run(" dependency data source plugin install and init", func(t *testing.T) {
- Install("etcd",
- func(opts Options) (datasource.DataSource, error) {
- return etcd2.NewDataSource(), nil
- })
-
- // sc main function initialize step
- err := Init(Options{
- Endpoint: "",
- PluginImplName: ImplName(archaius.GetString("servicecomb.dep.name", "etcd")),
- })
- assert.NoError(t, err)
- })
-}
diff --git a/server/service/dep/options.go b/server/service/dep/options.go
deleted file mode 100644
index f985069..0000000
--- a/server/service/dep/options.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// 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 dep
-
-//Options contains configuration for plugins
-type Options struct {
- Endpoint string
- PluginImplName ImplName
-}
diff --git a/server/service/dep/types.go b/server/service/dep/types.go
deleted file mode 100644
index 34e0835..0000000
--- a/server/service/dep/types.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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 dep
-
-type ImplName string
diff --git a/server/service/ms/etcd/etcd_suite_test.go b/server/service/ms/etcd/etcd_suite_test.go
deleted file mode 100644
index e956a6d..0000000
--- a/server/service/ms/etcd/etcd_suite_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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 etcd_test
-
-// initialize
-import (
- _ "github.com/apache/servicecomb-service-center/server/bootstrap"
-)
-import (
- "context"
- "github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core"
- "github.com/astaxie/beego"
- . "github.com/onsi/ginkgo"
- "github.com/onsi/ginkgo/reporters"
- . "github.com/onsi/gomega"
- "testing"
-)
-
-func init() {
- beego.AppConfig.Set("registry_plugin", "etcd")
- testing.Init()
- core.Initialize()
-}
-
-var _ = BeforeSuite(func() {
- //init plugin
- core.ServerInfo.Config.EnableCache = false
-})
-
-func getContext() context.Context {
- return util.SetContext(
- util.SetDomainProject(context.Background(), "default", "default"),
- util.CtxNocache, "1")
-}
-
-func TestGrpc(t *testing.T) {
- RegisterFailHandler(Fail)
- junitReporter := reporters.NewJUnitReporter("model.junit.xml")
- RunSpecsWithDefaultAndCustomReporters(t, "model Suite", []Reporter{junitReporter})
-}
diff --git a/server/service/ms/manager.go b/server/service/ms/manager.go
deleted file mode 100644
index 0453020..0000000
--- a/server/service/ms/manager.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// 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 ms
-
-import (
- "fmt"
- "github.com/apache/servicecomb-service-center/pkg/log"
-)
-
-type dataSourceEngine func(opts Options) (DataSource, error)
-
-var (
- plugins = make(map[ImplName]dataSourceEngine)
- msDataSourceInst DataSource
-)
-
-// load plugins configuration into plugins
-func Install(pluginImplName string, engineFunc dataSourceEngine) {
- plugins[ImplName(pluginImplName)] = engineFunc
-}
-
-// construct storage plugin instance
-// invoked by sc main process
-func Init(opts Options) error {
- if opts.PluginImplName == "" {
- return nil
- }
-
- msDataSourceEngine, ok := plugins[opts.PluginImplName]
- if !ok {
- return fmt.Errorf("microservice datasource implementation not supported [%s]", opts.PluginImplName)
- }
- var err error
- msDataSourceInst, err = msDataSourceEngine(opts)
- if err != nil {
- return err
- }
- log.Info(fmt.Sprintf("microservice datasource mgt [%s@%s] enabled", opts.PluginImplName, opts.Endpoint))
- return nil
-}
-
-// usage: ms.MicroService().create()
-func MicroService() DataSource {
- return msDataSourceInst
-}
diff --git a/server/service/ms/options.go b/server/service/ms/options.go
deleted file mode 100644
index ae81716..0000000
--- a/server/service/ms/options.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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 ms
-
-//Options contains configuration for plugins
-type Options struct {
- Endpoint string
- PluginImplName ImplName
- SchemaEditable bool
- TTL int64
- // TODO: pay attention to more net config like TLSConfig when coding
-}
diff --git a/server/service/ms/types.go b/server/service/ms/types.go
deleted file mode 100644
index 7046d0f..0000000
--- a/server/service/ms/types.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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 ms
-
-type ImplName string