opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4342 from swordqiu/hotfix/qj-fetch-project-domain-name-in-system-scope

Browse Source 
fix: fetch project/domain name should use system query scope
This commit is contained in:
Zexi Li
2019-12-26 21:13:48 +08:00
committed by GitHub
parent 6e93f11632 2a51cf685f
commit 4b7e25cd20
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/utils/fetchnames.go
+3
View File
@@ -26,6 +26,7 @@ import (
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/mcclient/auth"
"yunion.io/x/onecloud/pkg/mcclient/modules"
"yunion.io/x/onecloud/pkg/util/rbacutils"
)
func MapKeys(idMap map[string]string) []string {
@@ -43,6 +44,7 @@ func FetchDomainNames(ctx context.Context, domainMap map[string]string) (map[str
query := jsonutils.NewDict()
query.Add(jsonutils.NewString(fmt.Sprintf("id.equals(%s)", strings.Join(MapKeys(domainMap), ","))), "filter.0")
query.Add(jsonutils.NewInt(int64(len(domainMap))), "limit")
query.Add(jsonutils.NewString(string(rbacutils.ScopeSystem)), "scope")
results, err := modules.Domains.List(s, query)
if err == nil {
for i := range results.Data {
@@ -68,6 +70,7 @@ func FetchTenantNames(ctx context.Context, tenantMap map[string]string) (map[str
query := jsonutils.NewDict()
query.Add(jsonutils.NewString(fmt.Sprintf("id.equals(%s)", strings.Join(MapKeys(tenantMap), ","))), "filter.0")
query.Add(jsonutils.NewInt(int64(len(tenantMap))), "limit")
query.Add(jsonutils.NewString(string(rbacutils.ScopeSystem)), "scope")
results, err := modules.Projects.List(s, query)
if err == nil {
for i := range results.Data {