github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display apiGroups before resources in PolicyRule

Browse Source
This commit is contained in:
Jordan Liggitt
2017-12-11 09:53:27 -05:00
parent bb72237375
commit 16d4fb7e52
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/apis/rbac/helpers.go
View File

@@ -147,6 +147,10 @@ func (r PolicyRule) String() string {
func (r PolicyRule) CompactString() string { func (r PolicyRule) CompactString() string {
formatStringParts := []string{} formatStringParts := []string{}
formatArgs := []interface{}{} formatArgs := []interface{}{}
if len(r.APIGroups) > 0 {
formatStringParts = append(formatStringParts, "APIGroups:%q")
formatArgs = append(formatArgs, r.APIGroups)
}
if len(r.Resources) > 0 { if len(r.Resources) > 0 {
formatStringParts = append(formatStringParts, "Resources:%q") formatStringParts = append(formatStringParts, "Resources:%q")
formatArgs = append(formatArgs, r.Resources) formatArgs = append(formatArgs, r.Resources)
@@ -159,10 +163,6 @@ func (r PolicyRule) CompactString() string {
formatStringParts = append(formatStringParts, "ResourceNames:%q") formatStringParts = append(formatStringParts, "ResourceNames:%q")
formatArgs = append(formatArgs, r.ResourceNames) formatArgs = append(formatArgs, r.ResourceNames)
} }
if len(r.APIGroups) > 0 {
formatStringParts = append(formatStringParts, "APIGroups:%q")
formatArgs = append(formatArgs, r.APIGroups)
}
if len(r.Verbs) > 0 { if len(r.Verbs) > 0 {
formatStringParts = append(formatStringParts, "Verbs:%q") formatStringParts = append(formatStringParts, "Verbs:%q")
formatArgs = append(formatArgs, r.Verbs) formatArgs = append(formatArgs, r.Verbs)