Handle out of order lists

Emyrk · Emyrk · commit 42b42abc73c5 · 2022-05-03T13:34:26.000-05:00
diff --git a/coderd/rbac/builtin.go b/coderd/rbac/builtin.go
@@ -174,14 +174,15 @@ func OrganizationRoles(organizationID uuid.UUID) []string {
 // the list from the builtins.
 func SiteRoles() []string {
 	var roles []string
-	for role := range builtInRoles {
-		_, scope, err := roleSplit(role)
+	for _, roleF := range builtInRoles {
+		role := roleF("random")
+		_, scope, err := roleSplit(role.Name)
 		if err != nil {
 			// This should never happen
 			continue
 		}
 		if scope == "" {
-			roles = append(roles, role)
+			roles = append(roles, role.Name)
 		}
 	}
 	return roles
diff --git a/coderd/roles_test.go b/coderd/roles_test.go
@@ -122,7 +122,7 @@ func TestListRoles(t *testing.T) {
 				require.Contains(t, apiErr.Message, c.AuthorizedError)
 			} else {
 				require.NoError(t, err)
-				require.Equal(t, c.ExpectedRoles, roles)
+				require.ElementsMatch(t, c.ExpectedRoles, roles)
 			}
 		})
 	}
diff --git a/codersdk/roles.go b/codersdk/roles.go
@@ -9,6 +9,8 @@ import (
 	"github.com/google/uuid"
 )
 
+// ListSiteRoles lists all available site wide roles.
+// This is not user specific.
 func (c *Client) ListSiteRoles(ctx context.Context) ([]string, error) {
 	res, err := c.request(ctx, http.MethodGet, "/api/v2/users/roles", nil)
 	if err != nil {
@@ -22,6 +24,8 @@ func (c *Client) ListSiteRoles(ctx context.Context) ([]string, error) {
 	return roles, json.NewDecoder(res.Body).Decode(&roles)
 }
 
+// ListOrganizationRoles lists all available roles for a given organization.
+// This is not user specific.
 func (c *Client) ListOrganizationRoles(ctx context.Context, org uuid.UUID) ([]string, error) {
 	res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/members/roles/", org.String()), nil)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -174,14 +174,15 @@ func OrganizationRoles(organizationID uuid.UUID) []string {`
`174`	`174`	`// the list from the builtins.`
`175`	`175`	`func SiteRoles() []string {`
`176`	`176`	`var roles []string`
`177`		`- for role := range builtInRoles {`
`178`		`- _, scope, err := roleSplit(role)`
	`177`	`+ for _, roleF := range builtInRoles {`
	`178`	`+ role := roleF("random")`
	`179`	`+ _, scope, err := roleSplit(role.Name)`
`179`	`180`	`if err != nil {`
`180`	`181`	`// This should never happen`
`181`	`182`	`continue`
`182`	`183`	`}`
`183`	`184`	`if scope == "" {`
`184`		`- roles = append(roles, role)`
	`185`	`+ roles = append(roles, role.Name)`
`185`	`186`	`}`
`186`	`187`	`}`
`187`	`188`	`return roles`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func TestListRoles(t *testing.T) {`
`122`	`122`	`require.Contains(t, apiErr.Message, c.AuthorizedError)`
`123`	`123`	`} else {`
`124`	`124`	`require.NoError(t, err)`
`125`		`- require.Equal(t, c.ExpectedRoles, roles)`
	`125`	`+ require.ElementsMatch(t, c.ExpectedRoles, roles)`
`126`	`126`	`}`
`127`	`127`	`})`
`128`	`128`	`}`