- Notifications
You must be signed in to change notification settings - Fork1.1k
feat: add edit-role within user command#17341
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Changes fromall commits
d11c17bd6a1dc2ff0603d85ef42e2b2e8fefc2ccf142bb16dec1da5945894ee1e049b38908b96681ecbaa2b349d1be4b48ea2e908c4d380635ed6adFile filter
Filter by extension
Conversations
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| coder v0.0.0-devel | ||
| USAGE: | ||
| coder users edit-roles [flags] <username|user_id> | ||
| Edit a user's roles by username or id | ||
| OPTIONS: | ||
| --roles string-array | ||
| A list of roles to give to the user. This removes any existing roles | ||
| the user may have. The available roles are: auditor, member, owner, | ||
| template-admin, user-admin. | ||
| -y, --yes bool | ||
| Bypass prompts. | ||
| ——— | ||
| Run `coder --help` for a list of global options. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package cli | ||
| import ( | ||
| "fmt" | ||
| "slices" | ||
| "sort" | ||
| "strings" | ||
| "golang.org/x/xerrors" | ||
| "github.com/coder/coder/v2/cli/cliui" | ||
| "github.com/coder/coder/v2/coderd/rbac" | ||
| "github.com/coder/coder/v2/codersdk" | ||
| "github.com/coder/serpent" | ||
| ) | ||
| func (r *RootCmd) userEditRoles() *serpent.Command { | ||
| client := new(codersdk.Client) | ||
| roles := rbac.SiteRoles() | ||
| siteRoles := make([]string, 0) | ||
| for _, role := range roles { | ||
| siteRoles = append(siteRoles, role.Identifier.Name) | ||
| } | ||
| sort.Strings(siteRoles) | ||
| var givenRoles []string | ||
| cmd := &serpent.Command{ | ||
| Use: "edit-roles <username|user_id>", | ||
| Short: "Edit a user's roles by username or id", | ||
| Options: []serpent.Option{ | ||
| cliui.SkipPromptOption(), | ||
| { | ||
| Name: "roles", | ||
| Description: fmt.Sprintf("A list of roles to give to the user. This removes any existing roles the user may have. The available roles are: %s.", strings.Join(siteRoles, ", ")), | ||
| Flag: "roles", | ||
| Value: serpent.StringArrayOf(&givenRoles), | ||
| }, | ||
| }, | ||
| 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) | ||
| } | ||
| userRoles, err := client.UserRoles(ctx, user.Username) | ||
| if err != nil { | ||
| return xerrors.Errorf("fetch user roles: %w", err) | ||
| } | ||
| var selectedRoles []string | ||
| if len(givenRoles) > 0 { | ||
| // Make sure all of the given roles are valid site roles | ||
| for _, givenRole := range givenRoles { | ||
| if !slices.Contains(siteRoles, givenRole) { | ||
| siteRolesPretty := strings.Join(siteRoles, ", ") | ||
| return xerrors.Errorf("The role %s is not valid. Please use one or more of the following roles: %s\n", givenRole, siteRolesPretty) | ||
| } | ||
| } | ||
| selectedRoles = givenRoles | ||
| } else { | ||
| 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 | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package cli_test | ||
| import ( | ||
| "fmt" | ||
| "strings" | ||
| "testing" | ||
| "github.com/stretchr/testify/require" | ||
| "github.com/coder/coder/v2/cli/clitest" | ||
| "github.com/coder/coder/v2/coderd/coderdtest" | ||
| "github.com/coder/coder/v2/coderd/rbac" | ||
| "github.com/coder/coder/v2/testutil" | ||
| ) | ||
| var roles = []string{"auditor", "user-admin"} | ||
| func TestUserEditRoles(t *testing.T) { | ||
| t.Parallel() | ||
| t.Run("UpdateUserRoles", func(t *testing.T) { | ||
| t.Parallel() | ||
| client := coderdtest.New(t, nil) | ||
| owner := coderdtest.CreateFirstUser(t, client) | ||
| userAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleOwner()) | ||
| _, member := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleMember()) | ||
| inv, root := clitest.New(t, "users", "edit-roles", member.Username, fmt.Sprintf("--roles=%s", strings.Join(roles, ","))) | ||
| clitest.SetupConfig(t, userAdmin, root) | ||
| // Create context with timeout | ||
| ctx := testutil.Context(t, testutil.WaitShort) | ||
| err := inv.WithContext(ctx).Run() | ||
| require.NoError(t, err) | ||
| memberRoles, err := client.UserRoles(ctx, member.Username) | ||
| require.NoError(t, err) | ||
| require.ElementsMatch(t, memberRoles.Roles, roles) | ||
| }) | ||
| t.Run("UserNotFound", func(t *testing.T) { | ||
| t.Parallel() | ||
| client := coderdtest.New(t, nil) | ||
| owner := coderdtest.CreateFirstUser(t, client) | ||
| userAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleUserAdmin()) | ||
| // Setup command with non-existent user | ||
| inv, root := clitest.New(t, "users", "edit-roles", "nonexistentuser") | ||
| clitest.SetupConfig(t, userAdmin, root) | ||
| // Create context with timeout | ||
| ctx := testutil.Context(t, testutil.WaitShort) | ||
| err := inv.WithContext(ctx).Run() | ||
| require.Error(t, err) | ||
| require.Contains(t, err.Error(), "fetch user") | ||
| }) | ||
| } |
Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.
Uh oh!
There was an error while loading.Please reload this page.
Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.
Uh oh!
There was an error while loading.Please reload this page.
Uh oh!
There was an error while loading.Please reload this page.