[servicecomb-service-center] branch v1.x updated: SCB-2176 revert commits (#915)

[tianxiaoliang]

This is an automated email from the ASF dual-hosted git repository.

tianxiaoliang pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git


The following commit(s) were added to refs/heads/v1.x by this push:
     new 3eae2fa  SCB-2176 revert commits (#915)
3eae2fa is described below

commit 3eae2fa0574b43cf1be1d4906904b5ddf8c3eb9c
Author: little-cui <sure_0...@qq.com>
AuthorDate: Wed Mar 24 22:36:41 2021 +0800

    SCB-2176 revert commits (#915)
    
    * Revert "SCB-2176 Fix: remove all instances properties (#908)"
    
    This reverts commit 13d57de2
    
    * Revert "remove schemas and props response, no client use it (#907)"
    
    This reverts commit 3a92dcc9
---
 server/rest/govern/service.go             | 5 ++---
 server/service/instance.go                | 2 +-
 server/service/util/instance_util.go      | 6 ++----
 server/service/util/instance_util_test.go | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/server/rest/govern/service.go b/server/rest/govern/service.go
index c5cc9c1..b5d03e1 100644
--- a/server/rest/govern/service.go
+++ b/server/rest/govern/service.go
@@ -102,8 +102,7 @@ func (governService *Service) GetServicesInfo(ctx 
context.Context, in *pb.GetSer
                                continue
                        }
                }
-               service.Properties = nil
-               service.Schemas = nil
+
                serviceDetail, err := getServiceDetailUtil(ctx, 
ServiceDetailOpt{
                        domainProject: domainProject,
                        service:       service,
@@ -317,7 +316,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/server/service/instance.go b/server/service/instance.go
index 989cfea..aafa7b4 100644
--- a/server/service/instance.go
+++ b/server/service/instance.go
@@ -961,7 +961,7 @@ func (s *InstanceService) ClusterHealth(ctx 
context.Context) (*pb.GetInstancesRe
                }, nil
        }
 
-       instances, err := serviceUtil.GetInstancesWithoutProperties(ctx, 
domainProject, serviceID)
+       instances, err := serviceUtil.GetAllInstancesOfOneService(ctx, 
domainProject, serviceID)
        if err != nil {
                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)
diff --git a/server/service/util/instance_util.go 
b/server/service/util/instance_util.go
index 222acde..2d77dd4 100644
--- a/server/service/util/instance_util.go
+++ b/server/service/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 := apt.GenerateInstanceKey(domainProject, serviceID, "")
        opts := append(FromContext(ctx), registry.WithStrKey(key), 
registry.WithPrefix())
        resp, err := backend.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/server/service/util/instance_util_test.go 
b/server/service/util/instance_util_test.go
index 04494f8..ca075c5 100644
--- a/server/service/util/instance_util_test.go
+++ b/server/service/util/instance_util_test.go
@@ -53,9 +53,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`)
        }
 
        QueryAllProvidersInstances(context.Background(), "")