[incubator-servicecomb-service-center] branch master updated: SCB-981 Can not remove the microservice and instance properties (#465)

[asifdxtreme]

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

asifdxtreme pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
     new c5473e0  SCB-981 Can not remove the microservice and instance 
properties (#465)
c5473e0 is described below

commit c5473e0d125130abd8e5469566fcf4c24cbab965
Author: little-cui <sure_0...@qq.com>
AuthorDate: Thu Oct 25 22:30:18 2018 +0800

    SCB-981 Can not remove the microservice and instance properties (#465)
---
 server/service/instance_test.go          | 5 +++--
 server/service/instance_validator.go     | 1 -
 server/service/microservice_test.go      | 6 +++---
 server/service/microservice_validator.go | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/server/service/instance_test.go b/server/service/instance_test.go
index fb012d3..dd5de49 100644
--- a/server/service/instance_test.go
+++ b/server/service/instance_test.go
@@ -745,13 +745,14 @@ var _ = Describe("'Instance' service", func() {
 
                                Expect(err).To(BeNil())
                                
Expect(respUpdateProperties.Response.Code).To(Equal(scerr.ErrInvalidParams))
+
+                               By("remove the properties")
                                respUpdateProperties, err = 
instanceResource.UpdateInstanceProperties(getContext(), 
&pb.UpdateInstancePropsRequest{
                                        ServiceId:  serviceId,
                                        InstanceId: instanceId,
                                })
-
                                Expect(err).To(BeNil())
-                               
Expect(respUpdateProperties.Response.Code).To(Equal(scerr.ErrInvalidParams))
+                               
Expect(respUpdateProperties.Response.Code).To(Equal(pb.Response_SUCCESS))
 
                                By("service does not exist")
                                respUpdateProperties, err = 
instanceResource.UpdateInstanceProperties(getContext(), 
&pb.UpdateInstancePropsRequest{
diff --git a/server/service/instance_validator.go 
b/server/service/instance_validator.go
index 369b8aa..1777b40 100644
--- a/server/service/instance_validator.go
+++ b/server/service/instance_validator.go
@@ -81,7 +81,6 @@ func UpdateInstanceReqValidator() *validate.Validator {
 func UpdateInstancePropsReqValidator() *validate.Validator {
        return updateInstancePropsReqValidator.Init(func(v *validate.Validator) 
{
                v.AddRules(heartbeatReqValidator.GetRules())
-               v.AddRule("Properties", 
UpdateServicePropsReqValidator().GetRule("Properties"))
        })
 }
 
diff --git a/server/service/microservice_test.go 
b/server/service/microservice_test.go
index f27c897..b1c36b0 100644
--- a/server/service/microservice_test.go
+++ b/server/service/microservice_test.go
@@ -1079,15 +1079,15 @@ var _ = Describe("'Micro-service' service", func() {
                        })
                })
 
-               Context("when property is nil or empty", func() {
-                       It("should be failed", func() {
+               Context("when remove the properties", func() {
+                       It("should be pass", func() {
                                r := &pb.UpdateServicePropsRequest{
                                        ServiceId:  serviceId,
                                        Properties: nil,
                                }
                                resp, err := 
serviceResource.UpdateProperties(getContext(), r)
                                Expect(err).To(BeNil())
-                               
Expect(resp.Response.Code).ToNot(Equal(pb.Response_SUCCESS))
+                               
Expect(resp.Response.Code).To(Equal(pb.Response_SUCCESS))
 
                                r = &pb.UpdateServicePropsRequest{
                                        ServiceId:  "",
diff --git a/server/service/microservice_validator.go 
b/server/service/microservice_validator.go
index d010ec5..b4eb4a7 100644
--- a/server/service/microservice_validator.go
+++ b/server/service/microservice_validator.go
@@ -108,6 +108,5 @@ func CreateServiceReqValidator() *validate.Validator {
 func UpdateServicePropsReqValidator() *validate.Validator {
        return updateServicePropsReqValidator.Init(func(v *validate.Validator) {
                v.AddRule("ServiceId", 
GetServiceReqValidator().GetRule("ServiceId"))
-               v.AddRule("Properties", &validate.ValidateRule{Min: 1})
        })
 }