[GitHub] little-cui closed pull request #307: [SCB-376] Optimize validate parameter log print

[GitBox <gi...@apache.org>]

little-cui closed pull request #307:  [SCB-376] Optimize validate parameter log print
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/307
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/pkg/validate/validate.go b/pkg/validate/validate.go
index 3a36f319..59190e3b 100644
--- a/pkg/validate/validate.go
+++ b/pkg/validate/validate.go
@@ -238,9 +238,25 @@ func (v *Validator) Validate(s interface{}) error {
 			}
 			// TODO null pointer如何校验
 			if field.Kind() != reflect.Ptr && !validate.Match(fi) {
-				return fmt.Errorf("%s validate failed, %s", fieldName, validate)
+				if filter(fieldName) {
+					return fmt.Errorf("invalid field: %s.%s , %s", st.Type.Name(), fieldName, validate)
+				}
+				return fmt.Errorf("invalid field: %s.%s,  invalid value: {%v} , %s", st.Type.Name(), fieldName, fi, validate)
 			}
 		}
 	}
 	return nil
 }
+
+var (
+	BLACK_LIST_FOR_PRINT = map[string]interface{} {
+		"Properties": nil,
+		}
+)
+
+func filter(fieldName string) bool {
+	if _, ok := BLACK_LIST_FOR_PRINT[fieldName]; ok {
+		return true
+	}
+	return false
+}
diff --git a/server/govern/service.go b/server/govern/service.go
index 5cc5290e..2ae05145 100644
--- a/server/govern/service.go
+++ b/server/govern/service.go
@@ -121,7 +121,7 @@ func (governService *GovernService) GetServiceDetail(ctx context.Context, in *pb
 
 	if len(in.ServiceId) == 0 {
 		return &pb.GetServiceDetailResponse{
-			Response: pb.CreateResponse(scerr.ErrInvalidParams, "Invalid requtest for getting service detail."),
+			Response: pb.CreateResponse(scerr.ErrInvalidParams, "Invalid request for getting service detail."),
 		}, nil
 	}
 
diff --git a/server/service/microservices.go b/server/service/microservices.go
index d3265e52..4fe47d29 100644
--- a/server/service/microservices.go
+++ b/server/service/microservices.go
@@ -406,7 +406,7 @@ func (s *MicroServiceService) DeleteServices(ctx context.Context, request *pb.De
 		}
 	}
 
-	util.Logger().Infof("Batch DeleteServices serviceId = %v , result = %d, ", request.ServiceIds, responseCode)
+	util.Logger().Infof("Batch DeleteServices, count is %s, serviceId = %v , result = %d, ", len(request.ServiceIds), request.ServiceIds, responseCode)
 
 	resp := &pb.DelServicesResponse{
 		Services: delServiceRspInfo,
diff --git a/server/service/microservices_test.go b/server/service/microservices_test.go
index f5819c9e..5dd04f28 100644
--- a/server/service/microservices_test.go
+++ b/server/service/microservices_test.go
@@ -206,6 +206,39 @@ var _ = Describe("'Micro-service' service", func() {
 				Expect(err).To(BeNil())
 				Expect(resp.Response.Code).ToNot(Equal(pb.Response_SUCCESS))
 			})
+			It("same serviceId,different service, can not register again,error is same as the service register twice", func() {
+				resp, err := serviceResource.Create(getContext(), &pb.CreateServiceRequest{
+					Service: &pb.MicroService{
+						ServiceId:   "same_serviceId",
+						ServiceName: "serviceA",
+						AppId:       "default",
+						Version:     "1.0.0",
+						Level:       "FRONT",
+						Schemas: []string{
+							"xxxxxxxx",
+						},
+						Status: "UP",
+					},
+				})
+				Expect(err).To(BeNil())
+				Expect(resp.Response.Code).To(Equal(pb.Response_SUCCESS))
+
+				resp, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
+					Service: &pb.MicroService{
+						ServiceId:   "same_serviceId",
+						ServiceName: "serviceB",
+						AppId:       "default",
+						Version:     "1.0.0",
+						Level:       "FRONT",
+						Schemas: []string{
+							"xxxxxxxx",
+						},
+						Status: "UP",
+					},
+				})
+				Expect(err).To(BeNil())
+				Expect(resp.Response.Code).ToNot(Equal(pb.Response_SUCCESS))
+			})
 		})
 
 		Context("when creating a diff env service", func() {
@@ -485,7 +518,7 @@ var _ = Describe("'Micro-service' service", func() {
 		})
 	})
 
-	Describe("execute 'exists' operartion", func() {
+	Describe("execute 'exists' operation", func() {
 		var (
 			serviceId1 string
 			serviceId2 string
@@ -667,7 +700,7 @@ var _ = Describe("'Micro-service' service", func() {
 		})
 	})
 
-	Describe("execute 'query' operartion", func() {
+	Describe("execute 'query' operation", func() {
 		Context("when request is nil", func() {
 			It("should be failed", func() {
 				resp, err := serviceResource.GetServices(getContext(), nil)
@@ -707,7 +740,7 @@ var _ = Describe("'Micro-service' service", func() {
 		})
 	})
 
-	Describe("execute 'update' operartion", func() {
+	Describe("execute 'update' operation", func() {
 		var (
 			serviceId string
 		)
diff --git a/server/service/util/rule_util.go b/server/service/util/rule_util.go
index df2047d8..e158c80a 100644
--- a/server/service/util/rule_util.go
+++ b/server/service/util/rule_util.go
@@ -160,14 +160,10 @@ func MatchRules(rulesOfProvider []*pb.ServiceRule, consumer *pb.MicroService, ta
 		return scerr.NewError(scerr.ErrInvalidParams, "consumer is nil")
 	}
 
-	isWhite := false
 	if len(rulesOfProvider) <= 0 {
 		return nil
 	}
 	if rulesOfProvider[0].RuleType == "WHITE" {
-		isWhite = true
-	}
-	if isWhite {
 		return patternWhiteList(rulesOfProvider, tagsOfConsumer, consumer)
 	}
 	return patternBlackList(rulesOfProvider, tagsOfConsumer, consumer)


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services