fixup rolename expansion

Emyrk · Emyrk · commit 52e097c5416c · 2024-05-15T21:28:43.000-05:00
diff --git a/coderd/httpmw/authorize_test.go b/coderd/httpmw/authorize_test.go
@@ -128,7 +128,8 @@ func TestExtractUserRoles(t *testing.T) {
 			rtr.Get("/", func(_ http.ResponseWriter, r *http.Request) {
 				roles := httpmw.UserAuthorization(r)
 				require.Equal(t, user.ID.String(), roles.ID)
-				require.ElementsMatch(t, expRoles, roles.Roles.Names())
+				foundRoles := roles.Roles.Names()
+				require.ElementsMatch(t, expRoles, foundRoles)
 			})
 
 			req := httptest.NewRequest("GET", "/", nil)
diff --git a/coderd/rbac/roles.go b/coderd/rbac/roles.go
@@ -454,7 +454,7 @@ func (roles Roles) Expand() ([]Role, error) {
 func (roles Roles) Names() []string {
 	names := make([]string, 0, len(roles))
 	for _, r := range roles {
-		return append(names, r.Name)
+		names = append(names, r.Name)
 	}
 	return names
 }

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ func (roles Roles) Expand() ([]Role, error) {`
`454`	`454`	`func (roles Roles) Names() []string {`
`455`	`455`	`names := make([]string, 0, len(roles))`
`456`	`456`	`for _, r := range roles {`
`457`		`- return append(names, r.Name)`
	`457`	`+ names = append(names, r.Name)`
`458`	`458`	`}`
`459`	`459`	`return names`
`460`	`460`	`}`