always indent and reply policy JSON (#12399)

This commit is contained in:
Harshavardhana
2021-05-29 09:22:22 -07:00
committed by GitHub
parent 81d5688d56
commit 3350dbc50d
2 changed files with 16 additions and 10 deletions

View File

@@ -738,12 +738,18 @@ func (sys *IAMSys) InfoPolicy(policyName string) (iampolicy.Policy, error) {
sys.store.rlock()
defer sys.store.runlock()
v, ok := sys.iamPolicyDocsMap[policyName]
if !ok {
return iampolicy.Policy{}, errNoSuchPolicy
var combinedPolicy iampolicy.Policy
for _, policy := range strings.Split(policyName, ",") {
if policy == "" {
continue
}
v, ok := sys.iamPolicyDocsMap[policy]
if !ok {
return iampolicy.Policy{}, errNoSuchPolicy
}
combinedPolicy = combinedPolicy.Merge(v)
}
return v, nil
return combinedPolicy, nil
}
// ListPolicies - lists all canned policies.