[GitHub] asifdxtreme closed pull request #421: SCB-851 BUG: Can not get providers if consumer have * dependency rule

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

asifdxtreme closed pull request #421: SCB-851 BUG: Can not get providers if consumer have * dependency rule
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/421
 
 
   

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/server/service/dependency_test.go b/server/service/dependency_test.go
index b1bfcbce..497b86c6 100644
--- a/server/service/dependency_test.go
+++ b/server/service/dependency_test.go
@@ -32,6 +32,7 @@ var _ = Describe("'Dependency' service", func() {
 		var (
 			consumerId1 string
 			consumerId2 string
+			consumerId3 string
 		)
 
 		It("should be passed", func() {
@@ -48,6 +49,19 @@ var _ = Describe("'Dependency' service", func() {
 			Expect(respCreateService.Response.Code).To(Equal(pb.Response_SUCCESS))
 			consumerId1 = respCreateService.ServiceId
 
+			respCreateService, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
+				Service: &pb.MicroService{
+					AppId:       "create_dep_group",
+					ServiceName: "create_dep_consumer_all",
+					Version:     "1.0.0",
+					Level:       "FRONT",
+					Status:      pb.MS_UP,
+				},
+			})
+			Expect(err).To(BeNil())
+			Expect(respCreateService.Response.Code).To(Equal(pb.Response_SUCCESS))
+			consumerId3 = respCreateService.ServiceId
+
 			respCreateService, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
 				Service: &pb.MicroService{
 					Environment: pb.ENV_PROD,
@@ -443,7 +457,11 @@ var _ = Describe("'Dependency' service", func() {
 				respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
 					Dependencies: []*pb.ConsumerDependency{
 						{
-							Consumer: consumer,
+							Consumer: &pb.MicroServiceKey{
+								ServiceName: "create_dep_consumer_all",
+								AppId:       "create_dep_group",
+								Version:     "1.0.0",
+							},
 							Providers: []*pb.MicroServiceKey{
 								{
 									ServiceName: "*",
@@ -455,6 +473,31 @@ var _ = Describe("'Dependency' service", func() {
 				Expect(err).To(BeNil())
 				Expect(respCreateDependency.Response.Code).To(Equal(pb.Response_SUCCESS))
 
+				Expect(deh.Handle()).To(BeNil())
+
+				respPro, err = serviceResource.GetConsumerDependencies(getContext(), &pb.GetDependenciesRequest{
+					ServiceId: consumerId3,
+				})
+				Expect(err).To(BeNil())
+				Expect(respPro.Response.Code).To(Equal(pb.Response_SUCCESS))
+				Expect(len(respPro.Providers)).ToNot(Equal(0))
+
+				By("clean all")
+				respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
+					Dependencies: []*pb.ConsumerDependency{
+						{
+							Consumer: &pb.MicroServiceKey{
+								ServiceName: "create_dep_consumer_all",
+								AppId:       "create_dep_group",
+								Version:     "1.0.0",
+							},
+							Providers: nil,
+						},
+					},
+				})
+				Expect(err).To(BeNil())
+				Expect(respCreateDependency.Response.Code).To(Equal(pb.Response_SUCCESS))
+
 				By("add multiple providers")
 				respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
 					Dependencies: []*pb.ConsumerDependency{
@@ -476,7 +519,7 @@ var _ = Describe("'Dependency' service", func() {
 				Expect(err).To(BeNil())
 				Expect(respCreateDependency.Response.Code).To(Equal(pb.Response_SUCCESS))
 
-				By("add 1.0.0-2.0.0")
+				By("add 1.0.0-2.0.0 to override *")
 				respCreateDependency, err = serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
 					Dependencies: []*pb.ConsumerDependency{
 						{
diff --git a/server/service/util/dependency_query.go b/server/service/util/dependency_query.go
index 88bf4c49..b873b729 100644
--- a/server/service/util/dependency_query.go
+++ b/server/service/util/dependency_query.go
@@ -167,7 +167,7 @@ func (dr *DependencyRelation) parseDependencyRule(dependencyRule *pb.MicroServic
 		sopts := append(opts,
 			registry.WithStrKey(allServiceKey),
 			registry.WithPrefix())
-		resp, err := backend.Store().Service().Search(dr.ctx, sopts...)
+		resp, err := backend.Store().ServiceIndex().Search(dr.ctx, sopts...)
 		if err != nil {
 			return nil, err
 		}


 

----------------------------------------------------------------
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