From 72e805ab925f1f53fbd7f38f9e33005b6ab6cbc4 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Fri, 12 Mar 2021 20:11:49 +0800 Subject: [PATCH] fix(region): cloud provider filter by domain_id ignore private case --- pkg/compute/models/cloudproviders.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index d2b4cfe6ec..e39aa32bb9 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -1516,6 +1516,10 @@ func (manager *SCloudproviderManager) filterByDomainId(q *sqlchemy.SQuery, domai sqlchemy.AND( sqlchemy.Equals(cloudaccounts.Field("share_mode"), api.CLOUD_ACCOUNT_SHARE_MODE_SYSTEM), sqlchemy.OR( + sqlchemy.AND( + sqlchemy.Equals(cloudaccounts.Field("public_scope"), rbacutils.ScopeNone), + sqlchemy.Equals(cloudaccounts.Field("domain_id"), domainId), + ), sqlchemy.AND( sqlchemy.Equals(cloudaccounts.Field("public_scope"), rbacutils.ScopeDomain), sqlchemy.OR(