[GitHub] asifdxtreme closed pull request #429: SCB-857 Provider rule of consumer can not be removed

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

asifdxtreme closed pull request #429: SCB-857 Provider rule of consumer can not be removed
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/429
 
 
   

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/util/dependency_util.go b/server/service/util/dependency_util.go
index 288aeea2..00411305 100644
--- a/server/service/util/dependency_util.go
+++ b/server/service/util/dependency_util.go
@@ -444,13 +444,13 @@ loop:
 				continue loop
 			}
 
-			id := apt.GenerateProviderDependencyRuleKey(domainProject, key)
+			id := apt.GenerateProviderDependencyRuleKey(key.Tenant, key)
 			exist, ok := cache[id]
 			if !ok {
 				_, exist, err = FindServiceIds(ctx, key.Version, key)
 				if err != nil {
 					return nil, fmt.Errorf("%v, find service %s/%s/%s/%s",
-						err, domainProject, key.AppId, key.ServiceName, key.Version)
+						err, key.Tenant, key.AppId, key.ServiceName, key.Version)
 				}
 				cache[id] = exist
 			}
@@ -497,7 +497,7 @@ func removeProviderRuleKeys(ctx context.Context, domainProject string, cache map
 			_, exist, err = FindServiceIds(ctx, key.Version, key)
 			if err != nil {
 				return nil, fmt.Errorf("find service %s/%s/%s/%s, %v",
-					domainProject, key.AppId, key.ServiceName, key.Version, err)
+					key.Tenant, key.AppId, key.ServiceName, key.Version, err)
 			}
 			cache[id] = exist
 		}


 

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