@@ -697,13 +697,15 @@ type Role struct {
697697// that means the UI should never display it.
698698DisplayName string `json:"display_name"`
699699Site []Permission `json:"site"`
700- // Org is a map of organization IDs to permissions. Grouping by organization
701- // makes roles easy to combine.
702- Org map [string ][]Permission `json:"org"`
703- User []Permission `json:"user"`
704- // OrgMember is a map of organization IDs to permissions. Grouping by
705- // organization makes roles easy to combine.
706- OrgMember map [string ][]Permission `json:"org_member"`
700+ User []Permission `json:"user"`
701+ ByOrgID map [string ]struct {
702+ // Org is a map of organization IDs to permissions. Grouping by organization
703+ // makes roles easy to combine.
704+ Org []Permission `json:"org"`
705+ // OrgMember is a map of organization IDs to permissions. Grouping by
706+ // organization makes roles easy to combine.
707+ Member []Permission `json:"member"`
708+ }`json:"by_org_id"`
707709
708710// cachedRegoValue can be used to cache the rego value for this role.
709711// This is helpful for static roles that never change.