@@ -19,7 +19,7 @@ func TestToAttributeSet(t *testing.T) {
1919 tests := []struct {
2020 description string
2121 rule rbacv1.PolicyRule
22- expectedAttributes map [authorizer.AttributesRecord ] struct {}
22+ expectedAttributes map [string ] authorizer.AttributesRecord
2323 }{
2424 {
2525 description : "SimpleRule" ,
@@ -28,8 +28,8 @@ func TestToAttributeSet(t *testing.T) {
2828 APIGroups : []string {"*" },
2929 Resources : []string {"*" },
3030 },
31- expectedAttributes : map [authorizer.AttributesRecord ] struct {} {
32- attributesRecord (user , namespace , "*" , "*" , "*" , "" , "" ): {} ,
31+ expectedAttributes : map [string ] authorizer.AttributesRecord {
32+ attributesKey (user , namespace , "*" , "*" , "*" , "" , "" ): attributesRecord ( user , namespace , "*" , "*" , "*" , "" , "" ) ,
3333 },
3434 },
3535 {
@@ -38,8 +38,8 @@ func TestToAttributeSet(t *testing.T) {
3838 Verbs : []string {"*" },
3939 NonResourceURLs : []string {"/api" },
4040 },
41- expectedAttributes : map [authorizer.AttributesRecord ] struct {} {
42- attributesRecord (user , namespace , "*" , "" , "" , "" , "/api" ): {} ,
41+ expectedAttributes : map [string ] authorizer.AttributesRecord {
42+ attributesKey (user , namespace , "*" , "" , "" , "" , "/api" ): attributesRecord ( user , namespace , "*" , "" , "" , "" , "/api" ) ,
4343 },
4444 },
4545 {
@@ -49,9 +49,9 @@ func TestToAttributeSet(t *testing.T) {
4949 APIGroups : []string {"*" },
5050 Resources : []string {"*" },
5151 },
52- expectedAttributes : map [authorizer.AttributesRecord ] struct {} {
53- attributesRecord (user , namespace , "create" , "*" , "*" , "" , "" ): {} ,
54- attributesRecord (user , namespace , "delete" , "*" , "*" , "" , "" ): {} ,
52+ expectedAttributes : map [string ] authorizer.AttributesRecord {
53+ attributesKey (user , namespace , "create" , "*" , "*" , "" , "" ): attributesRecord ( user , namespace , "create" , "*" , "*" , "" , "" ) ,
54+ attributesKey (user , namespace , "delete" , "*" , "*" , "" , "" ): attributesRecord ( user , namespace , "delete" , "*" , "*" , "" , "" ) ,
5555 },
5656 },
5757 {
@@ -60,11 +60,11 @@ func TestToAttributeSet(t *testing.T) {
6060 Verbs : []string {"get" , "update" },
6161 Resources : []string {"donuts" , "coffee" },
6262 },
63- expectedAttributes : map [authorizer.AttributesRecord ] struct {} {
64- attributesRecord (user , namespace , "get" , "" , "donuts" , "" , "" ): {} ,
65- attributesRecord (user , namespace , "update" , "" , "donuts" , "" , "" ): {} ,
66- attributesRecord (user , namespace , "get" , "" , "coffee" , "" , "" ): {} ,
67- attributesRecord (user , namespace , "update" , "" , "coffee" , "" , "" ): {} ,
63+ expectedAttributes : map [string ] authorizer.AttributesRecord {
64+ attributesKey (user , namespace , "get" , "" , "donuts" , "" , "" ): attributesRecord ( user , namespace , "get" , "" , "donuts" , "" , "" ) ,
65+ attributesKey (user , namespace , "update" , "" , "donuts" , "" , "" ): attributesRecord ( user , namespace , "update" , "" , "donuts" , "" , "" ) ,
66+ attributesKey (user , namespace , "get" , "" , "coffee" , "" , "" ): attributesRecord ( user , namespace , "get" , "" , "coffee" , "" , "" ) ,
67+ attributesKey (user , namespace , "update" , "" , "coffee" , "" , "" ): attributesRecord ( user , namespace , "update" , "" , "coffee" , "" , "" ) ,
6868 },
6969 },
7070 {
@@ -73,9 +73,9 @@ func TestToAttributeSet(t *testing.T) {
7373 Verbs : []string {"*" },
7474 NonResourceURLs : []string {"/capybaras" , "/caviidaes" },
7575 },
76- expectedAttributes : map [authorizer.AttributesRecord ] struct {} {
77- attributesRecord (user , namespace , "*" , "" , "" , "" , "/capybaras" ): {} ,
78- attributesRecord (user , namespace , "*" , "" , "" , "" , "/caviidaes" ): {} ,
76+ expectedAttributes : map [string ] authorizer.AttributesRecord {
77+ attributesKey (user , namespace , "*" , "" , "" , "" , "/capybaras" ): attributesRecord ( user , namespace , "*" , "" , "" , "" , "/capybaras" ) ,
78+ attributesKey (user , namespace , "*" , "" , "" , "" , "/caviidaes" ): attributesRecord ( user , namespace , "*" , "" , "" , "" , "/caviidaes" ) ,
7979 },
8080 },
8181 {
@@ -85,11 +85,11 @@ func TestToAttributeSet(t *testing.T) {
8585 Resources : []string {"donuts" , "coffee" },
8686 ResourceNames : []string {"nyc" },
8787 },
88- expectedAttributes : map [authorizer.AttributesRecord ] struct {} {
89- attributesRecord (user , namespace , "get" , "" , "donuts" , "nyc" , "" ): {} ,
90- attributesRecord (user , namespace , "update" , "" , "donuts" , "nyc" , "" ): {} ,
91- attributesRecord (user , namespace , "get" , "" , "coffee" , "nyc" , "" ): {} ,
92- attributesRecord (user , namespace , "update" , "" , "coffee" , "nyc" , "" ): {} ,
88+ expectedAttributes : map [string ] authorizer.AttributesRecord {
89+ attributesKey (user , namespace , "get" , "" , "donuts" , "nyc" , "" ): attributesRecord ( user , namespace , "get" , "" , "donuts" , "nyc" , "" ) ,
90+ attributesKey (user , namespace , "update" , "" , "donuts" , "nyc" , "" ): attributesRecord ( user , namespace , "update" , "" , "donuts" , "nyc" , "" ) ,
91+ attributesKey (user , namespace , "get" , "" , "coffee" , "nyc" , "" ): attributesRecord ( user , namespace , "get" , "" , "coffee" , "nyc" , "" ) ,
92+ attributesKey (user , namespace , "update" , "" , "coffee" , "nyc" , "" ): attributesRecord ( user , namespace , "update" , "" , "coffee" , "nyc" , "" ) ,
9393 },
9494 },
9595 {
@@ -100,21 +100,21 @@ func TestToAttributeSet(t *testing.T) {
100100 APIGroups : []string {"apps.coreos.com" , "apps.redhat.com" },
101101 ResourceNames : []string {"nyc" },
102102 },
103- expectedAttributes : map [authorizer.AttributesRecord ] struct {} {
104- attributesRecord (user , namespace , "get" , "apps.coreos.com" , "donuts" , "nyc" , "" ): {} ,
105- attributesRecord (user , namespace , "update" , "apps.coreos.com" , "donuts" , "nyc" , "" ): {} ,
106- attributesRecord (user , namespace , "get" , "apps.coreos.com" , "coffee" , "nyc" , "" ): {} ,
107- attributesRecord (user , namespace , "update" , "apps.coreos.com" , "coffee" , "nyc" , "" ): {} ,
108- attributesRecord (user , namespace , "get" , "apps.redhat.com" , "donuts" , "nyc" , "" ): {} ,
109- attributesRecord (user , namespace , "update" , "apps.redhat.com" , "donuts" , "nyc" , "" ): {} ,
110- attributesRecord (user , namespace , "get" , "apps.redhat.com" , "coffee" , "nyc" , "" ): {} ,
111- attributesRecord (user , namespace , "update" , "apps.redhat.com" , "coffee" , "nyc" , "" ): {} ,
103+ expectedAttributes : map [string ] authorizer.AttributesRecord {
104+ attributesKey (user , namespace , "get" , "apps.coreos.com" , "donuts" , "nyc" , "" ): attributesRecord ( user , namespace , "get" , "apps.coreos.com" , "donuts" , "nyc" , "" ) ,
105+ attributesKey (user , namespace , "update" , "apps.coreos.com" , "donuts" , "nyc" , "" ): attributesRecord ( user , namespace , "update" , "apps.coreos.com" , "donuts" , "nyc" , "" ) ,
106+ attributesKey (user , namespace , "get" , "apps.coreos.com" , "coffee" , "nyc" , "" ): attributesRecord ( user , namespace , "get" , "apps.coreos.com" , "coffee" , "nyc" , "" ) ,
107+ attributesKey (user , namespace , "update" , "apps.coreos.com" , "coffee" , "nyc" , "" ): attributesRecord ( user , namespace , "update" , "apps.coreos.com" , "coffee" , "nyc" , "" ) ,
108+ attributesKey (user , namespace , "get" , "apps.redhat.com" , "donuts" , "nyc" , "" ): attributesRecord ( user , namespace , "get" , "apps.redhat.com" , "donuts" , "nyc" , "" ) ,
109+ attributesKey (user , namespace , "update" , "apps.redhat.com" , "donuts" , "nyc" , "" ): attributesRecord ( user , namespace , "update" , "apps.redhat.com" , "donuts" , "nyc" , "" ) ,
110+ attributesKey (user , namespace , "get" , "apps.redhat.com" , "coffee" , "nyc" , "" ): attributesRecord ( user , namespace , "get" , "apps.redhat.com" , "coffee" , "nyc" , "" ) ,
111+ attributesKey (user , namespace , "update" , "apps.redhat.com" , "coffee" , "nyc" , "" ): attributesRecord ( user , namespace , "update" , "apps.redhat.com" , "coffee" , "nyc" , "" ) ,
112112 },
113113 },
114114 {
115115 description : "NoVerbs" ,
116116 rule : rbacv1.PolicyRule {},
117- expectedAttributes : map [authorizer.AttributesRecord ] struct {} {},
117+ expectedAttributes : map [string ] authorizer.AttributesRecord {},
118118 },
119119 }
120120
@@ -130,11 +130,12 @@ func TestToAttributeSet(t *testing.T) {
130130 require .True (t , ok , "type assertion for attributes failed" )
131131
132132 // make sure we're expecting the attribute
133- _ , exists := tt .expectedAttributes [a ]
133+ key := attributesKey (a .GetUser (), a .GetNamespace (), a .GetVerb (), a .GetAPIGroup (), a .GetResource (), a .GetName (), a .GetPath ())
134+ _ , exists := tt .expectedAttributes [key ]
134135 require .True (t , exists , fmt .Sprintf ("found unexpected attributes %v" , attributes ))
135136
136137 // ensure each expected attribute only appears once
137- delete (tt .expectedAttributes , a )
138+ delete (tt .expectedAttributes , key )
138139 }
139140
140141 // check that all expected have been found
0 commit comments