coder · brettkolodny · Apr 15, 2025 · Apr 10, 2025 · Apr 10, 2025 · Apr 10, 2025
diff --git a/cli/testdata/coder_users_--help.golden b/cli/testdata/coder_users_--help.golden
@@ -8,15 +8,16 @@ USAGE:
   Aliases: user
 
 SUBCOMMANDS:
-    activate    Update a user's status to 'active'. Active users can fully
-                interact with the platform
-    create      
-    delete      Delete a user by username or user_id.
-    list        
-    show        Show a single user. Use 'me' to indicate the currently
-                authenticated user.
-    suspend     Update a user's status to 'suspended'. A suspended user cannot
-                log into the platform
+    activate      Update a user's status to 'active'. Active users can fully
+                  interact with the platform
+    create        
+    delete        Delete a user by username or user_id.
+    edit-roles    Edit a user's roles by username or id
+    list          
+    show          Show a single user. Use 'me' to indicate the currently
+                  authenticated user.
+    suspend       Update a user's status to 'suspended'. A suspended user cannot
+                  log into the platform
 
 ———
 Run `coder --help` for a list of global options.
diff --git a/cli/testdata/coder_users_edit-roles_--help.golden b/cli/testdata/coder_users_edit-roles_--help.golden
@@ -0,0 +1,9 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder users edit-roles <username|user_id>
+
+  Edit a user's roles by username or id
+
+———
+Run `coder --help` for a list of global options.
diff --git a/cli/usereditroles.go b/cli/usereditroles.go
@@ -0,0 +1,66 @@
+package cli
+
+import (
+	"sort"
+
+	"golang.org/x/xerrors"
+
+	"github.com/coder/coder/v2/cli/cliui"
+	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/serpent"
+)
+
+func (r *RootCmd) userEditRoles() *serpent.Command {
+	client := new(codersdk.Client)
+	cmd := &serpent.Command{
+		Use:        "edit-roles <username|user_id>",
+		Short:      "Edit a user's roles by username or id",
+		Middleware: serpent.Chain(serpent.RequireNArgs(1), r.InitClient(client)),
+		Handler: func(inv *serpent.Invocation) error {
+			ctx := inv.Context()
+
+			user, err := client.User(ctx, inv.Args[0])
+			if err != nil {
+				return xerrors.Errorf("fetch user: %w", err)
+			}
+
+			roles, err := client.ListSiteRoles(ctx)
+			if err != nil {
+				return xerrors.Errorf("fetch site roles: %w", err)
+			}
+
+			siteRoles := make([]string, 0)
+			for _, role := range roles {
+				if role.Assignable {
+					siteRoles = append(siteRoles, role.Name)
+				}
+			}
+
+			userRoles, err := client.UserRoles(ctx, user.Username)
+			if err != nil {
+				return xerrors.Errorf("fetch user roles: %w", err)
+			}
+
+			sort.Strings(siteRoles)
+			selectedRoles, err := cliui.MultiSelect(inv, cliui.MultiSelectOptions{
+				Message:  "Select the roles you'd like to assign to the user",
+				Options:  siteRoles,
+				Defaults: userRoles.Roles,
+			})
+			if err != nil {
+				return xerrors.Errorf("selecting roles for user: %w", err)
+			}
+
+			_, err = client.UpdateUserRoles(ctx, user.Username, codersdk.UpdateRoles{
+				Roles: selectedRoles,
+			})
+			if err != nil {
+				return xerrors.Errorf("update user roles: %w", err)
+			}
+
+			return nil
+		},
+	}
+
+	return cmd
+}
diff --git a/cli/users.go b/cli/users.go
@@ -18,6 +18,7 @@ func (r *RootCmd) users() *serpent.Command {
 			r.userList(),
 			r.userSingle(),
 			r.userDelete(),
+			r.userEditRoles(),
 			r.createUserStatusCommand(codersdk.UserStatusActive),
 			r.createUserStatusCommand(codersdk.UserStatusSuspended),
 		},

diff --git a/docs/manifest.json b/docs/manifest.json
@@ -1605,6 +1605,11 @@
 							"description": "Delete a user by username or user_id.",
 							"path": "reference/cli/users_delete.md"
 						},
+						{
+							"title": "users edit-roles",
+							"description": "Edit a user's roles by username or id",
+							"path": "reference/cli/users_edit-roles.md"
+						},
 						{
 							"title": "users list",
 							"path": "reference/cli/users_list.md"

diff --git a/docs/reference/cli/users.md b/docs/reference/cli/users.md
diff --git a/docs/reference/cli/users_edit-roles.md b/docs/reference/cli/users_edit-roles.md