[servicecomb-service-center] branch master updated: SCB-2176 revert commits (#916)

[ti...@apache.org]

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 df63a66  SCB-2176 revert commits (#916)
df63a66 is described below

commit df63a6699afc12de57f910c3f09a79a4d2846731
Author: little-cui <su...@qq.com>
AuthorDate: Wed Mar 24 22:48:02 2021 +0800

    SCB-2176 revert commits (#916)
    
    * Revert "SCB-2176 Fix: remove all instances properties (#909)"
    
    This reverts commit 611a3b15
    
    * Revert "remove schemas and props response, no client use it (#906)"
    
    This reverts commit abcd38fb
---
 datasource/etcd/ms.go                      | 5 +----
 datasource/etcd/util.go                    | 2 +-
 datasource/etcd/util/instance_util.go      | 6 ++----
 datasource/etcd/util/instance_util_test.go | 4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/datasource/etcd/ms.go b/datasource/etcd/ms.go
index 8e2f81b..34aad64 100644
--- a/datasource/etcd/ms.go
+++ b/datasource/etcd/ms.go
@@ -209,7 +209,6 @@ func (ds *DataSource) GetService(ctx context.Context, request *pb.GetServiceRequ
 	}, nil
 }
 
-// GetServiceDetail is only for govern API
 func (ds *DataSource) GetServiceDetail(ctx context.Context, request *pb.GetServiceRequest) (
 	*pb.GetServiceDetailResponse, error) {
 	domainProject := util.ParseDomainProject(ctx)
@@ -262,7 +261,6 @@ func (ds *DataSource) GetServiceDetail(ctx context.Context, request *pb.GetServi
 	}, nil
 }
 
-// GetServicesInfo is only for govern API
 func (ds *DataSource) GetServicesInfo(ctx context.Context, request *pb.GetServicesInfoRequest) (
 	*pb.GetServicesInfoResponse, error) {
 	ctx = util.WithCacheOnly(ctx)
@@ -322,8 +320,7 @@ func (ds *DataSource) GetServicesInfo(ctx context.Context, request *pb.GetServic
 				continue
 			}
 		}
-		service.Properties = nil
-		service.Schemas = nil
+
 		serviceDetail, err := getServiceDetailUtil(ctx, ServiceDetailOpt{
 			domainProject: domainProject,
 			service:       service,
diff --git a/datasource/etcd/util.go b/datasource/etcd/util.go
index 1564c18..497b69a 100644
--- a/datasource/etcd/util.go
+++ b/datasource/etcd/util.go
@@ -299,7 +299,7 @@ func getServiceDetailUtil(ctx context.Context, serviceDetailOpt ServiceDetailOpt
 					Count: instanceCount}
 				continue
 			}
-			instances, err := serviceUtil.GetInstancesWithoutProperties(ctx, domainProject, serviceID)
+			instances, err := serviceUtil.GetAllInstancesOfOneService(ctx, domainProject, serviceID)
 			if err != nil {
 				log.Errorf(err, "get service[%s]'s all instances failed", serviceID)
 				return nil, err
diff --git a/datasource/etcd/util/instance_util.go b/datasource/etcd/util/instance_util.go
index 20b72df..9a53e48 100644
--- a/datasource/etcd/util/instance_util.go
+++ b/datasource/etcd/util/instance_util.go
@@ -72,7 +72,7 @@ func FormatRevision(revs, counts []int64) (s string) {
 	return fmt.Sprintf("%x", sha1.Sum(util.StringToBytesWithNoCopy(s)))
 }
 
-func GetInstancesWithoutProperties(ctx context.Context, domainProject string, serviceID string) ([]*pb.MicroServiceInstance, error) {
+func GetAllInstancesOfOneService(ctx context.Context, domainProject string, serviceID string) ([]*pb.MicroServiceInstance, error) {
 	key := path.GenerateInstanceKey(domainProject, serviceID, "")
 	opts := append(FromContext(ctx), client.WithStrKey(key), client.WithPrefix())
 	resp, err := kv.Store().Instance().Search(ctx, opts...)
@@ -83,9 +83,7 @@ func GetInstancesWithoutProperties(ctx context.Context, domainProject string, se
 
 	instances := make([]*pb.MicroServiceInstance, 0, len(resp.Kvs))
 	for _, kv := range resp.Kvs {
-		instance := kv.Value.(*pb.MicroServiceInstance)
-		instance.Properties = nil
-		instances = append(instances, instance)
+		instances = append(instances, kv.Value.(*pb.MicroServiceInstance))
 	}
 	return instances, nil
 }
diff --git a/datasource/etcd/util/instance_util_test.go b/datasource/etcd/util/instance_util_test.go
index 53d7127..e062d15 100644
--- a/datasource/etcd/util/instance_util_test.go
+++ b/datasource/etcd/util/instance_util_test.go
@@ -54,9 +54,9 @@ func TestGetInstance(t *testing.T) {
 		t.Fatalf(`GetInstance failed`)
 	}
 
-	_, err = GetInstancesWithoutProperties(context.Background(), "", "")
+	_, err = GetAllInstancesOfOneService(context.Background(), "", "")
 	if err != nil {
-		t.Fatalf(`GetInstancesWithoutProperties failed`)
+		t.Fatalf(`GetAllInstancesOfOneService failed`)
 	}
 
 	_, err = QueryServiceInstancesKvs(context.Background(), "", 0)