Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit53adce9

Browse files
committed
PR cleanup, better short msg
1 parent5e80192 commit53adce9

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

‎cli/userstatus.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,26 @@ func userStatus() *cobra.Command {
1616
Short:"Update the status of a user",
1717
}
1818
cmd.AddCommand(
19-
setUserStatus(codersdk.UserStatusActive),
20-
setUserStatus(codersdk.UserStatusSuspended),
19+
createUserStatusCommand(codersdk.UserStatusActive),
20+
createUserStatusCommand(codersdk.UserStatusSuspended),
2121
)
2222
returncmd
2323
}
2424

25-
//setUserStatus sets a user status.
26-
funcsetUserStatus(sdkStatus codersdk.UserStatus)*cobra.Command {
25+
//createUserStatusCommand sets a user status.
26+
funccreateUserStatusCommand(sdkStatus codersdk.UserStatus)*cobra.Command {
2727
varverbstring
2828
varaliases []string
29+
varshortstring
2930
switchsdkStatus {
3031
casecodersdk.UserStatusActive:
31-
verb="active"
32-
aliases= []string{"activate"}
32+
verb="activate"
33+
aliases= []string{"active"}
34+
short="Update a user's status to 'active'. Active users can fully interact with the platform"
3335
casecodersdk.UserStatusSuspended:
3436
verb="suspend"
3537
aliases= []string{"rm","delete"}
38+
short="Update a user's status to 'suspended'. A suspended user cannot log into the platform"
3639
default:
3740
panic(fmt.Sprintf("%s is not supported",sdkStatus))
3841
}
@@ -42,7 +45,7 @@ func setUserStatus(sdkStatus codersdk.UserStatus) *cobra.Command {
4245
)
4346
cmd:=&cobra.Command{
4447
Use:fmt.Sprintf("%s <username|user_id>",verb),
45-
Short:fmt.Sprintf("Update a user's status to %q",sdkStatus),
48+
Short:short,
4649
Args:cobra.ExactArgs(1),
4750
Aliases:aliases,
4851
Example:fmt.Sprintf("coder users status %s example_user",verb),
@@ -81,7 +84,7 @@ func setUserStatus(sdkStatus codersdk.UserStatus) *cobra.Command {
8184
returnerr
8285
}
8386

84-
_,err=client.SetUserStatus(cmd.Context(),user.ID,sdkStatus)
87+
_,err=client.UpdateUserStatus(cmd.Context(),user.ID,sdkStatus)
8588
iferr!=nil {
8689
returnxerrors.Errorf("%s user: %w",verb,err)
8790
}

‎coderd/users_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ func TestPutUserSuspend(t *testing.T) {
452452
Password:"password",
453453
OrganizationID:me.OrganizationID,
454454
})
455-
user,err:=client.SetUserStatus(context.Background(),user.ID,codersdk.UserStatusSuspended)
455+
user,err:=client.UpdateUserStatus(context.Background(),user.ID,codersdk.UserStatusSuspended)
456456
require.NoError(t,err)
457457
require.Equal(t,user.Status,codersdk.UserStatusSuspended)
458458
})
@@ -462,7 +462,7 @@ func TestPutUserSuspend(t *testing.T) {
462462
client:=coderdtest.New(t,nil)
463463
coderdtest.CreateFirstUser(t,client)
464464
client.User(context.Background(),codersdk.Me)
465-
_,err:=client.SetUserStatus(context.Background(),codersdk.Me,codersdk.UserStatusSuspended)
465+
_,err:=client.UpdateUserStatus(context.Background(),codersdk.Me,codersdk.UserStatusSuspended)
466466

467467
require.ErrorContains(t,err,"suspend yourself","cannot suspend yourself")
468468
})
@@ -555,7 +555,7 @@ func TestGetUsers(t *testing.T) {
555555
require.NoError(t,err)
556556
active=append(active,bruno)
557557

558-
_,err=client.SetUserStatus(context.Background(),alice.ID,codersdk.UserStatusSuspended)
558+
_,err=client.UpdateUserStatus(context.Background(),alice.ID,codersdk.UserStatusSuspended)
559559
require.NoError(t,err)
560560

561561
users,err:=client.Users(context.Background(), codersdk.UsersRequest{

‎codersdk/users.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ func (c *Client) UpdateUserProfile(ctx context.Context, userID uuid.UUID, req Up
212212
returnuser,json.NewDecoder(res.Body).Decode(&user)
213213
}
214214

215-
//SetUserStatus sets the user status to the given status
216-
func (c*Client)SetUserStatus(ctx context.Context,userID uuid.UUID,statusUserStatus) (User,error) {
215+
//UpdateUserStatus sets the user status to the given status
216+
func (c*Client)UpdateUserStatus(ctx context.Context,userID uuid.UUID,statusUserStatus) (User,error) {
217217
path:=fmt.Sprintf("/api/v2/users/%s/status/",uuidOrMe(userID))
218218
switchstatus {
219219
caseUserStatusActive:

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp