7
7
8
8
"github.com/stretchr/testify/require"
9
9
10
- "github.com/coder/coder/coderd"
11
10
"github.com/coder/coder/coderd/coderdtest"
12
11
"github.com/coder/coder/coderd/rbac"
13
12
"github.com/coder/coder/codersdk"
@@ -85,7 +84,7 @@ func TestListRoles(t *testing.T) {
85
84
APICall : func () ([]codersdk.Role , error ) {
86
85
return orgAdmin .ListOrganizationRoles (ctx , admin .OrganizationID )
87
86
},
88
- ExpectedRoles : coderd . ConvertRoles (rbac .OrganizationRoles (admin .OrganizationID )),
87
+ ExpectedRoles : convertRoles (rbac .OrganizationRoles (admin .OrganizationID )),
89
88
},
90
89
{
91
90
Name : "OrgAdminListOtherOrg" ,
@@ -100,14 +99,14 @@ func TestListRoles(t *testing.T) {
100
99
APICall : func () ([]codersdk.Role , error ) {
101
100
return client .ListSiteRoles (ctx )
102
101
},
103
- ExpectedRoles : coderd . ConvertRoles (rbac .SiteRoles ()),
102
+ ExpectedRoles : convertRoles (rbac .SiteRoles ()),
104
103
},
105
104
{
106
105
Name : "AdminListOrg" ,
107
106
APICall : func () ([]codersdk.Role , error ) {
108
107
return client .ListOrganizationRoles (ctx , admin .OrganizationID )
109
108
},
110
- ExpectedRoles : coderd . ConvertRoles (rbac .OrganizationRoles (admin .OrganizationID )),
109
+ ExpectedRoles : convertRoles (rbac .OrganizationRoles (admin .OrganizationID )),
111
110
},
112
111
}
113
112
@@ -128,3 +127,18 @@ func TestListRoles(t *testing.T) {
128
127
})
129
128
}
130
129
}
130
+
131
+ func convertRole (role rbac.Role ) codersdk.Role {
132
+ return codersdk.Role {
133
+ DisplayName : role .DisplayName ,
134
+ Name : role .Name ,
135
+ }
136
+ }
137
+
138
+ func convertRoles (roles []rbac.Role ) []codersdk.Role {
139
+ converted := make ([]codersdk.Role , 0 , len (roles ))
140
+ for _ , role := range roles {
141
+ converted = append (converted , convertRole (role ))
142
+ }
143
+ return converted
144
+ }
0 commit comments