You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ti...@apache.org on 2020/10/29 07:45:33 UTC
[servicecomb-service-center] branch master updated: SCB-2094
Refactor pkg (#731)
This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new 0228ba8 SCB-2094 Refactor pkg (#731)
0228ba8 is described below
commit 0228ba8c82b804e2c0081869a7d680fe01d0fb28
Author: little-cui <su...@qq.com>
AuthorDate: Thu Oct 29 15:42:55 2020 +0800
SCB-2094 Refactor pkg (#731)
* SCB-2094 Refactor pkg
* SCB-2094 Refactor pkg
---
README.md | 2 +-
client/apis.go | 12 +-
datasource/engine.go | 4 +-
datasource/etcd/client/config.go | 20 +-
datasource/etcd/config.go | 2 +-
datasource/etcd/dep.go | 15 +-
datasource/etcd/dep_test.go | 55 ++-
datasource/etcd/engine.go | 19 +-
datasource/etcd/engine_test.go | 5 +-
datasource/etcd/etcd_suite_test.go | 2 +-
datasource/etcd/job/job.go | 2 +-
datasource/etcd/kv/kv.go | 2 +-
datasource/etcd/kv/types.go | 28 +-
datasource/etcd/ms.go | 347 ++++++++--------
datasource/etcd/ms_test.go | 461 ++++++++++-----------
datasource/etcd/sd/aggregate/repo.go | 2 +-
datasource/etcd/sd/cacher.go | 3 +-
datasource/etcd/sd/config.go | 8 +-
datasource/etcd/sd/config_test.go | 6 +-
datasource/etcd/sd/etcd/adaptor.go | 2 +-
datasource/etcd/sd/etcd/adaptor_test.go | 2 +-
datasource/etcd/sd/etcd/cacher_kv.go | 2 +-
datasource/etcd/sd/etcd/cacher_kv_test.go | 6 +-
datasource/etcd/sd/etcd/common.go | 4 +-
datasource/etcd/sd/etcd/indexer_etcd.go | 6 +-
datasource/etcd/sd/etcd/indexer_test.go | 6 +-
datasource/etcd/sd/k8s/adaptor/cacher_instance.go | 3 +-
datasource/etcd/sd/k8s/adaptor/convertor.go | 9 +-
datasource/etcd/sd/k8s/adaptor/listwatcher.go | 3 +-
datasource/etcd/sd/servicecenter/aggregate.go | 12 +-
datasource/etcd/sd/servicecenter/syncer.go | 26 +-
datasource/etcd/sd/servicecenter/syncer_test.go | 60 +--
datasource/etcd/sd/types.go | 6 +-
datasource/etcd/system.go | 8 +-
datasource/etcd/system_test.go | 4 +-
datasource/etcd/util.go | 11 +-
datasource/etcd/util/dependency_query.go | 7 +-
datasource/etcd/util/dependency_util.go | 5 +-
datasource/etcd/util/instance_util.go | 5 +-
datasource/etcd/util/instance_util_test.go | 7 +-
datasource/etcd/util/microservice_util.go | 5 +-
datasource/etcd/util/rule_util.go | 5 +-
datasource/etcd/util/rule_util_test.go | 9 +-
.../core/proto => datasource/etcd/value}/parser.go | 32 +-
.../proto => datasource/etcd/value}/parser_test.go | 2 +-
datasource/etcd/version.go | 2 +-
datasource/system.go | 4 +-
{server/core/swagger => docs/openapi}/v4.yaml | 0
pkg/{types => cluster}/types.go | 4 +-
pkg/{model => dump}/dump.go | 6 +-
pkg/{model => dump}/types.go | 6 +-
pkg/{model => gov}/governance.go | 2 +-
pkg/{model => gov}/governance_test.go | 24 +-
pkg/{model => gov}/marker.go | 2 +-
pkg/{model => gov}/rate_limiter.go | 2 +-
{server/core => pkg}/proto/service.go | 0
{server/core => pkg}/proto/service_ex.go | 0
pkg/registry/common.go | 69 +++
pkg/registry/{struct.go => types.go} | 16 +-
scctl/pkg/model/types.go | 10 +-
scctl/pkg/plugin/diagnose/compare_holder.go | 36 +-
scctl/pkg/plugin/diagnose/compare_holder_test.go | 2 +-
scctl/pkg/plugin/diagnose/diagnose.go | 4 +-
scctl/pkg/plugin/diagnose/diagnose_test.go | 2 +-
scctl/pkg/plugin/get/instance/instance_cmd.go | 2 +-
scctl/pkg/plugin/get/schema/schema_cmd.go | 2 +-
server/api.go | 2 +-
server/broker/broker_suite_test.go | 2 +-
server/broker/service.go | 115 +++--
server/broker/service_test.go | 26 +-
server/broker/util.go | 61 ++-
server/command/command.go | 2 +-
server/{core => }/config/config.go | 9 +-
server/{core => }/config/config_test.go | 2 +-
server/{core/proto/types.go => config/server.go} | 34 +-
server/{core/config/struct.go => config/types.go} | 0
server/core/core.go | 2 +-
server/core/microservice.go | 6 +-
server/core/proto/common.go | 68 ---
server/handler/accesslog/handler.go | 2 +-
server/handler/maxbody/maxbody.go | 2 +-
server/notify/stream.go | 2 +-
server/notify/websocket_test.go | 5 +-
server/plugin/quota/counter/event.go | 3 +-
server/plugin/security/tlsconf/buildin/tlsconf.go | 2 +-
server/plugin/tracing/pzipkin/file_collector.go | 2 +-
server/plugin/types.go | 2 +-
server/resource/v1/gov_resource_test.go | 16 +-
server/rest/admin/controller_v4.go | 10 +-
server/rest/admin/service.go | 30 +-
server/rest/admin/service_test.go | 14 +-
server/rest/controller/rest_util.go | 5 +-
server/rest/controller/v3/main_controller.go | 3 +-
server/rest/controller/v4/instance_controller.go | 3 +-
server/rest/controller/v4/main_controller.go | 9 +-
server/rest/controller/v4/schema_controller.go | 2 +-
server/rest/govern/controller_v4.go | 3 +-
server/rest/govern/govern_suite_test.go | 2 +-
server/rest/govern/service.go | 32 +-
server/rest/govern/service_test.go | 33 +-
server/rest/pprof.go | 2 +-
server/rest/server.go | 2 +-
server/server.go | 2 +-
server/service/dependency.go | 33 +-
server/service/dependency_test.go | 113 +++--
server/service/event/dependency_event_handler.go | 7 +-
server/service/event/instance_event_handler.go | 5 +-
server/service/event/rule_event_handler.go | 3 +-
server/service/event/service_event_handler.go | 3 +-
server/service/event/tag_event_handler.go | 5 +-
server/service/gov/config_distributor.go | 2 +-
server/service/gov/config_distributor_test.go | 16 +-
server/service/gov/mock/mock.go | 22 +-
server/service/instance.go | 137 +++---
server/service/instance_test.go | 235 ++++++-----
server/service/microservice.go | 118 +++---
server/service/microservice_test.go | 99 +++--
server/service/rbac/rbac.go | 2 +-
server/service/rule.go | 65 ++-
server/service/rule_test.go | 83 ++--
server/service/schema.go | 57 ++-
server/service/schema_test.go | 163 ++++----
server/service/service.go | 2 +-
server/service/service_suite_test.go | 4 +-
server/service/tag.go | 49 ++-
server/service/tag_test.go | 73 ++--
server/service/watch.go | 2 +-
server/service/watch_test.go | 3 +-
syncer/plugins/servicecenter/transform.go | 6 +-
test/test.go | 2 +-
130 files changed, 1610 insertions(+), 1653 deletions(-)
diff --git a/README.md b/README.md
index 59b6d2b..d62813a 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ It provides out of box support for metrics and tracing. It has a web portal to m
- syncer: alpha feature. multiple cluster synchronization tool, designed for large microservice architectures
## Features
- - **[`Open API`](/server/core/swagger/v4.yaml)**: API doc(Open API format) management for microservice
+ - **[`Open API`](/docs/openapi/v4.yaml)**: API doc(Open API format) management for microservice
- **Metadata**: Metadata management for both microservice and microservice instance
- **Separated**: Separated microservice and microservice instance entity management
- **Domains**: Logical multiple domains management
diff --git a/client/apis.go b/client/apis.go
index 809c7f7..40669c9 100644
--- a/client/apis.go
+++ b/client/apis.go
@@ -22,8 +22,8 @@ import (
"io/ioutil"
"net/http"
- "github.com/apache/servicecomb-service-center/pkg/model"
- "github.com/apache/servicecomb-service-center/pkg/types"
+ "github.com/apache/servicecomb-service-center/pkg/cluster"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/pkg/util"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"github.com/apache/servicecomb-service-center/version"
@@ -82,7 +82,7 @@ func (c *Client) GetScVersion(ctx context.Context) (*version.Set, *scerr.Error)
return v, nil
}
-func (c *Client) GetScCache(ctx context.Context) (*model.Cache, *scerr.Error) {
+func (c *Client) GetScCache(ctx context.Context) (*dump.Cache, *scerr.Error) {
headers := c.CommonHeaders(ctx)
// only default domain has admin permission
headers.Set("X-Domain-Name", "default")
@@ -101,7 +101,7 @@ func (c *Client) GetScCache(ctx context.Context) (*model.Cache, *scerr.Error) {
return nil, c.toError(body)
}
- dump := &model.DumpResponse{}
+ dump := &dump.Response{}
err = json.Unmarshal(body, dump)
if err != nil {
return nil, scerr.NewError(scerr.ErrInternal, err.Error())
@@ -110,7 +110,7 @@ func (c *Client) GetScCache(ctx context.Context) (*model.Cache, *scerr.Error) {
return dump.Cache, nil
}
-func (c *Client) GetClusters(ctx context.Context) (types.Clusters, *scerr.Error) {
+func (c *Client) GetClusters(ctx context.Context) (cluster.Clusters, *scerr.Error) {
headers := c.CommonHeaders(ctx)
// only default domain has admin permission
headers.Set("X-Domain-Name", "default")
@@ -129,7 +129,7 @@ func (c *Client) GetClusters(ctx context.Context) (types.Clusters, *scerr.Error)
return nil, c.toError(body)
}
- clusters := &model.ClustersResponse{}
+ clusters := &dump.ClustersResponse{}
err = json.Unmarshal(body, clusters)
if err != nil {
return nil, scerr.NewError(scerr.ErrInternal, err.Error())
diff --git a/datasource/engine.go b/datasource/engine.go
index 07fd03f..5df4ece 100644
--- a/datasource/engine.go
+++ b/datasource/engine.go
@@ -19,7 +19,7 @@ package datasource
import (
"context"
- "github.com/apache/servicecomb-service-center/pkg/types"
+ "github.com/apache/servicecomb-service-center/pkg/cluster"
"time"
)
@@ -30,5 +30,5 @@ type SCManager interface {
// OPS
ClearNoInstanceServices(ctx context.Context, ttl time.Duration) error
UpgradeVersion(ctx context.Context) error
- GetClusters(ctx context.Context) (types.Clusters, error)
+ GetClusters(ctx context.Context) (cluster.Clusters, error)
}
diff --git a/datasource/etcd/client/config.go b/datasource/etcd/client/config.go
index a9aa9a1..1991469 100644
--- a/datasource/etcd/client/config.go
+++ b/datasource/etcd/client/config.go
@@ -18,25 +18,25 @@
package client
import (
- "github.com/apache/servicecomb-service-center/pkg/types"
+ "github.com/apache/servicecomb-service-center/pkg/cluster"
"strings"
"time"
)
type Config struct {
- SslEnabled bool `json:"-"`
- ManagerAddress string `json:"manageAddress,omitempty"`
- ClusterName string `json:"manageName,omitempty"`
- ClusterAddresses string `json:"manageClusters,omitempty"` // the raw string of cluster configuration
- Clusters types.Clusters `json:"-"` // parsed from ClusterAddresses
- DialTimeout time.Duration `json:"connectTimeout"`
- RequestTimeOut time.Duration `json:"registryTimeout"`
- AutoSyncInterval time.Duration `json:"autoSyncInterval"`
+ SslEnabled bool `json:"-"`
+ ManagerAddress string `json:"manageAddress,omitempty"`
+ ClusterName string `json:"manageName,omitempty"`
+ ClusterAddresses string `json:"manageClusters,omitempty"` // the raw string of cluster configuration
+ Clusters cluster.Clusters `json:"-"` // parsed from ClusterAddresses
+ DialTimeout time.Duration `json:"connectTimeout"`
+ RequestTimeOut time.Duration `json:"registryTimeout"`
+ AutoSyncInterval time.Duration `json:"autoSyncInterval"`
}
//InitClusterInfo re-org address info with node name
func (c *Config) InitClusterInfo() {
- c.Clusters = make(types.Clusters)
+ c.Clusters = make(cluster.Clusters)
// sc-0=http(s)://host1:port1,http(s)://host2:port2,sc-1=http(s)://host3:port3
kvs := strings.Split(c.ClusterAddresses, "=")
if l := len(kvs); l >= 2 {
diff --git a/datasource/etcd/config.go b/datasource/etcd/config.go
index bb4c645..0b21205 100644
--- a/datasource/etcd/config.go
+++ b/datasource/etcd/config.go
@@ -21,7 +21,7 @@ import (
"context"
"github.com/apache/servicecomb-service-center/datasource/etcd/client"
"github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/astaxie/beego"
"strings"
"sync"
diff --git a/datasource/etcd/dep.go b/datasource/etcd/dep.go
index c77396b..0579ecc 100644
--- a/datasource/etcd/dep.go
+++ b/datasource/etcd/dep.go
@@ -27,7 +27,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
)
@@ -78,8 +77,8 @@ func (ds *DataSource) AddOrUpdateDependencies(ctx context.Context, dependencyInf
domainProject := util.ParseDomainProject(ctx)
for _, dependencyInfo := range dependencyInfos {
consumerFlag := util.StringJoin([]string{dependencyInfo.Consumer.Environment, dependencyInfo.Consumer.AppId, dependencyInfo.Consumer.ServiceName, dependencyInfo.Consumer.Version}, "/")
- consumerInfo := proto.DependenciesToKeys([]*pb.MicroServiceKey{dependencyInfo.Consumer}, domainProject)[0]
- providersInfo := proto.DependenciesToKeys(dependencyInfo.Providers, domainProject)
+ consumerInfo := pb.DependenciesToKeys([]*pb.MicroServiceKey{dependencyInfo.Consumer}, domainProject)[0]
+ providersInfo := pb.DependenciesToKeys(dependencyInfo.Providers, domainProject)
rsp := serviceUtil.ParamsChecker(consumerInfo, providersInfo)
if rsp != nil {
@@ -92,12 +91,12 @@ func (ds *DataSource) AddOrUpdateDependencies(ctx context.Context, dependencyInf
if err != nil {
log.Errorf(err, "put request into dependency queue failed, override: %t, get consumer[%s] id failed",
override, consumerFlag)
- return proto.CreateResponse(scerr.ErrInternal, err.Error()), err
+ return pb.CreateResponse(scerr.ErrInternal, err.Error()), err
}
if len(consumerID) == 0 {
log.Errorf(nil, "put request into dependency queue failed, override: %t, consumer[%s] does not exist",
override, consumerFlag)
- return proto.CreateResponse(scerr.ErrServiceNotExists, fmt.Sprintf("Consumer %s does not exist.", consumerFlag)), nil
+ return pb.CreateResponse(scerr.ErrServiceNotExists, fmt.Sprintf("Consumer %s does not exist.", consumerFlag)), nil
}
dependencyInfo.Override = override
@@ -105,7 +104,7 @@ func (ds *DataSource) AddOrUpdateDependencies(ctx context.Context, dependencyInf
if err != nil {
log.Errorf(err, "put request into dependency queue failed, override: %t, marshal consumer[%s] dependency failed",
override, consumerFlag)
- return proto.CreateResponse(scerr.ErrInternal, err.Error()), err
+ return pb.CreateResponse(scerr.ErrInternal, err.Error()), err
}
id := apt.DepsQueueUUID
@@ -119,10 +118,10 @@ func (ds *DataSource) AddOrUpdateDependencies(ctx context.Context, dependencyInf
err := client.BatchCommit(ctx, opts)
if err != nil {
log.Errorf(err, "put request into dependency queue failed, override: %t, %v", override, dependencyInfos)
- return proto.CreateResponse(scerr.ErrInternal, err.Error()), err
+ return pb.CreateResponse(scerr.ErrInternal, err.Error()), err
}
log.Infof("put request into dependency queue successfully, override: %t, %v, from remote %s",
override, dependencyInfos, util.GetIPFromContext(ctx))
- return proto.CreateResponse(proto.ResponseSuccess, "Create dependency successfully."), nil
+ return pb.CreateResponse(pb.ResponseSuccess, "Create dependency successfully."), nil
}
diff --git a/datasource/etcd/dep_test.go b/datasource/etcd/dep_test.go
index c475e4e..2794522 100644
--- a/datasource/etcd/dep_test.go
+++ b/datasource/etcd/dep_test.go
@@ -20,7 +20,6 @@ package etcd_test
import (
"github.com/apache/servicecomb-service-center/datasource"
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/event"
"github.com/stretchr/testify/assert"
@@ -47,7 +46,7 @@ func Test_Creat(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
consumerId1 = resp.ServiceId
resp, err = datasource.Instance().RegisterService(depGetContext(), &pb.CreateServiceRequest{
@@ -61,7 +60,7 @@ func Test_Creat(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
consumerId3 = resp.ServiceId
resp, err = datasource.Instance().RegisterService(depGetContext(), &pb.CreateServiceRequest{
@@ -76,7 +75,7 @@ func Test_Creat(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
consumerId2 = resp.ServiceId
resp, err = datasource.Instance().RegisterService(depGetContext(), &pb.CreateServiceRequest{
@@ -90,7 +89,7 @@ func Test_Creat(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().RegisterService(depGetContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
@@ -103,7 +102,7 @@ func Test_Creat(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().RegisterService(depGetContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
@@ -117,7 +116,7 @@ func Test_Creat(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("when request is invalid, should be failed", func(t *testing.T) {
@@ -167,7 +166,7 @@ func Test_Creat(t *testing.T) {
}, false)
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.GetCode())
// consumer in diff env
consumer.Environment = pb.ENV_PROD
@@ -185,7 +184,7 @@ func Test_Creat(t *testing.T) {
}, false)
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.GetCode())
assert.Equal(t, nil, deh.Handle())
@@ -226,7 +225,7 @@ func Test_Creat(t *testing.T) {
}, false)
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.GetCode())
assert.Equal(t, nil, deh.Handle())
@@ -252,7 +251,7 @@ func Test_Creat(t *testing.T) {
}, false)
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.GetCode())
assert.Equal(t, nil, deh.Handle())
@@ -280,7 +279,7 @@ func Test_Creat(t *testing.T) {
}, false)
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.GetCode())
respPro, err = datasource.Instance().SearchConsumerDependency(depGetContext(), &pb.GetDependenciesRequest{
ServiceId: consumerId3,
@@ -302,7 +301,7 @@ func Test_Creat(t *testing.T) {
}, false)
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.GetCode())
// add multiple providers
resp, err = datasource.Instance().AddOrUpdateDependencies(depGetContext(), []*pb.ConsumerDependency{
@@ -322,7 +321,7 @@ func Test_Creat(t *testing.T) {
}, false)
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.GetCode())
// add 1.0.0-2.0.0 to override *
resp, err = datasource.Instance().AddOrUpdateDependencies(depGetContext(), []*pb.ConsumerDependency{
@@ -339,7 +338,7 @@ func Test_Creat(t *testing.T) {
}, false)
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.GetCode())
assert.Equal(t, nil, deh.Handle())
@@ -365,7 +364,7 @@ func Test_Creat(t *testing.T) {
}, false)
assert.NotNil(t, respAdd)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAdd.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAdd.GetCode())
assert.Equal(t, nil, deh.Handle())
@@ -384,7 +383,7 @@ func Test_Creat(t *testing.T) {
}, false)
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.GetCode())
resp, err = datasource.Instance().AddOrUpdateDependencies(depGetContext(), []*pb.ConsumerDependency{
{
@@ -393,7 +392,7 @@ func Test_Creat(t *testing.T) {
}, false)
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.GetCode())
assert.Equal(t, nil, deh.Handle())
@@ -424,7 +423,7 @@ func Test_Get(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
consumerId1 = resp.ServiceId
resp, err = datasource.Instance().RegisterService(depGetContext(), &pb.CreateServiceRequest{
@@ -438,7 +437,7 @@ func Test_Get(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
providerId1 = resp.ServiceId
resp, err = datasource.Instance().RegisterService(depGetContext(), &pb.CreateServiceRequest{
@@ -452,7 +451,7 @@ func Test_Get(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
providerId2 = resp.ServiceId
})
@@ -482,7 +481,7 @@ func Test_Get(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.Equal(t, nil, deh.Handle())
@@ -509,7 +508,7 @@ func Test_Get(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.Equal(t, nil, deh.Handle())
@@ -542,7 +541,7 @@ func Test_Get(t *testing.T) {
})
assert.NotNil(t, respCreateF)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateF.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateF.Response.GetCode())
finder1 := respCreateF.ServiceId
resp, err = datasource.Instance().FindInstances(depGetContext(), &pb.FindInstancesRequest{
@@ -553,7 +552,7 @@ func Test_Get(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.Equal(t, nil, deh.Handle())
@@ -571,7 +570,7 @@ func Test_Get(t *testing.T) {
})
assert.NotNil(t, respDelP)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respDelP.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respDelP.Response.GetCode())
assert.Equal(t, nil, deh.Handle())
@@ -594,7 +593,7 @@ func Test_Get(t *testing.T) {
})
assert.NotNil(t, respCreateF)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateF.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateF.Response.GetCode())
resp, err = datasource.Instance().FindInstances(depGetContext(), &pb.FindInstancesRequest{
ConsumerServiceId: providerId2,
@@ -604,7 +603,7 @@ func Test_Get(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.Equal(t, nil, deh.Handle())
diff --git a/datasource/etcd/engine.go b/datasource/etcd/engine.go
index fcf0b20..7fa84ec 100644
--- a/datasource/etcd/engine.go
+++ b/datasource/etcd/engine.go
@@ -22,9 +22,8 @@ import (
"errors"
"fmt"
"github.com/apache/servicecomb-service-center/datasource"
+ "github.com/apache/servicecomb-service-center/pkg/cluster"
"github.com/apache/servicecomb-service-center/pkg/gopool"
- "github.com/apache/servicecomb-service-center/pkg/types"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"strconv"
"strings"
"time"
@@ -57,10 +56,10 @@ func (ds *DataSource) registryService(pCtx context.Context) error {
log.Error("query service center existence failed", err)
return err
}
- if respE.Response.GetCode() == proto.ResponseSuccess {
+ if respE.Response.GetCode() == pb.ResponseSuccess {
log.Warnf("service center service[%s] already registered", respE.ServiceId)
respG, err := core.ServiceAPI.GetOne(ctx, core.GetServiceRequest(respE.ServiceId))
- if respG.Response.GetCode() != proto.ResponseSuccess {
+ if respG.Response.GetCode() != pb.ResponseSuccess {
log.Errorf(err, "query service center service[%s] info failed", respE.ServiceId)
return fmt.Errorf("service center service file lost")
}
@@ -89,7 +88,7 @@ func (ds *DataSource) registryInstance(pCtx context.Context) error {
log.Error("register failed", err)
return err
}
- if respI.Response.GetCode() != proto.ResponseSuccess {
+ if respI.Response.GetCode() != pb.ResponseSuccess {
err = fmt.Errorf("register service center[%s] instance failed, %s",
core.Instance.ServiceId, respI.Response.GetMessage())
log.Error(err.Error(), nil)
@@ -111,7 +110,7 @@ func (ds *DataSource) SelfUnregister(pCtx context.Context) error {
log.Error("unregister failed", err)
return err
}
- if respI.Response.GetCode() != proto.ResponseSuccess {
+ if respI.Response.GetCode() != pb.ResponseSuccess {
err = fmt.Errorf("unregister service center instance[%s/%s] failed, %s",
core.Instance.ServiceId, core.Instance.InstanceId, respI.Response.GetMessage())
log.Error(err.Error(), nil)
@@ -129,7 +128,7 @@ func (ds *DataSource) selfHeartBeat(pCtx context.Context) error {
log.Error("sen heartbeat failed", err)
return err
}
- if respI.Response.GetCode() == proto.ResponseSuccess {
+ if respI.Response.GetCode() == pb.ResponseSuccess {
log.Debugf("update service center instance[%s/%s] heartbeat",
core.Instance.ServiceId, core.Instance.InstanceId)
return nil
@@ -207,7 +206,7 @@ func (ds *DataSource) ClearNoInstanceServices(ctx context.Context, serviceTTL ti
log.Errorf(err, "clear service failed, %s", svcCtxStr)
continue
}
- if delSvcResp.Response.GetCode() != proto.ResponseSuccess {
+ if delSvcResp.Response.GetCode() != pb.ResponseSuccess {
log.Errorf(nil, "clear service failed, %s, %s", delSvcResp.Response.GetMessage(), svcCtxStr)
continue
}
@@ -241,7 +240,7 @@ func shouldClear(ctx context.Context, timeLimitStamp string, svc *pb.MicroServic
if err != nil {
return false, err
}
- if getInstsResp.Response.GetCode() != proto.ResponseSuccess {
+ if getInstsResp.Response.GetCode() != pb.ResponseSuccess {
return false, errors.New("get instance failed: " + getInstsResp.Response.GetMessage())
}
//ignore a service if it has instances
@@ -251,6 +250,6 @@ func shouldClear(ctx context.Context, timeLimitStamp string, svc *pb.MicroServic
return true, nil
}
-func (ds *DataSource) GetClusters(ctx context.Context) (types.Clusters, error) {
+func (ds *DataSource) GetClusters(ctx context.Context) (cluster.Clusters, error) {
return Configuration().Clusters, nil
}
diff --git a/datasource/etcd/engine_test.go b/datasource/etcd/engine_test.go
index 28eab3c..e6f67b5 100644
--- a/datasource/etcd/engine_test.go
+++ b/datasource/etcd/engine_test.go
@@ -30,7 +30,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
@@ -72,7 +71,7 @@ func createService(domain string, project string, name string, withInstance bool
svcResp, err := apt.ServiceAPI.Create(ctx, svc)
Expect(err).To(BeNil())
Expect(svcResp).NotTo(BeNil())
- Expect(svcResp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(svcResp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
info := &serviceCleanInfo{
ServiceName: name,
ServiceId: svcResp.ServiceId,
@@ -100,7 +99,7 @@ func checkServiceCleared(domain string, project string) {
getSvcResp, err := apt.ServiceAPI.GetOne(ctx, getSvcReq)
Expect(err).To(BeNil())
Expect(getSvcResp).NotTo(BeNil())
- Expect(getSvcResp.Response.GetCode() == proto.ResponseSuccess).To(Equal(!v.ShouldClear))
+ Expect(getSvcResp.Response.GetCode() == pb.ResponseSuccess).To(Equal(!v.ShouldClear))
}
}
diff --git a/datasource/etcd/etcd_suite_test.go b/datasource/etcd/etcd_suite_test.go
index 7ed611d..72492ad 100644
--- a/datasource/etcd/etcd_suite_test.go
+++ b/datasource/etcd/etcd_suite_test.go
@@ -19,7 +19,7 @@ package etcd_test
// initialize
import (
_ "github.com/apache/servicecomb-service-center/server/bootstrap"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
)
import (
"context"
diff --git a/datasource/etcd/job/job.go b/datasource/etcd/job/job.go
index 8f0aec0..8538f8d 100644
--- a/datasource/etcd/job/job.go
+++ b/datasource/etcd/job/job.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/servicecomb-service-center/datasource/etcd/mux"
"github.com/apache/servicecomb-service-center/pkg/gopool"
"github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"time"
)
diff --git a/datasource/etcd/kv/kv.go b/datasource/etcd/kv/kv.go
index d4844a6..7525b20 100644
--- a/datasource/etcd/kv/kv.go
+++ b/datasource/etcd/kv/kv.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/gopool"
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"time"
)
diff --git a/datasource/etcd/kv/types.go b/datasource/etcd/kv/types.go
index b1d61d3..eacd78d 100644
--- a/datasource/etcd/kv/types.go
+++ b/datasource/etcd/kv/types.go
@@ -19,8 +19,8 @@ package kv
import (
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
+ "github.com/apache/servicecomb-service-center/datasource/etcd/value"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"time"
)
@@ -52,45 +52,45 @@ var (
func registerInnerTypes() {
SERVICE = Store().MustInstall(NewAddOn("SERVICE",
sd.Configure().WithPrefix(core.GetServiceRootKey("")).
- WithInitSize(500).WithParser(proto.ServiceParser)))
+ WithInitSize(500).WithParser(value.ServiceParser)))
INSTANCE = Store().MustInstall(NewAddOn("INSTANCE",
sd.Configure().WithPrefix(core.GetInstanceRootKey("")).
- WithInitSize(1000).WithParser(proto.InstanceParser).
+ WithInitSize(1000).WithParser(value.InstanceParser).
WithDeferHandler(NewInstanceEventDeferHandler())))
DOMAIN = Store().MustInstall(NewAddOn("DOMAIN",
sd.Configure().WithPrefix(core.GetDomainRootKey()+core.SPLIT).
- WithInitSize(100).WithParser(proto.StringParser)))
+ WithInitSize(100).WithParser(value.StringParser)))
SCHEMA = Store().MustInstall(NewAddOn("SCHEMA",
sd.Configure().WithPrefix(core.GetServiceSchemaRootKey("")).
WithInitSize(0)))
SchemaSummary = Store().MustInstall(NewAddOn("SCHEMA_SUMMARY",
sd.Configure().WithPrefix(core.GetServiceSchemaSummaryRootKey("")).
- WithInitSize(100).WithParser(proto.StringParser)))
+ WithInitSize(100).WithParser(value.StringParser)))
RULE = Store().MustInstall(NewAddOn("RULE",
sd.Configure().WithPrefix(core.GetServiceRuleRootKey("")).
- WithInitSize(100).WithParser(proto.RuleParser)))
+ WithInitSize(100).WithParser(value.RuleParser)))
LEASE = Store().MustInstall(NewAddOn("LEASE",
sd.Configure().WithPrefix(core.GetInstanceLeaseRootKey("")).
- WithInitSize(1000).WithParser(proto.StringParser)))
+ WithInitSize(1000).WithParser(value.StringParser)))
ServiceIndex = Store().MustInstall(NewAddOn("SERVICE_INDEX",
sd.Configure().WithPrefix(core.GetServiceIndexRootKey("")).
- WithInitSize(500).WithParser(proto.StringParser)))
+ WithInitSize(500).WithParser(value.StringParser)))
ServiceAlias = Store().MustInstall(NewAddOn("SERVICE_ALIAS",
sd.Configure().WithPrefix(core.GetServiceAliasRootKey("")).
- WithInitSize(100).WithParser(proto.StringParser)))
+ WithInitSize(100).WithParser(value.StringParser)))
ServiceTag = Store().MustInstall(NewAddOn("SERVICE_TAG",
sd.Configure().WithPrefix(core.GetServiceTagRootKey("")).
- WithInitSize(100).WithParser(proto.MapParser)))
+ WithInitSize(100).WithParser(value.MapParser)))
RuleIndex = Store().MustInstall(NewAddOn("RULE_INDEX",
sd.Configure().WithPrefix(core.GetServiceRuleIndexRootKey("")).
- WithInitSize(100).WithParser(proto.StringParser)))
+ WithInitSize(100).WithParser(value.StringParser)))
DependencyRule = Store().MustInstall(NewAddOn("DEPENDENCY_RULE",
sd.Configure().WithPrefix(core.GetServiceDependencyRuleRootKey("")).
- WithInitSize(100).WithParser(proto.DependencyRuleParser)))
+ WithInitSize(100).WithParser(value.DependencyRuleParser)))
DependencyQueue = Store().MustInstall(NewAddOn("DEPENDENCY_QUEUE",
sd.Configure().WithPrefix(core.GetServiceDependencyQueueRootKey("")).
- WithInitSize(100).WithParser(proto.DependencyQueueParser)))
+ WithInitSize(100).WithParser(value.DependencyQueueParser)))
PROJECT = Store().MustInstall(NewAddOn("PROJECT",
sd.Configure().WithPrefix(core.GetProjectRootKey("")).
- WithInitSize(100).WithParser(proto.StringParser)))
+ WithInitSize(100).WithParser(value.StringParser)))
}
diff --git a/datasource/etcd/ms.go b/datasource/etcd/ms.go
index 5c2bd89..f83110a 100644
--- a/datasource/etcd/ms.go
+++ b/datasource/etcd/ms.go
@@ -32,7 +32,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"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/cache"
@@ -67,7 +66,7 @@ func (ds *DataSource) RegisterService(ctx context.Context, request *pb.CreateSer
opts, uniqueCmpOpts, failOpts, err := capRegisterData(ctx, request)
if err != nil {
return &pb.CreateServiceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
resp, err := client.Instance().TxnWithCmp(ctx, opts, uniqueCmpOpts, failOpts)
@@ -81,12 +80,12 @@ func (ds *DataSource) GetServices(ctx context.Context, request *pb.GetServicesRe
if err != nil {
log.Errorf(err, "get all services by domain failed")
return &pb.GetServicesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
return &pb.GetServicesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get all services successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get all services successfully."),
Services: services,
}, nil
}
@@ -99,17 +98,17 @@ func (ds *DataSource) GetService(ctx context.Context, request *pb.GetServiceRequ
if err != nil {
log.Errorf(err, "get micro-service[%s] failed, get service file failed", request.ServiceId)
return &pb.GetServiceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if singleService == nil {
log.Errorf(nil, "get micro-service[%s] failed, service does not exist", request.ServiceId)
return &pb.GetServiceResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
return &pb.GetServiceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get service successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get service successfully."),
Service: singleService,
}, nil
}
@@ -123,19 +122,19 @@ func (ds *DataSource) GetServiceDetail(ctx context.Context, request *pb.GetServi
if len(request.ServiceId) == 0 {
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Invalid request for getting service detail."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Invalid request for getting service detail."),
}, nil
}
service, err := serviceUtil.GetService(ctx, domainProject, request.ServiceId)
if service == nil {
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
if err != nil {
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -151,7 +150,7 @@ func (ds *DataSource) GetServiceDetail(ctx context.Context, request *pb.GetServi
log.Errorf(err, "get service[%s/%s/%s] all versions failed",
service.Environment, service.AppId, service.ServiceName)
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -162,14 +161,14 @@ func (ds *DataSource) GetServiceDetail(ctx context.Context, request *pb.GetServi
})
if err != nil {
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
serviceInfo.MicroService = service
serviceInfo.MicroServiceVersions = versions
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get service successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get service successfully."),
Service: serviceInfo,
}, nil
}
@@ -199,12 +198,12 @@ func (ds *DataSource) GetServicesInfo(ctx context.Context, request *pb.GetServic
st, err = statistics(ctx, request.WithShared)
if err != nil {
return &pb.GetServicesInfoResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if len(optionMap) == 1 {
return &pb.GetServicesInfoResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Statistics successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Statistics successfully."),
Statistics: st,
}, nil
}
@@ -215,14 +214,14 @@ func (ds *DataSource) GetServicesInfo(ctx context.Context, request *pb.GetServic
if err != nil {
log.Errorf(err, "get all services by domain failed")
return &pb.GetServicesInfoResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
allServiceDetails := make([]*pb.ServiceDetail, 0, len(services))
domainProject := util.ParseDomainProject(ctx)
for _, service := range services {
- if !request.WithShared && apt.IsShared(proto.MicroServiceToKey(domainProject, service)) {
+ if !request.WithShared && apt.IsShared(pb.MicroServiceToKey(domainProject, service)) {
continue
}
if len(request.AppId) > 0 {
@@ -242,7 +241,7 @@ func (ds *DataSource) GetServicesInfo(ctx context.Context, request *pb.GetServic
})
if err != nil {
return &pb.GetServicesInfoResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
serviceDetail.MicroService = service
@@ -250,7 +249,7 @@ func (ds *DataSource) GetServicesInfo(ctx context.Context, request *pb.GetServic
}
return &pb.GetServicesInfoResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get services info successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get services info successfully."),
AllServicesDetail: allServiceDetails,
Statistics: st,
}, nil
@@ -272,7 +271,7 @@ func (ds *DataSource) GetApplications(ctx context.Context, request *pb.GetAppsRe
l := len(resp.Kvs)
if l == 0 {
return &pb.GetAppsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get all applications successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get all applications successfully."),
}, nil
}
@@ -291,7 +290,7 @@ func (ds *DataSource) GetApplications(ctx context.Context, request *pb.GetAppsRe
}
return &pb.GetAppsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get all applications successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get all applications successfully."),
AppIds: apps,
}, nil
}
@@ -299,7 +298,7 @@ func (ds *DataSource) GetApplications(ctx context.Context, request *pb.GetAppsRe
func (ds *DataSource) ExistServiceByID(ctx context.Context, request *pb.GetExistenceByIDRequest) (*pb.GetExistenceByIDResponse, error) {
domainProject := util.ParseDomainProject(ctx)
return &pb.GetExistenceByIDResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get all applications successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get all applications successfully."),
Exist: serviceUtil.ServiceExist(ctx, domainProject, request.ServiceId),
}, nil
}
@@ -321,23 +320,23 @@ func (ds *DataSource) ExistService(ctx context.Context, request *pb.GetExistence
if err != nil {
log.Errorf(err, "micro-service[%s] exist failed, find serviceIDs failed", serviceFlag)
return &pb.GetExistenceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if !exist {
log.Infof("micro-service[%s] exist failed, service does not exist", serviceFlag)
return &pb.GetExistenceResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, serviceFlag+" does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, serviceFlag+" does not exist."),
}, nil
}
if len(ids) == 0 {
log.Infof("micro-service[%s] exist failed, version mismatch", serviceFlag)
return &pb.GetExistenceResponse{
- Response: proto.CreateResponse(scerr.ErrServiceVersionNotExists, serviceFlag+" version mismatch."),
+ Response: pb.CreateResponse(scerr.ErrServiceVersionNotExists, serviceFlag+" version mismatch."),
}, nil
}
return &pb.GetExistenceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "get service id successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "get service id successfully."),
ServiceId: ids[0], // 约定多个时,取较新版本
}, nil
}
@@ -353,14 +352,14 @@ func (ds *DataSource) UpdateService(ctx context.Context, request *pb.UpdateServi
log.Errorf(err, "update service[%s] properties failed, get service file failed, operator: %s",
request.ServiceId, remoteIP)
return &pb.UpdateServicePropsResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if microservice == nil {
log.Errorf(nil, "update service[%s] properties failed, service does not exist, operator: %s",
request.ServiceId, remoteIP)
return &pb.UpdateServicePropsResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -373,7 +372,7 @@ func (ds *DataSource) UpdateService(ctx context.Context, request *pb.UpdateServi
log.Errorf(err, "update service[%s] properties failed, json marshal service failed, operator: %s",
request.ServiceId, remoteIP)
return &pb.UpdateServicePropsResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -387,20 +386,20 @@ func (ds *DataSource) UpdateService(ctx context.Context, request *pb.UpdateServi
if err != nil {
log.Errorf(err, "update service[%s] properties failed, operator: %s", request.ServiceId, remoteIP)
return &pb.UpdateServicePropsResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
}, err
}
if !resp.Succeeded {
log.Errorf(err, "update service[%s] properties failed, service does not exist, operator: %s",
request.ServiceId, remoteIP)
return &pb.UpdateServicePropsResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
log.Infof("update service[%s] properties successfully, operator: %s", request.ServiceId, remoteIP)
return &pb.UpdateServicePropsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "update service successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "update service successfully."),
}, nil
}
@@ -431,11 +430,11 @@ func (ds *DataSource) RegisterInstance(ctx context.Context, request *pb.Register
log.Errorf(err, "register service[%s]'s instance failed, endpoints %v, host '%s', operator %s",
instance.ServiceId, instance.Endpoints, instance.HostName, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, nil
}
switch resp.Response.GetCode() {
- case proto.ResponseSuccess:
+ case pb.ResponseSuccess:
log.Infof("register instance successful, reuse instance[%s/%s], operator %s",
instance.ServiceId, instance.InstanceId, remoteIP)
return &pb.RegisterInstanceResponse{
@@ -457,7 +456,7 @@ func (ds *DataSource) RegisterInstance(ctx context.Context, request *pb.Register
log.Errorf(err, "register service[%s]'s instance failed, endpoints %v, host '%s', operator %s",
instance.ServiceId, instance.Endpoints, instance.HostName, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponseWithSCErr(err),
+ Response: pb.CreateResponseWithSCErr(err),
}, nil
}
@@ -482,7 +481,7 @@ func (ds *DataSource) RegisterInstance(ctx context.Context, request *pb.Register
log.Errorf(reporter.Err, "register instance failed, %s, operator %s",
instanceFlag, remoteIP)
response := &pb.RegisterInstanceResponse{
- Response: proto.CreateResponseWithSCErr(reporter.Err),
+ Response: pb.CreateResponseWithSCErr(reporter.Err),
}
if reporter.Err.InternalError() {
return response, reporter.Err
@@ -498,7 +497,7 @@ func (ds *DataSource) RegisterInstance(ctx context.Context, request *pb.Register
"register instance failed, %s, instanceID %s, operator %s",
instanceFlag, instanceID, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -506,7 +505,7 @@ func (ds *DataSource) RegisterInstance(ctx context.Context, request *pb.Register
if err != nil {
log.Errorf(err, "grant lease failed, %s, operator: %s", instanceFlag, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
}, err
}
@@ -531,7 +530,7 @@ func (ds *DataSource) RegisterInstance(ctx context.Context, request *pb.Register
"register instance failed, %s, instanceID %s, operator %s",
instanceFlag, instanceID, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
}, err
}
if !resp.Succeeded {
@@ -539,7 +538,7 @@ func (ds *DataSource) RegisterInstance(ctx context.Context, request *pb.Register
"register instance failed, %s, instanceID %s, operator %s: service does not exist",
instanceFlag, instanceID, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -552,7 +551,7 @@ func (ds *DataSource) RegisterInstance(ctx context.Context, request *pb.Register
log.Infof("register instance %s, instanceID %s, operator %s",
instanceFlag, instanceID, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Register service instance successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Register service instance successfully."),
InstanceId: instanceID,
}, nil
}
@@ -569,14 +568,14 @@ func (ds *DataSource) GetInstance(ctx context.Context, request *pb.GetOneInstanc
log.Errorf(err, "get consumer failed, consumer[%s] find provider instance[%s/%s]",
request.ConsumerServiceId, request.ProviderServiceId, request.ProviderInstanceId)
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if service == nil {
log.Errorf(nil, "consumer does not exist, consumer[%s] find provider instance[%s/%s]",
request.ConsumerServiceId, request.ProviderServiceId, request.ProviderInstanceId)
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists,
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists,
fmt.Sprintf("Consumer[%s] does not exist.", request.ConsumerServiceId)),
}, nil
}
@@ -587,14 +586,14 @@ func (ds *DataSource) GetInstance(ctx context.Context, request *pb.GetOneInstanc
log.Errorf(err, "get provider failed, consumer[%s] find provider instance[%s/%s]",
request.ConsumerServiceId, request.ProviderServiceId, request.ProviderInstanceId)
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if provider == nil {
log.Errorf(nil, "provider does not exist, consumer[%s] find provider instance[%s/%s]",
request.ConsumerServiceId, request.ProviderServiceId, request.ProviderInstanceId)
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists,
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists,
fmt.Sprintf("Provider[%s] does not exist.", request.ProviderServiceId)),
}, nil
}
@@ -608,21 +607,21 @@ func (ds *DataSource) GetInstance(ctx context.Context, request *pb.GetOneInstanc
var item *cache.VersionRuleCacheItem
rev, _ := ctx.Value(util.CtxRequestRevision).(string)
- item, err = cache.FindInstances.GetWithProviderID(ctx, service, proto.MicroServiceToKey(domainProject, provider),
+ item, err = cache.FindInstances.GetWithProviderID(ctx, service, pb.MicroServiceToKey(domainProject, provider),
&pb.HeartbeatSetElement{
ServiceId: request.ProviderServiceId, InstanceId: request.ProviderInstanceId,
}, request.Tags, rev)
if err != nil {
log.Errorf(err, "FindInstances.GetWithProviderID failed, %s failed", findFlag())
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if item == nil || len(item.Instances) == 0 {
mes := fmt.Errorf("%s failed, provider instance does not exist", findFlag())
log.Errorf(mes, "FindInstances.GetWithProviderID failed")
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInstanceNotExists, mes.Error()),
+ Response: pb.CreateResponse(scerr.ErrInstanceNotExists, mes.Error()),
}, nil
}
@@ -633,7 +632,7 @@ func (ds *DataSource) GetInstance(ctx context.Context, request *pb.GetOneInstanc
_ = util.SetContext(ctx, util.CtxResponseRevision, item.Rev)
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get instance successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get instance successfully."),
Instance: instance,
}, nil
}
@@ -650,14 +649,14 @@ func (ds *DataSource) GetInstances(ctx context.Context, request *pb.GetInstances
log.Errorf(err, "get consumer failed, consumer[%s] find provider instances",
request.ConsumerServiceId, request.ProviderServiceId)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if service == nil {
log.Errorf(nil, "consumer does not exist, consumer[%s] find provider instances",
request.ConsumerServiceId, request.ProviderServiceId)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists,
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists,
fmt.Sprintf("Consumer[%s] does not exist.", request.ConsumerServiceId)),
}, nil
}
@@ -668,14 +667,14 @@ func (ds *DataSource) GetInstances(ctx context.Context, request *pb.GetInstances
log.Errorf(err, "get provider failed, consumer[%s] find provider instances",
request.ConsumerServiceId, request.ProviderServiceId)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if provider == nil {
log.Errorf(nil, "provider does not exist, consumer[%s] find provider instances",
request.ConsumerServiceId, request.ProviderServiceId)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists,
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists,
fmt.Sprintf("Provider[%s] does not exist.", request.ProviderServiceId)),
}, nil
}
@@ -688,21 +687,21 @@ func (ds *DataSource) GetInstances(ctx context.Context, request *pb.GetInstances
var item *cache.VersionRuleCacheItem
rev, _ := ctx.Value(util.CtxRequestRevision).(string)
- item, err = cache.FindInstances.GetWithProviderID(ctx, service, proto.MicroServiceToKey(domainProject, provider),
+ item, err = cache.FindInstances.GetWithProviderID(ctx, service, pb.MicroServiceToKey(domainProject, provider),
&pb.HeartbeatSetElement{
ServiceId: request.ProviderServiceId,
}, request.Tags, rev)
if err != nil {
log.Errorf(err, "FindInstances.GetWithProviderID failed, %s failed", findFlag())
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if item == nil || len(item.ServiceIds) == 0 {
mes := fmt.Errorf("%s failed, provider instance does not exist", findFlag())
log.Errorf(mes, "FindInstances.GetWithProviderID failed")
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
}, nil
}
@@ -713,7 +712,7 @@ func (ds *DataSource) GetInstances(ctx context.Context, request *pb.GetInstances
_ = util.SetContext(ctx, util.CtxResponseRevision, item.Rev)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Query service instances successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Query service instances successfully."),
Instances: instances,
}, nil
}
@@ -791,7 +790,7 @@ func (ds *DataSource) FindInstances(ctx context.Context, request *pb.FindInstanc
err := errors.New("rev request context is not type string")
log.Error("", err)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -812,14 +811,14 @@ func (ds *DataSource) findInstance(ctx context.Context, request *pb.FindInstance
log.Errorf(err, "get consumer failed, consumer[%s] find provider[%s/%s/%s/%s]",
request.ConsumerServiceId, request.Environment, request.AppId, request.ServiceName, request.VersionRule)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if service == nil {
log.Errorf(nil, "consumer does not exist, consumer[%s] find provider[%s/%s/%s/%s]",
request.ConsumerServiceId, request.Environment, request.AppId, request.ServiceName, request.VersionRule)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists,
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists,
fmt.Sprintf("Consumer[%s] does not exist.", request.ConsumerServiceId)),
}, nil
}
@@ -841,14 +840,14 @@ func (ds *DataSource) findInstance(ctx context.Context, request *pb.FindInstance
if err != nil {
log.Errorf(err, "FindInstancesCache.Get failed, %s failed", findFlag)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if item == nil {
mes := fmt.Errorf("%s failed, provider does not exist", findFlag)
log.Errorf(mes, "FindInstancesCache.Get failed")
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
}, nil
}
@@ -866,13 +865,13 @@ func (ds *DataSource) findInstance(ctx context.Context, request *pb.FindInstance
mes := fmt.Errorf("%s failed, provider does not exist", findFlag)
log.Errorf(mes, "AddServiceVersionRule failed")
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
}, nil
}
if err != nil {
log.Errorf(err, "AddServiceVersionRule failed, %s failed", findFlag)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
}
@@ -894,14 +893,14 @@ func (ds *DataSource) findSharedServiceInstance(ctx context.Context, request *pb
if err != nil {
log.Errorf(err, "FindInstancesCache.Get failed, %s failed", findFlag)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if item == nil {
mes := fmt.Errorf("%s failed, provider does not exist", findFlag)
log.Errorf(mes, "FindInstancesCache.Get failed")
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
}, nil
}
@@ -917,7 +916,7 @@ func (ds *DataSource) genFindResult(ctx context.Context, oldRev string, item *ca
// TODO support gRPC output context
_ = util.SetContext(ctx, util.CtxResponseRevision, item.Rev)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Query service instances successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Query service instances successfully."),
Instances: instances,
}, nil
}
@@ -931,7 +930,7 @@ func (ds *DataSource) reshapeProviderKey(ctx context.Context, provider *pb.Micro
}
versionRule := provider.Version
- provider = proto.MicroServiceToKey(provider.Tenant, providerService)
+ provider = pb.MicroServiceToKey(provider.Tenant, providerService)
provider.Version = versionRule
return provider, nil
}
@@ -944,13 +943,13 @@ func (ds *DataSource) UpdateInstanceStatus(ctx context.Context, request *pb.Upda
if err != nil {
log.Errorf(err, "update instance[%s] status failed", updateStatusFlag)
return &pb.UpdateInstanceStatusResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if instance == nil {
log.Errorf(nil, "update instance[%s] status failed, instance does not exist", updateStatusFlag)
return &pb.UpdateInstanceStatusResponse{
- Response: proto.CreateResponse(scerr.ErrInstanceNotExists, "Service instance does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInstanceNotExists, "Service instance does not exist."),
}, nil
}
@@ -960,7 +959,7 @@ func (ds *DataSource) UpdateInstanceStatus(ctx context.Context, request *pb.Upda
if err := serviceUtil.UpdateInstance(ctx, domainProject, ©InstanceRef); err != nil {
log.Errorf(err, "update instance[%s] status failed", updateStatusFlag)
resp := &pb.UpdateInstanceStatusResponse{
- Response: proto.CreateResponseWithSCErr(err),
+ Response: pb.CreateResponseWithSCErr(err),
}
if err.InternalError() {
return resp, err
@@ -970,7 +969,7 @@ func (ds *DataSource) UpdateInstanceStatus(ctx context.Context, request *pb.Upda
log.Infof("update instance[%s] status successfully", updateStatusFlag)
return &pb.UpdateInstanceStatusResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Update service instance status successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Update service instance status successfully."),
}, nil
}
@@ -983,13 +982,13 @@ func (ds *DataSource) UpdateInstanceProperties(ctx context.Context, request *pb.
if err != nil {
log.Errorf(err, "update instance[%s] properties failed", instanceFlag)
return &pb.UpdateInstancePropsResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if instance == nil {
log.Errorf(nil, "update instance[%s] properties failed, instance does not exist", instanceFlag)
return &pb.UpdateInstancePropsResponse{
- Response: proto.CreateResponse(scerr.ErrInstanceNotExists, "Service instance does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInstanceNotExists, "Service instance does not exist."),
}, nil
}
@@ -999,7 +998,7 @@ func (ds *DataSource) UpdateInstanceProperties(ctx context.Context, request *pb.
if err := serviceUtil.UpdateInstance(ctx, domainProject, ©InstanceRef); err != nil {
log.Errorf(err, "update instance[%s] properties failed", instanceFlag)
resp := &pb.UpdateInstancePropsResponse{
- Response: proto.CreateResponseWithSCErr(err),
+ Response: pb.CreateResponseWithSCErr(err),
}
if err.InternalError() {
return resp, err
@@ -1009,7 +1008,7 @@ func (ds *DataSource) UpdateInstanceProperties(ctx context.Context, request *pb.
log.Infof("update instance[%s] properties successfully", instanceFlag)
return &pb.UpdateInstancePropsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Update service instance properties successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Update service instance properties successfully."),
}, nil
}
@@ -1050,13 +1049,13 @@ func (ds *DataSource) HeartbeatSet(ctx context.Context, request *pb.HeartbeatSet
if !failFlag && successFlag {
log.Infof("batch update heartbeats[%s] successfully", count)
return &pb.HeartbeatSetResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Heartbeat set successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Heartbeat set successfully."),
Instances: instanceHbRstArr,
}, nil
}
log.Errorf(nil, "batch update heartbeats failed, %v", request.Instances)
return &pb.HeartbeatSetResponse{
- Response: proto.CreateResponse(scerr.ErrInstanceNotExists, "Heartbeat set failed."),
+ Response: pb.CreateResponse(scerr.ErrInstanceNotExists, "Heartbeat set failed."),
Instances: instanceHbRstArr,
}, nil
}
@@ -1064,7 +1063,7 @@ func (ds *DataSource) HeartbeatSet(ctx context.Context, request *pb.HeartbeatSet
func (ds *DataSource) BatchFind(ctx context.Context, request *pb.BatchFindInstancesRequest) (
*pb.BatchFindInstancesResponse, error) {
response := &pb.BatchFindInstancesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Batch query service instances successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Batch query service instances successfully."),
}
var err error
@@ -1072,7 +1071,7 @@ func (ds *DataSource) BatchFind(ctx context.Context, request *pb.BatchFindInstan
response.Services, err = ds.batchFindServices(ctx, request)
if err != nil {
return &pb.BatchFindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -1080,7 +1079,7 @@ func (ds *DataSource) BatchFind(ctx context.Context, request *pb.BatchFindInstan
response.Instances, err = ds.batchFindInstances(ctx, request)
if err != nil {
return &pb.BatchFindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -1168,7 +1167,7 @@ func (ds *DataSource) UnregisterInstance(ctx context.Context, request *pb.Unregi
log.Errorf(err, "unregister instance failed, instance[%s], operator %s: revoke instance failed",
instanceFlag, remoteIP)
resp := &pb.UnregisterInstanceResponse{
- Response: proto.CreateResponseWithSCErr(err),
+ Response: pb.CreateResponseWithSCErr(err),
}
if err.InternalError() {
return resp, err
@@ -1178,7 +1177,7 @@ func (ds *DataSource) UnregisterInstance(ctx context.Context, request *pb.Unregi
log.Infof("unregister instance[%s], operator %s", instanceFlag, remoteIP)
return &pb.UnregisterInstanceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Unregister service instance successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Unregister service instance successfully."),
}, nil
}
@@ -1192,7 +1191,7 @@ func (ds *DataSource) Heartbeat(ctx context.Context, request *pb.HeartbeatReques
log.Errorf(err, "heartbeat failed, instance[%s]. operator %s",
instanceFlag, remoteIP)
resp := &pb.HeartbeatResponse{
- Response: proto.CreateResponseWithSCErr(err),
+ Response: pb.CreateResponseWithSCErr(err),
}
if err.InternalError() {
return resp, err
@@ -1208,7 +1207,7 @@ func (ds *DataSource) Heartbeat(ctx context.Context, request *pb.HeartbeatReques
instanceFlag, ttl, remoteIP)
}
return &pb.HeartbeatResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess,
+ Response: pb.CreateResponse(pb.ResponseSuccess,
"Update service instance heartbeat successfully."),
}, nil
}
@@ -1224,14 +1223,14 @@ func (ds *DataSource) ModifySchemas(ctx context.Context, request *pb.ModifySchem
log.Errorf(err, "modify service[%s] schemas failed, get service failed, operator: %s",
serviceID, remoteIP)
return &pb.ModifySchemasResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if serviceInfo == nil {
log.Errorf(nil, "modify service[%s] schemas failed, service does not exist, operator: %s",
serviceID, remoteIP)
return &pb.ModifySchemasResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -1239,7 +1238,7 @@ func (ds *DataSource) ModifySchemas(ctx context.Context, request *pb.ModifySchem
if respErr != nil {
log.Errorf(nil, "modify service[%s] schemas failed, operator: %s", serviceID, remoteIP)
resp := &pb.ModifySchemasResponse{
- Response: proto.CreateResponseWithSCErr(respErr),
+ Response: pb.CreateResponseWithSCErr(respErr),
}
if respErr.InternalError() {
return resp, respErr
@@ -1248,7 +1247,7 @@ func (ds *DataSource) ModifySchemas(ctx context.Context, request *pb.ModifySchem
}
return &pb.ModifySchemasResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "modify schemas info successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "modify schemas info successfully."),
}, nil
}
@@ -1267,7 +1266,7 @@ func (ds *DataSource) ModifySchema(ctx context.Context, request *pb.ModifySchema
if err != nil {
log.Errorf(err, "modify schema[%s/%s] failed, operator: %s", serviceID, schemaID, remoteIP)
resp := &pb.ModifySchemaResponse{
- Response: proto.CreateResponseWithSCErr(err),
+ Response: pb.CreateResponseWithSCErr(err),
}
if err.InternalError() {
return resp, err
@@ -1277,7 +1276,7 @@ func (ds *DataSource) ModifySchema(ctx context.Context, request *pb.ModifySchema
log.Infof("modify schema[%s/%s] successfully, operator: %s", serviceID, schemaID, remoteIP)
return &pb.ModifySchemaResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "modify schema info success"),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "modify schema info success"),
}, nil
}
@@ -1288,7 +1287,7 @@ func (ds *DataSource) ExistSchema(ctx context.Context, request *pb.GetExistenceR
if !serviceUtil.ServiceExist(ctx, domainProject, request.ServiceId) {
log.Warnf("schema[%s/%s] exist failed, service does not exist", request.ServiceId, request.SchemaId)
return &pb.GetExistenceResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "service does not exist."),
}, nil
}
@@ -1297,13 +1296,13 @@ func (ds *DataSource) ExistSchema(ctx context.Context, request *pb.GetExistenceR
if err != nil {
log.Errorf(err, "schema[%s/%s] exist failed, get schema failed", request.ServiceId, request.SchemaId)
return &pb.GetExistenceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if !exist {
log.Infof("schema[%s/%s] exist failed, schema does not exist", request.ServiceId, request.SchemaId)
return &pb.GetExistenceResponse{
- Response: proto.CreateResponse(scerr.ErrSchemaNotExists, "schema does not exist."),
+ Response: pb.CreateResponse(scerr.ErrSchemaNotExists, "schema does not exist."),
}, nil
}
schemaSummary, err := getSchemaSummary(ctx, domainProject, request.ServiceId, request.SchemaId)
@@ -1311,11 +1310,11 @@ func (ds *DataSource) ExistSchema(ctx context.Context, request *pb.GetExistenceR
log.Errorf(err, "schema[%s/%s] exist failed, get schema summary failed",
request.ServiceId, request.SchemaId)
return &pb.GetExistenceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
return &pb.GetExistenceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Schema exist."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Schema exist."),
SchemaId: request.SchemaId,
Summary: schemaSummary,
}, nil
@@ -1328,7 +1327,7 @@ func (ds *DataSource) GetSchema(ctx context.Context, request *pb.GetSchemaReques
log.Errorf(nil, "get schema[%s/%s] failed, service does not exist",
request.ServiceId, request.SchemaId)
return &pb.GetSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -1338,14 +1337,14 @@ func (ds *DataSource) GetSchema(ctx context.Context, request *pb.GetSchemaReques
if errDo != nil {
log.Errorf(errDo, "get schema[%s/%s] failed", request.ServiceId, request.SchemaId)
return &pb.GetSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, errDo.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, errDo.Error()),
}, errDo
}
if resp.Count == 0 {
log.Errorf(errDo, "get schema[%s/%s] failed, schema does not exists",
request.ServiceId, request.SchemaId)
return &pb.GetSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrSchemaNotExists, "Do not have this schema info."),
+ Response: pb.CreateResponse(scerr.ErrSchemaNotExists, "Do not have this schema info."),
}, nil
}
@@ -1354,12 +1353,12 @@ func (ds *DataSource) GetSchema(ctx context.Context, request *pb.GetSchemaReques
log.Errorf(err, "get schema[%s/%s] failed, get schema summary failed",
request.ServiceId, request.SchemaId)
return &pb.GetSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
return &pb.GetSchemaResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get schema info successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get schema info successfully."),
Schema: util.BytesToStringWithNoCopy(resp.Kvs[0].Value.([]byte)),
SchemaSummary: schemaSummary,
}, nil
@@ -1373,20 +1372,20 @@ func (ds *DataSource) GetAllSchemas(ctx context.Context, request *pb.GetAllSchem
if err != nil {
log.Errorf(err, "get service[%s] all schemas failed, get service failed", request.ServiceId)
return &pb.GetAllSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if service == nil {
log.Errorf(nil, "get service[%s] all schemas failed, service does not exist", request.ServiceId)
return &pb.GetAllSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
schemasList := service.Schemas
if len(schemasList) == 0 {
return &pb.GetAllSchemaResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Do not have this schema info."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Do not have this schema info."),
Schemas: []*pb.Schema{},
}, nil
}
@@ -1397,7 +1396,7 @@ func (ds *DataSource) GetAllSchemas(ctx context.Context, request *pb.GetAllSchem
if errDo != nil {
log.Errorf(errDo, "get service[%s] all schema summaries failed", request.ServiceId)
return &pb.GetAllSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, errDo.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, errDo.Error()),
}, errDo
}
@@ -1409,7 +1408,7 @@ func (ds *DataSource) GetAllSchemas(ctx context.Context, request *pb.GetAllSchem
if errDo != nil {
log.Errorf(errDo, "get service[%s] all schemas failed", request.ServiceId)
return &pb.GetAllSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, errDo.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, errDo.Error()),
}, errDo
}
}
@@ -1435,7 +1434,7 @@ func (ds *DataSource) GetAllSchemas(ctx context.Context, request *pb.GetAllSchem
}
return &pb.GetAllSchemaResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get all schema info successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get all schema info successfully."),
Schemas: schemas,
}, nil
}
@@ -1449,7 +1448,7 @@ func (ds *DataSource) DeleteSchema(ctx context.Context, request *pb.DeleteSchema
log.Errorf(nil, "delete schema[%s/%s] failed, service does not exist, operator: %s",
request.ServiceId, request.SchemaId, remoteIP)
return &pb.DeleteSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -1459,14 +1458,14 @@ func (ds *DataSource) DeleteSchema(ctx context.Context, request *pb.DeleteSchema
log.Errorf(err, "delete schema[%s/%s] failed, operator: %s",
request.ServiceId, request.SchemaId, remoteIP)
return &pb.DeleteSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if !exist {
log.Errorf(nil, "delete schema[%s/%s] failed, schema does not exist, operator: %s",
request.ServiceId, request.SchemaId, remoteIP)
return &pb.DeleteSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrSchemaNotExists, "Schema info does not exist."),
+ Response: pb.CreateResponse(scerr.ErrSchemaNotExists, "Schema info does not exist."),
}, nil
}
epSummaryKey := apt.GenerateServiceSchemaSummaryKey(domainProject, request.ServiceId, request.SchemaId)
@@ -1484,21 +1483,21 @@ func (ds *DataSource) DeleteSchema(ctx context.Context, request *pb.DeleteSchema
log.Errorf(errDo, "delete schema[%s/%s] failed, operator: %s",
request.ServiceId, request.SchemaId, remoteIP)
return &pb.DeleteSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, errDo.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, errDo.Error()),
}, errDo
}
if !resp.Succeeded {
log.Errorf(nil, "delete schema[%s/%s] failed, service does not exist, operator: %s",
request.ServiceId, request.SchemaId, remoteIP)
return &pb.DeleteSchemaResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
log.Infof("delete schema[%s/%s] info successfully, operator: %s",
request.ServiceId, request.SchemaId, remoteIP)
return &pb.DeleteSchemaResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Delete schema info successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Delete schema info successfully."),
}, nil
}
@@ -1511,7 +1510,7 @@ func (ds *DataSource) AddTags(ctx context.Context, request *pb.AddServiceTagsReq
log.Errorf(nil, "add service[%s]'s tags %v failed, service does not exist, operator: %s",
request.ServiceId, request.Tags, remoteIP)
return &pb.AddServiceTagsResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -1522,7 +1521,7 @@ func (ds *DataSource) AddTags(ctx context.Context, request *pb.AddServiceTagsReq
if errQuota != nil {
log.Errorf(errQuota, "add service[%s]'s tags %v failed, operator: %s", request.ServiceId, addTags, remoteIP)
response := &pb.AddServiceTagsResponse{
- Response: proto.CreateResponseWithSCErr(errQuota),
+ Response: pb.CreateResponseWithSCErr(errQuota),
}
if errQuota.InternalError() {
return response, errQuota
@@ -1535,7 +1534,7 @@ func (ds *DataSource) AddTags(ctx context.Context, request *pb.AddServiceTagsReq
log.Errorf(err, "add service[%s]'s tags %v failed, get existed tag failed, operator: %s",
request.ServiceId, addTags, remoteIP)
return &pb.AddServiceTagsResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
for key, value := range dataTags {
@@ -1550,7 +1549,7 @@ func (ds *DataSource) AddTags(ctx context.Context, request *pb.AddServiceTagsReq
if checkErr != nil {
log.Errorf(checkErr, "add service[%s]'s tags %v failed, operator: %s", request.ServiceId, request.Tags, remoteIP)
resp := &pb.AddServiceTagsResponse{
- Response: proto.CreateResponseWithSCErr(checkErr),
+ Response: pb.CreateResponseWithSCErr(checkErr),
}
if checkErr.InternalError() {
return resp, checkErr
@@ -1560,7 +1559,7 @@ func (ds *DataSource) AddTags(ctx context.Context, request *pb.AddServiceTagsReq
log.Infof("add service[%s]'s tags %v successfully, operator: %s", request.ServiceId, request.Tags, remoteIP)
return &pb.AddServiceTagsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Add service tags successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Add service tags successfully."),
}, nil
}
@@ -1570,19 +1569,19 @@ func (ds *DataSource) GetTags(ctx context.Context, request *pb.GetServiceTagsReq
if !serviceUtil.ServiceExist(ctx, domainProject, request.ServiceId) {
log.Errorf(err, "get service[%s]'s tags failed, service does not exist", request.ServiceId)
return &pb.GetServiceTagsResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
tags, err := serviceUtil.GetTagsUtils(ctx, domainProject, request.ServiceId)
if err != nil {
log.Errorf(err, "get service[%s]'s tags failed, get tags failed", request.ServiceId)
return &pb.GetServiceTagsResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
return &pb.GetServiceTagsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get service tags successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get service tags successfully."),
Tags: tags,
}, nil
}
@@ -1597,7 +1596,7 @@ func (ds *DataSource) UpdateTag(ctx context.Context, request *pb.UpdateServiceTa
log.Errorf(err, "update service[%s]'s tag[%s] failed, service does not exist, operator: %s",
request.ServiceId, tagFlag, remoteIP)
return &pb.UpdateServiceTagResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -1606,7 +1605,7 @@ func (ds *DataSource) UpdateTag(ctx context.Context, request *pb.UpdateServiceTa
log.Errorf(err, "update service[%s]'s tag[%s] failed, get tag failed, operator: %s",
request.ServiceId, tagFlag, remoteIP)
return &pb.UpdateServiceTagResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -1615,7 +1614,7 @@ func (ds *DataSource) UpdateTag(ctx context.Context, request *pb.UpdateServiceTa
log.Errorf(nil, "update service[%s]'s tag[%s] failed, tag does not exist, operator: %s",
request.ServiceId, tagFlag, remoteIP)
return &pb.UpdateServiceTagResponse{
- Response: proto.CreateResponse(scerr.ErrTagNotExists, "Tag does not exist, please add one first."),
+ Response: pb.CreateResponse(scerr.ErrTagNotExists, "Tag does not exist, please add one first."),
}, nil
}
@@ -1629,7 +1628,7 @@ func (ds *DataSource) UpdateTag(ctx context.Context, request *pb.UpdateServiceTa
if checkErr != nil {
log.Errorf(checkErr, "update service[%s]'s tag[%s] failed, operator: %s", request.ServiceId, tagFlag, remoteIP)
resp := &pb.UpdateServiceTagResponse{
- Response: proto.CreateResponseWithSCErr(checkErr),
+ Response: pb.CreateResponseWithSCErr(checkErr),
}
if checkErr.InternalError() {
return resp, checkErr
@@ -1639,7 +1638,7 @@ func (ds *DataSource) UpdateTag(ctx context.Context, request *pb.UpdateServiceTa
log.Infof("update service[%s]'s tag[%s] successfully, operator: %s", request.ServiceId, tagFlag, remoteIP)
return &pb.UpdateServiceTagResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Update service tag success."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Update service tag success."),
}, nil
}
@@ -1651,7 +1650,7 @@ func (ds *DataSource) DeleteTags(ctx context.Context, request *pb.DeleteServiceT
log.Errorf(nil, "delete service[%s]'s tags %v failed, service does not exist, operator: %s",
request.ServiceId, request.Keys, remoteIP)
return &pb.DeleteServiceTagsResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -1660,7 +1659,7 @@ func (ds *DataSource) DeleteTags(ctx context.Context, request *pb.DeleteServiceT
log.Errorf(err, "delete service[%s]'s tags %v failed, get service tags failed, operator: %s",
request.ServiceId, request.Keys, remoteIP)
return &pb.DeleteServiceTagsResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -1673,7 +1672,7 @@ func (ds *DataSource) DeleteTags(ctx context.Context, request *pb.DeleteServiceT
log.Errorf(nil, "delete service[%s]'s tags %v failed, tag[%s] does not exist, operator: %s",
request.ServiceId, request.Keys, key, remoteIP)
return &pb.DeleteServiceTagsResponse{
- Response: proto.CreateResponse(scerr.ErrTagNotExists, "Delete tags failed for this key "+key+" does not exist."),
+ Response: pb.CreateResponse(scerr.ErrTagNotExists, "Delete tags failed for this key "+key+" does not exist."),
}, nil
}
delete(copyTags, key)
@@ -1685,7 +1684,7 @@ func (ds *DataSource) DeleteTags(ctx context.Context, request *pb.DeleteServiceT
log.Errorf(err, "delete service[%s]'s tags %v failed, marshall service tags failed, operator: %s",
request.ServiceId, request.Keys, remoteIP)
return &pb.DeleteServiceTagsResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -1701,20 +1700,20 @@ func (ds *DataSource) DeleteTags(ctx context.Context, request *pb.DeleteServiceT
log.Errorf(err, "delete service[%s]'s tags %v failed, operator: %s",
request.ServiceId, request.Keys, remoteIP)
return &pb.DeleteServiceTagsResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
}, err
}
if !resp.Succeeded {
log.Errorf(err, "delete service[%s]'s tags %v failed, service does not exist, operator: %s",
request.ServiceId, request.Keys, remoteIP)
return &pb.DeleteServiceTagsResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
log.Infof("delete service[%s]'s tags %v successfully, operator: %s", request.ServiceId, request.Keys, remoteIP)
return &pb.DeleteServiceTagsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Delete service tags successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Delete service tags successfully."),
}, nil
}
@@ -1728,7 +1727,7 @@ func (ds *DataSource) AddRule(ctx context.Context, request *pb.AddServiceRulesRe
log.Errorf(nil, "add service[%s] rule failed, service does not exist, operator: %s",
request.ServiceId, remoteIP)
return &pb.AddServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Service does not exist."),
}, nil
}
res := quota.NewApplyQuotaResource(quota.RuleQuotaType, domainProject, request.ServiceId, int64(len(request.Rules)))
@@ -1737,7 +1736,7 @@ func (ds *DataSource) AddRule(ctx context.Context, request *pb.AddServiceRulesRe
if errQuota != nil {
log.Errorf(errQuota, "add service[%s] rule failed, operator: %s", request.ServiceId, remoteIP)
response := &pb.AddServiceRulesResponse{
- Response: proto.CreateResponseWithSCErr(errQuota),
+ Response: pb.CreateResponseWithSCErr(errQuota),
}
if errQuota.InternalError() {
return response, errQuota
@@ -1748,7 +1747,7 @@ func (ds *DataSource) AddRule(ctx context.Context, request *pb.AddServiceRulesRe
ruleType, _, err := serviceUtil.GetServiceRuleType(ctx, domainProject, request.ServiceId)
if err != nil {
return &pb.AddServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
ruleIDs := make([]string, 0, len(request.Rules))
@@ -1762,7 +1761,7 @@ func (ds *DataSource) AddRule(ctx context.Context, request *pb.AddServiceRulesRe
"add service[%s] rule failed, can not add different RuleType at the same time, operator: %s",
request.ServiceId, remoteIP)
return &pb.AddServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrBlackAndWhiteRule,
+ Response: pb.CreateResponse(scerr.ErrBlackAndWhiteRule,
"Service can only contain one rule type, BLACK or WHITE."),
}, nil
@@ -1796,7 +1795,7 @@ func (ds *DataSource) AddRule(ctx context.Context, request *pb.AddServiceRulesRe
log.Errorf(err, "add service[%s] rule failed, marshal rule[%s/%s] failed, operator: %s",
request.ServiceId, ruleAdd.Attribute, ruleAdd.Pattern, remoteIP)
return &pb.AddServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -1807,7 +1806,7 @@ func (ds *DataSource) AddRule(ctx context.Context, request *pb.AddServiceRulesRe
log.Infof("add service[%s] rule successfully, no rules to add, operator: %s",
request.ServiceId, remoteIP)
return &pb.AddServiceRulesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Service rules has been added."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Service rules has been added."),
}, nil
}
@@ -1819,20 +1818,20 @@ func (ds *DataSource) AddRule(ctx context.Context, request *pb.AddServiceRulesRe
if err != nil {
log.Errorf(err, "add service[%s] rule failed, operator: %s", request.ServiceId, remoteIP)
return &pb.AddServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
}, err
}
if !resp.Succeeded {
log.Errorf(nil, "add service[%s] rule failed, service does not exist, operator: %s",
request.ServiceId, remoteIP)
return &pb.AddServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
log.Infof("add service[%s] rule %v successfully, operator: %s", request.ServiceId, ruleIDs, remoteIP)
return &pb.AddServiceRulesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Add service rules successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Add service rules successfully."),
RuleIds: ruleIDs,
}, nil
}
@@ -1845,7 +1844,7 @@ func (ds *DataSource) GetRule(ctx context.Context, request *pb.GetServiceRulesRe
if !serviceUtil.ServiceExist(ctx, domainProject, request.ServiceId) {
log.Errorf(nil, "get service[%s] rule failed, service does not exist", request.ServiceId)
return &pb.GetServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -1853,12 +1852,12 @@ func (ds *DataSource) GetRule(ctx context.Context, request *pb.GetServiceRulesRe
if err != nil {
log.Errorf(err, "get service[%s] rule failed", request.ServiceId)
return &pb.GetServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
return &pb.GetServiceRulesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get service rules successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get service rules successfully."),
Rules: rules,
}, nil
}
@@ -1873,7 +1872,7 @@ func (ds *DataSource) UpdateRule(ctx context.Context, request *pb.UpdateServiceR
log.Errorf(nil, "update service rule[%s/%s] failed, service does not exist, operator: %s",
request.ServiceId, request.RuleId, remoteIP)
return &pb.UpdateServiceRuleResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -1883,14 +1882,14 @@ func (ds *DataSource) UpdateRule(ctx context.Context, request *pb.UpdateServiceR
log.Errorf(err, "update service rule[%s/%s] failed, get rule type failed, operator: %s",
request.ServiceId, request.RuleId, remoteIP)
return &pb.UpdateServiceRuleResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if ruleNum >= 1 && ruleType != request.Rule.RuleType {
log.Errorf(err, "update service rule[%s/%s] failed, can only exist one type, current type is %s, operator: %s",
request.ServiceId, request.RuleId, ruleType, remoteIP)
return &pb.UpdateServiceRuleResponse{
- Response: proto.CreateResponse(scerr.ErrModifyRuleNotAllow, "Exist multiple rules,can not change rule type. Rule type is "+ruleType),
+ Response: pb.CreateResponse(scerr.ErrModifyRuleNotAllow, "Exist multiple rules,can not change rule type. Rule type is "+ruleType),
}, nil
}
@@ -1899,14 +1898,14 @@ func (ds *DataSource) UpdateRule(ctx context.Context, request *pb.UpdateServiceR
log.Errorf(err, "update service rule[%s/%s] failed, query service rule failed, operator: %s",
request.ServiceId, request.RuleId, remoteIP)
return &pb.UpdateServiceRuleResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if rule == nil {
log.Errorf(err, "update service rule[%s/%s] failed, service rule does not exist, operator: %s",
request.ServiceId, request.RuleId, remoteIP)
return &pb.UpdateServiceRuleResponse{
- Response: proto.CreateResponse(scerr.ErrRuleNotExists, "This rule does not exist."),
+ Response: pb.CreateResponse(scerr.ErrRuleNotExists, "This rule does not exist."),
}, nil
}
@@ -1932,7 +1931,7 @@ func (ds *DataSource) UpdateRule(ctx context.Context, request *pb.UpdateServiceR
log.Errorf(err, "update service rule[%s/%s] failed, marshal service rule failed, operator: %s",
request.ServiceId, request.RuleId, remoteIP)
return &pb.UpdateServiceRuleResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
var opts []client.PluginOp
@@ -1955,20 +1954,20 @@ func (ds *DataSource) UpdateRule(ctx context.Context, request *pb.UpdateServiceR
if err != nil {
log.Errorf(err, "update service rule[%s/%s] failed, operator: %s", request.ServiceId, request.RuleId, remoteIP)
return &pb.UpdateServiceRuleResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
}, err
}
if !resp.Succeeded {
log.Errorf(err, "update service rule[%s/%s] failed, service does not exist, operator: %s",
request.ServiceId, request.RuleId, remoteIP)
return &pb.UpdateServiceRuleResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
log.Infof("update service rule[%s/%s] successfully, operator: %s", request.ServiceId, request.RuleId, remoteIP)
return &pb.UpdateServiceRuleResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get service rules successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get service rules successfully."),
}, nil
}
@@ -1982,7 +1981,7 @@ func (ds *DataSource) DeleteRule(ctx context.Context, request *pb.DeleteServiceR
log.Errorf(nil, "delete service[%s] rules %v failed, service does not exist, operator: %s",
request.ServiceId, request.RuleIds, remoteIP)
return &pb.DeleteServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -1997,14 +1996,14 @@ func (ds *DataSource) DeleteRule(ctx context.Context, request *pb.DeleteServiceR
log.Errorf(err, "delete service[%s] rules %v failed, get rule[%s] failed, operator: %s",
request.ServiceId, request.RuleIds, ruleID, remoteIP)
return &pb.DeleteServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if data == nil {
log.Errorf(nil, "delete service[%s] rules %v failed, rule[%s] does not exist, operator: %s",
request.ServiceId, request.RuleIds, ruleID, remoteIP)
return &pb.DeleteServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrRuleNotExists, "This rule does not exist."),
+ Response: pb.CreateResponse(scerr.ErrRuleNotExists, "This rule does not exist."),
}, nil
}
indexKey = apt.GenerateRuleIndexKey(domainProject, request.ServiceId, data.Attribute, data.Pattern)
@@ -2016,7 +2015,7 @@ func (ds *DataSource) DeleteRule(ctx context.Context, request *pb.DeleteServiceR
log.Errorf(nil, "delete service[%s] rules %v failed, no rule has been deleted, operator: %s",
request.ServiceId, request.RuleIds, remoteIP)
return &pb.DeleteServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrRuleNotExists, "No service rule has been deleted."),
+ Response: pb.CreateResponse(scerr.ErrRuleNotExists, "No service rule has been deleted."),
}, nil
}
@@ -2028,20 +2027,20 @@ func (ds *DataSource) DeleteRule(ctx context.Context, request *pb.DeleteServiceR
if err != nil {
log.Errorf(err, "delete service[%s] rules %v failed, operator: %s", request.ServiceId, request.RuleIds, remoteIP)
return &pb.DeleteServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
}, err
}
if !resp.Succeeded {
log.Errorf(err, "delete service[%s] rules %v failed, service does not exist, operator: %s",
request.ServiceId, request.RuleIds, remoteIP)
return &pb.DeleteServiceRulesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
log.Infof("delete service[%s] rules %v successfully, operator: %s", request.ServiceId, request.RuleIds, remoteIP)
return &pb.DeleteServiceRulesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Delete service rules successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Delete service rules successfully."),
}, nil
}
@@ -2273,20 +2272,20 @@ func (ds *DataSource) DeleteServicePri(ctx context.Context, serviceID string, fo
if serviceID == apt.Service.ServiceId {
err := errors.New("not allow to delete service center")
log.Errorf(err, "%s micro-service[%s] failed, operator: %s", title, serviceID, remoteIP)
- return proto.CreateResponse(scerr.ErrInvalidParams, err.Error()), nil
+ return pb.CreateResponse(scerr.ErrInvalidParams, err.Error()), nil
}
microservice, err := serviceUtil.GetService(ctx, domainProject, serviceID)
if err != nil {
log.Errorf(err, "%s micro-service[%s] failed, get service file failed, operator: %s",
title, serviceID, remoteIP)
- return proto.CreateResponse(scerr.ErrInternal, err.Error()), err
+ return pb.CreateResponse(scerr.ErrInternal, err.Error()), err
}
if microservice == nil {
log.Errorf(err, "%s micro-service[%s] failed, service does not exist, operator: %s",
title, serviceID, remoteIP)
- return proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."), nil
+ return pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."), nil
}
// 强制删除,则与该服务相关的信息删除,非强制删除: 如果作为该被依赖(作为provider,提供服务,且不是只存在自依赖)或者存在实例,则不能删除
@@ -2296,12 +2295,12 @@ func (ds *DataSource) DeleteServicePri(ctx context.Context, serviceID string, fo
if err != nil {
log.Errorf(err, "delete micro-service[%s] failed, get service dependency failed, operator: %s",
serviceID, remoteIP)
- return proto.CreateResponse(scerr.ErrInternal, err.Error()), err
+ return pb.CreateResponse(scerr.ErrInternal, err.Error()), err
}
if l := len(services); l > 1 || (l == 1 && services[0] != serviceID) {
log.Errorf(nil, "delete micro-service[%s] failed, other services[%d] depend on it, operator: %s",
serviceID, l, remoteIP)
- return proto.CreateResponse(scerr.ErrDependedOnConsumer, "Can not delete this service, other service rely it."), err
+ return pb.CreateResponse(scerr.ErrDependedOnConsumer, "Can not delete this service, other service rely it."), err
}
instancesKey := apt.GenerateInstanceKey(domainProject, serviceID, "")
@@ -2312,13 +2311,13 @@ func (ds *DataSource) DeleteServicePri(ctx context.Context, serviceID string, fo
if err != nil {
log.Errorf(err, "delete micro-service[%s] failed, get instances failed, operator: %s",
serviceID, remoteIP)
- return proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()), err
+ return pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()), err
}
if rsp.Count > 0 {
log.Errorf(nil, "delete micro-service[%s] failed, service deployed instances[%s], operator: %s",
serviceID, rsp.Count, remoteIP)
- return proto.CreateResponse(scerr.ErrDeployedInstance, "Can not delete the service deployed instance(s)."), err
+ return pb.CreateResponse(scerr.ErrDeployedInstance, "Can not delete the service deployed instance(s)."), err
}
}
@@ -2342,7 +2341,7 @@ func (ds *DataSource) DeleteServicePri(ctx context.Context, serviceID string, fo
if err != nil {
log.Errorf(err, "%s micro-service[%s] failed, delete dependency failed, operator: %s",
title, serviceID, remoteIP)
- return proto.CreateResponse(scerr.ErrInternal, err.Error()), err
+ return pb.CreateResponse(scerr.ErrInternal, err.Error()), err
}
opts = append(opts, optDeleteDep)
@@ -2379,7 +2378,7 @@ func (ds *DataSource) DeleteServicePri(ctx context.Context, serviceID string, fo
if err != nil {
log.Errorf(err, "%s micro-service[%s] failed, revoke all instances failed, operator: %s",
title, serviceID, remoteIP)
- return proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()), err
+ return pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()), err
}
resp, err := client.Instance().TxnWithCmp(ctx, opts,
@@ -2389,18 +2388,18 @@ func (ds *DataSource) DeleteServicePri(ctx context.Context, serviceID string, fo
nil)
if err != nil {
log.Errorf(err, "%s micro-service[%s] failed, operator: %s", title, serviceID, remoteIP)
- return proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()), err
+ return pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()), err
}
if !resp.Succeeded {
log.Errorf(err, "%s micro-service[%s] failed, service does not exist, operator: %s",
title, serviceID, remoteIP)
- return proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."), nil
+ return pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."), nil
}
serviceUtil.RemandServiceQuota(ctx)
log.Infof("%s micro-service[%s] successfully, operator: %s", title, serviceID, remoteIP)
- return proto.CreateResponse(proto.ResponseSuccess, "Unregister service successfully."), nil
+ return pb.CreateResponse(pb.ResponseSuccess, "Unregister service successfully."), nil
}
func (ds *DataSource) GetDeleteServiceFunc(ctx context.Context, serviceID string, force bool,
@@ -2413,7 +2412,7 @@ func (ds *DataSource) GetDeleteServiceFunc(ctx context.Context, serviceID string
resp, err := ds.DeleteServicePri(ctx, serviceID, force)
if err != nil {
serviceRst.ErrMessage = err.Error()
- } else if resp.GetCode() != proto.ResponseSuccess {
+ } else if resp.GetCode() != pb.ResponseSuccess {
serviceRst.ErrMessage = resp.GetMessage()
}
diff --git a/datasource/etcd/ms_test.go b/datasource/etcd/ms_test.go
index b9ad2a3..2a98fea 100644
--- a/datasource/etcd/ms_test.go
+++ b/datasource/etcd/ms_test.go
@@ -24,7 +24,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/plugin/quota"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"github.com/apache/servicecomb-service-center/server/service"
@@ -75,7 +74,7 @@ func TestService_Register(t *testing.T) {
resp, err := datasource.Instance().RegisterService(getContext(), request)
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("register service with same key", func(t *testing.T) {
@@ -96,7 +95,7 @@ func TestService_Register(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
sameId := resp.ServiceId
// serviceName: some-relay-ms-service-name
@@ -156,7 +155,7 @@ func TestService_Register(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
// serviceName: some-relay-ms-service-name
// alias: sr1-ms-service-name
@@ -177,7 +176,7 @@ func TestService_Register(t *testing.T) {
})
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
// serviceName: some-relay-ms-service-name
// alias: sr1-ms-service-name
@@ -240,7 +239,7 @@ func TestService_Register(t *testing.T) {
assert.NotNil(t, resp)
assert.NoError(t, err)
- assert.Equal(t, resp.Response.GetCode(), proto.ResponseSuccess)
+ assert.Equal(t, resp.Response.GetCode(), pb.ResponseSuccess)
// same serviceId with different service name
resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -284,14 +283,14 @@ func TestService_Get(t *testing.T) {
resp, err := datasource.Instance().RegisterService(getContext(), request)
assert.NoError(t, err)
- assert.Equal(t, resp.Response.GetCode(), proto.ResponseSuccess)
+ assert.Equal(t, resp.Response.GetCode(), pb.ResponseSuccess)
// search service by serviceID
queryResp, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: "ms-service-query-id",
})
assert.NoError(t, err)
- assert.Equal(t, queryResp.Response.GetCode(), proto.ResponseSuccess)
+ assert.Equal(t, queryResp.Response.GetCode(), pb.ResponseSuccess)
})
t.Run("query a service by a not existed serviceId, should not pass", func(t *testing.T) {
@@ -481,7 +480,7 @@ func TestService_Update(t *testing.T) {
})
assert.NoError(t, err)
assert.NotNil(t, resp)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.NotEqual(t, "", resp.ServiceId)
serviceId = resp.ServiceId
})
@@ -500,11 +499,11 @@ func TestService_Update(t *testing.T) {
request2.Properties["k"] = "v"
resp, err := datasource.Instance().UpdateService(getContext(), request)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().UpdateService(getContext(), request2)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
respGetService, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceId,
@@ -523,7 +522,7 @@ func TestService_Update(t *testing.T) {
}
resp, err := datasource.Instance().UpdateService(getContext(), r)
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("update service by removing the properties", func(t *testing.T) {
@@ -534,7 +533,7 @@ func TestService_Update(t *testing.T) {
}
resp, err := datasource.Instance().UpdateService(getContext(), r)
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("remove properties for service with empty serviceId")
r = &pb.UpdateServicePropsRequest{
@@ -543,7 +542,7 @@ func TestService_Update(t *testing.T) {
}
resp, err = datasource.Instance().UpdateService(getContext(), r)
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
})
}
@@ -564,7 +563,7 @@ func TestService_Delete(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreate.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreate.Response.GetCode())
serviceContainInstId = respCreate.ServiceId
log.Info("attach instance")
@@ -580,7 +579,7 @@ func TestService_Delete(t *testing.T) {
Instance: instance,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateIns.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateIns.Response.GetCode())
log.Info("create service without instance")
provider := &pb.MicroService{
@@ -594,7 +593,7 @@ func TestService_Delete(t *testing.T) {
Service: provider,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreate.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreate.Response.GetCode())
serviceNoInstId = respCreate.ServiceId
respCreate, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -607,7 +606,7 @@ func TestService_Delete(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreate.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreate.Response.GetCode())
})
t.Run("delete a service which contains instances with no force flag", func(t *testing.T) {
@@ -617,7 +616,7 @@ func TestService_Delete(t *testing.T) {
Force: false,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("delete a service which contains instances with force flag", func(t *testing.T) {
@@ -627,7 +626,7 @@ func TestService_Delete(t *testing.T) {
Force: true,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
// todo: add delete service depended by consumer after finishing dependency management
@@ -639,7 +638,7 @@ func TestService_Delete(t *testing.T) {
Force: true,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("delete a service with no force flag", func(t *testing.T) {
@@ -649,7 +648,7 @@ func TestService_Delete(t *testing.T) {
Force: false,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
})
}
@@ -660,32 +659,32 @@ func TestService_Info(t *testing.T) {
Options: []string{"all"},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().GetServicesInfo(getContext(), &pb.GetServicesInfoRequest{
Options: []string{""},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().GetServicesInfo(getContext(), &pb.GetServicesInfoRequest{
Options: []string{"tags", "rules", "instances", "schemas", "statistics"},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().GetServicesInfo(getContext(), &pb.GetServicesInfoRequest{
Options: []string{"statistics"},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().GetServicesInfo(getContext(), &pb.GetServicesInfoRequest{
Options: []string{"instances"},
CountOnly: true,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
}
@@ -706,7 +705,7 @@ func TestService_Detail(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
serviceId = resp.ServiceId
datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -715,7 +714,7 @@ func TestService_Detail(t *testing.T) {
Schema: "detail",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
@@ -728,34 +727,34 @@ func TestService_Detail(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("when get invalid service detail, should be failed")
respD, err := datasource.Instance().GetServiceDetail(getContext(), &pb.GetServiceRequest{
ServiceId: "",
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respD.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respD.Response.GetCode())
log.Info("when get a service detail, should be passed")
respGetServiceDetail, err := datasource.Instance().GetServiceDetail(getContext(), &pb.GetServiceRequest{
ServiceId: serviceId,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respGetServiceDetail.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respGetServiceDetail.Response.GetCode())
respDelete, err := datasource.Instance().UnregisterService(getContext(), &pb.DeleteServiceRequest{
ServiceId: serviceId,
Force: true,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respDelete.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respDelete.Response.GetCode())
respGetServiceDetail, err = datasource.Instance().GetServiceDetail(getContext(), &pb.GetServiceRequest{
ServiceId: serviceId,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respGetServiceDetail.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respGetServiceDetail.Response.GetCode())
})
}
@@ -764,13 +763,13 @@ func TestApplication_Get(t *testing.T) {
log.Info("when request is valid, should be passed")
resp, err := datasource.Instance().GetApplications(getContext(), &pb.GetAppsRequest{})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().GetApplications(getContext(), &pb.GetAppsRequest{
Environment: pb.ENV_ACCEPT,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
}
@@ -789,7 +788,7 @@ func TestInstance_Create(t *testing.T) {
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
})
@@ -805,7 +804,7 @@ func TestInstance_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInst.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInst.Response.GetCode())
assert.NotEqual(t, "", respCreateInst.InstanceId)
respCreateInst, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -820,7 +819,7 @@ func TestInstance_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInst.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInst.Response.GetCode())
assert.Equal(t, "customId_ms", respCreateInst.InstanceId)
})
@@ -837,13 +836,13 @@ func TestInstance_Create(t *testing.T) {
Instance: instance,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
Instance: instance,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.Equal(t, instance.InstanceId, resp.InstanceId)
})
}
@@ -867,7 +866,7 @@ func TestInstance_HeartBeat(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
respCreateInstance, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -881,7 +880,7 @@ func TestInstance_HeartBeat(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInstance.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInstance.Response.GetCode())
instanceId1 = respCreateInstance.InstanceId
respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -895,7 +894,7 @@ func TestInstance_HeartBeat(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInstance.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInstance.Response.GetCode())
instanceId2 = respCreateInstance.InstanceId
})
@@ -906,7 +905,7 @@ func TestInstance_HeartBeat(t *testing.T) {
InstanceId: instanceId1,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("serviceId does not exist")
resp, err = datasource.Instance().Heartbeat(getContext(), &pb.HeartbeatRequest{
@@ -914,7 +913,7 @@ func TestInstance_HeartBeat(t *testing.T) {
InstanceId: instanceId1,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("instance does not exist")
resp, err = datasource.Instance().Heartbeat(getContext(), &pb.HeartbeatRequest{
@@ -922,7 +921,7 @@ func TestInstance_HeartBeat(t *testing.T) {
InstanceId: "not-exist-ins",
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("batch update lease", func(t *testing.T) {
@@ -940,7 +939,7 @@ func TestInstance_HeartBeat(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
}
@@ -962,7 +961,7 @@ func TestInstance_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
log.Info("create instance")
@@ -978,7 +977,7 @@ func TestInstance_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInstance.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInstance.Response.GetCode())
instanceId = respCreateInstance.InstanceId
})
@@ -990,7 +989,7 @@ func TestInstance_Update(t *testing.T) {
Status: pb.MSI_DOWN,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respUpdateStatus.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respUpdateStatus.Response.GetCode())
log.Info("update instance status to OUTOFSERVICE")
respUpdateStatus, err = datasource.Instance().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
@@ -999,7 +998,7 @@ func TestInstance_Update(t *testing.T) {
Status: pb.MSI_OUTOFSERVICE,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respUpdateStatus.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respUpdateStatus.Response.GetCode())
log.Info("update instance status to STARTING")
respUpdateStatus, err = datasource.Instance().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
@@ -1008,7 +1007,7 @@ func TestInstance_Update(t *testing.T) {
Status: pb.MSI_STARTING,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respUpdateStatus.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respUpdateStatus.Response.GetCode())
log.Info("update instance status to TESTING")
respUpdateStatus, err = datasource.Instance().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
@@ -1017,7 +1016,7 @@ func TestInstance_Update(t *testing.T) {
Status: pb.MSI_TESTING,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respUpdateStatus.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respUpdateStatus.Response.GetCode())
log.Info("update instance status to UP")
respUpdateStatus, err = datasource.Instance().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
@@ -1026,7 +1025,7 @@ func TestInstance_Update(t *testing.T) {
Status: pb.MSI_UP,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respUpdateStatus.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respUpdateStatus.Response.GetCode())
log.Info("update instance status with a not exist instance")
respUpdateStatus, err = datasource.Instance().UpdateInstanceStatus(getContext(), &pb.UpdateInstanceStatusRequest{
@@ -1035,7 +1034,7 @@ func TestInstance_Update(t *testing.T) {
Status: pb.MSI_STARTING,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respUpdateStatus.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respUpdateStatus.Response.GetCode())
})
t.Run("update instance properties", func(t *testing.T) {
@@ -1049,7 +1048,7 @@ func TestInstance_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respUpdateProperties.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respUpdateProperties.Response.GetCode())
log.Info("all max properties updated")
size := 1000
@@ -1065,7 +1064,7 @@ func TestInstance_Update(t *testing.T) {
Properties: properties,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respUpdateProperties.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respUpdateProperties.Response.GetCode())
log.Info("update instance that does not exist")
respUpdateProperties, err = datasource.Instance().UpdateInstanceProperties(getContext(),
@@ -1077,7 +1076,7 @@ func TestInstance_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respUpdateProperties.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respUpdateProperties.Response.GetCode())
log.Info("remove properties")
respUpdateProperties, err = datasource.Instance().UpdateInstanceProperties(getContext(),
@@ -1086,7 +1085,7 @@ func TestInstance_Update(t *testing.T) {
InstanceId: instanceId,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respUpdateProperties.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respUpdateProperties.Response.GetCode())
log.Info("update service that does not exist")
respUpdateProperties, err = datasource.Instance().UpdateInstanceProperties(getContext(),
@@ -1098,7 +1097,7 @@ func TestInstance_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respUpdateProperties.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respUpdateProperties.Response.GetCode())
})
}
@@ -1132,7 +1131,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId1 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -1145,7 +1144,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId2 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -1158,7 +1157,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId3 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -1172,7 +1171,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId4 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -1184,12 +1183,12 @@ func TestInstance_Query(t *testing.T) {
Level: "FRONT",
Status: pb.MS_UP,
Properties: map[string]string{
- proto.PropAllowCrossApp: "true",
+ pb.PropAllowCrossApp: "true",
},
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId5 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(
@@ -1204,7 +1203,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId6 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -1217,7 +1216,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId7 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -1230,7 +1229,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId8 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -1243,7 +1242,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId9 = respCreateService.ServiceId
respCreateInstance, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -1257,7 +1256,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInstance.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInstance.Response.GetCode())
instanceId1 = respCreateInstance.InstanceId
respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -1271,7 +1270,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInstance.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInstance.Response.GetCode())
instanceId2 = respCreateInstance.InstanceId
respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -1285,7 +1284,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInstance.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInstance.Response.GetCode())
instanceId4 = respCreateInstance.InstanceId
respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -1299,7 +1298,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInstance.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInstance.Response.GetCode())
instanceId5 = respCreateInstance.InstanceId
respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -1313,7 +1312,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInstance.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInstance.Response.GetCode())
instanceId8 = respCreateInstance.InstanceId
respCreateInstance, err = datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -1327,7 +1326,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInstance.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInstance.Response.GetCode())
instanceId9 = respCreateInstance.InstanceId
})
@@ -1340,7 +1339,7 @@ func TestInstance_Query(t *testing.T) {
VersionRule: "latest",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, instanceId2, respFind.Instances[0].InstanceId)
respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
@@ -1351,7 +1350,7 @@ func TestInstance_Query(t *testing.T) {
Tags: []string{},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, instanceId2, respFind.Instances[0].InstanceId)
respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
@@ -1361,7 +1360,7 @@ func TestInstance_Query(t *testing.T) {
VersionRule: "1.0.0",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, instanceId1, respFind.Instances[0].InstanceId)
respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
@@ -1381,7 +1380,7 @@ func TestInstance_Query(t *testing.T) {
VersionRule: "1.0.0",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 1, len(respFind.Instances))
assert.Equal(t, instanceId4, respFind.Instances[0].InstanceId)
@@ -1392,7 +1391,7 @@ func TestInstance_Query(t *testing.T) {
VersionRule: "1.0.0",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 1, len(respFind.Instances))
assert.Equal(t, instanceId4, respFind.Instances[0].InstanceId)
@@ -1405,7 +1404,7 @@ func TestInstance_Query(t *testing.T) {
VersionRule: "1.0.0",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
rev, _ := ctx.Value(util.CtxResponseRevision).(string)
assert.Equal(t, instanceId8, respFind.Instances[0].InstanceId)
assert.NotEqual(t, 0, len(rev))
@@ -1418,7 +1417,7 @@ func TestInstance_Query(t *testing.T) {
VersionRule: "1.0.0",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, instanceId8, respFind.Instances[0].InstanceId)
assert.Equal(t, ctx.Value(util.CtxResponseRevision), rev)
@@ -1430,7 +1429,7 @@ func TestInstance_Query(t *testing.T) {
VersionRule: "1.0.5",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 0, len(respFind.Instances))
log.Info("provider tag does not exist")
@@ -1442,7 +1441,7 @@ func TestInstance_Query(t *testing.T) {
Tags: []string{"not_exist_tag"},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 0, len(respFind.Instances))
log.Info("shared service discovery")
@@ -1460,7 +1459,7 @@ func TestInstance_Query(t *testing.T) {
VersionRule: "1.0.0",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 1, len(respFind.Instances))
assert.Equal(t, instanceId5, respFind.Instances[0].InstanceId)
@@ -1471,7 +1470,7 @@ func TestInstance_Query(t *testing.T) {
VersionRule: "1.0.0",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 1, len(respFind.Instances))
assert.Equal(t, instanceId5, respFind.Instances[0].InstanceId)
@@ -1510,7 +1509,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, int64(0), respFind.Services.Updated[0].Index)
assert.Equal(t, instanceId2, respFind.Services.Updated[0].Instances[0].InstanceId)
assert.Equal(t, int64(1), respFind.Services.Updated[1].Index)
@@ -1532,7 +1531,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 1, len(respFind.Services.Updated[0].Instances))
assert.Equal(t, instanceId4, respFind.Services.Updated[0].Instances[0].InstanceId)
@@ -1572,7 +1571,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
rev := respFind.Services.Updated[0].Rev
assert.Equal(t, int64(0), respFind.Services.Updated[0].Index)
assert.Equal(t, int64(1), respFind.Services.Updated[1].Index)
@@ -1609,7 +1608,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, instanceId8, respFind.Services.Updated[0].Instances[0].InstanceId)
assert.Equal(t, respFind.Services.Updated[0].Rev, rev)
assert.Equal(t, instanceId9, respFind.Instances.Updated[0].Instances[0].InstanceId)
@@ -1638,7 +1637,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, int64(0), respFind.Services.NotModified[0])
assert.Equal(t, int64(0), respFind.Instances.NotModified[0])
@@ -1656,7 +1655,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 0, len(respFind.Services.Updated[0].Instances))
log.Info("shared service discovery")
@@ -1680,7 +1679,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 1, len(respFind.Services.Updated[0].Instances))
assert.Equal(t, instanceId5, respFind.Services.Updated[0].Instances[0].InstanceId)
@@ -1697,7 +1696,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 1, len(respFind.Services.Updated[0].Instances))
assert.Equal(t, instanceId5, respFind.Services.Updated[0].Instances[0].InstanceId)
@@ -1716,7 +1715,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, scerr.ErrServiceNotExists, respFind.Instances.Failed[0].Error.Code)
respFind, err = datasource.Instance().BatchFind(getContext(), &pb.BatchFindInstancesRequest{
@@ -1731,7 +1730,7 @@ func TestInstance_Query(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 1, len(respFind.Instances.Updated[0].Instances))
assert.Equal(t, instanceId5, respFind.Instances.Updated[0].Instances[0].InstanceId)
@@ -1751,7 +1750,7 @@ func TestInstance_Query(t *testing.T) {
UTFunc(serviceId3, scerr.ErrServiceNotExists)
- UTFunc(serviceId1, proto.ResponseSuccess)
+ UTFunc(serviceId1, pb.ResponseSuccess)
log.Info("diff env")
respFind, err := datasource.Instance().GetInstances(getContext(), &pb.GetInstancesRequest{
@@ -1759,7 +1758,7 @@ func TestInstance_Query(t *testing.T) {
ProviderServiceId: serviceId2,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respFind.Response.GetCode())
})
}
@@ -1782,7 +1781,7 @@ func TestInstance_GetOne(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId1 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -1795,7 +1794,7 @@ func TestInstance_GetOne(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId2 = respCreateService.ServiceId
respCreateInstance, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -1809,7 +1808,7 @@ func TestInstance_GetOne(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
instanceId2 = respCreateInstance.InstanceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -1822,7 +1821,7 @@ func TestInstance_GetOne(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId3 = respCreateService.ServiceId
})
@@ -1834,7 +1833,7 @@ func TestInstance_GetOne(t *testing.T) {
ProviderInstanceId: instanceId2,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("consumer does not exist")
resp, err = datasource.Instance().GetInstance(getContext(), &pb.GetOneInstanceRequest{
@@ -1843,7 +1842,7 @@ func TestInstance_GetOne(t *testing.T) {
ProviderInstanceId: instanceId2,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("get between diff apps", func(t *testing.T) {
@@ -1860,7 +1859,7 @@ func TestInstance_GetOne(t *testing.T) {
ProviderServiceId: serviceId2,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respAll.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respAll.Response.GetCode())
})
t.Run("get instances when request is invalid", func(t *testing.T) {
@@ -1870,7 +1869,7 @@ func TestInstance_GetOne(t *testing.T) {
ProviderServiceId: serviceId2,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("consumer does not exist")
resp, err = datasource.Instance().GetInstances(getContext(), &pb.GetInstancesRequest{
@@ -1878,7 +1877,7 @@ func TestInstance_GetOne(t *testing.T) {
ProviderServiceId: serviceId2,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
}
@@ -1902,7 +1901,7 @@ func TestInstance_Unregister(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
respCreateInstance, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -1916,7 +1915,7 @@ func TestInstance_Unregister(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateInstance.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateInstance.Response.GetCode())
instanceId = respCreateInstance.InstanceId
})
@@ -1926,7 +1925,7 @@ func TestInstance_Unregister(t *testing.T) {
InstanceId: instanceId,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("unregister instance when request is invalid", func(t *testing.T) {
@@ -1936,7 +1935,7 @@ func TestInstance_Unregister(t *testing.T) {
InstanceId: instanceId,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("instance id does not exist")
resp, err = datasource.Instance().UnregisterInstance(getContext(), &pb.UnregisterInstanceRequest{
@@ -1944,7 +1943,7 @@ func TestInstance_Unregister(t *testing.T) {
InstanceId: "not-exist-id-ms",
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
})
}
@@ -1967,7 +1966,7 @@ func TestSchema_Create(t *testing.T) {
})
assert.NoError(t, err)
assert.NotEqual(t, "", resp.ServiceId)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
serviceIdDev = resp.ServiceId
resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -1982,7 +1981,7 @@ func TestSchema_Create(t *testing.T) {
})
assert.NoError(t, err)
assert.NotEqual(t, "", resp.ServiceId)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("create schemas out of gauge", func(t *testing.T) {
@@ -2015,7 +2014,7 @@ func TestSchema_Create(t *testing.T) {
Schemas: schemas[:quota.DefaultSchemaQuota],
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("should be failed in production env")
resp, err = datasource.Instance().ModifySchemas(getContext(), &pb.ModifySchemasRequest{
@@ -2044,7 +2043,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
serviceIdDev1 = resp.ServiceId
resp, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -2061,7 +2060,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
serviceIdDev2 = resp.ServiceId
log.Info("create schemas with service schemaId set is empty")
@@ -2082,7 +2081,7 @@ func TestSchema_Create(t *testing.T) {
Schemas: schemas,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateSchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateSchema.Response.GetCode())
// todo: test GetAllSchemaInfo interface refers to schema_test line 342
@@ -2112,14 +2111,14 @@ func TestSchema_Create(t *testing.T) {
Schemas: schemas,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateSchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateSchema.Response.GetCode())
log.Info("query service by serviceID to obtain schema info")
respGetService, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceIdDev1,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respGetService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respGetService.Response.GetCode())
assert.Equal(t, []string{"second_schemaId_service_ms"}, respGetService.Service.Schemas)
log.Info("add new schemaId not exist in service's schemaId list")
@@ -2135,13 +2134,13 @@ func TestSchema_Create(t *testing.T) {
Schemas: schemas,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateSchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateSchema.Response.GetCode())
respGetService, err = datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceIdDev2,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respGetService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respGetService.Response.GetCode())
assert.Equal(t, []string{"second_schemaId_service_ms"}, respGetService.Service.Schemas)
})
@@ -2163,7 +2162,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceIdPro1 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -2181,7 +2180,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceIdPro2 = respCreateService.ServiceId
log.Info("add schemas to service whose schemaId set is empty")
@@ -2202,12 +2201,12 @@ func TestSchema_Create(t *testing.T) {
Schemas: schemas,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchemas.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchemas.Response.GetCode())
respGetService, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceIdPro1,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respGetService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respGetService.Response.GetCode())
assert.Equal(t, []string{"first_schemaId_service_ms"}, respGetService.Service.Schemas)
// todo: finish ut after implementing GetAllSchemaInfo, refer to schema_test.go line. 496
@@ -2218,7 +2217,7 @@ func TestSchema_Create(t *testing.T) {
Schemas: schemas,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchemas.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchemas.Response.GetCode())
log.Info("add schemas, non-exist schemaId")
schemas = []*pb.Schema{
@@ -2242,7 +2241,7 @@ func TestSchema_Create(t *testing.T) {
Schema: "first_schema_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("add schemas when summary in database is empty")
schemas = []*pb.Schema{
@@ -2257,7 +2256,7 @@ func TestSchema_Create(t *testing.T) {
Schemas: schemas,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchemas.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchemas.Response.GetCode())
respExist, err := datasource.Instance().ExistSchema(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeSchema,
ServiceId: serviceIdPro2,
@@ -2271,7 +2270,7 @@ func TestSchema_Create(t *testing.T) {
Schemas: schemas,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchemas.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchemas.Response.GetCode())
})
t.Run("create a schema in dev env", func(t *testing.T) {
@@ -2292,7 +2291,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceIdDev1 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -2309,7 +2308,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceIdDev2 = respCreateService.ServiceId
log.Info("create a schema for service whose schemaID is empty")
@@ -2319,7 +2318,7 @@ func TestSchema_Create(t *testing.T) {
Schema: "first_schema_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("create schema for the service whose schemaId already exist")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2328,7 +2327,7 @@ func TestSchema_Create(t *testing.T) {
Schema: "first_schema_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("create schema for the service whose schema summary is empty")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2338,7 +2337,7 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary1change_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("create schema for the service whose schema summary already exist")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2348,7 +2347,7 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("add schema")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2357,7 +2356,7 @@ func TestSchema_Create(t *testing.T) {
Schema: "second_schema_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
})
@@ -2379,7 +2378,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceIdPro1 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -2397,7 +2396,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceIdPro2 = respCreateService.ServiceId
log.Info("create a schema for service whose schemaID is empty")
@@ -2407,7 +2406,7 @@ func TestSchema_Create(t *testing.T) {
Schema: "first_schema_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schema summary is empty")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2417,7 +2416,7 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary1change_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schema summary already exist")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2427,7 +2426,7 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary_service_ms",
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("add schema")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2436,7 +2435,7 @@ func TestSchema_Create(t *testing.T) {
Schema: "second_schema_service_ms",
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schemaId already exist")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2445,7 +2444,7 @@ func TestSchema_Create(t *testing.T) {
Schema: "first_schema_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
})
@@ -2466,7 +2465,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceIdPro1 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -2483,7 +2482,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceIdPro2 = respCreateService.ServiceId
log.Info("create a schema for service whose schemaID is empty")
@@ -2493,7 +2492,7 @@ func TestSchema_Create(t *testing.T) {
Schema: "first_schema_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schema summary is empty")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2503,7 +2502,7 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary1change_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schema summary already exist")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2513,7 +2512,7 @@ func TestSchema_Create(t *testing.T) {
Summary: "first0summary_service_ms",
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("add schema")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2522,7 +2521,7 @@ func TestSchema_Create(t *testing.T) {
Schema: "second_schema_service_ms",
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
log.Info("modify schema for the service whose schemaId already exist")
respModifySchema, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2531,7 +2530,7 @@ func TestSchema_Create(t *testing.T) {
Schema: "first_schema_service_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
})
t.Run("add a schemaId in production env while schema editable is set", func(t *testing.T) {
@@ -2550,7 +2549,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceIdPro1 = respCreateService.ServiceId
log.Info("add a schema with new schemaId, should pass")
@@ -2566,13 +2565,13 @@ func TestSchema_Create(t *testing.T) {
Schemas: schemas,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchemas.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchemas.Response.GetCode())
respService, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceIdPro1,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respService.Response.GetCode())
assert.Equal(t, []string{"first_schemaId_ms"}, respService.Service.Schemas)
schemas = []*pb.Schema{
@@ -2599,7 +2598,7 @@ func TestSchema_Create(t *testing.T) {
Schemas: schemas,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchemas.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchemas.Response.GetCode())
})
t.Run("modify a schema in production env while schema editable is set", func(t *testing.T) {
@@ -2618,7 +2617,7 @@ func TestSchema_Create(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceIdPro1 = respCreateService.ServiceId
log.Info("add schemas, should pass")
@@ -2634,7 +2633,7 @@ func TestSchema_Create(t *testing.T) {
Schemas: schemas,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchemas.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchemas.Response.GetCode())
respService, err := datasource.Instance().GetService(getContext(), &pb.GetServiceRequest{
ServiceId: serviceIdPro1,
@@ -2662,7 +2661,7 @@ func TestSchema_Create(t *testing.T) {
Schema: schemas[0].SchemaId,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respModifySchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respModifySchema.Response.GetCode())
})
}
@@ -2684,7 +2683,7 @@ func TestSchema_Exist(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
log.Info("add schemas, should pass")
@@ -2695,7 +2694,7 @@ func TestSchema_Exist(t *testing.T) {
Summary: "summary_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceId,
@@ -2703,7 +2702,7 @@ func TestSchema_Exist(t *testing.T) {
Schema: "query schema ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("check exists", func(t *testing.T) {
@@ -2714,7 +2713,7 @@ func TestSchema_Exist(t *testing.T) {
SchemaId: "com.huawei.test.ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.Equal(t, "summary_ms", resp.Summary)
resp, err = datasource.Instance().ExistSchema(getContext(), &pb.GetExistenceRequest{
@@ -2726,7 +2725,7 @@ func TestSchema_Exist(t *testing.T) {
Version: "()",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().ExistSchema(getContext(), &pb.GetExistenceRequest{
Type: service.ExistTypeSchema,
@@ -2734,7 +2733,7 @@ func TestSchema_Exist(t *testing.T) {
SchemaId: "com.huawei.test.no.summary.ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.Equal(t, "com.huawei.test.no.summary.ms", resp.SchemaId)
assert.Equal(t, "", resp.Summary)
})
@@ -2769,7 +2768,7 @@ func TestSchema_Get(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
respCreateSchema, err := datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2779,7 +2778,7 @@ func TestSchema_Get(t *testing.T) {
Summary: "schema0summary1ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateSchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateSchema.Response.GetCode())
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
@@ -2796,7 +2795,7 @@ func TestSchema_Get(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId1 = respCreateService.ServiceId
respPutData, err := datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2805,7 +2804,7 @@ func TestSchema_Get(t *testing.T) {
Schema: schemaContent,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respPutData.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respPutData.Response.GetCode())
respPutData, err = datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
ServiceId: serviceId1,
@@ -2814,14 +2813,14 @@ func TestSchema_Get(t *testing.T) {
Summary: summary,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respPutData.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respPutData.Response.GetCode())
respGetAllSchema, err := datasource.Instance().GetAllSchemas(getContext(), &pb.GetAllSchemaRequest{
ServiceId: serviceId1,
WithSchema: false,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respGetAllSchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respGetAllSchema.Response.GetCode())
schemas := respGetAllSchema.Schemas
for _, schema := range schemas {
if schema.SchemaId == schemaId1 && schema.SchemaId == schemaId2 {
@@ -2839,7 +2838,7 @@ func TestSchema_Get(t *testing.T) {
WithSchema: true,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respGetAllSchema.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respGetAllSchema.Response.GetCode())
schemas = respGetAllSchema.Schemas
for _, schema := range schemas {
switch schema.SchemaId {
@@ -2886,7 +2885,7 @@ func TestSchema_Get(t *testing.T) {
SchemaId: "com.huawei.test.ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.Equal(t, "get schema ms", resp.Schema)
assert.Equal(t, "schema0summary1ms", resp.SchemaSummary)
@@ -2909,7 +2908,7 @@ func TestSchema_Delete(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
resp, err := datasource.Instance().ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -2919,7 +2918,7 @@ func TestSchema_Delete(t *testing.T) {
Summary: "summary_ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("test delete when request is invalid", func(t *testing.T) {
@@ -2929,7 +2928,7 @@ func TestSchema_Delete(t *testing.T) {
SchemaId: "none_exist_schema",
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("service id does not exist")
resp, err = datasource.Instance().DeleteSchema(getContext(), &pb.DeleteSchemaRequest{
@@ -2937,7 +2936,7 @@ func TestSchema_Delete(t *testing.T) {
SchemaId: "com.huawei.test.ms",
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("test delete when request is valid", func(t *testing.T) {
@@ -2946,7 +2945,7 @@ func TestSchema_Delete(t *testing.T) {
SchemaId: "com.huawei.test.ms",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
respGet, err := datasource.Instance().GetSchema(getContext(), &pb.GetSchemaRequest{
ServiceId: serviceId,
@@ -2982,7 +2981,7 @@ func TestRule_Add(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId1 = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -2995,7 +2994,7 @@ func TestRule_Add(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId2 = respCreateService.ServiceId
})
@@ -3013,7 +3012,7 @@ func TestRule_Add(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respAddRule)
+ assert.NotEqual(t, pb.ResponseSuccess, respAddRule)
})
t.Run("request is valid", func(t *testing.T) {
@@ -3030,7 +3029,7 @@ func TestRule_Add(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAddRule.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAddRule.Response.GetCode())
ruleId := respAddRule.RuleIds[0]
assert.NotEqual(t, "", ruleId)
@@ -3047,7 +3046,7 @@ func TestRule_Add(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAddRule.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAddRule.Response.GetCode())
assert.Equal(t, 0, len(respAddRule.RuleIds))
log.Info("create a new white list when black list already exists")
@@ -3063,7 +3062,7 @@ func TestRule_Add(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, respAddRule.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, respAddRule.Response.GetCode())
})
t.Run("create rule out of gaugue", func(t *testing.T) {
@@ -3083,7 +3082,7 @@ func TestRule_Add(t *testing.T) {
Rules: rules[:size-1],
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
resp, err = datasource.Instance().AddRule(getContext(), &pb.AddServiceRulesRequest{
ServiceId: serviceId2,
@@ -3111,7 +3110,7 @@ func TestRule_Get(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
respAddRule, err := datasource.Instance().AddRule(getContext(), &pb.AddServiceRulesRequest{
@@ -3126,7 +3125,7 @@ func TestRule_Get(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAddRule.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAddRule.Response.GetCode())
ruleId = respAddRule.RuleIds[0]
assert.NotEqual(t, "", ruleId)
})
@@ -3145,7 +3144,7 @@ func TestRule_Get(t *testing.T) {
ServiceId: serviceId,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respGetRule.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respGetRule.Response.GetCode())
assert.Equal(t, ruleId, respGetRule.Rules[0].RuleId)
})
}
@@ -3167,7 +3166,7 @@ func TestRule_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
respAddRule, err := datasource.Instance().AddRule(getContext(), &pb.AddServiceRulesRequest{
@@ -3182,7 +3181,7 @@ func TestRule_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAddRule.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAddRule.Response.GetCode())
ruleId = respAddRule.RuleIds[0]
assert.NotEqual(t, "", ruleId)
})
@@ -3201,7 +3200,7 @@ func TestRule_Update(t *testing.T) {
Rule: rule,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("rule not exists")
resp, err = datasource.Instance().UpdateRule(getContext(), &pb.UpdateServiceRuleRequest{
@@ -3210,7 +3209,7 @@ func TestRule_Update(t *testing.T) {
Rule: rule,
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("change rule type")
resp, err = datasource.Instance().UpdateRule(getContext(), &pb.UpdateServiceRuleRequest{
@@ -3224,7 +3223,7 @@ func TestRule_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.NotEqual(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.NotEqual(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("update when request is valid", func(t *testing.T) {
@@ -3239,7 +3238,7 @@ func TestRule_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
}
@@ -3259,7 +3258,7 @@ func TestRule_Delete(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
serviceId = respCreateService.ServiceId
respAddRule, err := datasource.Instance().AddRule(getContext(), &pb.AddServiceRulesRequest{
@@ -3274,7 +3273,7 @@ func TestRule_Delete(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAddRule.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAddRule.Response.GetCode())
ruleId = respAddRule.RuleIds[0]
assert.NotEqual(t, "", ruleId)
})
@@ -3303,13 +3302,13 @@ func TestRule_Delete(t *testing.T) {
RuleIds: []string{ruleId},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
respGetRule, err := datasource.Instance().GetRule(getContext(), &pb.GetServiceRulesRequest{
ServiceId: serviceId,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.Equal(t, 0, len(respGetRule.Rules))
})
}
@@ -3332,7 +3331,7 @@ func TestRule_Permission(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
consumerVersion = respCreateService.ServiceId
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
@@ -3345,7 +3344,7 @@ func TestRule_Permission(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
providerBlack = respCreateService.ServiceId
respAddRule, err := datasource.Instance().AddRule(getContext(), &pb.AddServiceRulesRequest{
@@ -3364,7 +3363,7 @@ func TestRule_Permission(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAddRule.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAddRule.Response.GetCode())
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
@@ -3376,7 +3375,7 @@ func TestRule_Permission(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
providerWhite = respCreateService.ServiceId
respAddRule, err = datasource.Instance().AddRule(getContext(), &pb.AddServiceRulesRequest{
@@ -3395,7 +3394,7 @@ func TestRule_Permission(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAddRule.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAddRule.Response.GetCode())
respCreateService, err = datasource.Instance().RegisterService(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
@@ -3407,7 +3406,7 @@ func TestRule_Permission(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respCreateService.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respCreateService.Response.GetCode())
consumerTag = respCreateService.ServiceId
respAddTag, err := datasource.Instance().AddTags(getContext(), &pb.AddServiceTagsRequest{
@@ -3415,7 +3414,7 @@ func TestRule_Permission(t *testing.T) {
Tags: map[string]string{"a": "b"},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAddTag.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAddTag.Response.GetCode())
})
t.Run("when query instances", func(t *testing.T) {
@@ -3443,7 +3442,7 @@ func TestRule_Permission(t *testing.T) {
VersionRule: "0+",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 0, len(respFind.Instances))
respFind, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
@@ -3453,7 +3452,7 @@ func TestRule_Permission(t *testing.T) {
VersionRule: "0+",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respFind.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respFind.Response.GetCode())
assert.Equal(t, 0, len(respFind.Instances))
log.Info("consumer not in black list")
@@ -3462,7 +3461,7 @@ func TestRule_Permission(t *testing.T) {
ProviderServiceId: providerBlack,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("consumer not in white list")
resp, err = datasource.Instance().GetInstances(getContext(), &pb.GetInstancesRequest{
@@ -3478,7 +3477,7 @@ func TestRule_Permission(t *testing.T) {
ProviderServiceId: providerWhite,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
log.Info("consumer tag in white list")
resp, err = datasource.Instance().GetInstances(getContext(), &pb.GetInstancesRequest{
@@ -3486,7 +3485,7 @@ func TestRule_Permission(t *testing.T) {
ProviderServiceId: providerWhite,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
}
@@ -3552,7 +3551,7 @@ func TestTags_Add(t *testing.T) {
Tags: tags,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("tag's quota exceeded", func(t *testing.T) {
@@ -3568,7 +3567,7 @@ func TestTags_Add(t *testing.T) {
Tags: tags,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
tags["out"] = "range"
resp, _ = datasource.Instance().AddTags(getContext(), &pb.AddServiceTagsRequest{
@@ -3594,7 +3593,7 @@ func TestTags_Get(t *testing.T) {
Service: svc,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
serviceId = resp.ServiceId
log.Info("add tags should be passed")
@@ -3606,7 +3605,7 @@ func TestTags_Get(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAddTags.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAddTags.Response.GetCode())
})
t.Run("the request is invalid", func(t *testing.T) {
@@ -3636,7 +3635,7 @@ func TestTags_Get(t *testing.T) {
ServiceId: serviceId,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.Equal(t, "test", resp.Tags["a"])
})
}
@@ -3655,7 +3654,7 @@ func TestTag_Update(t *testing.T) {
Service: svc,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
serviceId = resp.ServiceId
log.Info("add tags")
@@ -3667,7 +3666,7 @@ func TestTag_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAddTags.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAddTags.Response.GetCode())
})
t.Run("the request is invalid", func(t *testing.T) {
@@ -3707,7 +3706,7 @@ func TestTag_Update(t *testing.T) {
Value: "update",
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
})
t.Run("find instance, contain tag", func(t *testing.T) {
@@ -3722,7 +3721,7 @@ func TestTag_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
consumerId := resp.ServiceId
log.Info("create provider")
@@ -3736,7 +3735,7 @@ func TestTag_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
providerId := resp.ServiceId
log.Info("tag the provider")
@@ -3745,7 +3744,7 @@ func TestTag_Update(t *testing.T) {
Tags: map[string]string{"filter_tag": "filter"},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, addTagsResp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, addTagsResp.Response.GetCode())
log.Info("add instance to provider")
instanceResp, err := datasource.Instance().RegisterInstance(getContext(), &pb.RegisterInstanceRequest{
@@ -3759,7 +3758,7 @@ func TestTag_Update(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, instanceResp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, instanceResp.Response.GetCode())
log.Info("find instance")
findResp, err := datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
@@ -3770,7 +3769,7 @@ func TestTag_Update(t *testing.T) {
Tags: []string{"not-exist-tag"},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, findResp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, findResp.Response.GetCode())
assert.Equal(t, 0, len(findResp.Instances))
findResp, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
@@ -3781,7 +3780,7 @@ func TestTag_Update(t *testing.T) {
Tags: []string{"filter_tag"},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, findResp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, findResp.Response.GetCode())
assert.Equal(t, instanceResp.InstanceId, findResp.Instances[0].InstanceId)
// no add rules
@@ -3792,7 +3791,7 @@ func TestTag_Update(t *testing.T) {
Tags: map[string]string{"consumer_tag": "filter"},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, addTagsResp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, addTagsResp.Response.GetCode())
findResp, err = datasource.Instance().FindInstances(getContext(), &pb.FindInstancesRequest{
ConsumerServiceId: consumerId,
@@ -3802,7 +3801,7 @@ func TestTag_Update(t *testing.T) {
Tags: []string{"filter_tag"},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, findResp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, findResp.Response.GetCode())
})
}
@@ -3819,7 +3818,7 @@ func TestTags_Delete(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
serviceId = resp.ServiceId
respAddTages, err := datasource.Instance().AddTags(getContext(), &pb.AddServiceTagsRequest{
@@ -3830,7 +3829,7 @@ func TestTags_Delete(t *testing.T) {
},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, respAddTages.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, respAddTages.Response.GetCode())
})
t.Run("the request is invalid", func(t *testing.T) {
@@ -3857,13 +3856,13 @@ func TestTags_Delete(t *testing.T) {
Keys: []string{"a", "b"},
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
respGetTags, err := datasource.Instance().GetTags(getContext(), &pb.GetServiceTagsRequest{
ServiceId: serviceId,
})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, pb.ResponseSuccess, resp.Response.GetCode())
assert.Equal(t, "", respGetTags.Tags["a"])
})
}
diff --git a/datasource/etcd/sd/aggregate/repo.go b/datasource/etcd/sd/aggregate/repo.go
index f3d58b1..07ade8c 100644
--- a/datasource/etcd/sd/aggregate/repo.go
+++ b/datasource/etcd/sd/aggregate/repo.go
@@ -17,7 +17,7 @@ package aggregate
import (
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
)
func init() {
diff --git a/datasource/etcd/sd/cacher.go b/datasource/etcd/sd/cacher.go
index f99c8b6..153c8c1 100644
--- a/datasource/etcd/sd/cacher.go
+++ b/datasource/etcd/sd/cacher.go
@@ -20,7 +20,6 @@ package sd
import (
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/registry"
- "github.com/apache/servicecomb-service-center/pkg/types"
"github.com/apache/servicecomb-service-center/pkg/util"
)
@@ -39,7 +38,7 @@ func (c *CommonCacher) Cache() CacheReader {
return c.cache
}
-func (c *CommonCacher) Notify(action types.EventType, key string, kv *KeyValue) {
+func (c *CommonCacher) Notify(action registry.EventType, key string, kv *KeyValue) {
switch action {
case registry.EVT_DELETE:
c.cache.Remove(key)
diff --git a/datasource/etcd/sd/config.go b/datasource/etcd/sd/config.go
index 4f394b6..a1538cf 100644
--- a/datasource/etcd/sd/config.go
+++ b/datasource/etcd/sd/config.go
@@ -19,7 +19,7 @@ package sd
import (
"fmt"
- "github.com/apache/servicecomb-service-center/server/core/proto"
+ "github.com/apache/servicecomb-service-center/datasource/etcd/value"
"time"
)
@@ -31,7 +31,7 @@ type Config struct {
Period time.Duration
DeferHandler DeferHandler
OnEvent KvEventFunc
- Parser proto.Parser
+ Parser value.Parser
}
func (cfg *Config) String() string {
@@ -81,7 +81,7 @@ func (cfg *Config) AppendEventFunc(f KvEventFunc) *Config {
return cfg
}
-func (cfg *Config) WithParser(parser proto.Parser) *Config {
+func (cfg *Config) WithParser(parser value.Parser) *Config {
cfg.Parser = parser
return cfg
}
@@ -92,6 +92,6 @@ func Configure() *Config {
Timeout: DefaultTimeout,
Period: time.Second,
InitSize: DefaultCacheInitSize,
- Parser: proto.BytesParser,
+ Parser: value.BytesParser,
}
}
diff --git a/datasource/etcd/sd/config_test.go b/datasource/etcd/sd/config_test.go
index 2df9ef9..db38ca8 100644
--- a/datasource/etcd/sd/config_test.go
+++ b/datasource/etcd/sd/config_test.go
@@ -18,7 +18,7 @@
package sd
import (
- "github.com/apache/servicecomb-service-center/server/core/proto"
+ "github.com/apache/servicecomb-service-center/datasource/etcd/value"
"testing"
"time"
)
@@ -72,8 +72,8 @@ func TestConfigure(t *testing.T) {
if i != 3 {
t.Fatalf("TestConfigure failed")
}
- cfg.WithParser(proto.MapParser)
- if cfg.Parser != proto.MapParser {
+ cfg.WithParser(value.MapParser)
+ if cfg.Parser != value.MapParser {
t.Fatalf("TestConfigure failed")
}
if cfg.String() != "{key: /test, timeout: 2s, period: 3s}" {
diff --git a/datasource/etcd/sd/etcd/adaptor.go b/datasource/etcd/sd/etcd/adaptor.go
index 7a8e55a..8d6cdf8 100644
--- a/datasource/etcd/sd/etcd/adaptor.go
+++ b/datasource/etcd/sd/etcd/adaptor.go
@@ -20,7 +20,7 @@ package etcd
import (
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
"github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
)
// Adaptor implements sd.Adaptor.
diff --git a/datasource/etcd/sd/etcd/adaptor_test.go b/datasource/etcd/sd/etcd/adaptor_test.go
index 0cc3952..d251c89 100644
--- a/datasource/etcd/sd/etcd/adaptor_test.go
+++ b/datasource/etcd/sd/etcd/adaptor_test.go
@@ -19,7 +19,7 @@ package etcd
import (
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"testing"
)
diff --git a/datasource/etcd/sd/etcd/cacher_kv.go b/datasource/etcd/sd/etcd/cacher_kv.go
index c37ad17..3e09179 100644
--- a/datasource/etcd/sd/etcd/cacher_kv.go
+++ b/datasource/etcd/sd/etcd/cacher_kv.go
@@ -28,7 +28,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
rmodel "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/coreos/etcd/mvcc/mvccpb"
"sync"
"time"
diff --git a/datasource/etcd/sd/etcd/cacher_kv_test.go b/datasource/etcd/sd/etcd/cacher_kv_test.go
index 100c84d..32295c2 100644
--- a/datasource/etcd/sd/etcd/cacher_kv_test.go
+++ b/datasource/etcd/sd/etcd/cacher_kv_test.go
@@ -23,10 +23,10 @@ import (
"fmt"
"github.com/apache/servicecomb-service-center/datasource/etcd/client"
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
+ "github.com/apache/servicecomb-service-center/datasource/etcd/value"
"github.com/apache/servicecomb-service-center/pkg/gopool"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/coreos/etcd/mvcc/mvccpb"
"math/rand"
"strconv"
@@ -290,7 +290,7 @@ func TestNewKvCacher(t *testing.T) {
lw.Bus <- nil
evt.KV = nil
old := *cr.Cfg
- cr.Cfg.WithParser(proto.MapParser)
+ cr.Cfg.WithParser(value.MapParser)
cr.refresh(ctx)
// check event
if evt.KV != nil {
@@ -380,7 +380,7 @@ func BenchmarkFilter(b *testing.B) {
}
v, _ := json.Marshal(inst)
- cfg := sd.Configure().WithParser(proto.InstanceParser)
+ cfg := sd.Configure().WithParser(value.InstanceParser)
n := 300 * 1000 // 30w
cache := sd.NewKvCache("test", cfg)
diff --git a/datasource/etcd/sd/etcd/common.go b/datasource/etcd/sd/etcd/common.go
index 06367c3..45b5caf 100644
--- a/datasource/etcd/sd/etcd/common.go
+++ b/datasource/etcd/sd/etcd/common.go
@@ -18,7 +18,7 @@ package etcd
import (
"github.com/apache/servicecomb-service-center/datasource/etcd"
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
- "github.com/apache/servicecomb-service-center/server/core/proto"
+ "github.com/apache/servicecomb-service-center/datasource/etcd/value"
"github.com/coreos/etcd/mvcc/mvccpb"
"time"
)
@@ -39,7 +39,7 @@ func init() {
close(closedCh)
}
-func FromEtcdKeyValue(dist *sd.KeyValue, src *mvccpb.KeyValue, parser proto.Parser) (err error) {
+func FromEtcdKeyValue(dist *sd.KeyValue, src *mvccpb.KeyValue, parser value.Parser) (err error) {
dist.ClusterName = etcd.Configuration().ClusterName
dist.Key = src.Key
dist.Version = src.Version
diff --git a/datasource/etcd/sd/etcd/indexer_etcd.go b/datasource/etcd/sd/etcd/indexer_etcd.go
index 3b1b832..d2a5380 100644
--- a/datasource/etcd/sd/etcd/indexer_etcd.go
+++ b/datasource/etcd/sd/etcd/indexer_etcd.go
@@ -20,7 +20,7 @@ package etcd
import (
"fmt"
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
- "github.com/apache/servicecomb-service-center/server/core/proto"
+ "github.com/apache/servicecomb-service-center/datasource/etcd/value"
"strings"
"github.com/apache/servicecomb-service-center/datasource/etcd/client"
@@ -34,7 +34,7 @@ import (
// Indexer searches data from etcd server.
type Indexer struct {
Client client.Registry
- Parser proto.Parser
+ Parser value.Parser
Root string
}
@@ -88,6 +88,6 @@ func (i *Indexer) Creditable() bool {
return true
}
-func NewEtcdIndexer(root string, p proto.Parser) (indexer *Indexer) {
+func NewEtcdIndexer(root string, p value.Parser) (indexer *Indexer) {
return &Indexer{Client: client.Instance(), Parser: p, Root: root}
}
diff --git a/datasource/etcd/sd/etcd/indexer_test.go b/datasource/etcd/sd/etcd/indexer_test.go
index 09daae7..9e85dc7 100644
--- a/datasource/etcd/sd/etcd/indexer_test.go
+++ b/datasource/etcd/sd/etcd/indexer_test.go
@@ -21,7 +21,7 @@ import (
"context"
"github.com/apache/servicecomb-service-center/datasource/etcd/client"
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
- "github.com/apache/servicecomb-service-center/server/core/proto"
+ "github.com/apache/servicecomb-service-center/datasource/etcd/value"
"github.com/coreos/etcd/mvcc/mvccpb"
"testing"
)
@@ -29,7 +29,7 @@ import (
func TestEtcdIndexer_Search(t *testing.T) {
data := &client.PluginResponse{Revision: 1}
c := &mockRegistry{}
- i := &Indexer{Client: c, Root: "/", Parser: proto.BytesParser}
+ i := &Indexer{Client: c, Root: "/", Parser: value.BytesParser}
// case: key does not contain prefix
resp, err := i.Search(context.Background(), client.WithStrKey("a"))
@@ -54,7 +54,7 @@ func TestEtcdIndexer_Search(t *testing.T) {
data.Count = 2
data.Kvs = []*mvccpb.KeyValue{{Key: []byte("/a/b"), Value: []byte("abc")}, {Key: []byte("/a/c"), Value: []byte("{}")}}
old := i.Parser
- i.Parser = proto.MapParser
+ i.Parser = value.MapParser
c.Response = data
resp, err = i.Search(context.Background(), client.WithStrKey("/a"))
if err != nil || resp == nil || resp.Count != 2 || len(resp.Kvs) != 1 {
diff --git a/datasource/etcd/sd/k8s/adaptor/cacher_instance.go b/datasource/etcd/sd/k8s/adaptor/cacher_instance.go
index 8b21411..3c251e5 100644
--- a/datasource/etcd/sd/k8s/adaptor/cacher_instance.go
+++ b/datasource/etcd/sd/k8s/adaptor/cacher_instance.go
@@ -20,7 +20,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"k8s.io/api/core/v1"
"reflect"
"strconv"
@@ -110,7 +109,7 @@ func (c *InstanceCacher) onEndpointsEvent(evt K8sEvent) {
Status: pb.MSI_UP,
DataCenterInfo: &pb.DataCenterInfo{},
Timestamp: strconv.FormatInt(pod.CreationTimestamp.Unix(), 10),
- Version: getLabel(svc.Labels, LabelVersion, proto.VERSION),
+ Version: getLabel(svc.Labels, LabelVersion, pb.VERSION),
Properties: map[string]string{
PropNodeIP: pod.Status.HostIP,
},
diff --git a/datasource/etcd/sd/k8s/adaptor/convertor.go b/datasource/etcd/sd/k8s/adaptor/convertor.go
index 750b2ab..6acbf4c 100644
--- a/datasource/etcd/sd/k8s/adaptor/convertor.go
+++ b/datasource/etcd/sd/k8s/adaptor/convertor.go
@@ -20,7 +20,6 @@ import (
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"k8s.io/api/core/v1"
"net/url"
"strconv"
@@ -83,9 +82,9 @@ func generateServiceKey(domainProject string, svc *v1.Service) *pb.MicroServiceK
return &pb.MicroServiceKey{
Tenant: domainProject,
Environment: getLabel(svc.Labels, LabelEnvironment, ""),
- AppId: getLabel(svc.Labels, LabelApp, proto.AppID),
+ AppId: getLabel(svc.Labels, LabelApp, pb.AppID),
ServiceName: svc.Name,
- Version: getLabel(svc.Labels, LabelVersion, proto.VERSION),
+ Version: getLabel(svc.Labels, LabelVersion, pb.VERSION),
}
}
@@ -93,9 +92,9 @@ func FromK8sService(domainProject string, svc *v1.Service) (ms *pb.MicroService)
ms = &pb.MicroService{
ServiceId: generateServiceID(domainProject, svc),
Environment: getLabel(svc.Labels, LabelEnvironment, ""),
- AppId: getLabel(svc.Labels, LabelApp, proto.AppID),
+ AppId: getLabel(svc.Labels, LabelApp, pb.AppID),
ServiceName: svc.Name,
- Version: getLabel(svc.Labels, LabelVersion, proto.VERSION),
+ Version: getLabel(svc.Labels, LabelVersion, pb.VERSION),
Level: "BACK",
Status: pb.MS_UP,
Framework: &pb.FrameWorkProperty{
diff --git a/datasource/etcd/sd/k8s/adaptor/listwatcher.go b/datasource/etcd/sd/k8s/adaptor/listwatcher.go
index 520d400..0d36413 100644
--- a/datasource/etcd/sd/k8s/adaptor/listwatcher.go
+++ b/datasource/etcd/sd/k8s/adaptor/listwatcher.go
@@ -19,13 +19,12 @@ import (
"context"
"github.com/apache/servicecomb-service-center/pkg/queue"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
- "github.com/apache/servicecomb-service-center/pkg/types"
"k8s.io/client-go/tools/cache"
"reflect"
)
type K8sEvent struct {
- EventType types.EventType
+ EventType pb.EventType
Object interface{}
PrevObject interface{}
}
diff --git a/datasource/etcd/sd/servicecenter/aggregate.go b/datasource/etcd/sd/servicecenter/aggregate.go
index 3d8bdcf..4e9ec2e 100644
--- a/datasource/etcd/sd/servicecenter/aggregate.go
+++ b/datasource/etcd/sd/servicecenter/aggregate.go
@@ -22,8 +22,8 @@ import (
"github.com/apache/servicecomb-service-center/datasource/etcd"
etcdclient "github.com/apache/servicecomb-service-center/datasource/etcd/client"
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/apache/servicecomb-service-center/pkg/model"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/plugin/security/tlsconf"
@@ -49,8 +49,8 @@ func getClientTLS() (*tls.Config, error) {
return clientTLS, err
}
-func (c *SCClientAggregate) GetScCache(ctx context.Context) (*model.Cache, map[string]error) {
- var caches *model.Cache
+func (c *SCClientAggregate) GetScCache(ctx context.Context) (*dump.Cache, map[string]error) {
+ var caches *dump.Cache
errs := make(map[string]error)
for _, client := range *c {
cache, err := client.GetScCache(ctx)
@@ -60,7 +60,7 @@ func (c *SCClientAggregate) GetScCache(ctx context.Context) (*model.Cache, map[s
}
if caches == nil {
- caches = &model.Cache{}
+ caches = &dump.Cache{}
}
c.cacheAppend(client.Cfg.Name, &caches.Microservices, &cache.Microservices)
c.cacheAppend(client.Cfg.Name, &caches.Indexes, &cache.Indexes)
@@ -75,8 +75,8 @@ func (c *SCClientAggregate) GetScCache(ctx context.Context) (*model.Cache, map[s
return caches, errs
}
-func (c *SCClientAggregate) cacheAppend(name string, setter model.Setter, getter model.Getter) {
- getter.ForEach(func(_ int, v *model.KV) bool {
+func (c *SCClientAggregate) cacheAppend(name string, setter dump.Setter, getter dump.Getter) {
+ getter.ForEach(func(_ int, v *dump.KV) bool {
if len(v.ClusterName) == 0 || v.ClusterName == etcdclient.DefaultClusterName {
v.ClusterName = name
}
diff --git a/datasource/etcd/sd/servicecenter/syncer.go b/datasource/etcd/sd/servicecenter/syncer.go
index e628051..858285e 100644
--- a/datasource/etcd/sd/servicecenter/syncer.go
+++ b/datasource/etcd/sd/servicecenter/syncer.go
@@ -20,7 +20,7 @@ import (
"github.com/apache/servicecomb-service-center/datasource/etcd"
"github.com/apache/servicecomb-service-center/datasource/etcd/kv"
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
- "github.com/apache/servicecomb-service-center/pkg/model"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"sync"
"time"
@@ -109,14 +109,14 @@ func (c *Syncer) Sync(ctx context.Context) {
}
}
-func (c *Syncer) check(local *Cacher, remote model.Getter, skipClusters map[string]error) {
+func (c *Syncer) check(local *Cacher, remote dump.Getter, skipClusters map[string]error) {
c.checkWithConflictHandleFunc(local, remote, skipClusters, c.skipHandleFunc)
}
-func (c *Syncer) checkWithConflictHandleFunc(local *Cacher, remote model.Getter, skipClusters map[string]error,
- conflictHandleFunc func(origin *model.KV, conflict model.Getter, index int)) {
- exists := make(map[string]*model.KV)
- remote.ForEach(func(i int, v *model.KV) bool {
+func (c *Syncer) checkWithConflictHandleFunc(local *Cacher, remote dump.Getter, skipClusters map[string]error,
+ conflictHandleFunc func(origin *dump.KV, conflict dump.Getter, index int)) {
+ exists := make(map[string]*dump.KV)
+ remote.ForEach(func(i int, v *dump.KV) bool {
// because the result of the remote return may contain the same data as
// the local cache of the current SC. So we need to ignore it and
// prevent the aggregation result from increasing.
@@ -158,7 +158,7 @@ func (c *Syncer) checkWithConflictHandleFunc(local *Cacher, remote model.Getter,
var deletes []*sd.KeyValue
local.Cache().ForEach(func(key string, v *sd.KeyValue) (next bool) {
var exist bool
- remote.ForEach(func(_ int, v *model.KV) bool {
+ remote.ForEach(func(_ int, v *dump.KV) bool {
if v.ClusterName == etcd.Configuration().ClusterName {
return true
}
@@ -180,13 +180,13 @@ func (c *Syncer) checkWithConflictHandleFunc(local *Cacher, remote model.Getter,
}
}
-func (c *Syncer) skipHandleFunc(origin *model.KV, conflict model.Getter, index int) {
+func (c *Syncer) skipHandleFunc(origin *dump.KV, conflict dump.Getter, index int) {
}
-func (c *Syncer) logConflictFunc(origin *model.KV, conflict model.Getter, index int) {
+func (c *Syncer) logConflictFunc(origin *dump.KV, conflict dump.Getter, index int) {
switch conflict.(type) {
- case *model.MicroserviceIndexSlice:
- slice := conflict.(*model.MicroserviceIndexSlice)
+ case *dump.MicroserviceIndexSlice:
+ slice := conflict.(*dump.MicroserviceIndexSlice)
kv := (*slice)[index]
if serviceID := origin.Value.(string); kv.Value != serviceID {
key := core.GetInfoFromSvcIndexKV(util.StringToBytesWithNoCopy(kv.Key))
@@ -194,8 +194,8 @@ func (c *Syncer) logConflictFunc(origin *model.KV, conflict model.Getter, index
kv.ClusterName, kv.Value, key.Environment, key.AppId, key.ServiceName, key.Version,
serviceID, origin.ClusterName)
}
- case *model.MicroserviceAliasSlice:
- slice := conflict.(*model.MicroserviceAliasSlice)
+ case *dump.MicroserviceAliasSlice:
+ slice := conflict.(*dump.MicroserviceAliasSlice)
kv := (*slice)[index]
if serviceID := origin.Value.(string); kv.Value != serviceID {
key := core.GetInfoFromSvcAliasKV(util.StringToBytesWithNoCopy(kv.Key))
diff --git a/datasource/etcd/sd/servicecenter/syncer_test.go b/datasource/etcd/sd/servicecenter/syncer_test.go
index 17b5797..5a069e0 100644
--- a/datasource/etcd/sd/servicecenter/syncer_test.go
+++ b/datasource/etcd/sd/servicecenter/syncer_test.go
@@ -19,8 +19,8 @@ import (
"fmt"
"github.com/apache/servicecomb-service-center/datasource/etcd"
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/apache/servicecomb-service-center/pkg/model"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"testing"
)
@@ -30,13 +30,13 @@ func TestClusterIndexer_Sync(t *testing.T) {
c := sd.NewKvCache("test", sd.Configure())
cfg := sd.Configure()
sccacher := NewServiceCenterCacher(cfg, c)
- arr := model.MicroserviceIndexSlice{}
+ arr := dump.MicroserviceIndexSlice{}
// case: sync empty data
cfg.WithEventFunc(func(sd.KvEvent) {
t.Fatalf("TestClusterIndexer_Sync failed")
})
- syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(*model.KV, model.Getter, int) {
+ syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(*dump.KV, dump.Getter, int) {
t.Fatalf("TestClusterIndexer_Sync failed")
})
@@ -47,9 +47,9 @@ func TestClusterIndexer_Sync(t *testing.T) {
}
fmt.Println(evt)
})
- arr = model.MicroserviceIndexSlice{}
- arr.SetValue(&model.KV{Key: "/a", Value: "a", Rev: 1, ClusterName: "a"})
- syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(*model.KV, model.Getter, int) {
+ arr = dump.MicroserviceIndexSlice{}
+ arr.SetValue(&dump.KV{Key: "/a", Value: "a", Rev: 1, ClusterName: "a"})
+ syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(*dump.KV, dump.Getter, int) {
t.Fatalf("TestClusterIndexer_Sync failed")
})
@@ -60,9 +60,9 @@ func TestClusterIndexer_Sync(t *testing.T) {
}
fmt.Println(evt)
})
- arr = model.MicroserviceIndexSlice{}
- arr.SetValue(&model.KV{Key: "/a", Value: "aa", Rev: 2, ClusterName: "a"})
- syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(kv *model.KV, _ model.Getter, _ int) {
+ arr = dump.MicroserviceIndexSlice{}
+ arr.SetValue(&dump.KV{Key: "/a", Value: "aa", Rev: 2, ClusterName: "a"})
+ syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(kv *dump.KV, _ dump.Getter, _ int) {
t.Fatalf("TestClusterIndexer_Sync failed %v", kv)
})
@@ -70,7 +70,7 @@ func TestClusterIndexer_Sync(t *testing.T) {
cfg.WithEventFunc(func(evt sd.KvEvent) {
t.Fatalf("TestClusterIndexer_Sync failed, %v", evt)
})
- syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(*model.KV, model.Getter, int) {
+ syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(*dump.KV, dump.Getter, int) {
t.Fatalf("TestClusterIndexer_Sync failed")
})
@@ -78,9 +78,9 @@ func TestClusterIndexer_Sync(t *testing.T) {
cfg.WithEventFunc(func(evt sd.KvEvent) {
t.Fatalf("TestClusterIndexer_Sync failed, %v", evt)
})
- arr = model.MicroserviceIndexSlice{}
- arr.SetValue(&model.KV{Key: "/a", Value: "aa", Rev: 2, ClusterName: "a"})
- arr.SetValue(&model.KV{Key: "/a", Value: "aa", Rev: 2, ClusterName: "b"})
+ arr = dump.MicroserviceIndexSlice{}
+ arr.SetValue(&dump.KV{Key: "/a", Value: "aa", Rev: 2, ClusterName: "a"})
+ arr.SetValue(&dump.KV{Key: "/a", Value: "aa", Rev: 2, ClusterName: "b"})
syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, syncer.logConflictFunc)
// case: conflict and print log
@@ -89,9 +89,9 @@ func TestClusterIndexer_Sync(t *testing.T) {
cfg.WithEventFunc(func(evt sd.KvEvent) {
t.Fatalf("TestClusterIndexer_Sync failed, %v", evt)
})
- arr = model.MicroserviceIndexSlice{}
- arr.SetValue(&model.KV{Key: "/a", Value: "aa", Rev: 2, ClusterName: "a"})
- arr.SetValue(&model.KV{Key: "/a", Value: "ab", Rev: 2, ClusterName: "b"})
+ arr = dump.MicroserviceIndexSlice{}
+ arr.SetValue(&dump.KV{Key: "/a", Value: "aa", Rev: 2, ClusterName: "a"})
+ arr.SetValue(&dump.KV{Key: "/a", Value: "ab", Rev: 2, ClusterName: "b"})
syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, syncer.logConflictFunc)
// '/a' is incorrect key and logConflictFunc will be excepted to panic here
t.Fatalf("TestClusterIndexer_Sync failed")
@@ -101,9 +101,9 @@ func TestClusterIndexer_Sync(t *testing.T) {
cfg.WithEventFunc(func(evt sd.KvEvent) {
t.Fatalf("TestClusterIndexer_Sync failed, %v", evt)
})
- arr = model.MicroserviceIndexSlice{}
- arr.SetValue(&model.KV{Key: "/a", Value: "ab", Rev: 3, ClusterName: "b"})
- syncer.checkWithConflictHandleFunc(sccacher, &arr, map[string]error{"a": fmt.Errorf("error")}, func(kv *model.KV, _ model.Getter, _ int) {
+ arr = dump.MicroserviceIndexSlice{}
+ arr.SetValue(&dump.KV{Key: "/a", Value: "ab", Rev: 3, ClusterName: "b"})
+ syncer.checkWithConflictHandleFunc(sccacher, &arr, map[string]error{"a": fmt.Errorf("error")}, func(kv *dump.KV, _ dump.Getter, _ int) {
t.Fatalf("TestClusterIndexer_Sync failed %v", kv)
})
@@ -111,8 +111,8 @@ func TestClusterIndexer_Sync(t *testing.T) {
cfg.WithEventFunc(func(evt sd.KvEvent) {
t.Fatalf("TestClusterIndexer_Sync failed, %v", evt)
})
- arr = model.MicroserviceIndexSlice{}
- syncer.checkWithConflictHandleFunc(sccacher, &arr, map[string]error{"a": fmt.Errorf("error")}, func(kv *model.KV, _ model.Getter, _ int) {
+ arr = dump.MicroserviceIndexSlice{}
+ syncer.checkWithConflictHandleFunc(sccacher, &arr, map[string]error{"a": fmt.Errorf("error")}, func(kv *dump.KV, _ dump.Getter, _ int) {
t.Fatalf("TestClusterIndexer_Sync failed %v", kv)
})
@@ -123,8 +123,8 @@ func TestClusterIndexer_Sync(t *testing.T) {
t.Fatalf("TestClusterIndexer_Sync failed, %v", evt)
}
})
- arr = model.MicroserviceIndexSlice{}
- syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(kv *model.KV, _ model.Getter, _ int) {
+ arr = dump.MicroserviceIndexSlice{}
+ syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(kv *dump.KV, _ dump.Getter, _ int) {
t.Fatalf("TestClusterIndexer_Sync failed %v", kv)
})
@@ -135,9 +135,9 @@ func TestClusterIndexer_Sync(t *testing.T) {
}
fmt.Println(evt)
})
- arr = model.MicroserviceIndexSlice{}
- arr.SetValue(&model.KV{Key: "/a", Value: "a", Rev: 1, ClusterName: etcd.Configuration().ClusterName})
- syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(*model.KV, model.Getter, int) {
+ arr = dump.MicroserviceIndexSlice{}
+ arr.SetValue(&dump.KV{Key: "/a", Value: "a", Rev: 1, ClusterName: etcd.Configuration().ClusterName})
+ syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(*dump.KV, dump.Getter, int) {
t.Fatalf("TestClusterIndexer_Sync failed")
})
@@ -148,10 +148,10 @@ func TestClusterIndexer_Sync(t *testing.T) {
}
fmt.Println(evt)
})
- arr = model.MicroserviceIndexSlice{}
- arr.SetValue(&model.KV{Key: "/a", Value: "x", Rev: 2, ClusterName: etcd.Configuration().ClusterName})
- arr.SetValue(&model.KV{Key: "/a", Value: "aa", Rev: 2, ClusterName: "a"})
- syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(kv *model.KV, _ model.Getter, _ int) {
+ arr = dump.MicroserviceIndexSlice{}
+ arr.SetValue(&dump.KV{Key: "/a", Value: "x", Rev: 2, ClusterName: etcd.Configuration().ClusterName})
+ arr.SetValue(&dump.KV{Key: "/a", Value: "aa", Rev: 2, ClusterName: "a"})
+ syncer.checkWithConflictHandleFunc(sccacher, &arr, nil, func(kv *dump.KV, _ dump.Getter, _ int) {
t.Fatalf("TestClusterIndexer_Sync failed %v", kv)
})
}
diff --git a/datasource/etcd/sd/types.go b/datasource/etcd/sd/types.go
index d937cd1..c2b584a 100644
--- a/datasource/etcd/sd/types.go
+++ b/datasource/etcd/sd/types.go
@@ -21,8 +21,8 @@ import (
"encoding/json"
"fmt"
"github.com/apache/servicecomb-service-center/datasource/etcd/client"
+ "github.com/apache/servicecomb-service-center/pkg/registry"
simple "github.com/apache/servicecomb-service-center/pkg/time"
- "github.com/apache/servicecomb-service-center/pkg/types"
"github.com/apache/servicecomb-service-center/pkg/util"
"strconv"
"time"
@@ -89,7 +89,7 @@ type Response struct {
type KvEvent struct {
Revision int64
- Type types.EventType
+ Type registry.EventType
KV *KeyValue
CreateAt simple.Time
}
@@ -101,6 +101,6 @@ type KvEventHandler interface {
OnEvent(evt KvEvent)
}
-func NewKvEvent(action types.EventType, kv *KeyValue, rev int64) KvEvent {
+func NewKvEvent(action registry.EventType, kv *KeyValue, rev int64) KvEvent {
return KvEvent{Type: action, KV: kv, Revision: rev, CreateAt: simple.FromTime(time.Now())}
}
diff --git a/datasource/etcd/system.go b/datasource/etcd/system.go
index c69823c..7118447 100644
--- a/datasource/etcd/system.go
+++ b/datasource/etcd/system.go
@@ -21,11 +21,11 @@ import (
"context"
"github.com/apache/servicecomb-service-center/datasource/etcd/kv"
"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/pkg/gopool"
- "github.com/apache/servicecomb-service-center/pkg/model"
)
-func (ds *DataSource) DumpCache(ctx context.Context, cache *model.Cache) {
+func (ds *DataSource) DumpCache(ctx context.Context, cache *dump.Cache) {
gopool.New(ctx, gopool.Configure().Workers(2)).
Do(func(_ context.Context) { setValue(kv.Store().Service(), &cache.Microservices) }).
Do(func(_ context.Context) { setValue(kv.Store().ServiceIndex(), &cache.Indexes) }).
@@ -39,9 +39,9 @@ func (ds *DataSource) DumpCache(ctx context.Context, cache *model.Cache) {
Done()
}
-func setValue(e sd.Adaptor, setter model.Setter) {
+func setValue(e sd.Adaptor, setter dump.Setter) {
e.Cache().ForEach(func(k string, kv *sd.KeyValue) (next bool) {
- setter.SetValue(&model.KV{
+ setter.SetValue(&dump.KV{
Key: k,
Rev: kv.ModRevision,
Value: kv.Value,
diff --git a/datasource/etcd/system_test.go b/datasource/etcd/system_test.go
index aaa900a..1065393 100644
--- a/datasource/etcd/system_test.go
+++ b/datasource/etcd/system_test.go
@@ -18,14 +18,14 @@ package etcd_test
import (
"github.com/apache/servicecomb-service-center/datasource"
- "github.com/apache/servicecomb-service-center/pkg/model"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/stretchr/testify/assert"
"testing"
)
func TestAdminService_Dump(t *testing.T) {
t.Log("execute 'dump' operation,when get all,should be passed")
- var cache model.Cache
+ var cache dump.Cache
datasource.Instance().DumpCache(getContext(), &cache)
assert.Equal(t, len(cache.Indexes), len(cache.Microservices))
}
diff --git a/datasource/etcd/util.go b/datasource/etcd/util.go
index 16c4679..8a7c6ac 100644
--- a/datasource/etcd/util.go
+++ b/datasource/etcd/util.go
@@ -29,7 +29,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/plugin/uuid"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"strconv"
@@ -120,7 +119,7 @@ func newRegisterServiceResp(ctx context.Context, reqService *pb.MicroService, re
log.Errorf(err, "create micro-service[%s] failed, operator: %s",
serviceFlag, remoteIP)
return &pb.CreateServiceResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
}, err
}
@@ -132,7 +131,7 @@ func newRegisterServiceResp(ctx context.Context, reqService *pb.MicroService, re
log.Warnf("create micro-service[%s] failed, service already exists, operator: %s",
serviceFlag, remoteIP)
return &pb.CreateServiceResponse{
- Response: proto.CreateResponse(scerr.ErrServiceAlreadyExists,
+ Response: pb.CreateResponse(scerr.ErrServiceAlreadyExists,
"ServiceID conflict or found the same service with different id."),
}, nil
}
@@ -143,7 +142,7 @@ func newRegisterServiceResp(ctx context.Context, reqService *pb.MicroService, re
log.Errorf(nil, "create micro-service[%s] failed, unexpected txn response, operator: %s",
serviceFlag, remoteIP)
return &pb.CreateServiceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "Unexpected txn response."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "Unexpected txn response."),
}, nil
}
@@ -151,7 +150,7 @@ func newRegisterServiceResp(ctx context.Context, reqService *pb.MicroService, re
log.Warnf("create micro-service[%s][%s] failed, service already exists, operator: %s",
serviceIDInner, serviceFlag, remoteIP)
return &pb.CreateServiceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "register service successfully"),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "register service successfully"),
ServiceId: serviceIDInner,
}, nil
}
@@ -159,7 +158,7 @@ func newRegisterServiceResp(ctx context.Context, reqService *pb.MicroService, re
log.Infof("create micro-service[%s][%s] successfully, operator: %s",
reqService.ServiceId, serviceFlag, remoteIP)
return &pb.CreateServiceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Register service successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Register service successfully."),
ServiceId: reqService.ServiceId,
}, nil
}
diff --git a/datasource/etcd/util/dependency_query.go b/datasource/etcd/util/dependency_query.go
index 664ee6e..a1f78d1 100644
--- a/datasource/etcd/util/dependency_query.go
+++ b/datasource/etcd/util/dependency_query.go
@@ -28,7 +28,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
)
// DependencyRelationFilterOpt contains SameDomainProject and NonSelf flag
@@ -124,7 +123,7 @@ func (dr *DependencyRelation) getProviderKeys() ([]*pb.MicroServiceKey, error) {
if dr.consumer == nil {
return nil, fmt.Errorf("Invalid consumer")
}
- consumerMicroServiceKey := proto.MicroServiceToKey(dr.domainProject, dr.consumer)
+ consumerMicroServiceKey := pb.MicroServiceToKey(dr.domainProject, dr.consumer)
conKey := apt.GenerateConsumerDependencyRuleKey(dr.domainProject, consumerMicroServiceKey)
consumerDependency, err := TransferToMicroServiceDependency(dr.ctx, conKey)
@@ -260,7 +259,7 @@ func (dr *DependencyRelation) GetDependencyConsumersOfProvider() ([]*pb.MicroSer
if dr.provider == nil {
return nil, fmt.Errorf("Invalid provider")
}
- providerService := proto.MicroServiceToKey(dr.domainProject, dr.provider)
+ providerService := pb.MicroServiceToKey(dr.domainProject, dr.provider)
consumerDependAllList, err := dr.getConsumerOfDependAllServices()
if err != nil {
log.Errorf(err, "get consumers that depend on all services failed, %s", dr.provider.ServiceId)
@@ -278,7 +277,7 @@ func (dr *DependencyRelation) GetDependencyConsumersOfProvider() ([]*pb.MicroSer
}
func (dr *DependencyRelation) getConsumerOfDependAllServices() ([]*pb.MicroServiceKey, error) {
- providerService := proto.MicroServiceToKey(dr.domainProject, dr.provider)
+ providerService := pb.MicroServiceToKey(dr.domainProject, dr.provider)
providerService.ServiceName = "*"
relyAllKey := apt.GenerateProviderDependencyRuleKey(dr.domainProject, providerService)
opts := append(FromContext(dr.ctx), client.WithStrKey(relyAllKey))
diff --git a/datasource/etcd/util/dependency_util.go b/datasource/etcd/util/dependency_util.go
index 9d83a1a..55e0684 100644
--- a/datasource/etcd/util/dependency_util.go
+++ b/datasource/etcd/util/dependency_util.go
@@ -28,7 +28,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"strings"
)
@@ -161,7 +160,7 @@ func DependencyRuleExistUtil(ctx context.Context, key string, target *pb.MicroSe
func AddServiceVersionRule(ctx context.Context, domainProject string, consumer *pb.MicroService, provider *pb.MicroServiceKey) error {
//创建依赖一致
- consumerKey := proto.MicroServiceToKey(domainProject, consumer)
+ consumerKey := pb.MicroServiceToKey(domainProject, consumer)
exist, err := DependencyRuleExist(ctx, provider, consumerKey)
if exist || err != nil {
return err
@@ -362,7 +361,7 @@ func BadParamsResponse(detailErr string) *pb.CreateDependenciesResponse {
detailErr = "Request params is invalid."
}
return &pb.CreateDependenciesResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, detailErr),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, detailErr),
}
}
diff --git a/datasource/etcd/util/instance_util.go b/datasource/etcd/util/instance_util.go
index 6c5bc3a..d5ef724 100644
--- a/datasource/etcd/util/instance_util.go
+++ b/datasource/etcd/util/instance_util.go
@@ -34,7 +34,6 @@ import (
rmodel "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
)
@@ -186,7 +185,7 @@ func QueryAllProvidersInstances(ctx context.Context, selfServiceID string) (resu
for _, kv := range kvs {
results = append(results, &pb.WatchInstanceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "List instance successfully."),
+ Response: rmodel.CreateResponse(rmodel.ResponseSuccess, "List instance successfully."),
Action: string(rmodel.EVT_INIT),
Key: &pb.MicroServiceKey{
Environment: service.Environment,
@@ -253,7 +252,7 @@ func UpdateInstance(ctx context.Context, domainProject string, instance *pb.Micr
func AppendFindResponse(ctx context.Context, index int64, resp *pb.Response, instances []*pb.MicroServiceInstance,
updatedResult *[]*pb.FindResult, notModifiedResult *[]int64, failedResult **pb.FindFailedResult) {
- if code := resp.GetCode(); code != proto.ResponseSuccess {
+ if code := resp.GetCode(); code != rmodel.ResponseSuccess {
if *failedResult == nil {
*failedResult = &pb.FindFailedResult{
Error: scerr.NewError(code, resp.GetMessage()),
diff --git a/datasource/etcd/util/instance_util_test.go b/datasource/etcd/util/instance_util_test.go
index 681b447..6f516b9 100644
--- a/datasource/etcd/util/instance_util_test.go
+++ b/datasource/etcd/util/instance_util_test.go
@@ -22,7 +22,6 @@ import (
. "github.com/apache/servicecomb-service-center/datasource/etcd/util"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core/proto"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"testing"
)
@@ -134,7 +133,7 @@ func TestAppendFindResponse(t *testing.T) {
}
notModifiedResult = nil
- find.Response = proto.CreateResponse(scerr.ErrInternal, "test")
+ find.Response = pb.CreateResponse(scerr.ErrInternal, "test")
AppendFindResponse(ctx, 1, find.Response, find.Instances, &updatedResult, ¬ModifiedResult, &failedResult)
if updatedResult != nil || notModifiedResult != nil || failedResult == nil {
t.Fatal("TestAppendFindResponse failed")
@@ -142,7 +141,7 @@ func TestAppendFindResponse(t *testing.T) {
if failedResult.Error.Code != scerr.ErrInternal {
t.Fatal("TestAppendFindResponse failed")
}
- find.Response = proto.CreateResponse(scerr.ErrInvalidParams, "test")
+ find.Response = pb.CreateResponse(scerr.ErrInvalidParams, "test")
AppendFindResponse(ctx, 2, find.Response, find.Instances, &updatedResult, ¬ModifiedResult, &failedResult)
if updatedResult != nil || notModifiedResult != nil || failedResult == nil {
t.Fatal("TestAppendFindResponse failed")
@@ -159,7 +158,7 @@ func TestAppendFindResponse(t *testing.T) {
cloneCtx = context.WithValue(cloneCtx, util.CtxResponseRevision, "1")
AppendFindResponse(cloneCtx, 3, find.Response, find.Instances, &updatedResult, ¬ModifiedResult, &failedResult)
AppendFindResponse(cloneCtx, 4, find.Response, find.Instances, &updatedResult, ¬ModifiedResult, &failedResult)
- find.Response = proto.CreateResponse(scerr.ErrInternal, "test")
+ find.Response = pb.CreateResponse(scerr.ErrInternal, "test")
AppendFindResponse(ctx, 5, find.Response, find.Instances, &updatedResult, ¬ModifiedResult, &failedResult)
AppendFindResponse(ctx, 6, find.Response, find.Instances, &updatedResult, ¬ModifiedResult, &failedResult)
if updatedResult == nil || notModifiedResult == nil || failedResult == nil {
diff --git a/datasource/etcd/util/microservice_util.go b/datasource/etcd/util/microservice_util.go
index 1b2cf26..a6b96b9 100644
--- a/datasource/etcd/util/microservice_util.go
+++ b/datasource/etcd/util/microservice_util.go
@@ -29,7 +29,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/plugin/quota"
)
@@ -295,10 +294,10 @@ func GetOneDomainProjectInstanceCount(ctx context.Context, domainProject string)
func SetServiceDefaultValue(service *pb.MicroService) {
if len(service.AppId) == 0 {
- service.AppId = proto.AppID
+ service.AppId = pb.AppID
}
if len(service.Version) == 0 {
- service.Version = proto.VERSION
+ service.Version = pb.VERSION
}
if len(service.Level) == 0 {
service.Level = "BACK"
diff --git a/datasource/etcd/util/rule_util.go b/datasource/etcd/util/rule_util.go
index e38cec4..2cb7d2c 100644
--- a/datasource/etcd/util/rule_util.go
+++ b/datasource/etcd/util/rule_util.go
@@ -30,7 +30,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
)
@@ -156,12 +155,12 @@ func AllowAcrossDimension(ctx context.Context, providerService *pb.MicroService,
return fmt.Errorf("not allow across app access")
}
- if allowCrossApp, ok := providerService.Properties[proto.PropAllowCrossApp]; !ok || strings.ToLower(allowCrossApp) != "true" {
+ if allowCrossApp, ok := providerService.Properties[pb.PropAllowCrossApp]; !ok || strings.ToLower(allowCrossApp) != "true" {
return fmt.Errorf("not allow across app access")
}
}
- if !apt.IsShared(proto.MicroServiceToKey(util.ParseTargetDomainProject(ctx), providerService)) &&
+ if !apt.IsShared(pb.MicroServiceToKey(util.ParseTargetDomainProject(ctx), providerService)) &&
providerService.Environment != consumerService.Environment {
return fmt.Errorf("not allow across environment access")
}
diff --git a/datasource/etcd/util/rule_util_test.go b/datasource/etcd/util/rule_util_test.go
index fd94bd6..b8fb0a4 100644
--- a/datasource/etcd/util/rule_util_test.go
+++ b/datasource/etcd/util/rule_util_test.go
@@ -25,7 +25,6 @@ import (
. "github.com/apache/servicecomb-service-center/datasource/etcd/util"
"github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core/proto"
)
func TestRuleFilter_Filter(t *testing.T) {
@@ -101,7 +100,7 @@ func TestAllowAcrossApp(t *testing.T) {
err = AllowAcrossDimension(context.Background(), ®istry.MicroService{
AppId: "a",
Properties: map[string]string{
- proto.PropAllowCrossApp: "true",
+ registry.PropAllowCrossApp: "true",
},
}, ®istry.MicroService{
AppId: "a",
@@ -113,7 +112,7 @@ func TestAllowAcrossApp(t *testing.T) {
err = AllowAcrossDimension(context.Background(), ®istry.MicroService{
AppId: "a",
Properties: map[string]string{
- proto.PropAllowCrossApp: "true",
+ registry.PropAllowCrossApp: "true",
},
}, ®istry.MicroService{
AppId: "b",
@@ -125,7 +124,7 @@ func TestAllowAcrossApp(t *testing.T) {
err = AllowAcrossDimension(context.Background(), ®istry.MicroService{
AppId: "a",
Properties: map[string]string{
- proto.PropAllowCrossApp: "false",
+ registry.PropAllowCrossApp: "false",
},
}, ®istry.MicroService{
AppId: "b",
@@ -137,7 +136,7 @@ func TestAllowAcrossApp(t *testing.T) {
err = AllowAcrossDimension(context.Background(), ®istry.MicroService{
AppId: "a",
Properties: map[string]string{
- proto.PropAllowCrossApp: "",
+ registry.PropAllowCrossApp: "",
},
}, ®istry.MicroService{
AppId: "b",
diff --git a/server/core/proto/parser.go b/datasource/etcd/value/parser.go
similarity index 80%
rename from server/core/proto/parser.go
rename to datasource/etcd/value/parser.go
index 0a1f594..fd607ab 100644
--- a/server/core/proto/parser.go
+++ b/datasource/etcd/value/parser.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 proto
+package value
import (
"encoding/json"
diff --git a/server/core/proto/parser_test.go b/datasource/etcd/value/parser_test.go
similarity index 99%
rename from server/core/proto/parser_test.go
rename to datasource/etcd/value/parser_test.go
index cda1720..f897222 100644
--- a/server/core/proto/parser_test.go
+++ b/datasource/etcd/value/parser_test.go
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package proto
+package value
import (
"github.com/apache/servicecomb-service-center/pkg/registry"
diff --git a/datasource/etcd/version.go b/datasource/etcd/version.go
index 1aace20..85921dd 100644
--- a/datasource/etcd/version.go
+++ b/datasource/etcd/version.go
@@ -25,8 +25,8 @@ import (
"github.com/apache/servicecomb-service-center/datasource/etcd/mux"
serviceUtil "github.com/apache/servicecomb-service-center/datasource/etcd/util"
"github.com/apache/servicecomb-service-center/pkg/log"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/config"
"github.com/apache/servicecomb-service-center/version"
"os"
)
diff --git a/datasource/system.go b/datasource/system.go
index 541b225..828abd4 100644
--- a/datasource/system.go
+++ b/datasource/system.go
@@ -19,10 +19,10 @@ package datasource
import (
"context"
- "github.com/apache/servicecomb-service-center/pkg/model"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
)
// SystemManager contains the APIs of system management
type SystemManager interface {
- DumpCache(ctx context.Context, cache *model.Cache)
+ DumpCache(ctx context.Context, cache *dump.Cache)
}
diff --git a/server/core/swagger/v4.yaml b/docs/openapi/v4.yaml
similarity index 100%
rename from server/core/swagger/v4.yaml
rename to docs/openapi/v4.yaml
diff --git a/pkg/types/types.go b/pkg/cluster/types.go
similarity index 95%
rename from pkg/types/types.go
rename to pkg/cluster/types.go
index 9e13338..b96df32 100644
--- a/pkg/types/types.go
+++ b/pkg/cluster/types.go
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-package types
+package cluster
type Clusters map[string][]string
-
-type EventType string
diff --git a/pkg/model/dump.go b/pkg/dump/dump.go
similarity index 98%
rename from pkg/model/dump.go
rename to pkg/dump/dump.go
index 72c2aa5..eb63f53 100644
--- a/pkg/model/dump.go
+++ b/pkg/dump/dump.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package model
+package dump
import (
"github.com/apache/servicecomb-service-center/pkg/registry"
@@ -212,11 +212,11 @@ type Instance struct {
Value *registry.MicroServiceInstance `json:"value,omitempty"`
}
-type DumpRequest struct {
+type Request struct {
Options []string
}
-type DumpResponse struct {
+type Response struct {
Response *registry.Response `json:"response,omitempty"`
Info *version.Set `json:"info,omitempty"`
AppConfig map[string]string `json:"appConf,omitempty"`
diff --git a/pkg/model/types.go b/pkg/dump/types.go
similarity index 91%
rename from pkg/model/types.go
rename to pkg/dump/types.go
index 16b7e69..fe59d4a 100644
--- a/pkg/model/types.go
+++ b/pkg/dump/types.go
@@ -13,11 +13,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package model
+package dump
import (
+ "github.com/apache/servicecomb-service-center/pkg/cluster"
"github.com/apache/servicecomb-service-center/pkg/registry"
- "github.com/apache/servicecomb-service-center/pkg/types"
"github.com/apache/servicecomb-service-center/server/alarm/model"
)
@@ -34,7 +34,7 @@ type ClustersRequest struct {
type ClustersResponse struct {
Response *registry.Response `json:"response,omitempty"`
- Clusters types.Clusters `json:"clusters,omitempty"`
+ Clusters cluster.Clusters `json:"clusters,omitempty"`
}
type ClearAlarmRequest struct {
diff --git a/pkg/model/governance.go b/pkg/gov/governance.go
similarity index 99%
rename from pkg/model/governance.go
rename to pkg/gov/governance.go
index 65f8a41..bbe0276 100644
--- a/pkg/model/governance.go
+++ b/pkg/gov/governance.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package model
+package gov
//GovernancePolicy is a unified struct
//all governance policy must extend this struct
diff --git a/pkg/model/governance_test.go b/pkg/gov/governance_test.go
similarity index 74%
rename from pkg/model/governance_test.go
rename to pkg/gov/governance_test.go
index 76093f6..b0446e6 100644
--- a/pkg/model/governance_test.go
+++ b/pkg/gov/governance_test.go
@@ -15,35 +15,35 @@
* limitations under the License.
*/
-package model_test
+package gov_test
import (
"encoding/json"
- "github.com/apache/servicecomb-service-center/pkg/model"
+ "github.com/apache/servicecomb-service-center/pkg/gov"
"testing"
)
func TestNewInstance3(t *testing.T) {
- b, _ := json.MarshalIndent(&model.LoadBalancer{
- GovernancePolicy: &model.GovernancePolicy{
+ b, _ := json.MarshalIndent(&gov.LoadBalancer{
+ GovernancePolicy: &gov.GovernancePolicy{
Name: "Traffic2adminAPI",
},
- Spec: &model.LBSpec{RetryNext: 3, MarkerName: "traffic2adminAPI"},
+ Spec: &gov.LBSpec{RetryNext: 3, MarkerName: "traffic2adminAPI"},
}, "", " ")
t.Log(string(b))
}
func TestNewInstance2(t *testing.T) {
- b, _ := json.MarshalIndent(&model.RateLimiter{
- GovernancePolicy: &model.GovernancePolicy{
+ b, _ := json.MarshalIndent(&gov.RateLimiter{
+ GovernancePolicy: &gov.GovernancePolicy{
Name: "limitTraffic2adminAPI",
},
- Spec: &model.LimiterSpec{Burst: 10, Rate: 100, MarkerName: "traffic2adminAPI"},
+ Spec: &gov.LimiterSpec{Burst: 10, Rate: 100, MarkerName: "traffic2adminAPI"},
}, "", " ")
t.Log(string(b))
}
func TestNewInstance(t *testing.T) {
- b, _ := json.MarshalIndent(&model.TrafficMarker{
- GovernancePolicy: &model.GovernancePolicy{
+ b, _ := json.MarshalIndent(&gov.TrafficMarker{
+ GovernancePolicy: &gov.GovernancePolicy{
Name: "traffic2adminAPI",
MD: map[string]string{
"service": "payment",
@@ -52,9 +52,9 @@ func TestNewInstance(t *testing.T) {
"environment": "development",
},
},
- Spec: &model.MatchSpec{
+ Spec: &gov.MatchSpec{
TrafficMarkPolicy: "perService",
- MatchPolicies: []*model.MatchPolicy{
+ MatchPolicies: []*gov.MatchPolicy{
{
Headers: map[string]map[string]string{
"X-User": {"regex": "ja.*"},
diff --git a/pkg/model/marker.go b/pkg/gov/marker.go
similarity index 99%
rename from pkg/model/marker.go
rename to pkg/gov/marker.go
index 280348b..b942267 100644
--- a/pkg/model/marker.go
+++ b/pkg/gov/marker.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package model
+package gov
//TrafficMarker marks request, it assign a name to request in runtime
type TrafficMarker struct {
diff --git a/pkg/model/rate_limiter.go b/pkg/gov/rate_limiter.go
similarity index 98%
rename from pkg/model/rate_limiter.go
rename to pkg/gov/rate_limiter.go
index 12e2cc6..281eccd 100644
--- a/pkg/model/rate_limiter.go
+++ b/pkg/gov/rate_limiter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package model
+package gov
//RateLimiter limit request rate
type RateLimiter struct {
diff --git a/server/core/proto/service.go b/pkg/proto/service.go
similarity index 100%
rename from server/core/proto/service.go
rename to pkg/proto/service.go
diff --git a/server/core/proto/service_ex.go b/pkg/proto/service_ex.go
similarity index 100%
rename from server/core/proto/service_ex.go
rename to pkg/proto/service_ex.go
diff --git a/pkg/registry/common.go b/pkg/registry/common.go
new file mode 100644
index 0000000..19468ca
--- /dev/null
+++ b/pkg/registry/common.go
@@ -0,0 +1,69 @@
+/*
+ * 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 registry
+
+import (
+ scerr "github.com/apache/servicecomb-service-center/server/scerror"
+)
+
+const (
+ ExistenceMicroservice string = "microservice"
+ ExistenceSchema string = "schema"
+
+ PropAllowCrossApp = "allowCrossApp"
+
+ ResponseSuccess int32 = 0
+
+ AppID = "default"
+ VERSION = "0.0.1"
+)
+
+func CreateResponse(code int32, message string) *Response {
+ resp := &Response{
+ Code: code,
+ Message: message,
+ }
+ return resp
+}
+
+func CreateResponseWithSCErr(err *scerr.Error) *Response {
+ return &Response{
+ Code: err.Code,
+ Message: err.Detail,
+ }
+}
+
+func DependenciesToKeys(in []*MicroServiceKey, domainProject string) []*MicroServiceKey {
+ for _, value := range in {
+ if len(value.Tenant) == 0 {
+ value.Tenant = domainProject
+ }
+ }
+ return in
+}
+
+func MicroServiceToKey(domainProject string, in *MicroService) *MicroServiceKey {
+ return &MicroServiceKey{
+ Tenant: domainProject,
+ Environment: in.Environment,
+ AppId: in.AppId,
+ ServiceName: in.ServiceName,
+ Alias: in.Alias,
+ Version: in.Version,
+ }
+}
diff --git a/pkg/registry/struct.go b/pkg/registry/types.go
similarity index 98%
rename from pkg/registry/struct.go
rename to pkg/registry/types.go
index d65e544..006a163 100644
--- a/pkg/registry/struct.go
+++ b/pkg/registry/types.go
@@ -17,8 +17,6 @@
package registry
-import "github.com/apache/servicecomb-service-center/pkg/types"
-
const (
MS_UP string = "UP"
MS_DOWN string = "DOWN"
@@ -38,17 +36,19 @@ const (
REGISTERBY_SIDECAR string = "SIDECAR"
REGISTERBY_PLATFORM string = "PLATFORM"
- EVT_INIT types.EventType = "INIT"
- EVT_CREATE types.EventType = "CREATE"
- EVT_UPDATE types.EventType = "UPDATE"
- EVT_DELETE types.EventType = "DELETE"
- EVT_EXPIRE types.EventType = "EXPIRE"
- EVT_ERROR types.EventType = "ERROR"
+ EVT_INIT EventType = "INIT"
+ EVT_CREATE EventType = "CREATE"
+ EVT_UPDATE EventType = "UPDATE"
+ EVT_DELETE EventType = "DELETE"
+ EVT_EXPIRE EventType = "EXPIRE"
+ EVT_ERROR EventType = "ERROR"
CHECK_BY_HEARTBEAT string = "push"
CHECK_BY_PLATFORM string = "pull"
)
+type EventType string
+
type HeartbeatSetRequest struct {
Instances []*HeartbeatSetElement `protobuf:"bytes,1,rep,name=instances" json:"instances,omitempty"`
}
diff --git a/scctl/pkg/model/types.go b/scctl/pkg/model/types.go
index 022c5ec..866ca5c 100644
--- a/scctl/pkg/model/types.go
+++ b/scctl/pkg/model/types.go
@@ -16,7 +16,7 @@
package model
import (
- "github.com/apache/servicecomb-service-center/pkg/model"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
@@ -26,12 +26,12 @@ import (
func GetDomainProject(resource interface{}) (domainProject string) {
switch resource.(type) {
- case *model.Microservice:
+ case *dump.Microservice:
_, domainProject = core.GetInfoFromSvcKV(
- util.StringToBytesWithNoCopy(resource.(*model.Microservice).Key))
- case *model.Instance:
+ util.StringToBytesWithNoCopy(resource.(*dump.Microservice).Key))
+ case *dump.Instance:
_, _, domainProject = core.GetInfoFromInstKV(
- util.StringToBytesWithNoCopy(resource.(*model.Instance).Key))
+ util.StringToBytesWithNoCopy(resource.(*dump.Instance).Key))
}
return
}
diff --git a/scctl/pkg/plugin/diagnose/compare_holder.go b/scctl/pkg/plugin/diagnose/compare_holder.go
index dffa797..a9146eb 100644
--- a/scctl/pkg/plugin/diagnose/compare_holder.go
+++ b/scctl/pkg/plugin/diagnose/compare_holder.go
@@ -18,10 +18,10 @@ package diagnose
import (
"context"
"fmt"
+ "github.com/apache/servicecomb-service-center/datasource/etcd/value"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/pkg/gopool"
- "github.com/apache/servicecomb-service-center/pkg/model"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/coreos/etcd/mvcc/mvccpb"
)
@@ -31,13 +31,13 @@ type CompareHolder interface {
type DataStore struct {
Data []*mvccpb.KeyValue
- DataParser proto.Parser
+ DataParser value.Parser
}
-func (d *DataStore) ForEach(f func(i int, v *model.KV) bool) {
+func (d *DataStore) ForEach(f func(i int, v *dump.KV) bool) {
for i, kv := range d.Data {
obj, _ := d.DataParser.Unmarshal(kv.Value)
- if !f(i, &model.KV{Key: string(kv.Key), Rev: kv.ModRevision, Value: obj}) {
+ if !f(i, &dump.KV{Key: string(kv.Key), Rev: kv.ModRevision, Value: obj}) {
return
}
}
@@ -49,14 +49,14 @@ type CompareResult struct {
}
type abstractCompareHolder struct {
- Cache model.Getter
+ Cache dump.Getter
DataStore *DataStore
- MismatchFunc func(v *model.KV) string
+ MismatchFunc func(v *dump.KV) string
}
-func (h *abstractCompareHolder) toMap(getter model.Getter) map[string]*model.KV {
- m := make(map[string]*model.KV)
- getter.ForEach(func(i int, v *model.KV) bool {
+func (h *abstractCompareHolder) toMap(getter dump.Getter) map[string]*dump.KV {
+ m := make(map[string]*dump.KV)
+ getter.ForEach(func(i int, v *dump.KV) bool {
m[v.Key] = v
return true
})
@@ -67,8 +67,8 @@ func (h *abstractCompareHolder) Compare() *CompareResult {
result := &CompareResult{
Results: make(map[int][]string),
}
- leftCh := make(chan map[string]*model.KV, 2)
- rightCh := make(chan map[string]*model.KV, 2)
+ leftCh := make(chan map[string]*dump.KV, 2)
+ rightCh := make(chan map[string]*dump.KV, 2)
var (
add []string
@@ -128,19 +128,19 @@ func (h *abstractCompareHolder) Compare() *CompareResult {
type ServiceCompareHolder struct {
*abstractCompareHolder
- Cache model.MicroserviceSlice
+ Cache dump.MicroserviceSlice
Kvs []*mvccpb.KeyValue
}
func (h *ServiceCompareHolder) Compare() *CompareResult {
h.abstractCompareHolder = &abstractCompareHolder{
- Cache: &h.Cache, DataStore: &DataStore{Data: h.Kvs, DataParser: proto.ServiceParser}, MismatchFunc: h.toName,
+ Cache: &h.Cache, DataStore: &DataStore{Data: h.Kvs, DataParser: value.ServiceParser}, MismatchFunc: h.toName,
}
r := h.abstractCompareHolder.Compare()
r.Name = service
return r
}
-func (h *ServiceCompareHolder) toName(kv *model.KV) string {
+func (h *ServiceCompareHolder) toName(kv *dump.KV) string {
s, ok := kv.Value.(*pb.MicroService)
if !ok {
return "unknown"
@@ -150,19 +150,19 @@ func (h *ServiceCompareHolder) toName(kv *model.KV) string {
type InstanceCompareHolder struct {
*abstractCompareHolder
- Cache model.InstanceSlice
+ Cache dump.InstanceSlice
Kvs []*mvccpb.KeyValue
}
func (h *InstanceCompareHolder) Compare() *CompareResult {
h.abstractCompareHolder = &abstractCompareHolder{
- Cache: &h.Cache, DataStore: &DataStore{Data: h.Kvs, DataParser: proto.InstanceParser}, MismatchFunc: h.toName,
+ Cache: &h.Cache, DataStore: &DataStore{Data: h.Kvs, DataParser: value.InstanceParser}, MismatchFunc: h.toName,
}
r := h.abstractCompareHolder.Compare()
r.Name = instance
return r
}
-func (h *InstanceCompareHolder) toName(kv *model.KV) string {
+func (h *InstanceCompareHolder) toName(kv *dump.KV) string {
s, ok := kv.Value.(*pb.MicroServiceInstance)
if !ok {
return "unknown"
diff --git a/scctl/pkg/plugin/diagnose/compare_holder_test.go b/scctl/pkg/plugin/diagnose/compare_holder_test.go
index caf68bd..1763301 100644
--- a/scctl/pkg/plugin/diagnose/compare_holder_test.go
+++ b/scctl/pkg/plugin/diagnose/compare_holder_test.go
@@ -16,7 +16,7 @@
package diagnose
import (
- model2 "github.com/apache/servicecomb-service-center/pkg/model"
+ model2 "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/coreos/etcd/mvcc/mvccpb"
"testing"
diff --git a/scctl/pkg/plugin/diagnose/diagnose.go b/scctl/pkg/plugin/diagnose/diagnose.go
index cf6cc78..ec9ce1f 100644
--- a/scctl/pkg/plugin/diagnose/diagnose.go
+++ b/scctl/pkg/plugin/diagnose/diagnose.go
@@ -20,7 +20,7 @@ import (
"context"
"fmt"
"github.com/apache/servicecomb-service-center/client"
- "github.com/apache/servicecomb-service-center/pkg/model"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/scctl/etcd"
"github.com/apache/servicecomb-service-center/scctl/pkg/cmd"
"github.com/coreos/etcd/clientv3"
@@ -97,7 +97,7 @@ func setResponse(ctx context.Context, etcdClient *clientv3.Client, key, prefix s
return nil
}
-func diagnose(cache *model.Cache, etcdResp etcdResponse) (err error, details string) {
+func diagnose(cache *dump.Cache, etcdResp etcdResponse) (err error, details string) {
var (
service = ServiceCompareHolder{Cache: cache.Microservices, Kvs: etcdResp[service]}
instance = InstanceCompareHolder{Cache: cache.Instances, Kvs: etcdResp[instance]}
diff --git a/scctl/pkg/plugin/diagnose/diagnose_test.go b/scctl/pkg/plugin/diagnose/diagnose_test.go
index 05e7c45..18e6722 100644
--- a/scctl/pkg/plugin/diagnose/diagnose_test.go
+++ b/scctl/pkg/plugin/diagnose/diagnose_test.go
@@ -17,7 +17,7 @@ package diagnose
import (
"fmt"
- model2 "github.com/apache/servicecomb-service-center/pkg/model"
+ model2 "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/coreos/etcd/mvcc/mvccpb"
"testing"
diff --git a/scctl/pkg/plugin/get/instance/instance_cmd.go b/scctl/pkg/plugin/get/instance/instance_cmd.go
index 4dd06fb..3015877 100644
--- a/scctl/pkg/plugin/get/instance/instance_cmd.go
+++ b/scctl/pkg/plugin/get/instance/instance_cmd.go
@@ -18,7 +18,7 @@ package instance
import (
"context"
"github.com/apache/servicecomb-service-center/client"
- model2 "github.com/apache/servicecomb-service-center/pkg/model"
+ model2 "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/scctl/pkg/cmd"
"github.com/apache/servicecomb-service-center/scctl/pkg/model"
"github.com/apache/servicecomb-service-center/scctl/pkg/plugin/get"
diff --git a/scctl/pkg/plugin/get/schema/schema_cmd.go b/scctl/pkg/plugin/get/schema/schema_cmd.go
index 97b1941..a434435 100644
--- a/scctl/pkg/plugin/get/schema/schema_cmd.go
+++ b/scctl/pkg/plugin/get/schema/schema_cmd.go
@@ -19,7 +19,7 @@ import (
"context"
"fmt"
"github.com/apache/servicecomb-service-center/client"
- model2 "github.com/apache/servicecomb-service-center/pkg/model"
+ model2 "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/scctl/pkg/cmd"
"github.com/apache/servicecomb-service-center/scctl/pkg/model"
diff --git a/server/api.go b/server/api.go
index 2c19e78..4e30b18 100644
--- a/server/api.go
+++ b/server/api.go
@@ -25,8 +25,8 @@ import (
"github.com/apache/servicecomb-service-center/pkg/grace"
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/rest"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/config"
rs "github.com/apache/servicecomb-service-center/server/rest"
"github.com/apache/servicecomb-service-center/server/service"
"net"
diff --git a/server/broker/broker_suite_test.go b/server/broker/broker_suite_test.go
index a93d9c5..1414899 100644
--- a/server/broker/broker_suite_test.go
+++ b/server/broker/broker_suite_test.go
@@ -18,7 +18,7 @@ package broker_test
import (
_ "github.com/apache/servicecomb-service-center/server/bootstrap"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
)
import (
"github.com/apache/servicecomb-service-center/server/broker"
diff --git a/server/broker/service.go b/server/broker/service.go
index a3f13bb..bc681bf 100644
--- a/server/broker/service.go
+++ b/server/broker/service.go
@@ -20,7 +20,6 @@ package broker
import (
"crypto/sha1"
"encoding/json"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"math"
"strconv"
"strings"
@@ -48,7 +47,7 @@ func (*Service) GetBrokerHome(ctx context.Context,
if in == nil || len(in.HostAddress) == 0 {
PactLogger.Errorf(nil, "Get Participant versions request failed: invalid params.")
return &brokerpb.BrokerHomeResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
}, nil
}
@@ -92,7 +91,7 @@ func (*Service) GetPactsOfProvider(ctx context.Context,
finalBytes := append(sliceOfResp, linksBytes...)
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Success."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Success."),
Pact: finalBytes,
}, nil
@@ -111,7 +110,7 @@ func (*Service) RetrieveProviderPacts(ctx context.Context,
if in == nil || len(in.ProviderId) == 0 {
PactLogger.Errorf(nil, "all provider pact retrieve request failed: invalid params.")
return &brokerpb.GetAllProviderPactsResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
}, nil
}
tenant := GetDefaultTenantProject()
@@ -120,13 +119,13 @@ func (*Service) RetrieveProviderPacts(ctx context.Context,
if err != nil {
PactLogger.Errorf(err, "all provider pact retrieve failed, providerId is %s: query provider failed.", in.ProviderId)
return &brokerpb.GetAllProviderPactsResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Query provider failed."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Query provider failed."),
}, err
}
if provider == nil {
PactLogger.Errorf(nil, "all provider pact retrieve failed, providerId is %s: provider not exist.", in.ProviderId)
return &brokerpb.GetAllProviderPactsResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Provider does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Provider does not exist."),
}, nil
}
// Get the provider participant
@@ -135,7 +134,7 @@ func (*Service) RetrieveProviderPacts(ctx context.Context,
if err != nil || providerParticipant == nil {
PactLogger.Errorf(nil, "all provider pact retrieve failed, provider participant cannot be searched.", in.ProviderId)
return &brokerpb.GetAllProviderPactsResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Provider participant cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Provider participant cannot be searched."),
}, err
}
PactLogger.Infof("[RetrieveProviderPacts] Provider participant id : %d", providerParticipant.Id)
@@ -252,7 +251,7 @@ func (*Service) RetrieveProviderPacts(ctx context.Context,
}
PactLogger.Infof("Json : %s", string(resJSON))
response := &brokerpb.GetAllProviderPactsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "retrieve provider pact info succeeded."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "retrieve provider pact info succeeded."),
XLinks: links,
}
return response, nil
@@ -264,7 +263,7 @@ func (*Service) GetAllProviderPacts(ctx context.Context,
if in == nil || len(in.ProviderId) == 0 {
PactLogger.Errorf(nil, "all provider pact retrieve request failed: invalid params.")
return &brokerpb.GetAllProviderPactsResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
}, nil
}
tenant := GetDefaultTenantProject()
@@ -273,13 +272,13 @@ func (*Service) GetAllProviderPacts(ctx context.Context,
if err != nil {
PactLogger.Errorf(err, "all provider pact retrieve failed, providerId is %s: query provider failed.", in.ProviderId)
return &brokerpb.GetAllProviderPactsResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Query provider failed."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Query provider failed."),
}, err
}
if provider == nil {
PactLogger.Errorf(nil, "all provider pact retrieve failed, providerId is %s: provider not exist.", in.ProviderId)
return &brokerpb.GetAllProviderPactsResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Provider does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Provider does not exist."),
}, nil
}
// Get the provider participant
@@ -288,7 +287,7 @@ func (*Service) GetAllProviderPacts(ctx context.Context,
if err != nil || providerParticipant == nil {
PactLogger.Errorf(nil, "all provider pact retrieve failed, provider participant cannot be searched.", in.ProviderId)
return &brokerpb.GetAllProviderPactsResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Provider participant cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Provider participant cannot be searched."),
}, err
}
PactLogger.Infof("[RetrieveProviderPacts] Provider participant id : %d", providerParticipant.Id)
@@ -405,7 +404,7 @@ func (*Service) GetAllProviderPacts(ctx context.Context,
}
PactLogger.Infof("Json : %s", string(resJSON))
response := &brokerpb.GetAllProviderPactsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "retrieve provider pact info succeeded."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "retrieve provider pact info succeeded."),
XLinks: links,
}
return response, nil
@@ -415,7 +414,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if in == nil || len(in.ConsumerId) == 0 || len(in.ConsumerVersion) == 0 {
PactLogger.Errorf(nil, "verification result retrieve request failed: invalid params.")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
}, nil
}
tenant := GetDefaultTenantProject()
@@ -423,13 +422,13 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if err != nil {
PactLogger.Errorf(err, "verification result retrieve request failed, consumerID is %s: query consumer failed.", in.ConsumerId)
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Query consumer failed."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Query consumer failed."),
}, err
}
if consumer == nil {
PactLogger.Errorf(nil, "verification result retrieve request failed, consumerID is %s: consumer not exist.", in.ConsumerId)
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Consumer does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Consumer does not exist."),
}, nil
}
PactLogger.Infof("Consumer service found: (%s, %s, %s, %s)", consumer.ServiceId, consumer.AppId, consumer.ServiceName, consumer.Version)
@@ -438,7 +437,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if err != nil || consumerParticipant == nil {
PactLogger.Errorf(nil, "verification result retrieve request failed, consumer participant cannot be searched.", in.ConsumerId)
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "consumer participant cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "consumer participant cannot be searched."),
}, err
}
PactLogger.Infof("Consumer participant found: (%d, %s, %s)", consumerParticipant.Id, consumerParticipant.AppId, consumerParticipant.ServiceName)
@@ -447,7 +446,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if err != nil || version == nil {
PactLogger.Errorf(nil, "verification result retrieve request failed, version cannot be searched.")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "version cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "version cannot be searched."),
}, err
}
PactLogger.Infof("Version found/created: (%d, %s, %d, %d)", version.Id, version.Number, version.ParticipantId, version.Order)
@@ -459,7 +458,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if err != nil || len(pactVersions.Kvs) == 0 {
PactLogger.Errorf(nil, "verification result publish request failed, pact version cannot be searched.")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "pact version cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "pact version cannot be searched."),
}, err
}
overAllSuccess := false
@@ -475,7 +474,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if err != nil {
PactLogger.Errorf(nil, "verification result retrieve request failed, pact version cannot be searched.")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "pact version cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "pact version cannot be searched."),
}, err
}
key = util.StringJoin([]string{GetBrokerVerificationKey(tenant), strconv.Itoa(int(pactVersion.Id))}, "/")
@@ -486,7 +485,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if err != nil || len(verifications.Kvs) == 0 {
PactLogger.Errorf(nil, "verification result retrieve request failed, verification results cannot be searched.")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "verification results cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "verification results cannot be searched."),
}, err
}
lastNumber := int32(math.MinInt32)
@@ -497,7 +496,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if err != nil {
PactLogger.Errorf(nil, "verification result retrieve request failed, verification result unmarshall error.")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "verification result unmarshall error."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "verification result unmarshall error."),
}, err
}
if verification.Number > lastNumber {
@@ -508,7 +507,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if lastVerificationResult == nil {
PactLogger.Errorf(nil, "verification result retrieve request failed, verification result cannot be found.")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "verification result cannot be found."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "verification result cannot be found."),
}, err
}
PactLogger.Infof("Verification result found: (%d, %d, %d, %t, %s, %s, %s)",
@@ -524,7 +523,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if err != nil || len(participants.Kvs) == 0 {
PactLogger.Errorf(nil, "verification result retrieve request failed, provider participant cannot be searched.")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "provider participant cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "provider participant cannot be searched."),
}, err
}
var providerParticipant *brokerpb.Participant
@@ -534,7 +533,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if err != nil {
PactLogger.Errorf(nil, "verification result retrieve request failed, verification result unmarshall error.")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "verification result unmarshall error."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "verification result unmarshall error."),
}, err
}
if participant.Id == pactVersion.ProviderParticipantId {
@@ -545,7 +544,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if providerParticipant == nil {
PactLogger.Errorf(nil, "verification result retrieve request failed, verification result unmarshall error.")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "verification result unmarshall error."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "verification result unmarshall error."),
}, err
}
serviceFindReq := &pb.GetExistenceRequest{
@@ -558,7 +557,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
if err != nil {
PactLogger.Errorf(nil, "verification result retrieve request failed, provider service cannot be found.")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "provider service cannot be found."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "provider service cannot be found."),
}, err
}
providerName := resp.ServiceId
@@ -581,7 +580,7 @@ func (*Service) RetrieveVerificationResults(ctx context.Context, in *brokerpb.Re
verificationResult := &brokerpb.VerificationResult{Success: overAllSuccess, ProviderSummary: verificationSummary, XEmbedded: verificationDetails}
PactLogger.Infof("Verification result retrieved successfully ...")
return &brokerpb.RetrieveVerificationResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Verification result retrieved successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Verification result retrieved successfully."),
Result: verificationResult,
}, nil
}
@@ -590,7 +589,7 @@ func (*Service) PublishVerificationResults(ctx context.Context, in *brokerpb.Pub
if in == nil || len(in.ProviderId) == 0 || len(in.ConsumerId) == 0 {
PactLogger.Errorf(nil, "verification result publish request failed: invalid params.")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
}, nil
}
tenant := GetDefaultTenantProject()
@@ -598,13 +597,13 @@ func (*Service) PublishVerificationResults(ctx context.Context, in *brokerpb.Pub
if err != nil {
PactLogger.Errorf(err, "verification result publish request failed, consumerID is %s: query consumer failed.", in.ConsumerId)
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Query consumer failed."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Query consumer failed."),
}, err
}
if consumer == nil {
PactLogger.Errorf(nil, "verification result publish request failed, consumerID is %s: consumer not exist.", in.ConsumerId)
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Consumer does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Consumer does not exist."),
}, nil
}
PactLogger.Infof("Consumer service found: (%s, %s, %s, %s)", consumer.ServiceId, consumer.AppId, consumer.ServiceName, consumer.Version)
@@ -613,7 +612,7 @@ func (*Service) PublishVerificationResults(ctx context.Context, in *brokerpb.Pub
if err != nil || consumerParticipant == nil {
PactLogger.Errorf(nil, "verification result publish request failed, consumer participant cannot be searched.", in.ConsumerId)
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "consumer participant cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "consumer participant cannot be searched."),
}, err
}
PactLogger.Infof("Consumer participant found: (%d, %s, %s)", consumerParticipant.Id, consumerParticipant.AppId, consumerParticipant.ServiceName)
@@ -622,7 +621,7 @@ func (*Service) PublishVerificationResults(ctx context.Context, in *brokerpb.Pub
if err != nil || version == nil {
PactLogger.Errorf(nil, "verification result publish request failed, version cannot be searched.")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "version cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "version cannot be searched."),
}, err
}
PactLogger.Infof("Version found/created: (%d, %s, %d, %d)", version.Id, version.Number, version.ParticipantId, version.Order)
@@ -634,7 +633,7 @@ func (*Service) PublishVerificationResults(ctx context.Context, in *brokerpb.Pub
if err != nil || len(pacts.Kvs) == 0 {
PactLogger.Errorf(nil, "verification result publish request failed, pact cannot be searched.")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "pact cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "pact cannot be searched."),
}, err
}
pactExists := false
@@ -644,7 +643,7 @@ func (*Service) PublishVerificationResults(ctx context.Context, in *brokerpb.Pub
if err != nil {
PactLogger.Errorf(nil, "verification result publish request failed, pact cannot be searched.")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "pact cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "pact cannot be searched."),
}, err
}
if pact.Id == in.PactId {
@@ -654,14 +653,14 @@ func (*Service) PublishVerificationResults(ctx context.Context, in *brokerpb.Pub
if !pactExists {
PactLogger.Errorf(nil, "verification result publish request failed, pact does not exists.")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "pact does not exists."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "pact does not exists."),
}, err
}
pactVersion, err := GetPactVersion(ctx, tenant, version.Id, in.PactId)
if err != nil || pactVersion == nil {
PactLogger.Errorf(nil, "verification result publish request failed, pact version cannot be searched.")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "pact version cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "pact version cannot be searched."),
}, err
}
// Check if some verification results already exists
@@ -673,7 +672,7 @@ func (*Service) PublishVerificationResults(ctx context.Context, in *brokerpb.Pub
if err != nil {
PactLogger.Errorf(nil, "verification result publish request failed, verification result cannot be searched.")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "verification result cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "verification result cannot be searched."),
}, err
}
lastNumber := int32(math.MinInt32)
@@ -684,7 +683,7 @@ func (*Service) PublishVerificationResults(ctx context.Context, in *brokerpb.Pub
if err != nil {
PactLogger.Errorf(nil, "verification result publish request failed, verification result unmarshall error.")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "verification result unmarshall error."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "verification result unmarshall error."),
}, err
}
if verification.Number > lastNumber {
@@ -702,7 +701,7 @@ func (*Service) PublishVerificationResults(ctx context.Context, in *brokerpb.Pub
id, err := GetData(ctx, GetBrokerLatestVerificationIDKey())
if err != nil {
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "get data error."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "get data error."),
}, err
}
verification := &brokerpb.Verification{
@@ -729,7 +728,7 @@ func (*Service) PublishVerificationResults(ctx context.Context, in *brokerpb.Pub
}
PactLogger.Infof("Verification result published successfully ...")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Verification result published successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Verification result published successfully."),
Confirmation: verificationResponse,
}, nil
}
@@ -738,7 +737,7 @@ func (*Service) PublishPact(ctx context.Context, in *brokerpb.PublishPactRequest
if InvalidInput(in) {
PactLogger.Errorf(nil, "pact publish request failed: invalid params.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
}, nil
}
tenant := GetDefaultTenantProject()
@@ -747,13 +746,13 @@ func (*Service) PublishPact(ctx context.Context, in *brokerpb.PublishPactRequest
if err != nil {
PactLogger.Errorf(err, "pact publish failed, providerId is %s: query provider failed.", in.ProviderId)
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Query provider failed."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Query provider failed."),
}, err
}
if provider == nil {
PactLogger.Errorf(nil, "pact publish failed, providerId is %s: provider not exist.", in.ProviderId)
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Provider does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Provider does not exist."),
}, nil
}
PactLogger.Infof("Provider service found: (%s, %s, %s, %s)", provider.ServiceId, provider.AppId, provider.ServiceName, provider.Version)
@@ -761,13 +760,13 @@ func (*Service) PublishPact(ctx context.Context, in *brokerpb.PublishPactRequest
if err != nil {
PactLogger.Errorf(err, "pact publish failed, consumerID is %s: query consumer failed.", in.ConsumerId)
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Query consumer failed."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Query consumer failed."),
}, err
}
if consumer == nil {
PactLogger.Errorf(nil, "pact publish failed, consumerID is %s: consumer not exist.", in.ConsumerId)
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Consumer does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Consumer does not exist."),
}, nil
}
@@ -776,7 +775,7 @@ func (*Service) PublishPact(ctx context.Context, in *brokerpb.PublishPactRequest
log.Errorf(nil,
"pact publish failed, version (%s) does not exist for consmer", in.Version)
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Consumer Version does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Consumer Version does not exist."),
}, nil
}
@@ -787,14 +786,14 @@ func (*Service) PublishPact(ctx context.Context, in *brokerpb.PublishPactRequest
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, provider participant cannot be searched.", in.ProviderId)
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Provider participant cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Provider participant cannot be searched."),
}, err
}
if providerParticipant == nil {
id, err := GetData(ctx, GetBrokerLatestParticipantIDKey())
if err != nil {
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "get data error."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "get data error."),
}, err
}
providerParticipant = &brokerpb.Participant{Id: int32(id) + 1, AppId: provider.AppId, ServiceName: provider.ServiceName}
@@ -810,14 +809,14 @@ func (*Service) PublishPact(ctx context.Context, in *brokerpb.PublishPactRequest
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, consumer participant cannot be searched.", in.ConsumerId)
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "consumer participant cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "consumer participant cannot be searched."),
}, err
}
if consumerParticipant == nil {
id, err := GetData(ctx, GetBrokerLatestParticipantIDKey())
if err != nil {
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "get data error."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "get data error."),
}, err
}
consumerParticipant = &brokerpb.Participant{Id: int32(id) + 1, AppId: consumer.AppId, ServiceName: consumer.ServiceName}
@@ -833,7 +832,7 @@ func (*Service) PublishPact(ctx context.Context, in *brokerpb.PublishPactRequest
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, version cannot be searched.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "version cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "version cannot be searched."),
}, err
}
if version == nil {
@@ -843,7 +842,7 @@ func (*Service) PublishPact(ctx context.Context, in *brokerpb.PublishPactRequest
id, err := GetData(ctx, GetBrokerLatestVersionIDKey())
if err != nil {
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "get data error."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "get data error."),
}, err
}
version = &brokerpb.Version{Id: int32(id) + 1, Number: in.Version, ParticipantId: consumerParticipant.Id, Order: order}
@@ -861,14 +860,14 @@ func (*Service) PublishPact(ctx context.Context, in *brokerpb.PublishPactRequest
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, pact cannot be searched.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "pact cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "pact cannot be searched."),
}, err
}
if pact == nil {
id, err := GetData(ctx, GetBrokerLatestPactIDKey())
if err != nil {
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "get data error."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "get data error."),
}, err
}
pact = &brokerpb.Pact{Id: int32(id) + 1, ConsumerParticipantId: consumerParticipant.Id,
@@ -885,14 +884,14 @@ func (*Service) PublishPact(ctx context.Context, in *brokerpb.PublishPactRequest
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, pact version cannot be searched.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "pact version cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "pact version cannot be searched."),
}, err
}
if pactVersion == nil {
id, err := GetData(ctx, GetBrokerLatestPactVersionIDKey())
if err != nil {
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "get data error."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "get data error."),
}, err
}
pactVersion = &brokerpb.PactVersion{Id: int32(id) + 1, VersionId: version.Id, PactId: pact.Id, ProviderParticipantId: providerParticipant.Id}
@@ -904,7 +903,7 @@ func (*Service) PublishPact(ctx context.Context, in *brokerpb.PublishPactRequest
PactLogger.Infof("PactVersion found/create: (%d, %d, %d, %d)", pactVersion.Id, pactVersion.VersionId, pactVersion.PactId, pactVersion.ProviderParticipantId)
PactLogger.Infof("Pact published successfully ...")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Pact published successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Pact published successfully."),
}, nil
}
diff --git a/server/broker/service_test.go b/server/broker/service_test.go
index 58301d1..e985d06 100644
--- a/server/broker/service_test.go
+++ b/server/broker/service_test.go
@@ -17,10 +17,8 @@
package broker_test
import (
- "fmt"
- "github.com/apache/servicecomb-service-center/server/core/proto"
-
"context"
+ "fmt"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/broker"
@@ -68,7 +66,7 @@ var _ = Describe("Controller", func() {
Expect(err).To(BeNil())
consumerServiceId = resp.ServiceId
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
//(2) create provider service
resp, err = core.ServiceAPI.Create(getContext(), &pb.CreateServiceRequest{
@@ -86,7 +84,7 @@ var _ = Describe("Controller", func() {
})
Expect(err).To(BeNil())
providerServiceId = resp.ServiceId
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
//(3) publish a pact between two services
respPublishPact, err := brokerResource.PublishPact(getContext(),
@@ -98,7 +96,7 @@ var _ = Describe("Controller", func() {
})
Expect(err).To(BeNil())
- Expect(respPublishPact.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respPublishPact.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
It("PublishPact-noProviderServiceId", func() {
@@ -112,7 +110,7 @@ var _ = Describe("Controller", func() {
Pact: []byte("hello"),
})
- Expect(respPublishPact.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respPublishPact.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
It("PublishPact-noConumerServiceId", func() {
@@ -126,7 +124,7 @@ var _ = Describe("Controller", func() {
Pact: []byte("hello"),
})
- Expect(respPublishPact.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respPublishPact.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
It("PublishPact-noConumerVersion", func() {
@@ -140,7 +138,7 @@ var _ = Describe("Controller", func() {
Pact: []byte("hello"),
})
- Expect(respPublishPact.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respPublishPact.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
It("GetBrokerHome", func() {
@@ -167,7 +165,7 @@ var _ = Describe("Controller", func() {
}})
Expect(respGetAllProviderPacts).NotTo(BeNil())
- Expect(respGetAllProviderPacts.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respGetAllProviderPacts.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
It("GetBrokerPactsOfProvider", func() {
@@ -184,7 +182,7 @@ var _ = Describe("Controller", func() {
}})
Expect(respGetAllProviderPacts).NotTo(BeNil())
- Expect(respGetAllProviderPacts.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respGetAllProviderPacts.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
It("PublishVerificationResults", func() {
@@ -201,7 +199,7 @@ var _ = Describe("Controller", func() {
})
Expect(respResults).NotTo(BeNil())
- Expect(respResults.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respResults.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
It("RetrieveVerificationResults", func() {
@@ -214,7 +212,7 @@ var _ = Describe("Controller", func() {
})
Expect(respVerification).NotTo(BeNil())
- Expect(respVerification.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respVerification.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
It("RetrieveProviderPacts", func() {
@@ -230,7 +228,7 @@ var _ = Describe("Controller", func() {
})
Expect(respProviderPact).NotTo(BeNil())
- Expect(respProviderPact.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respProviderPact.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
})
})
diff --git a/server/broker/util.go b/server/broker/util.go
index 3732fd4..e1b498b 100644
--- a/server/broker/util.go
+++ b/server/broker/util.go
@@ -20,8 +20,7 @@ package broker
import (
"context"
"encoding/json"
- "github.com/apache/servicecomb-service-center/server/core/config"
- "github.com/apache/servicecomb-service-center/server/core/proto"
+ "github.com/apache/servicecomb-service-center/server/config"
"math"
"net/url"
"strconv"
@@ -145,7 +144,7 @@ func CreateBrokerHomeResponse(host string, scheme string) *brokerpb.BrokerHomeRe
})
return &brokerpb.BrokerHomeResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Broker Home."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Broker Home."),
XLinks: apiEntries,
Curies: curies,
}
@@ -256,7 +255,7 @@ func CreateParticipant(ctx context.Context, participantKey string, participant b
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, participant cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "participant cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "participant cannot be created."),
}, err
}
@@ -267,7 +266,7 @@ func CreateParticipant(ctx context.Context, participantKey string, participant b
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, participant cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "participant cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "participant cannot be created."),
}, err
}
@@ -278,7 +277,7 @@ func CreateParticipant(ctx context.Context, participantKey string, participant b
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, participant cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "participant cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "participant cannot be created."),
}, err
}
PactLogger.Infof("Participant created for key: %s", participantKey)
@@ -291,7 +290,7 @@ func CreateVersion(ctx context.Context, versionKey string,
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, version cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "version cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "version cannot be created."),
}, err
}
@@ -301,7 +300,7 @@ func CreateVersion(ctx context.Context, versionKey string,
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, version cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "version cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "version cannot be created."),
}, err
}
k := GetBrokerLatestVersionIDKey()
@@ -311,7 +310,7 @@ func CreateVersion(ctx context.Context, versionKey string,
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, version cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "version cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "version cannot be created."),
}, err
}
PactLogger.Infof("Version created for key: %s", versionKey)
@@ -324,7 +323,7 @@ func CreatePact(ctx context.Context,
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, pact cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "pact cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "pact cannot be created."),
}, err
}
@@ -336,7 +335,7 @@ func CreatePact(ctx context.Context,
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, pact cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "pact cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "pact cannot be created."),
}, err
}
k := GetBrokerLatestPactIDKey()
@@ -346,7 +345,7 @@ func CreatePact(ctx context.Context,
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, pact cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "pact cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "pact cannot be created."),
}, err
}
PactLogger.Infof("Pact created for key: %s", pactKey)
@@ -358,7 +357,7 @@ func CreatePactVersion(ctx context.Context, pactVersionKey string, pactVersion b
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, pact version cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "pact version cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "pact version cannot be created."),
}, err
}
@@ -367,7 +366,7 @@ func CreatePactVersion(ctx context.Context, pactVersionKey string, pactVersion b
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, pact version cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "pact version cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "pact version cannot be created."),
}, err
}
k := GetBrokerLatestPactVersionIDKey()
@@ -377,7 +376,7 @@ func CreatePactVersion(ctx context.Context, pactVersionKey string, pactVersion b
if err != nil {
PactLogger.Errorf(nil, "pact publish failed, pact version cannot be created.")
return &brokerpb.PublishPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "pact version cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "pact version cannot be created."),
}, err
}
PactLogger.Infof("Pact version created for key: %s", pactVersionKey)
@@ -390,7 +389,7 @@ func CreateVerification(ctx context.Context,
if err != nil {
PactLogger.Errorf(nil, "verification result publish failed, verification result marshal error.")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "verification result marshal error."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "verification result marshal error."),
}, err
}
@@ -400,7 +399,7 @@ func CreateVerification(ctx context.Context,
if err != nil {
PactLogger.Errorf(nil, "verification result publish failed, verification result cannot be created.")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "verification result cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "verification result cannot be created."),
}, err
}
k := GetBrokerLatestVerificationIDKey()
@@ -410,7 +409,7 @@ func CreateVerification(ctx context.Context,
if err != nil {
PactLogger.Errorf(nil, "verification result publish failed, verification result cannot be created.")
return &brokerpb.PublishVerificationResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "verification result cannot be created."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "verification result cannot be created."),
}, err
}
PactLogger.Infof("Verification result created for key: %s", verificationKey)
@@ -450,7 +449,7 @@ func RetrieveProviderConsumerPact(ctx context.Context,
if in == nil || len(in.ProviderId) == 0 || len(in.ConsumerId) == 0 || len(in.Version) == 0 {
PactLogger.Errorf(nil, "pact retrieve request failed: invalid params.")
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "Request format invalid."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "Request format invalid."),
}, -1, nil
}
tenant := GetDefaultTenantProject()
@@ -459,13 +458,13 @@ func RetrieveProviderConsumerPact(ctx context.Context,
if err != nil {
PactLogger.Errorf(err, "pact retrieve failed, providerId is %s: query provider failed.", in.ProviderId)
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "Query provider failed."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "Query provider failed."),
}, -1, err
}
if provider == nil {
PactLogger.Errorf(nil, "pact retrieve failed, providerId is %s: provider not exist.", in.ProviderId)
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "Provider does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "Provider does not exist."),
}, -1, nil
}
// Get consumer microservice
@@ -473,13 +472,13 @@ func RetrieveProviderConsumerPact(ctx context.Context,
if err != nil {
PactLogger.Errorf(err, "pact retrieve failed, consumerId is %s: query consumer failed.", in.ConsumerId)
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "Query consumer failed."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "Query consumer failed."),
}, -1, err
}
if consumer == nil {
PactLogger.Errorf(nil, "pact retrieve failed, consumerId is %s: consumer not exist.", in.ConsumerId)
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "Consumer does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "Consumer does not exist."),
}, -1, nil
}
// Get provider participant
@@ -488,7 +487,7 @@ func RetrieveProviderConsumerPact(ctx context.Context,
if err != nil || providerParticipant == nil {
PactLogger.Errorf(nil, "pact retrieve failed, provider participant %s cannot be searched.", in.ProviderId)
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "Provider participant cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "Provider participant cannot be searched."),
}, -1, err
}
// Get consumer participant
@@ -497,7 +496,7 @@ func RetrieveProviderConsumerPact(ctx context.Context,
if err != nil || consumerParticipant == nil {
PactLogger.Errorf(nil, "pact retrieve failed, consumer participant %s cannot be searched.", in.ConsumerId)
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "consumer participant cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "consumer participant cannot be searched."),
}, -1, err
}
// Get or create version
@@ -506,7 +505,7 @@ func RetrieveProviderConsumerPact(ctx context.Context,
if err != nil || version == nil {
PactLogger.Errorf(nil, "pact retrieve failed, version cannot be searched.")
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "version cannot be searched."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "version cannot be searched."),
}, -1, err
}
// Get all pactversions and filter using the provider participant id
@@ -541,7 +540,7 @@ func RetrieveProviderConsumerPact(ctx context.Context,
if len(pactIDs) == 0 {
PactLogger.Errorf(nil, "pact retrieve failed, pact cannot be found.")
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "pact cannot be found."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "pact cannot be found."),
}, -1, err
}
pactKey := util.StringJoin([]string{
@@ -569,14 +568,14 @@ func RetrieveProviderConsumerPact(ctx context.Context,
if _, ok := pactIDs[pactObj.Id]; ok {
//PactLogger.Infof("pact retrieve succeeded, found pact: %s", string(pactObj.Content))
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "pact found."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "pact found."),
Pact: pactObj.Content,
}, pactObj.Id, nil
}
}
PactLogger.Errorf(nil, "pact retrieve failed, pact cannot be found.")
return &brokerpb.GetProviderConsumerVersionPactResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, "pact cannot be found."),
+ Response: pb.CreateResponse(scerr.ErrInternal, "pact cannot be found."),
}, -1, nil
}
@@ -588,7 +587,7 @@ func DeletePactData(ctx context.Context,
_, err := client.Instance().Do(ctx,
client.DEL, client.WithStrKey(allPactKey), client.WithPrefix())
if err != nil {
- return proto.CreateResponse(scerr.ErrInternal, "error deleting pacts."), err
+ return pb.CreateResponse(scerr.ErrInternal, "error deleting pacts."), err
}
- return proto.CreateResponse(proto.ResponseSuccess, "deleting pacts Succeed."), nil
+ return pb.CreateResponse(pb.ResponseSuccess, "deleting pacts Succeed."), nil
}
diff --git a/server/command/command.go b/server/command/command.go
index 25e0c43..f46386b 100644
--- a/server/command/command.go
+++ b/server/command/command.go
@@ -18,7 +18,7 @@
package command
import (
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/apache/servicecomb-service-center/version"
"github.com/urfave/cli"
)
diff --git a/server/core/config/config.go b/server/config/config.go
similarity index 96%
rename from server/core/config/config.go
rename to server/config/config.go
index 124a969..05c810b 100644
--- a/server/core/config/config.go
+++ b/server/config/config.go
@@ -18,7 +18,6 @@
package config
import (
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/go-chassis/go-archaius"
util2 "github.com/go-chassis/go-archaius/source/util"
"gopkg.in/yaml.v2"
@@ -52,7 +51,7 @@ const (
//Configurations is kie config items
var Configurations = &Config{}
-var ServerInfo = proto.NewServerInformation()
+var ServerInfo = NewServerInformation()
//GetGov return governance configs
func GetGov() Gov {
@@ -89,7 +88,7 @@ func Init() {
}
-func newInfo() proto.ServerInformation {
+func newInfo() ServerInformation {
maxLogFileSize := beego.AppConfig.DefaultInt64("log_rotate_size", 20)
if maxLogFileSize <= 0 || maxLogFileSize > 50 {
maxLogFileSize = 20
@@ -117,9 +116,9 @@ func newInfo() proto.ServerInformation {
accessLogFileFromConfig := beego.AppConfig.DefaultString("access_log_file", "./access.log")
accessLogFile := util.GetEnvString("SC_ACCESS_LOG_FILE", accessLogFileFromConfig)
- return proto.ServerInformation{
+ return ServerInformation{
Version: InitVersion,
- Config: proto.ServerConfig{
+ Config: ServerConfig{
MaxHeaderBytes: int64(beego.AppConfig.DefaultInt("max_header_bytes", 16384)),
MaxBodyBytes: beego.AppConfig.DefaultInt64("max_body_bytes", 2097152),
diff --git a/server/core/config/config_test.go b/server/config/config_test.go
similarity index 95%
rename from server/core/config/config_test.go
rename to server/config/config_test.go
index e17cc45..8d4cf2f 100644
--- a/server/core/config/config_test.go
+++ b/server/config/config_test.go
@@ -18,7 +18,7 @@
package config_test
import (
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/stretchr/testify/assert"
"io"
"os"
diff --git a/server/core/proto/types.go b/server/config/server.go
similarity index 74%
rename from server/core/proto/types.go
rename to server/config/server.go
index 3ea9a55..7470d02 100644
--- a/server/core/proto/types.go
+++ b/server/config/server.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.
-
-package proto
+/*
+ * 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 config
import (
"time"
diff --git a/server/core/config/struct.go b/server/config/types.go
similarity index 100%
rename from server/core/config/struct.go
rename to server/config/types.go
diff --git a/server/core/core.go b/server/core/core.go
index 3aef763..f77d7a5 100644
--- a/server/core/core.go
+++ b/server/core/core.go
@@ -18,7 +18,7 @@
package core
import (
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
// import the grace package and parse grace cmd line
_ "github.com/apache/servicecomb-service-center/pkg/grace"
diff --git a/server/core/microservice.go b/server/core/microservice.go
index 9452f11..6bd927a 100644
--- a/server/core/microservice.go
+++ b/server/core/microservice.go
@@ -19,9 +19,9 @@ package core
import (
"context"
+ "github.com/apache/servicecomb-service-center/pkg/proto"
"github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/version"
"github.com/astaxie/beego"
"os"
@@ -72,7 +72,7 @@ func prepareSelfRegistration() {
"servicecenter.grpc.api.ServiceInstanceCtrl",
},
Properties: map[string]string{
- proto.PropAllowCrossApp: "true",
+ registry.PropAllowCrossApp: "true",
},
}
if beego.BConfig.RunMode == "dev" {
@@ -131,7 +131,7 @@ func IsSCInstance(ctx context.Context) bool {
func GetExistenceRequest() *registry.GetExistenceRequest {
return ®istry.GetExistenceRequest{
- Type: proto.ExistenceMicroservice,
+ Type: registry.ExistenceMicroservice,
Environment: Service.Environment,
AppId: Service.AppId,
ServiceName: Service.ServiceName,
diff --git a/server/core/proto/common.go b/server/core/proto/common.go
deleted file mode 100644
index 8a84df7..0000000
--- a/server/core/proto/common.go
+++ /dev/null
@@ -1,68 +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 proto
-
-import (
- "github.com/apache/servicecomb-service-center/pkg/registry"
- scerr "github.com/apache/servicecomb-service-center/server/scerror"
-)
-
-const (
- ExistenceMicroservice string = "microservice"
- ExistenceSchema string = "schema"
-
- PropAllowCrossApp = "allowCrossApp"
-
- ResponseSuccess int32 = 0
-
- AppID = "default"
- VERSION = "0.0.1"
-)
-
-func CreateResponse(code int32, message string) *registry.Response {
- resp := ®istry.Response{
- Code: code,
- Message: message,
- }
- return resp
-}
-
-func CreateResponseWithSCErr(err *scerr.Error) *registry.Response {
- return ®istry.Response{
- Code: err.Code,
- Message: err.Detail,
- }
-}
-
-func DependenciesToKeys(in []*registry.MicroServiceKey, domainProject string) []*registry.MicroServiceKey {
- for _, value := range in {
- if len(value.Tenant) == 0 {
- value.Tenant = domainProject
- }
- }
- return in
-}
-
-func MicroServiceToKey(domainProject string, in *registry.MicroService) *registry.MicroServiceKey {
- return ®istry.MicroServiceKey{
- Tenant: domainProject,
- Environment: in.Environment,
- AppId: in.AppId,
- ServiceName: in.ServiceName,
- Alias: in.Alias,
- Version: in.Version,
- }
-}
diff --git a/server/handler/accesslog/handler.go b/server/handler/accesslog/handler.go
index 16c65fe..72c73be 100644
--- a/server/handler/accesslog/handler.go
+++ b/server/handler/accesslog/handler.go
@@ -19,7 +19,7 @@ package accesslog
import (
"fmt"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"net/http"
"os"
"time"
diff --git a/server/handler/maxbody/maxbody.go b/server/handler/maxbody/maxbody.go
index a786b75..d088753 100644
--- a/server/handler/maxbody/maxbody.go
+++ b/server/handler/maxbody/maxbody.go
@@ -20,7 +20,7 @@ package maxbody
import (
"github.com/apache/servicecomb-service-center/pkg/chain"
"github.com/apache/servicecomb-service-center/pkg/rest"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"net/http"
)
diff --git a/server/notify/stream.go b/server/notify/stream.go
index 5af309d..f146849 100644
--- a/server/notify/stream.go
+++ b/server/notify/stream.go
@@ -21,10 +21,10 @@ import (
"context"
"errors"
"github.com/apache/servicecomb-service-center/pkg/log"
+ "github.com/apache/servicecomb-service-center/pkg/proto"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"time"
)
diff --git a/server/notify/websocket_test.go b/server/notify/websocket_test.go
index f8bc60a..d0bba93 100644
--- a/server/notify/websocket_test.go
+++ b/server/notify/websocket_test.go
@@ -23,7 +23,6 @@ import (
"errors"
"github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
. "github.com/apache/servicecomb-service-center/server/notify"
"github.com/gorilla/websocket"
"net/http"
@@ -69,7 +68,7 @@ func TestDoWebSocketListAndWatch(t *testing.T) {
w := NewInstanceEventListWatcher("g", "s", func() (results []*registry.WatchInstanceResponse, rev int64) {
results = append(results, ®istry.WatchInstanceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "ok"),
+ Response: registry.CreateResponse(registry.ResponseSuccess, "ok"),
Action: string(registry.EVT_CREATE),
Key: ®istry.MicroServiceKey{},
Instance: ®istry.MicroServiceInstance{},
@@ -104,7 +103,7 @@ func TestDoWebSocketListAndWatch(t *testing.T) {
w.OnMessage(&InstanceEvent{})
GetNotifyCenter().Publish(NewInstanceEvent("g", "s", 1, ®istry.WatchInstanceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "ok"),
+ Response: registry.CreateResponse(registry.ResponseSuccess, "ok"),
Action: string(registry.EVT_CREATE),
Key: ®istry.MicroServiceKey{},
Instance: ®istry.MicroServiceInstance{},
diff --git a/server/plugin/quota/counter/event.go b/server/plugin/quota/counter/event.go
index c9bfd8b..724f4bb 100644
--- a/server/plugin/quota/counter/event.go
+++ b/server/plugin/quota/counter/event.go
@@ -24,7 +24,6 @@ import (
"github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/astaxie/beego"
)
@@ -86,7 +85,7 @@ func (h *InstanceEventHandler) OnEvent(evt sd.KvEvent) {
log.Errorf(err, "GetService[%s] failed", key)
return
}
- if core.IsShared(proto.MicroServiceToKey(domainProject, resp.Service)) {
+ if core.IsShared(registry.MicroServiceToKey(domainProject, resp.Service)) {
SharedServiceIds.Put(key, struct{}{})
return
}
diff --git a/server/plugin/security/tlsconf/buildin/tlsconf.go b/server/plugin/security/tlsconf/buildin/tlsconf.go
index 0b25619..2743e70 100644
--- a/server/plugin/security/tlsconf/buildin/tlsconf.go
+++ b/server/plugin/security/tlsconf/buildin/tlsconf.go
@@ -22,7 +22,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/tlsutil"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/apache/servicecomb-service-center/server/plugin/security/cipher"
"github.com/astaxie/beego"
"io/ioutil"
diff --git a/server/plugin/tracing/pzipkin/file_collector.go b/server/plugin/tracing/pzipkin/file_collector.go
index 947f482..e1f62a1 100644
--- a/server/plugin/tracing/pzipkin/file_collector.go
+++ b/server/plugin/tracing/pzipkin/file_collector.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/gopool"
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
"os"
"strings"
diff --git a/server/plugin/types.go b/server/plugin/types.go
index 24c6f18..dba9b2e 100644
--- a/server/plugin/types.go
+++ b/server/plugin/types.go
@@ -17,7 +17,7 @@ package plugin
import (
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
)
// Kind is an alias, it represents a plugin interface.
diff --git a/server/resource/v1/gov_resource_test.go b/server/resource/v1/gov_resource_test.go
index 30889d1..d0d1365 100644
--- a/server/resource/v1/gov_resource_test.go
+++ b/server/resource/v1/gov_resource_test.go
@@ -3,11 +3,11 @@ package v1_test
import (
"bytes"
"encoding/json"
+ "github.com/apache/servicecomb-service-center/pkg/gov"
"github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/apache/servicecomb-service-center/pkg/model"
"github.com/apache/servicecomb-service-center/pkg/rest"
"github.com/apache/servicecomb-service-center/server/resource/v1"
- "github.com/apache/servicecomb-service-center/server/service/gov"
+ svc "github.com/apache/servicecomb-service-center/server/service/gov"
"github.com/go-chassis/go-archaius"
"github.com/stretchr/testify/assert"
"net/http"
@@ -18,7 +18,7 @@ import (
)
func init() {
- err := gov.Init()
+ err := svc.Init()
if err != nil {
log.Fatal("", err)
}
@@ -27,14 +27,14 @@ func TestAuthResource_Login(t *testing.T) {
err := archaius.Init(archaius.WithMemorySource(), archaius.WithENVSource())
assert.NoError(t, err)
- gov.Init()
+ svc.Init()
rest.RegisterServant(&v1.Governance{})
t.Run("create policy", func(t *testing.T) {
- b, _ := json.Marshal(&model.LoadBalancer{
- GovernancePolicy: &model.GovernancePolicy{Name: "test"},
- Spec: &model.LBSpec{
- Bo: &model.BackOffPolicy{InitialInterval: 1}}})
+ b, _ := json.Marshal(&gov.LoadBalancer{
+ GovernancePolicy: &gov.GovernancePolicy{Name: "test"},
+ Spec: &gov.LBSpec{
+ Bo: &gov.BackOffPolicy{InitialInterval: 1}}})
r, _ := http.NewRequest(http.MethodPost, "/v1/default/gov/loadBalancer", bytes.NewBuffer(b))
w := httptest.NewRecorder()
diff --git a/server/rest/admin/controller_v4.go b/server/rest/admin/controller_v4.go
index c4a0a79..25305ea 100644
--- a/server/rest/admin/controller_v4.go
+++ b/server/rest/admin/controller_v4.go
@@ -18,7 +18,7 @@
package admin
import (
- "github.com/apache/servicecomb-service-center/pkg/model"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
"net/http"
"github.com/apache/servicecomb-service-center/pkg/rest"
@@ -46,7 +46,7 @@ func (ctrl *ControllerV4) Dump(w http.ResponseWriter, r *http.Request) {
if s := strings.TrimSpace(query.Get("options")); len(s) > 0 {
options = strings.Split(s, ",")
}
- request := &model.DumpRequest{
+ request := &dump.Request{
Options: options,
}
ctx := r.Context()
@@ -58,7 +58,7 @@ func (ctrl *ControllerV4) Dump(w http.ResponseWriter, r *http.Request) {
}
func (ctrl *ControllerV4) Clusters(w http.ResponseWriter, r *http.Request) {
- request := &model.ClustersRequest{}
+ request := &dump.ClustersRequest{}
ctx := r.Context()
resp, _ := AdminServiceAPI.Clusters(ctx, request)
@@ -68,7 +68,7 @@ func (ctrl *ControllerV4) Clusters(w http.ResponseWriter, r *http.Request) {
}
func (ctrl *ControllerV4) AlarmList(w http.ResponseWriter, r *http.Request) {
- request := &model.AlarmListRequest{}
+ request := &dump.AlarmListRequest{}
ctx := r.Context()
resp, _ := AdminServiceAPI.AlarmList(ctx, request)
@@ -78,7 +78,7 @@ func (ctrl *ControllerV4) AlarmList(w http.ResponseWriter, r *http.Request) {
}
func (ctrl *ControllerV4) ClearAlarm(w http.ResponseWriter, r *http.Request) {
- request := &model.ClearAlarmRequest{}
+ request := &dump.ClearAlarmRequest{}
ctx := r.Context()
resp, _ := AdminServiceAPI.ClearAlarm(ctx, request)
controller.WriteResponse(w, resp.Response, nil)
diff --git a/server/rest/admin/service.go b/server/rest/admin/service.go
index 2411d0b..2de12a7 100644
--- a/server/rest/admin/service.go
+++ b/server/rest/admin/service.go
@@ -20,12 +20,12 @@ package admin
import (
"context"
"github.com/apache/servicecomb-service-center/datasource"
+ "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/apache/servicecomb-service-center/pkg/model"
+ "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/alarm"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"github.com/apache/servicecomb-service-center/version"
"github.com/astaxie/beego"
@@ -58,17 +58,17 @@ func init() {
type Service struct {
}
-func (service *Service) Dump(ctx context.Context, in *model.DumpRequest) (*model.DumpResponse, error) {
+func (service *Service) Dump(ctx context.Context, in *dump.Request) (*dump.Response, error) {
domainProject := util.ParseDomainProject(ctx)
if !core.IsDefaultDomainProject(domainProject) {
- return &model.DumpResponse{
- Response: proto.CreateResponse(scerr.ErrForbidden, "Required admin permission"),
+ return &dump.Response{
+ Response: registry.CreateResponse(scerr.ErrForbidden, "Required admin permission"),
}, nil
}
- resp := &model.DumpResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Admin dump successfully"),
+ resp := &dump.Response{
+ Response: registry.CreateResponse(registry.ResponseSuccess, "Admin dump successfully"),
}
if len(in.Options) == 0 {
@@ -90,7 +90,7 @@ func (service *Service) Dump(ctx context.Context, in *model.DumpRequest) (*model
return resp, nil
}
-func (service *Service) dump(ctx context.Context, option string, resp *model.DumpResponse) {
+func (service *Service) dump(ctx context.Context, option string, resp *dump.Response) {
switch option {
case "info":
resp.Info = version.Ver()
@@ -99,7 +99,7 @@ func (service *Service) dump(ctx context.Context, option string, resp *model.Dum
case "env":
resp.Environments = environments
case "cache":
- var cache model.Cache
+ var cache dump.Cache
datasource.Instance().DumpCache(ctx, &cache)
resp.Cache = &cache
case "all":
@@ -110,24 +110,24 @@ func (service *Service) dump(ctx context.Context, option string, resp *model.Dum
}
}
-func (service *Service) Clusters(ctx context.Context, in *model.ClustersRequest) (*model.ClustersResponse, error) {
+func (service *Service) Clusters(ctx context.Context, in *dump.ClustersRequest) (*dump.ClustersResponse, error) {
clusters, err := datasource.Instance().GetClusters(ctx)
if err != nil {
return nil, err
}
- return &model.ClustersResponse{
+ return &dump.ClustersResponse{
Clusters: clusters,
}, nil
}
-func (service *Service) AlarmList(ctx context.Context, in *model.AlarmListRequest) (*model.AlarmListResponse, error) {
- return &model.AlarmListResponse{
+func (service *Service) AlarmList(ctx context.Context, in *dump.AlarmListRequest) (*dump.AlarmListResponse, error) {
+ return &dump.AlarmListResponse{
Alarms: alarm.ListAll(),
}, nil
}
-func (service *Service) ClearAlarm(ctx context.Context, in *model.ClearAlarmRequest) (*model.ClearAlarmResponse, error) {
+func (service *Service) ClearAlarm(ctx context.Context, in *dump.ClearAlarmRequest) (*dump.ClearAlarmResponse, error) {
alarm.ClearAll()
log.Infof("service center alarms are cleared")
- return &model.ClearAlarmResponse{}, nil
+ return &dump.ClearAlarmResponse{}, nil
}
diff --git a/server/rest/admin/service_test.go b/server/rest/admin/service_test.go
index c464d32..6eb1245 100644
--- a/server/rest/admin/service_test.go
+++ b/server/rest/admin/service_test.go
@@ -17,12 +17,14 @@
package admin_test
// initialize
-import _ "github.com/apache/servicecomb-service-center/server/bootstrap"
+import (
+ "github.com/apache/servicecomb-service-center/pkg/registry"
+ _ "github.com/apache/servicecomb-service-center/server/bootstrap"
+)
import (
"context"
- model2 "github.com/apache/servicecomb-service-center/pkg/model"
+ model2 "github.com/apache/servicecomb-service-center/pkg/dump"
"github.com/apache/servicecomb-service-center/pkg/util"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/rest/admin"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"github.com/astaxie/beego"
@@ -35,13 +37,13 @@ func init() {
}
func TestAdminService_Dump(t *testing.T) {
t.Log("execute 'dump' operation,when get all,should be passed")
- resp, err := admin.AdminServiceAPI.Dump(getContext(), &model2.DumpRequest{})
+ resp, err := admin.AdminServiceAPI.Dump(getContext(), &model2.Request{})
assert.NoError(t, err)
- assert.Equal(t, proto.ResponseSuccess, resp.Response.GetCode())
+ assert.Equal(t, registry.ResponseSuccess, resp.Response.GetCode())
t.Log("execute 'dump' operation,when get by domain project,should be passed")
resp, err = admin.AdminServiceAPI.Dump(
util.SetDomainProject(context.Background(), "x", "x"),
- &model2.DumpRequest{})
+ &model2.Request{})
assert.NoError(t, err)
assert.Equal(t, scerr.ErrForbidden, resp.Response.GetCode())
}
diff --git a/server/rest/controller/rest_util.go b/server/rest/controller/rest_util.go
index df8ffcf..604be7d 100644
--- a/server/rest/controller/rest_util.go
+++ b/server/rest/controller/rest_util.go
@@ -25,7 +25,6 @@ import (
"github.com/apache/servicecomb-service-center/pkg/rest"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/alarm"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/scerror"
"net/http"
"strconv"
@@ -47,7 +46,7 @@ func WriteError(w http.ResponseWriter, code int32, detail string) {
}
func WriteResponse(w http.ResponseWriter, resp *pb.Response, obj interface{}) {
- if resp != nil && resp.GetCode() != proto.ResponseSuccess {
+ if resp != nil && resp.GetCode() != pb.ResponseSuccess {
WriteError(w, resp.GetCode(), resp.GetMessage())
return
}
@@ -71,7 +70,7 @@ func WriteResponse(w http.ResponseWriter, resp *pb.Response, obj interface{}) {
}
func WriteJSONIfSuccess(w http.ResponseWriter, resp *pb.Response, json []byte) {
- if resp.GetCode() == proto.ResponseSuccess {
+ if resp.GetCode() == pb.ResponseSuccess {
WriteJSON(w, json)
return
}
diff --git a/server/rest/controller/v3/main_controller.go b/server/rest/controller/v3/main_controller.go
index 83de8a8..f1191dc 100644
--- a/server/rest/controller/v3/main_controller.go
+++ b/server/rest/controller/v3/main_controller.go
@@ -20,7 +20,6 @@ import (
"encoding/json"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/rest"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/rest/controller"
"github.com/apache/servicecomb-service-center/server/rest/controller/v4"
"github.com/apache/servicecomb-service-center/version"
@@ -40,7 +39,7 @@ func init() {
APIVersion: APIVersion,
}
versionJsonCache, _ = json.Marshal(result)
- versionResp = proto.CreateResponse(proto.ResponseSuccess, "get version successfully")
+ versionResp = pb.CreateResponse(pb.ResponseSuccess, "get version successfully")
}
type MainService struct {
diff --git a/server/rest/controller/v4/instance_controller.go b/server/rest/controller/v4/instance_controller.go
index 27f6da4..c2146cd 100644
--- a/server/rest/controller/v4/instance_controller.go
+++ b/server/rest/controller/v4/instance_controller.go
@@ -25,7 +25,6 @@ import (
"github.com/apache/servicecomb-service-center/pkg/rest"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/rest/controller"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"io/ioutil"
@@ -109,7 +108,7 @@ func (s *MicroServiceInstanceService) HeartbeatSet(w http.ResponseWriter, r *htt
}
resp, _ := core.InstanceAPI.HeartbeatSet(r.Context(), request)
- if resp.Response.GetCode() == proto.ResponseSuccess {
+ if resp.Response.GetCode() == pb.ResponseSuccess {
controller.WriteResponse(w, nil, nil)
return
}
diff --git a/server/rest/controller/v4/main_controller.go b/server/rest/controller/v4/main_controller.go
index e8a98c7..609557e 100644
--- a/server/rest/controller/v4/main_controller.go
+++ b/server/rest/controller/v4/main_controller.go
@@ -21,9 +21,8 @@ import (
"encoding/json"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/rest"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/config"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/rest/controller"
"github.com/apache/servicecomb-service-center/version"
"net/http"
@@ -40,8 +39,8 @@ const APIVersion = "4.0.0"
type Result struct {
*version.Set
- APIVersion string `json:"apiVersion"`
- Config *proto.ServerConfig `json:"config,omitempty"`
+ APIVersion string `json:"apiVersion"`
+ Config *config.ServerConfig `json:"config,omitempty"`
}
type MainService struct {
@@ -70,7 +69,7 @@ func (s *MainService) GetVersion(w http.ResponseWriter, r *http.Request) {
&config.ServerInfo.Config,
}
versionJSONCache, _ = json.Marshal(result)
- versionResp = proto.CreateResponse(proto.ResponseSuccess, "get version successfully")
+ versionResp = pb.CreateResponse(pb.ResponseSuccess, "get version successfully")
})
controller.WriteJSONIfSuccess(w, versionResp, versionJSONCache)
}
diff --git a/server/rest/controller/v4/schema_controller.go b/server/rest/controller/v4/schema_controller.go
index 4762dcf..ee044d7 100644
--- a/server/rest/controller/v4/schema_controller.go
+++ b/server/rest/controller/v4/schema_controller.go
@@ -23,8 +23,8 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/rest"
"github.com/apache/servicecomb-service-center/pkg/util"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/config"
"github.com/apache/servicecomb-service-center/server/rest/controller"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"io/ioutil"
diff --git a/server/rest/govern/controller_v4.go b/server/rest/govern/controller_v4.go
index c73bf03..5420425 100644
--- a/server/rest/govern/controller_v4.go
+++ b/server/rest/govern/controller_v4.go
@@ -18,7 +18,6 @@
package govern
import (
- "github.com/apache/servicecomb-service-center/server/core/proto"
"net/http"
"github.com/apache/servicecomb-service-center/pkg/log"
@@ -122,7 +121,7 @@ func (governService *ResourceV4) genLinesFromNode(withShared bool, domainProject
}
func (governService *ResourceV4) isSkipped(withShared bool, domainProject string, service *pb.MicroService) bool {
- return !withShared && core.IsShared(proto.MicroServiceToKey(domainProject, service))
+ return !withShared && core.IsShared(pb.MicroServiceToKey(domainProject, service))
}
// GetServiceDetail 查询服务详细信息
diff --git a/server/rest/govern/govern_suite_test.go b/server/rest/govern/govern_suite_test.go
index 03a7393..e3bc97c 100644
--- a/server/rest/govern/govern_suite_test.go
+++ b/server/rest/govern/govern_suite_test.go
@@ -21,9 +21,9 @@ import _ "github.com/apache/servicecomb-service-center/server/bootstrap"
import (
"context"
+ "github.com/apache/servicecomb-service-center/pkg/proto"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/rest/govern"
"github.com/apache/servicecomb-service-center/server/service"
"github.com/astaxie/beego"
diff --git a/server/rest/govern/service.go b/server/rest/govern/service.go
index 8f7e3b1..2746b38 100644
--- a/server/rest/govern/service.go
+++ b/server/rest/govern/service.go
@@ -24,10 +24,10 @@ import (
serviceUtil "github.com/apache/servicecomb-service-center/datasource/etcd/util"
"github.com/apache/servicecomb-service-center/pkg/gopool"
"github.com/apache/servicecomb-service-center/pkg/log"
+ "github.com/apache/servicecomb-service-center/pkg/proto"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
"github.com/apache/servicecomb-service-center/server/service"
)
@@ -68,12 +68,12 @@ func (governService *Service) GetServicesInfo(ctx context.Context, in *pb.GetSer
st, err = statistics(ctx, in.WithShared)
if err != nil {
return &pb.GetServicesInfoResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if len(optionMap) == 1 {
return &pb.GetServicesInfoResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Statistics successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Statistics successfully."),
Statistics: st,
}, nil
}
@@ -84,14 +84,14 @@ func (governService *Service) GetServicesInfo(ctx context.Context, in *pb.GetSer
if err != nil {
log.Errorf(err, "get all services by domain failed")
return &pb.GetServicesInfoResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
allServiceDetails := make([]*pb.ServiceDetail, 0, len(services))
domainProject := util.ParseDomainProject(ctx)
for _, service := range services {
- if !in.WithShared && apt.IsShared(proto.MicroServiceToKey(domainProject, service)) {
+ if !in.WithShared && apt.IsShared(pb.MicroServiceToKey(domainProject, service)) {
continue
}
if len(in.AppId) > 0 {
@@ -111,7 +111,7 @@ func (governService *Service) GetServicesInfo(ctx context.Context, in *pb.GetSer
})
if err != nil {
return &pb.GetServicesInfoResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
serviceDetail.MicroService = service
@@ -119,7 +119,7 @@ func (governService *Service) GetServicesInfo(ctx context.Context, in *pb.GetSer
}
return &pb.GetServicesInfoResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get services info successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get services info successfully."),
AllServicesDetail: allServiceDetails,
Statistics: st,
}, nil
@@ -133,19 +133,19 @@ func (governService *Service) GetServiceDetail(ctx context.Context, in *pb.GetSe
if len(in.ServiceId) == 0 {
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Invalid request for getting service detail."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Invalid request for getting service detail."),
}, nil
}
service, err := serviceUtil.GetService(ctx, domainProject, in.ServiceId)
if service == nil {
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
if err != nil {
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -161,7 +161,7 @@ func (governService *Service) GetServiceDetail(ctx context.Context, in *pb.GetSe
log.Errorf(err, "get service[%s/%s/%s] all versions failed",
service.Environment, service.AppId, service.ServiceName)
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -172,14 +172,14 @@ func (governService *Service) GetServiceDetail(ctx context.Context, in *pb.GetSe
})
if err != nil {
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
serviceInfo.MicroService = service
serviceInfo.MicroServiceVersions = versions
return &pb.GetServiceDetailResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get service successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get service successfully."),
Service: serviceInfo,
}, nil
}
@@ -188,7 +188,7 @@ func (governService *Service) GetApplications(ctx context.Context, in *pb.GetApp
err := service.Validate(in)
if err != nil {
return &pb.GetAppsResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
@@ -207,7 +207,7 @@ func (governService *Service) GetApplications(ctx context.Context, in *pb.GetApp
l := len(resp.Kvs)
if l == 0 {
return &pb.GetAppsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get all applications successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get all applications successfully."),
}, nil
}
@@ -226,7 +226,7 @@ func (governService *Service) GetApplications(ctx context.Context, in *pb.GetApp
}
return &pb.GetAppsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get all applications successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get all applications successfully."),
AppIds: apps,
}, nil
}
diff --git a/server/rest/govern/service_test.go b/server/rest/govern/service_test.go
index 6d27442..1536633 100644
--- a/server/rest/govern/service_test.go
+++ b/server/rest/govern/service_test.go
@@ -20,7 +20,6 @@ import (
"bytes"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/rest/govern"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@@ -46,28 +45,28 @@ var _ = Describe("'Govern' service", func() {
Options: []string{"all"},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("only service metadata")
resp, err = governService.GetServicesInfo(getContext(), &pb.GetServicesInfoRequest{
Options: []string{""},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("custom options")
resp, err = governService.GetServicesInfo(getContext(), &pb.GetServicesInfoRequest{
Options: []string{"tags", "rules", "instances", "schemas", "statistics"},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("'statistics' option")
resp, err = governService.GetServicesInfo(getContext(), &pb.GetServicesInfoRequest{
Options: []string{"statistics"},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("get instance count")
resp, err = governService.GetServicesInfo(getContext(), &pb.GetServicesInfoRequest{
@@ -75,7 +74,7 @@ var _ = Describe("'Govern' service", func() {
CountOnly: true,
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
})
@@ -91,7 +90,7 @@ var _ = Describe("'Govern' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respC.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respC.Response.GetCode()).To(Equal(pb.ResponseSuccess))
svr := httptest.NewServer(&mockGovernHandler{func(w http.ResponseWriter, r *http.Request) {
ctrl := &govern.ResourceV4{}
@@ -128,7 +127,7 @@ var _ = Describe("'Govern' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId = resp.ServiceId
core.ServiceAPI.ModifySchema(getContext(), &pb.ModifySchemaRequest{
@@ -137,7 +136,7 @@ var _ = Describe("'Govern' service", func() {
Schema: "detail",
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
core.InstanceAPI.Register(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
@@ -150,7 +149,7 @@ var _ = Describe("'Govern' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
Context("when get invalid service detail", func() {
@@ -159,7 +158,7 @@ var _ = Describe("'Govern' service", func() {
ServiceId: "",
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
})
@@ -169,20 +168,20 @@ var _ = Describe("'Govern' service", func() {
ServiceId: serviceId,
})
Expect(err).To(BeNil())
- Expect(respGetServiceDetail.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respGetServiceDetail.Response.GetCode()).To(Equal(pb.ResponseSuccess))
respDelete, err := core.ServiceAPI.Delete(getContext(), &pb.DeleteServiceRequest{
ServiceId: serviceId,
Force: true,
})
Expect(err).To(BeNil())
- Expect(respDelete.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respDelete.Response.GetCode()).To(Equal(pb.ResponseSuccess))
respGetServiceDetail, err = governService.GetServiceDetail(getContext(), &pb.GetServiceRequest{
ServiceId: serviceId,
})
Expect(err).To(BeNil())
- Expect(respGetServiceDetail.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respGetServiceDetail.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
})
})
@@ -194,7 +193,7 @@ var _ = Describe("'Govern' service", func() {
Environment: "non-exist-env",
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
})
@@ -202,13 +201,13 @@ var _ = Describe("'Govern' service", func() {
It("should be passed", func() {
resp, err := governService.GetApplications(getContext(), &pb.GetAppsRequest{})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
resp, err = governService.GetApplications(getContext(), &pb.GetAppsRequest{
Environment: pb.ENV_ACCEPT,
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
})
})
diff --git a/server/rest/pprof.go b/server/rest/pprof.go
index 47e03bd..a194544 100644
--- a/server/rest/pprof.go
+++ b/server/rest/pprof.go
@@ -18,7 +18,7 @@
package rest
import (
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"net/http"
"net/http/pprof"
)
diff --git a/server/rest/server.go b/server/rest/server.go
index 0827385..748c359 100644
--- a/server/rest/server.go
+++ b/server/rest/server.go
@@ -20,7 +20,7 @@ package rest
import (
"crypto/tls"
"github.com/apache/servicecomb-service-center/pkg/rest"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/apache/servicecomb-service-center/server/plugin/security/tlsconf"
"time"
)
diff --git a/server/server.go b/server/server.go
index beaaf7b..478ee5c 100644
--- a/server/server.go
+++ b/server/server.go
@@ -24,8 +24,8 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
nf "github.com/apache/servicecomb-service-center/pkg/notify"
"github.com/apache/servicecomb-service-center/server/command"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/config"
"github.com/apache/servicecomb-service-center/server/notify"
"github.com/apache/servicecomb-service-center/server/plugin"
"github.com/apache/servicecomb-service-center/server/service/gov"
diff --git a/server/service/dependency.go b/server/service/dependency.go
index 8f48011..b50acce 100644
--- a/server/service/dependency.go
+++ b/server/service/dependency.go
@@ -27,7 +27,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
)
@@ -62,8 +61,8 @@ func (s *MicroServiceService) AddOrUpdateDependencies(ctx context.Context, depen
domainProject := util.ParseDomainProject(ctx)
for _, dependencyInfo := range dependencyInfos {
consumerFlag := util.StringJoin([]string{dependencyInfo.Consumer.Environment, dependencyInfo.Consumer.AppId, dependencyInfo.Consumer.ServiceName, dependencyInfo.Consumer.Version}, "/")
- consumerInfo := proto.DependenciesToKeys([]*pb.MicroServiceKey{dependencyInfo.Consumer}, domainProject)[0]
- providersInfo := proto.DependenciesToKeys(dependencyInfo.Providers, domainProject)
+ consumerInfo := pb.DependenciesToKeys([]*pb.MicroServiceKey{dependencyInfo.Consumer}, domainProject)[0]
+ providersInfo := pb.DependenciesToKeys(dependencyInfo.Providers, domainProject)
rsp := serviceUtil.ParamsChecker(consumerInfo, providersInfo)
if rsp != nil {
@@ -76,12 +75,12 @@ func (s *MicroServiceService) AddOrUpdateDependencies(ctx context.Context, depen
if err != nil {
log.Errorf(err, "put request into dependency queue failed, override: %t, get consumer[%s] id failed",
override, consumerFlag)
- return proto.CreateResponse(scerr.ErrInternal, err.Error()), err
+ return pb.CreateResponse(scerr.ErrInternal, err.Error()), err
}
if len(consumerID) == 0 {
log.Errorf(nil, "put request into dependency queue failed, override: %t, consumer[%s] does not exist",
override, consumerFlag)
- return proto.CreateResponse(scerr.ErrServiceNotExists, fmt.Sprintf("Consumer %s does not exist.", consumerFlag)), nil
+ return pb.CreateResponse(scerr.ErrServiceNotExists, fmt.Sprintf("Consumer %s does not exist.", consumerFlag)), nil
}
dependencyInfo.Override = override
@@ -89,7 +88,7 @@ func (s *MicroServiceService) AddOrUpdateDependencies(ctx context.Context, depen
if err != nil {
log.Errorf(err, "put request into dependency queue failed, override: %t, marshal consumer[%s] dependency failed",
override, consumerFlag)
- return proto.CreateResponse(scerr.ErrInternal, err.Error()), err
+ return pb.CreateResponse(scerr.ErrInternal, err.Error()), err
}
id := apt.DepsQueueUUID
@@ -103,12 +102,12 @@ func (s *MicroServiceService) AddOrUpdateDependencies(ctx context.Context, depen
err := client.BatchCommit(ctx, opts)
if err != nil {
log.Errorf(err, "put request into dependency queue failed, override: %t, %v", override, dependencyInfos)
- return proto.CreateResponse(scerr.ErrInternal, err.Error()), err
+ return pb.CreateResponse(scerr.ErrInternal, err.Error()), err
}
log.Infof("put request into dependency queue successfully, override: %t, %v, from remote %s",
override, dependencyInfos, util.GetIPFromContext(ctx))
- return proto.CreateResponse(proto.ResponseSuccess, "Create dependency successfully."), nil
+ return pb.CreateResponse(pb.ResponseSuccess, "Create dependency successfully."), nil
}
func (s *MicroServiceService) GetProviderDependencies(ctx context.Context, in *pb.GetDependenciesRequest) (*pb.GetProDependenciesResponse, error) {
@@ -116,7 +115,7 @@ func (s *MicroServiceService) GetProviderDependencies(ctx context.Context, in *p
if err != nil {
log.Errorf(err, "GetProviderDependencies failed for validating parameters failed")
return &pb.GetProDependenciesResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
domainProject := util.ParseDomainProject(ctx)
@@ -130,7 +129,7 @@ func (s *MicroServiceService) GetProviderDependencies(ctx context.Context, in *p
if provider == nil {
log.Errorf(err, "GetProviderDependencies failed for provider[%s] does not exist", providerServiceID)
return &pb.GetProDependenciesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Provider does not exist"),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Provider does not exist"),
}, nil
}
@@ -140,11 +139,11 @@ func (s *MicroServiceService) GetProviderDependencies(ctx context.Context, in *p
log.Errorf(err, "GetProviderDependencies failed, provider is %s/%s/%s/%s",
provider.Environment, provider.AppId, provider.ServiceName, provider.Version)
return &pb.GetProDependenciesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
return &pb.GetProDependenciesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get all consumers successful."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get all consumers successful."),
Consumers: services,
}, nil
}
@@ -154,7 +153,7 @@ func (s *MicroServiceService) GetConsumerDependencies(ctx context.Context, in *p
if err != nil {
log.Errorf(err, "GetConsumerDependencies failed for validating parameters failed")
return &pb.GetConDependenciesResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
consumerID := in.ServiceId
@@ -164,13 +163,13 @@ func (s *MicroServiceService) GetConsumerDependencies(ctx context.Context, in *p
if err != nil {
log.Errorf(err, "GetConsumerDependencies failed, consumer is %s", consumerID)
return &pb.GetConDependenciesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if consumer == nil {
log.Errorf(err, "GetConsumerDependencies failed for consumer[%s] does not exist", consumerID)
return &pb.GetConDependenciesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Consumer does not exist"),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Consumer does not exist"),
}, nil
}
@@ -180,12 +179,12 @@ func (s *MicroServiceService) GetConsumerDependencies(ctx context.Context, in *p
log.Errorf(err, "GetConsumerDependencies failed, consumer is %s/%s/%s/%s",
consumer.Environment, consumer.AppId, consumer.ServiceName, consumer.Version)
return &pb.GetConDependenciesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
return &pb.GetConDependenciesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get all providers successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get all providers successfully."),
Providers: services,
}, nil
}
diff --git a/server/service/dependency_test.go b/server/service/dependency_test.go
index 99c9a2d..a7737a5 100644
--- a/server/service/dependency_test.go
+++ b/server/service/dependency_test.go
@@ -18,7 +18,6 @@ package service_test
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/event"
. "github.com/onsi/ginkgo"
@@ -47,7 +46,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateService.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateService.Response.GetCode()).To(Equal(pb.ResponseSuccess))
consumerId1 = respCreateService.ServiceId
respCreateService, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -60,7 +59,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateService.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateService.Response.GetCode()).To(Equal(pb.ResponseSuccess))
consumerId3 = respCreateService.ServiceId
respCreateService, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -74,7 +73,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateService.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateService.Response.GetCode()).To(Equal(pb.ResponseSuccess))
consumerId2 = respCreateService.ServiceId
respCreateService, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -87,7 +86,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateService.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateService.Response.GetCode()).To(Equal(pb.ResponseSuccess))
respCreateService, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
@@ -99,7 +98,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateService.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateService.Response.GetCode()).To(Equal(pb.ResponseSuccess))
respCreateService, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
Service: &pb.MicroService{
@@ -112,7 +111,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateService.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateService.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
Context("when request is invalid", func() {
@@ -120,7 +119,7 @@ var _ = Describe("'Dependency' service", func() {
By("dependency is nil")
respCreateDependency, err := serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
consumer := &pb.MicroServiceKey{
AppId: "create_dep_group",
@@ -149,7 +148,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("provider version is invalid")
respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
@@ -255,7 +254,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("provider app is invalid")
respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
@@ -273,7 +272,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("provider serviceName is invalid")
respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
@@ -291,7 +290,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("provider version is invalid")
respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
@@ -309,7 +308,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("provider in diff env")
respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
@@ -328,7 +327,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("consumer in diff env")
consumer.Environment = pb.ENV_PROD
@@ -347,7 +346,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -355,14 +354,14 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: consumerId1,
})
Expect(err).To(BeNil())
- Expect(respCon.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCon.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respCon.Providers)).To(Equal(0))
respCon, err = serviceResource.GetConsumerDependencies(getContext(), &pb.GetDependenciesRequest{
ServiceId: consumerId2,
})
Expect(err).To(BeNil())
- Expect(respCon.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCon.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respCon.Providers)).To(Equal(0))
By("dependencies is invalid")
@@ -415,7 +414,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -423,7 +422,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: consumerId1,
})
Expect(err).To(BeNil())
- Expect(respPro.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respPro.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respPro.Providers)).To(Equal(1))
Expect(respPro.Providers[0].Version).To(Equal("1.0.1"))
@@ -443,7 +442,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -451,7 +450,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: consumerId1,
})
Expect(err).To(BeNil())
- Expect(respPro.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respPro.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respPro.Providers)).To(Equal(2))
By("add *")
@@ -472,7 +471,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -480,7 +479,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: consumerId3,
})
Expect(err).To(BeNil())
- Expect(respPro.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respPro.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respPro.Providers)).ToNot(Equal(0))
By("clean all")
@@ -497,7 +496,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("add multiple providers")
respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
@@ -518,7 +517,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("add 1.0.0-2.0.0 to override *")
respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
@@ -536,7 +535,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -544,7 +543,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: consumerId1,
})
Expect(err).To(BeNil())
- Expect(respPro.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respPro.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respPro.Providers)).To(Equal(1))
Expect(respPro.Providers[0].Version).To(Equal("1.0.0"))
@@ -564,7 +563,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respAddDependency.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respAddDependency.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -572,7 +571,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: consumerId1,
})
Expect(err).To(BeNil())
- Expect(respPro.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respPro.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respPro.Providers)).To(Equal(2))
By("add provider is empty")
@@ -585,7 +584,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).To(Equal(pb.ResponseSuccess))
respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
Dependencies: []*pb.ConsumerDependency{
{
@@ -594,7 +593,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateDependency.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateDependency.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -602,7 +601,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: consumerId1,
})
Expect(err).To(BeNil())
- Expect(respPro.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respPro.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respPro.Providers)).To(Equal(0))
})
})
@@ -626,7 +625,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateService.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateService.Response.GetCode()).To(Equal(pb.ResponseSuccess))
consumerId1 = respCreateService.ServiceId
respCreateService, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -639,7 +638,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateService.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateService.Response.GetCode()).To(Equal(pb.ResponseSuccess))
providerId1 = respCreateService.ServiceId
respCreateService, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -652,7 +651,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateService.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateService.Response.GetCode()).To(Equal(pb.ResponseSuccess))
providerId2 = respCreateService.ServiceId
})
@@ -663,28 +662,28 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: "",
})
Expect(err).To(BeNil())
- Expect(respPro.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respPro.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("service does not exist when get provider")
respPro, err = serviceResource.GetProviderDependencies(getContext(), &pb.GetDependenciesRequest{
ServiceId: "noneservice",
})
Expect(err).To(BeNil())
- Expect(respPro.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respPro.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("service id is empty when get consumer")
respCon, err := serviceResource.GetConsumerDependencies(getContext(), &pb.GetDependenciesRequest{
ServiceId: "",
})
Expect(err).To(BeNil())
- Expect(respCon.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respCon.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("service does not exist when get consumer")
respCon, err = serviceResource.GetConsumerDependencies(getContext(), &pb.GetDependenciesRequest{
ServiceId: "noneservice",
})
Expect(err).To(BeNil())
- Expect(respCon.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respCon.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
})
@@ -695,14 +694,14 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: providerId1,
})
Expect(err).To(BeNil())
- Expect(respPro.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respPro.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("get consumer")
respCon, err := serviceResource.GetConsumerDependencies(getContext(), &pb.GetDependenciesRequest{
ServiceId: consumerId1,
})
Expect(err).To(BeNil())
- Expect(respCon.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCon.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
})
@@ -716,7 +715,7 @@ var _ = Describe("'Dependency' service", func() {
VersionRule: "1.0.0+",
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -725,7 +724,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: providerId1,
})
Expect(err).To(BeNil())
- Expect(respGetP.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respGetP.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(respGetP.Consumers[0].ServiceId).To(Equal(consumerId1))
By("get provider's deps")
@@ -733,7 +732,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: consumerId1,
})
Expect(err).To(BeNil())
- Expect(respGetC.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respGetC.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respGetC.Providers)).To(Equal(2))
//重复find
@@ -744,7 +743,7 @@ var _ = Describe("'Dependency' service", func() {
VersionRule: "2.0.0+",
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -753,7 +752,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: providerId1,
})
Expect(err).To(BeNil())
- Expect(respGetP.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respGetP.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respGetP.Consumers)).To(Equal(0))
By("get provider again")
@@ -761,7 +760,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: consumerId1,
})
Expect(err).To(BeNil())
- Expect(respGetC.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respGetC.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respGetC.Providers)).To(Equal(1))
Expect(respGetC.Providers[0].ServiceId).To(Equal(providerId2))
@@ -773,7 +772,7 @@ var _ = Describe("'Dependency' service", func() {
VersionRule: "1.0.0+",
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -782,7 +781,7 @@ var _ = Describe("'Dependency' service", func() {
NoSelf: true,
})
Expect(err).To(BeNil())
- Expect(respGetC.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respGetC.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respGetC.Providers)).To(Equal(1))
By("find before provider register")
@@ -805,7 +804,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateF.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateF.Response.GetCode()).To(Equal(pb.ResponseSuccess))
finder1 := respCreateF.ServiceId
resp, err = instanceResource.Find(getContext(), &pb.FindInstancesRequest{
@@ -815,7 +814,7 @@ var _ = Describe("'Dependency' service", func() {
VersionRule: "1.0.0+",
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -823,7 +822,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: providerId2,
})
Expect(err).To(BeNil())
- Expect(respGetC.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respGetC.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respGetC.Providers)).To(Equal(1))
Expect(respGetC.Providers[0].ServiceId).To(Equal(finder1))
@@ -832,7 +831,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: finder1, Force: true,
})
Expect(err).To(BeNil())
- Expect(respDelP.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respDelP.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -840,7 +839,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: providerId2,
})
Expect(err).To(BeNil())
- Expect(respGetC.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respGetC.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respGetC.Providers)).To(Equal(0))
respCreateF, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -854,7 +853,7 @@ var _ = Describe("'Dependency' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreateF.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreateF.Response.GetCode()).To(Equal(pb.ResponseSuccess))
resp, err = instanceResource.Find(getContext(), &pb.FindInstancesRequest{
ConsumerServiceId: providerId2,
@@ -863,7 +862,7 @@ var _ = Describe("'Dependency' service", func() {
VersionRule: "1.0.0+",
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(deh.Handle()).To(BeNil())
@@ -871,7 +870,7 @@ var _ = Describe("'Dependency' service", func() {
ServiceId: providerId2,
})
Expect(err).To(BeNil())
- Expect(respGetC.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respGetC.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respGetC.Providers)).To(Equal(1))
Expect(respGetC.Providers[0].ServiceId).To(Equal(finder1))
})
diff --git a/server/service/event/dependency_event_handler.go b/server/service/event/dependency_event_handler.go
index 303d8b4..6704873 100644
--- a/server/service/event/dependency_event_handler.go
+++ b/server/service/event/dependency_event_handler.go
@@ -31,9 +31,8 @@ import (
"github.com/apache/servicecomb-service-center/pkg/queue"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
+ "github.com/apache/servicecomb-service-center/server/config"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/config"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"time"
)
@@ -187,8 +186,8 @@ func (h *DependencyEventHandler) dependencyRuleHandle(res interface{}) error {
consumerFlag := util.StringJoin([]string{r.Consumer.Environment, r.Consumer.AppId, r.Consumer.ServiceName, r.Consumer.Version}, "/")
domainProject := dependencyEventHandlerRes.domainProject
- consumerInfo := proto.DependenciesToKeys([]*pb.MicroServiceKey{r.Consumer}, domainProject)[0]
- providersInfo := proto.DependenciesToKeys(r.Providers, domainProject)
+ consumerInfo := pb.DependenciesToKeys([]*pb.MicroServiceKey{r.Consumer}, domainProject)[0]
+ providersInfo := pb.DependenciesToKeys(r.Providers, domainProject)
var dep serviceUtil.Dependency
var err error
diff --git a/server/service/event/instance_event_handler.go b/server/service/event/instance_event_handler.go
index cda1ac7..ddce862 100644
--- a/server/service/event/instance_event_handler.go
+++ b/server/service/event/instance_event_handler.go
@@ -26,7 +26,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/notify"
"github.com/apache/servicecomb-service-center/server/service/cache"
"github.com/apache/servicecomb-service-center/server/service/metrics"
@@ -115,7 +114,7 @@ func (h *InstanceEventHandler) OnEvent(evt sd.KvEvent) {
return
}
- PublishInstanceEvent(evt, domainProject, proto.MicroServiceToKey(domainProject, ms), consumerIDs)
+ PublishInstanceEvent(evt, domainProject, pb.MicroServiceToKey(domainProject, ms), consumerIDs)
}
func NewInstanceEventHandler() *InstanceEventHandler {
@@ -130,7 +129,7 @@ func PublishInstanceEvent(evt sd.KvEvent, domainProject string, serviceKey *pb.M
}
response := &pb.WatchInstanceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Watch instance successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Watch instance successfully."),
Action: string(evt.Type),
Key: serviceKey,
Instance: evt.KV.Value.(*pb.MicroServiceInstance),
diff --git a/server/service/event/rule_event_handler.go b/server/service/event/rule_event_handler.go
index e31104d..ba6a10d 100644
--- a/server/service/event/rule_event_handler.go
+++ b/server/service/event/rule_event_handler.go
@@ -28,7 +28,6 @@ import (
"github.com/apache/servicecomb-service-center/pkg/task"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/notify"
)
@@ -76,7 +75,7 @@ func (apt *RulesChangedTask) publish(ctx context.Context, domainProject, provide
providerID, provider.Environment, provider.AppId, provider.ServiceName, provider.Version)
return err
}
- providerKey := proto.MicroServiceToKey(domainProject, provider)
+ providerKey := pb.MicroServiceToKey(domainProject, provider)
PublishInstanceEvent(apt.KvEvent, domainProject, providerKey, consumerIds)
return nil
diff --git a/server/service/event/service_event_handler.go b/server/service/event/service_event_handler.go
index 8942227..5377753 100644
--- a/server/service/event/service_event_handler.go
+++ b/server/service/event/service_event_handler.go
@@ -25,7 +25,6 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/service/cache"
"github.com/apache/servicecomb-service-center/server/service/metrics"
"strings"
@@ -71,7 +70,7 @@ func (h *ServiceEventHandler) OnEvent(evt sd.KvEvent) {
evt.Type, ms.ServiceId, ms.Environment, ms.AppId, ms.ServiceName, ms.Version)
// cache
- providerKey := proto.MicroServiceToKey(domainProject, ms)
+ providerKey := pb.MicroServiceToKey(domainProject, ms)
cache.FindInstances.Remove(providerKey)
}
diff --git a/server/service/event/tag_event_handler.go b/server/service/event/tag_event_handler.go
index 8996afb..c010132 100644
--- a/server/service/event/tag_event_handler.go
+++ b/server/service/event/tag_event_handler.go
@@ -28,7 +28,6 @@ import (
"github.com/apache/servicecomb-service-center/pkg/task"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/notify"
"github.com/apache/servicecomb-service-center/server/service/cache"
)
@@ -71,7 +70,7 @@ func (apt *TagsChangedTask) publish(ctx context.Context, domainProject, consumer
return fmt.Errorf("consumer[%s] does not exist", consumerID)
}
- serviceKey := proto.MicroServiceToKey(domainProject, consumer)
+ serviceKey := pb.MicroServiceToKey(domainProject, consumer)
cache.FindInstances.Remove(serviceKey)
providerIDs, err := serviceUtil.GetProviderIds(ctx, domainProject, consumer)
@@ -89,7 +88,7 @@ func (apt *TagsChangedTask) publish(ctx context.Context, domainProject, consumer
continue
}
- providerKey := proto.MicroServiceToKey(domainProject, provider)
+ providerKey := pb.MicroServiceToKey(domainProject, provider)
PublishInstanceEvent(apt.KvEvent, domainProject, providerKey, []string{consumerID})
}
return nil
diff --git a/server/service/gov/config_distributor.go b/server/service/gov/config_distributor.go
index 58f0f07..66580c4 100644
--- a/server/service/gov/config_distributor.go
+++ b/server/service/gov/config_distributor.go
@@ -19,7 +19,7 @@ package gov
import (
"github.com/apache/servicecomb-service-center/pkg/log"
- "github.com/apache/servicecomb-service-center/server/core/config"
+ "github.com/apache/servicecomb-service-center/server/config"
)
const (
diff --git a/server/service/gov/config_distributor_test.go b/server/service/gov/config_distributor_test.go
index 9d63932..345301e 100644
--- a/server/service/gov/config_distributor_test.go
+++ b/server/service/gov/config_distributor_test.go
@@ -19,9 +19,9 @@ package gov_test
import (
"encoding/json"
- "github.com/apache/servicecomb-service-center/pkg/model"
- "github.com/apache/servicecomb-service-center/server/core/config"
- "github.com/apache/servicecomb-service-center/server/service/gov"
+ "github.com/apache/servicecomb-service-center/pkg/gov"
+ "github.com/apache/servicecomb-service-center/server/config"
+ svc "github.com/apache/servicecomb-service-center/server/service/gov"
_ "github.com/apache/servicecomb-service-center/server/service/gov/mock"
"github.com/stretchr/testify/assert"
"testing"
@@ -38,14 +38,14 @@ func TestCreate(t *testing.T) {
},
},
}
- err := gov.Init()
+ err := svc.Init()
assert.NoError(t, err)
- b, _ := json.MarshalIndent(&model.LoadBalancer{
- GovernancePolicy: &model.GovernancePolicy{
+ b, _ := json.MarshalIndent(&gov.LoadBalancer{
+ GovernancePolicy: &gov.GovernancePolicy{
Name: "Traffic2adminAPI",
},
- Spec: &model.LBSpec{RetryNext: 3, MarkerName: "traffic2adminAPI"},
+ Spec: &gov.LBSpec{RetryNext: 3, MarkerName: "traffic2adminAPI"},
}, "", " ")
- err = gov.Create("lb", b)
+ err = svc.Create("lb", b)
assert.NoError(t, err)
}
diff --git a/server/service/gov/mock/mock.go b/server/service/gov/mock/mock.go
index 6bb7b83..2d4549c 100644
--- a/server/service/gov/mock/mock.go
+++ b/server/service/gov/mock/mock.go
@@ -20,26 +20,26 @@ package mock
import (
"encoding/json"
"fmt"
- "github.com/apache/servicecomb-service-center/pkg/model"
- "github.com/apache/servicecomb-service-center/server/core/config"
- "github.com/apache/servicecomb-service-center/server/service/gov"
+ "github.com/apache/servicecomb-service-center/pkg/gov"
+ "github.com/apache/servicecomb-service-center/server/config"
+ svc "github.com/apache/servicecomb-service-center/server/service/gov"
"log"
)
type Distributor struct {
- lbPolicies map[string]*model.LoadBalancer
+ lbPolicies map[string]*gov.LoadBalancer
name string
}
func (d *Distributor) Create(kind string, spec []byte) error {
- p := &model.LoadBalancer{}
+ p := &gov.LoadBalancer{}
err := json.Unmarshal(spec, p)
log.Println(fmt.Sprintf("create %v", &p))
d.lbPolicies[p.GovernancePolicy.Name] = p
return err
}
func (d *Distributor) Update(kind string, spec []byte) error {
- p := &model.LoadBalancer{}
+ p := &gov.LoadBalancer{}
err := json.Unmarshal(spec, p)
log.Println("update ", p)
d.lbPolicies[p.GovernancePolicy.Name] = p
@@ -50,7 +50,7 @@ func (d *Distributor) Delete(name, kind string) error {
return nil
}
func (d *Distributor) List(kind string) ([]byte, error) {
- r := make([]*model.LoadBalancer, len(d.lbPolicies))
+ r := make([]*gov.LoadBalancer, len(d.lbPolicies))
for _, g := range d.lbPolicies {
r = append(r, g)
}
@@ -58,14 +58,14 @@ func (d *Distributor) List(kind string) ([]byte, error) {
return b, nil
}
func (d *Distributor) Type() string {
- return gov.ConfigDistributorMock
+ return svc.ConfigDistributorMock
}
func (d *Distributor) Name() string {
return d.name
}
-func new(opts config.DistributorOptions) (gov.ConfigDistributor, error) {
- return &Distributor{name: opts.Name, lbPolicies: map[string]*model.LoadBalancer{}}, nil
+func new(opts config.DistributorOptions) (svc.ConfigDistributor, error) {
+ return &Distributor{name: opts.Name, lbPolicies: map[string]*gov.LoadBalancer{}}, nil
}
func init() {
- gov.InstallDistributor(gov.ConfigDistributorMock, new)
+ svc.InstallDistributor(svc.ConfigDistributorMock, new)
}
diff --git a/server/service/instance.go b/server/service/instance.go
index 3c27b8f..aa9fea5 100644
--- a/server/service/instance.go
+++ b/server/service/instance.go
@@ -30,7 +30,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
apt "github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
"github.com/apache/servicecomb-service-center/server/health"
"github.com/apache/servicecomb-service-center/server/plugin/quota"
"github.com/apache/servicecomb-service-center/server/plugin/uuid"
@@ -99,7 +98,7 @@ func (s *InstanceService) Register(ctx context.Context, in *pb.RegisterInstanceR
if err := Validate(in); err != nil {
log.Errorf(err, "register instance failed, invalid parameters, operator %s", remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
@@ -115,7 +114,7 @@ func (s *InstanceService) Register(ctx context.Context, in *pb.RegisterInstanceR
// and needs to be re-registered.
resp, err := s.Heartbeat(ctx, &pb.HeartbeatRequest{ServiceId: instance.ServiceId, InstanceId: instance.InstanceId})
switch resp.Response.GetCode() {
- case proto.ResponseSuccess:
+ case pb.ResponseSuccess:
log.Infof("register instance successful, reuse instance[%s/%s], operator %s",
instance.ServiceId, instance.InstanceId, remoteIP)
return &pb.RegisterInstanceResponse{
@@ -137,7 +136,7 @@ func (s *InstanceService) Register(ctx context.Context, in *pb.RegisterInstanceR
log.Errorf(err, "register service[%s]'s instance failed, endpoints %v, host '%s', operator %s",
instance.ServiceId, instance.Endpoints, instance.HostName, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponseWithSCErr(err),
+ Response: pb.CreateResponseWithSCErr(err),
}, nil
}
@@ -162,7 +161,7 @@ func (s *InstanceService) Register(ctx context.Context, in *pb.RegisterInstanceR
log.Errorf(reporter.Err, "register instance failed, %s, operator %s",
instanceFlag, remoteIP)
response := &pb.RegisterInstanceResponse{
- Response: proto.CreateResponseWithSCErr(reporter.Err),
+ Response: pb.CreateResponseWithSCErr(reporter.Err),
}
if reporter.Err.InternalError() {
return response, reporter.Err
@@ -178,7 +177,7 @@ func (s *InstanceService) Register(ctx context.Context, in *pb.RegisterInstanceR
"register instance failed, %s, instanceID %s, operator %s",
instanceFlag, instanceID, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -186,7 +185,7 @@ func (s *InstanceService) Register(ctx context.Context, in *pb.RegisterInstanceR
if err != nil {
log.Errorf(err, "grant lease failed, %s, operator: %s", instanceFlag, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
}, err
}
@@ -211,7 +210,7 @@ func (s *InstanceService) Register(ctx context.Context, in *pb.RegisterInstanceR
"register instance failed, %s, instanceID %s, operator %s",
instanceFlag, instanceID, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnavailableBackend, err.Error()),
}, err
}
if !resp.Succeeded {
@@ -219,7 +218,7 @@ func (s *InstanceService) Register(ctx context.Context, in *pb.RegisterInstanceR
"register instance failed, %s, instanceID %s, operator %s: service does not exist",
instanceFlag, instanceID, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "Service does not exist."),
}, nil
}
@@ -232,7 +231,7 @@ func (s *InstanceService) Register(ctx context.Context, in *pb.RegisterInstanceR
log.Infof("register instance %s, instanceID %s, operator %s",
instanceFlag, instanceID, remoteIP)
return &pb.RegisterInstanceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Register service instance successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Register service instance successfully."),
InstanceId: instanceID,
}, nil
}
@@ -243,7 +242,7 @@ func (s *InstanceService) Unregister(ctx context.Context, in *pb.UnregisterInsta
if err := Validate(in); err != nil {
log.Errorf(err, "unregister instance failed, invalid parameters, operator %s", remoteIP)
return &pb.UnregisterInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
@@ -257,7 +256,7 @@ func (s *InstanceService) Unregister(ctx context.Context, in *pb.UnregisterInsta
if err != nil {
log.Errorf(err, "unregister instance failed, instance[%s], operator %s: revoke instance failed", instanceFlag, remoteIP)
resp := &pb.UnregisterInstanceResponse{
- Response: proto.CreateResponseWithSCErr(err),
+ Response: pb.CreateResponseWithSCErr(err),
}
if err.InternalError() {
return resp, err
@@ -267,7 +266,7 @@ func (s *InstanceService) Unregister(ctx context.Context, in *pb.UnregisterInsta
log.Infof("unregister instance[%s], operator %s", instanceFlag, remoteIP)
return &pb.UnregisterInstanceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Unregister service instance successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Unregister service instance successfully."),
}, nil
}
@@ -296,7 +295,7 @@ func (s *InstanceService) Heartbeat(ctx context.Context, in *pb.HeartbeatRequest
if err := Validate(in); err != nil {
log.Errorf(err, "heartbeat failed, invalid parameters, operator %s", remoteIP)
return &pb.HeartbeatResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
@@ -308,7 +307,7 @@ func (s *InstanceService) Heartbeat(ctx context.Context, in *pb.HeartbeatRequest
log.Errorf(err, "heartbeat failed, instance[%s]. operator %s",
instanceFlag, remoteIP)
resp := &pb.HeartbeatResponse{
- Response: proto.CreateResponseWithSCErr(err),
+ Response: pb.CreateResponseWithSCErr(err),
}
if err.InternalError() {
return resp, err
@@ -323,7 +322,7 @@ func (s *InstanceService) Heartbeat(ctx context.Context, in *pb.HeartbeatRequest
log.Infof("heartbeat successful, renew instance[%s] ttl to %d. operator %s", instanceFlag, ttl, remoteIP)
}
return &pb.HeartbeatResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Update service instance heartbeat successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Update service instance heartbeat successfully."),
}, nil
}
@@ -331,7 +330,7 @@ func (s *InstanceService) HeartbeatSet(ctx context.Context, in *pb.HeartbeatSetR
if len(in.Instances) == 0 {
log.Errorf(nil, "heartbeats failed, invalid request. Body not contain Instances or is empty")
return &pb.HeartbeatSetResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, "Request format invalid."),
}, nil
}
domainProject := util.ParseDomainProject(ctx)
@@ -369,13 +368,13 @@ func (s *InstanceService) HeartbeatSet(ctx context.Context, in *pb.HeartbeatSetR
if !failFlag && successFlag {
log.Infof("batch update heartbeats[%s] successfully", count)
return &pb.HeartbeatSetResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Heartbeat set successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Heartbeat set successfully."),
Instances: instanceHbRstArr,
}, nil
}
log.Errorf(nil, "batch update heartbeats failed, %v", in.Instances)
return &pb.HeartbeatSetResponse{
- Response: proto.CreateResponse(scerr.ErrInstanceNotExists, "Heartbeat set failed."),
+ Response: pb.CreateResponse(scerr.ErrInstanceNotExists, "Heartbeat set failed."),
Instances: instanceHbRstArr,
}, nil
}
@@ -401,7 +400,7 @@ func (s *InstanceService) GetOneInstance(ctx context.Context, in *pb.GetOneInsta
if err != nil {
log.Errorf(err, "get instance failed: invalid parameters")
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
@@ -414,14 +413,14 @@ func (s *InstanceService) GetOneInstance(ctx context.Context, in *pb.GetOneInsta
log.Errorf(err, "get consumer failed, consumer[%s] find provider instance[%s/%s]",
in.ConsumerServiceId, in.ProviderServiceId, in.ProviderInstanceId)
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if service == nil {
log.Errorf(nil, "consumer does not exist, consumer[%s] find provider instance[%s/%s]",
in.ConsumerServiceId, in.ProviderServiceId, in.ProviderInstanceId)
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists,
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists,
fmt.Sprintf("Consumer[%s] does not exist.", in.ConsumerServiceId)),
}, nil
}
@@ -432,14 +431,14 @@ func (s *InstanceService) GetOneInstance(ctx context.Context, in *pb.GetOneInsta
log.Errorf(err, "get provider failed, consumer[%s] find provider instance[%s/%s]",
in.ConsumerServiceId, in.ProviderServiceId, in.ProviderInstanceId)
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if provider == nil {
log.Errorf(nil, "provider does not exist, consumer[%s] find provider instance[%s/%s]",
in.ConsumerServiceId, in.ProviderServiceId, in.ProviderInstanceId)
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists,
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists,
fmt.Sprintf("Provider[%s] does not exist.", in.ProviderServiceId)),
}, nil
}
@@ -453,21 +452,21 @@ func (s *InstanceService) GetOneInstance(ctx context.Context, in *pb.GetOneInsta
var item *cache.VersionRuleCacheItem
rev, _ := ctx.Value(util.CtxRequestRevision).(string)
- item, err = cache.FindInstances.GetWithProviderID(ctx, service, proto.MicroServiceToKey(domainProject, provider),
+ item, err = cache.FindInstances.GetWithProviderID(ctx, service, pb.MicroServiceToKey(domainProject, provider),
&pb.HeartbeatSetElement{
ServiceId: in.ProviderServiceId, InstanceId: in.ProviderInstanceId,
}, in.Tags, rev)
if err != nil {
log.Errorf(err, "FindInstances.GetWithProviderID failed, %s failed", findFlag())
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if item == nil || len(item.Instances) == 0 {
mes := fmt.Errorf("%s failed, provider instance does not exist", findFlag())
log.Errorf(mes, "FindInstances.GetWithProviderID failed")
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(scerr.ErrInstanceNotExists, mes.Error()),
+ Response: pb.CreateResponse(scerr.ErrInstanceNotExists, mes.Error()),
}, nil
}
@@ -478,7 +477,7 @@ func (s *InstanceService) GetOneInstance(ctx context.Context, in *pb.GetOneInsta
_ = util.SetContext(ctx, util.CtxResponseRevision, item.Rev)
return &pb.GetOneInstanceResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Get instance successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Get instance successfully."),
Instance: instance,
}, nil
}
@@ -488,7 +487,7 @@ func (s *InstanceService) GetInstances(ctx context.Context, in *pb.GetInstancesR
if err != nil {
log.Errorf(err, "get instances failed: invalid parameters")
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
@@ -501,14 +500,14 @@ func (s *InstanceService) GetInstances(ctx context.Context, in *pb.GetInstancesR
log.Errorf(err, "get consumer failed, consumer[%s] find provider instances",
in.ConsumerServiceId, in.ProviderServiceId)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if service == nil {
log.Errorf(nil, "consumer does not exist, consumer[%s] find provider instances",
in.ConsumerServiceId, in.ProviderServiceId)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists,
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists,
fmt.Sprintf("Consumer[%s] does not exist.", in.ConsumerServiceId)),
}, nil
}
@@ -519,14 +518,14 @@ func (s *InstanceService) GetInstances(ctx context.Context, in *pb.GetInstancesR
log.Errorf(err, "get provider failed, consumer[%s] find provider instances",
in.ConsumerServiceId, in.ProviderServiceId)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if provider == nil {
log.Errorf(nil, "provider does not exist, consumer[%s] find provider instances",
in.ConsumerServiceId, in.ProviderServiceId)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists,
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists,
fmt.Sprintf("Provider[%s] does not exist.", in.ProviderServiceId)),
}, nil
}
@@ -539,21 +538,21 @@ func (s *InstanceService) GetInstances(ctx context.Context, in *pb.GetInstancesR
var item *cache.VersionRuleCacheItem
rev, _ := ctx.Value(util.CtxRequestRevision).(string)
- item, err = cache.FindInstances.GetWithProviderID(ctx, service, proto.MicroServiceToKey(domainProject, provider),
+ item, err = cache.FindInstances.GetWithProviderID(ctx, service, pb.MicroServiceToKey(domainProject, provider),
&pb.HeartbeatSetElement{
ServiceId: in.ProviderServiceId,
}, in.Tags, rev)
if err != nil {
log.Errorf(err, "FindInstances.GetWithProviderID failed, %s failed", findFlag())
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if item == nil || len(item.ServiceIds) == 0 {
mes := fmt.Errorf("%s failed, provider instance does not exist", findFlag())
log.Errorf(mes, "FindInstances.GetWithProviderID failed")
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
}, nil
}
@@ -564,7 +563,7 @@ func (s *InstanceService) GetInstances(ctx context.Context, in *pb.GetInstancesR
_ = util.SetContext(ctx, util.CtxResponseRevision, item.Rev)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Query service instances successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Query service instances successfully."),
Instances: instances,
}, nil
}
@@ -574,7 +573,7 @@ func (s *InstanceService) Find(ctx context.Context, in *pb.FindInstancesRequest)
if err != nil {
log.Errorf(err, "find instance failed: invalid parameters")
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
@@ -592,7 +591,7 @@ func (s *InstanceService) Find(ctx context.Context, in *pb.FindInstancesRequest)
err = errors.New("rev in context is not type string")
log.Error("", err)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -613,14 +612,14 @@ func (s *InstanceService) findInstance(ctx context.Context, in *pb.FindInstances
log.Errorf(err, "get consumer failed, consumer[%s] find provider[%s/%s/%s/%s]",
in.ConsumerServiceId, in.Environment, in.AppId, in.ServiceName, in.VersionRule)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if service == nil {
log.Errorf(nil, "consumer does not exist, consumer[%s] find provider[%s/%s/%s/%s]",
in.ConsumerServiceId, in.Environment, in.AppId, in.ServiceName, in.VersionRule)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists,
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists,
fmt.Sprintf("Consumer[%s] does not exist.", in.ConsumerServiceId)),
}, nil
}
@@ -642,14 +641,14 @@ func (s *InstanceService) findInstance(ctx context.Context, in *pb.FindInstances
if err != nil {
log.Errorf(err, "FindInstancesCache.Get failed, %s failed", findFlag)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if item == nil {
mes := fmt.Errorf("%s failed, provider does not exist", findFlag)
log.Errorf(mes, "FindInstancesCache.Get failed")
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
}, nil
}
@@ -667,13 +666,13 @@ func (s *InstanceService) findInstance(ctx context.Context, in *pb.FindInstances
mes := fmt.Errorf("%s failed, provider does not exist", findFlag)
log.Errorf(mes, "AddServiceVersionRule failed")
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
}, nil
}
if err != nil {
log.Errorf(err, "AddServiceVersionRule failed, %s failed", findFlag)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
}
@@ -695,14 +694,14 @@ func (s *InstanceService) findSharedServiceInstance(ctx context.Context, in *pb.
if err != nil {
log.Errorf(err, "FindInstancesCache.Get failed, %s failed", findFlag)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if item == nil {
mes := fmt.Errorf("%s failed, provider does not exist", findFlag)
log.Errorf(mes, "FindInstancesCache.Get failed")
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, mes.Error()),
}, nil
}
@@ -717,7 +716,7 @@ func (s *InstanceService) genFindResult(ctx context.Context, oldRev string, item
// TODO support gRPC output context
_ = util.SetContext(ctx, util.CtxResponseRevision, item.Rev)
return &pb.FindInstancesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Query service instances successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Query service instances successfully."),
Instances: instances,
}, nil
}
@@ -727,7 +726,7 @@ func (s *InstanceService) BatchFind(ctx context.Context, in *pb.BatchFindInstanc
err := errors.New("Required services or instances")
log.Errorf(err, "batch find instance failed: invalid parameters")
return &pb.BatchFindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
@@ -735,19 +734,19 @@ func (s *InstanceService) BatchFind(ctx context.Context, in *pb.BatchFindInstanc
if err != nil {
log.Errorf(err, "batch find instance failed: invalid parameters")
return &pb.BatchFindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
response := &pb.BatchFindInstancesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Batch query service instances successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Batch query service instances successfully."),
}
// find services
response.Services, err = s.batchFindServices(ctx, in)
if err != nil {
return &pb.BatchFindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -755,7 +754,7 @@ func (s *InstanceService) BatchFind(ctx context.Context, in *pb.BatchFindInstanc
response.Instances, err = s.batchFindInstances(ctx, in)
if err != nil {
return &pb.BatchFindInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
@@ -836,7 +835,7 @@ func (s *InstanceService) reshapeProviderKey(ctx context.Context, provider *pb.M
}
versionRule := provider.Version
- provider = proto.MicroServiceToKey(provider.Tenant, providerService)
+ provider = pb.MicroServiceToKey(provider.Tenant, providerService)
provider.Version = versionRule
return provider, nil
}
@@ -847,7 +846,7 @@ func (s *InstanceService) UpdateStatus(ctx context.Context, in *pb.UpdateInstanc
if err := Validate(in); err != nil {
log.Errorf(nil, "update instance[%s] status failed", updateStatusFlag)
return &pb.UpdateInstanceStatusResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
@@ -855,13 +854,13 @@ func (s *InstanceService) UpdateStatus(ctx context.Context, in *pb.UpdateInstanc
if err != nil {
log.Errorf(err, "update instance[%s] status failed", updateStatusFlag)
return &pb.UpdateInstanceStatusResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if instance == nil {
log.Errorf(nil, "update instance[%s] status failed, instance does not exist", updateStatusFlag)
return &pb.UpdateInstanceStatusResponse{
- Response: proto.CreateResponse(scerr.ErrInstanceNotExists, "Service instance does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInstanceNotExists, "Service instance does not exist."),
}, nil
}
@@ -871,7 +870,7 @@ func (s *InstanceService) UpdateStatus(ctx context.Context, in *pb.UpdateInstanc
if err := serviceUtil.UpdateInstance(ctx, domainProject, ©InstanceRef); err != nil {
log.Errorf(err, "update instance[%s] status failed", updateStatusFlag)
resp := &pb.UpdateInstanceStatusResponse{
- Response: proto.CreateResponseWithSCErr(err),
+ Response: pb.CreateResponseWithSCErr(err),
}
if err.InternalError() {
return resp, err
@@ -881,7 +880,7 @@ func (s *InstanceService) UpdateStatus(ctx context.Context, in *pb.UpdateInstanc
log.Infof("update instance[%s] status successfully", updateStatusFlag)
return &pb.UpdateInstanceStatusResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Update service instance status successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Update service instance status successfully."),
}, nil
}
@@ -891,7 +890,7 @@ func (s *InstanceService) UpdateInstanceProperties(ctx context.Context, in *pb.U
if err := Validate(in); err != nil {
log.Errorf(nil, "update instance[%s] properties failed", instanceFlag)
return &pb.UpdateInstancePropsResponse{
- Response: proto.CreateResponse(scerr.ErrInvalidParams, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInvalidParams, err.Error()),
}, nil
}
@@ -899,13 +898,13 @@ func (s *InstanceService) UpdateInstanceProperties(ctx context.Context, in *pb.U
if err != nil {
log.Errorf(err, "update instance[%s] properties failed", instanceFlag)
return &pb.UpdateInstancePropsResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if instance == nil {
log.Errorf(nil, "update instance[%s] properties failed, instance does not exist", instanceFlag)
return &pb.UpdateInstancePropsResponse{
- Response: proto.CreateResponse(scerr.ErrInstanceNotExists, "Service instance does not exist."),
+ Response: pb.CreateResponse(scerr.ErrInstanceNotExists, "Service instance does not exist."),
}, nil
}
@@ -915,7 +914,7 @@ func (s *InstanceService) UpdateInstanceProperties(ctx context.Context, in *pb.U
if err := serviceUtil.UpdateInstance(ctx, domainProject, ©InstanceRef); err != nil {
log.Errorf(err, "update instance[%s] properties failed", instanceFlag)
resp := &pb.UpdateInstancePropsResponse{
- Response: proto.CreateResponseWithSCErr(err),
+ Response: pb.CreateResponseWithSCErr(err),
}
if err.InternalError() {
return resp, err
@@ -925,14 +924,14 @@ func (s *InstanceService) UpdateInstanceProperties(ctx context.Context, in *pb.U
log.Infof("update instance[%s] properties successfully", instanceFlag)
return &pb.UpdateInstancePropsResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Update service instance properties successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Update service instance properties successfully."),
}, nil
}
func (s *InstanceService) ClusterHealth(ctx context.Context) (*pb.GetInstancesResponse, error) {
if err := health.GlobalHealthChecker().Healthy(); err != nil {
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrUnhealthy, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrUnhealthy, err.Error()),
}, nil
}
@@ -949,14 +948,14 @@ func (s *InstanceService) ClusterHealth(ctx context.Context) (*pb.GetInstancesRe
log.Errorf(err, "health check failed: get service center[%s/%s/%s/%s]'s serviceID failed",
apt.Service.Environment, apt.Service.AppId, apt.Service.ServiceName, apt.Service.Version)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
if len(serviceID) == 0 {
log.Errorf(nil, "health check failed: service center[%s/%s/%s/%s]'s serviceID does not exist",
apt.Service.Environment, apt.Service.AppId, apt.Service.ServiceName, apt.Service.Version)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrServiceNotExists, "ServiceCenter's serviceID not exist."),
+ Response: pb.CreateResponse(scerr.ErrServiceNotExists, "ServiceCenter's serviceID not exist."),
}, nil
}
@@ -965,11 +964,11 @@ func (s *InstanceService) ClusterHealth(ctx context.Context) (*pb.GetInstancesRe
log.Errorf(err, "health check failed: get service center[%s][%s/%s/%s/%s]'s instances failed",
serviceID, apt.Service.Environment, apt.Service.AppId, apt.Service.ServiceName, apt.Service.Version)
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(scerr.ErrInternal, err.Error()),
+ Response: pb.CreateResponse(scerr.ErrInternal, err.Error()),
}, err
}
return &pb.GetInstancesResponse{
- Response: proto.CreateResponse(proto.ResponseSuccess, "Health check successfully."),
+ Response: pb.CreateResponse(pb.ResponseSuccess, "Health check successfully."),
Instances: instances,
}, nil
}
diff --git a/server/service/instance_test.go b/server/service/instance_test.go
index a0c1397..c7750d3 100644
--- a/server/service/instance_test.go
+++ b/server/service/instance_test.go
@@ -20,7 +20,6 @@ import (
pb "github.com/apache/servicecomb-service-center/pkg/registry"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/core"
- "github.com/apache/servicecomb-service-center/server/core/proto"
scerr "github.com/apache/servicecomb-service-center/server/scerror"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@@ -52,7 +51,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId1 = respCreate.ServiceId
})
@@ -69,7 +68,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(resp.InstanceId).To(Not(Equal("")))
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -84,7 +83,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(resp.InstanceId).To(Equal("customId"))
By("status is nil")
@@ -98,7 +97,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(resp.InstanceId).To(Not(Equal("")))
By("all max")
@@ -131,7 +130,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(resp.InstanceId).To(Not(Equal("")))
})
})
@@ -150,13 +149,13 @@ var _ = Describe("'Instance' service", func() {
Instance: instance,
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
Instance: instance,
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(resp.InstanceId).To(Equal(instance.InstanceId))
})
})
@@ -186,7 +185,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("service does not exist")
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -200,7 +199,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("hostName is empty")
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -213,7 +212,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId1,
@@ -225,7 +224,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
ServiceId: serviceId1,
@@ -237,14 +236,14 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("instance is nil")
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
Instance: nil,
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("check normal push healthChceck")
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -263,7 +262,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
Instance: &pb.MicroServiceInstance{
@@ -281,7 +280,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("check normal pull healthChceck")
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -301,7 +300,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("check invalid push healthChceck")
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -389,7 +388,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
})
})
@@ -412,7 +411,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId = respCreate.ServiceId
resp, err := instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -426,7 +425,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
instanceId1 = resp.InstanceId
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -440,7 +439,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
instanceId2 = resp.InstanceId
})
@@ -452,7 +451,7 @@ var _ = Describe("'Instance' service", func() {
InstanceId: instanceId1,
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("serviceId/instanceId is invalid")
resp, err = instanceResource.Heartbeat(getContext(), &pb.HeartbeatRequest{
@@ -491,14 +490,14 @@ var _ = Describe("'Instance' service", func() {
ServiceId: "100000000000",
InstanceId: instanceId1,
})
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("instance does not exist")
resp, err = instanceResource.Heartbeat(getContext(), &pb.HeartbeatRequest{
ServiceId: serviceId,
InstanceId: "not-exist-ins",
})
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
})
@@ -509,12 +508,12 @@ var _ = Describe("'Instance' service", func() {
Instances: []*pb.HeartbeatSetElement{},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("instances are nil")
resp, err = instanceResource.HeartbeatSet(getContext(), &pb.HeartbeatSetRequest{})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("request contains > 1 instances")
resp, err = instanceResource.HeartbeatSet(getContext(), &pb.HeartbeatSetRequest{
@@ -529,7 +528,7 @@ var _ = Describe("'Instance' service", func() {
},
},
})
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("request contains invalid instance")
resp, err = instanceResource.HeartbeatSet(getContext(), &pb.HeartbeatSetRequest{
@@ -544,7 +543,7 @@ var _ = Describe("'Instance' service", func() {
},
},
})
- Expect(resp.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
})
})
@@ -554,7 +553,7 @@ var _ = Describe("'Instance' service", func() {
It("should be passed", func() {
resp, err := serviceResource.Create(getContext(), core.CreateServiceRequest())
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
Context("when SC does not exist", func() {
@@ -563,7 +562,7 @@ var _ = Describe("'Instance' service", func() {
core.Service.ServiceName = "x"
respCluterhealth, err := instanceResource.ClusterHealth(getContext())
Expect(err).To(BeNil())
- Expect(respCluterhealth.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respCluterhealth.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
core.Service.ServiceName = old
})
})
@@ -572,7 +571,7 @@ var _ = Describe("'Instance' service", func() {
It("should be passed", func() {
respCluterhealth, err := instanceResource.ClusterHealth(getContext())
Expect(err).To(BeNil())
- Expect(respCluterhealth.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCluterhealth.Response.GetCode()).To(Equal(pb.ResponseSuccess))
})
})
})
@@ -594,7 +593,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId = respCreate.ServiceId
resp, err := instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -609,7 +608,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
instanceId = resp.InstanceId
})
@@ -622,7 +621,7 @@ var _ = Describe("'Instance' service", func() {
Status: pb.MSI_DOWN,
})
Expect(err).To(BeNil())
- Expect(respUpdateStatus.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respUpdateStatus.Response.GetCode()).To(Equal(pb.ResponseSuccess))
respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), &pb.UpdateInstanceStatusRequest{
ServiceId: serviceId,
@@ -630,7 +629,7 @@ var _ = Describe("'Instance' service", func() {
Status: pb.MSI_OUTOFSERVICE,
})
Expect(err).To(BeNil())
- Expect(respUpdateStatus.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respUpdateStatus.Response.GetCode()).To(Equal(pb.ResponseSuccess))
respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), &pb.UpdateInstanceStatusRequest{
ServiceId: serviceId,
@@ -638,7 +637,7 @@ var _ = Describe("'Instance' service", func() {
Status: pb.MSI_STARTING,
})
Expect(err).To(BeNil())
- Expect(respUpdateStatus.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respUpdateStatus.Response.GetCode()).To(Equal(pb.ResponseSuccess))
respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), &pb.UpdateInstanceStatusRequest{
ServiceId: serviceId,
@@ -647,7 +646,7 @@ var _ = Describe("'Instance' service", func() {
})
Expect(err).To(BeNil())
- Expect(respUpdateStatus.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respUpdateStatus.Response.GetCode()).To(Equal(pb.ResponseSuccess))
respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), &pb.UpdateInstanceStatusRequest{
ServiceId: serviceId,
@@ -655,7 +654,7 @@ var _ = Describe("'Instance' service", func() {
Status: pb.MSI_UP,
})
Expect(err).To(BeNil())
- Expect(respUpdateStatus.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respUpdateStatus.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("update status with a empty serviceId")
respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), &pb.UpdateInstanceStatusRequest{
@@ -665,7 +664,7 @@ var _ = Describe("'Instance' service", func() {
})
Expect(err).To(BeNil())
- Expect(respUpdateStatus.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respUpdateStatus.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("update status with a not exist service")
respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), &pb.UpdateInstanceStatusRequest{
@@ -675,7 +674,7 @@ var _ = Describe("'Instance' service", func() {
})
Expect(err).To(BeNil())
- Expect(respUpdateStatus.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respUpdateStatus.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("update status with a not exist instance")
respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), &pb.UpdateInstanceStatusRequest{
@@ -685,7 +684,7 @@ var _ = Describe("'Instance' service", func() {
})
Expect(err).To(BeNil())
- Expect(respUpdateStatus.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respUpdateStatus.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("update invalid status")
respUpdateStatus, err = instanceResource.UpdateStatus(getContext(), &pb.UpdateInstanceStatusRequest{
@@ -695,7 +694,7 @@ var _ = Describe("'Instance' service", func() {
})
Expect(err).To(BeNil())
- Expect(respUpdateStatus.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respUpdateStatus.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
})
@@ -711,7 +710,7 @@ var _ = Describe("'Instance' service", func() {
})
Expect(err).To(BeNil())
- Expect(respUpdateProperties.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respUpdateProperties.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("all max")
size := 1000
@@ -727,7 +726,7 @@ var _ = Describe("'Instance' service", func() {
})
Expect(err).To(BeNil())
- Expect(respUpdateProperties.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respUpdateProperties.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("instance does not exist")
respUpdateProperties, err = instanceResource.UpdateInstanceProperties(getContext(), &pb.UpdateInstancePropsRequest{
@@ -739,7 +738,7 @@ var _ = Describe("'Instance' service", func() {
})
Expect(err).To(BeNil())
- Expect(respUpdateProperties.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respUpdateProperties.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("serviceId/instanceId/props is invalid")
respUpdateProperties, err = instanceResource.UpdateInstanceProperties(getContext(), &pb.UpdateInstancePropsRequest{
@@ -799,7 +798,7 @@ var _ = Describe("'Instance' service", func() {
InstanceId: instanceId,
})
Expect(err).To(BeNil())
- Expect(respUpdateProperties.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respUpdateProperties.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("service does not exist")
respUpdateProperties, err = instanceResource.UpdateInstanceProperties(getContext(), &pb.UpdateInstancePropsRequest{
@@ -811,7 +810,7 @@ var _ = Describe("'Instance' service", func() {
})
Expect(err).To(BeNil())
- Expect(respUpdateProperties.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respUpdateProperties.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
})
})
})
@@ -846,7 +845,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId1 = respCreate.ServiceId
respCreate, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -859,7 +858,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId2 = respCreate.ServiceId
respCreate, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -872,7 +871,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId3 = respCreate.ServiceId
respCreate, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -886,7 +885,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId4 = respCreate.ServiceId
respCreate, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -898,12 +897,12 @@ var _ = Describe("'Instance' service", func() {
Level: "FRONT",
Status: pb.MS_UP,
Properties: map[string]string{
- proto.PropAllowCrossApp: "true",
+ pb.PropAllowCrossApp: "true",
},
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId5 = respCreate.ServiceId
respCreate, err = serviceResource.Create(
@@ -918,7 +917,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId6 = respCreate.ServiceId
respCreate, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -931,7 +930,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId7 = respCreate.ServiceId
respCreate, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -944,7 +943,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId8 = respCreate.ServiceId
respCreate, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
@@ -957,7 +956,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(respCreate.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respCreate.Response.GetCode()).To(Equal(pb.ResponseSuccess))
serviceId9 = respCreate.ServiceId
resp, err := instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -971,7 +970,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
instanceId1 = resp.InstanceId
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -985,7 +984,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
instanceId2 = resp.InstanceId
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -999,7 +998,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
instanceId4 = resp.InstanceId
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -1013,7 +1012,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
instanceId5 = resp.InstanceId
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -1027,7 +1026,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
instanceId8 = resp.InstanceId
resp, err = instanceResource.Register(getContext(), &pb.RegisterInstanceRequest{
@@ -1041,7 +1040,7 @@ var _ = Describe("'Instance' service", func() {
},
})
Expect(err).To(BeNil())
- Expect(resp.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(resp.Response.GetCode()).To(Equal(pb.ResponseSuccess))
instanceId9 = resp.InstanceId
})
@@ -1141,7 +1140,7 @@ var _ = Describe("'Instance' service", func() {
VersionRule: "1.0.0+",
})
Expect(err).To(BeNil())
- Expect(respFind.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respFind.Response.GetCode()).To(Equal(pb.ResponseSuccess))
By("provider does not exist")
respFind, err = instanceResource.Find(getContext(), &pb.FindInstancesRequest{
@@ -1151,7 +1150,7 @@ var _ = Describe("'Instance' service", func() {
VersionRule: "latest",
})
Expect(err).To(BeNil())
- Expect(respFind.Response.GetCode()).ToNot(Equal(proto.ResponseSuccess))
+ Expect(respFind.Response.GetCode()).ToNot(Equal(pb.ResponseSuccess))
By("provider does not contain 3.0.0+ versions")
respFind, err = instanceResource.Find(getContext(), &pb.FindInstancesRequest{
@@ -1161,7 +1160,7 @@ var _ = Describe("'Instance' service", func() {
VersionRule: "3.0.0+",
})
Expect(err).To(BeNil())
- Expect(respFind.Response.GetCode()).To(Equal(proto.ResponseSuccess))
+ Expect(respFind.Response.GetCode()).To(Equal(pb.ResponseSuccess))
Expect(len(respFind.Instances)).To(Equal(0))
... 3713 lines suppressed ...