Commit2ed4249

committed

Move command outside status subgroup

1 parent53adce9 commit2ed4249Copy full SHA for 2ed4249

File tree

-18

lines changed

-18

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ func users() *cobra.Command {`
`18`	`18`	`cmd.AddCommand(`
`19`	`19`	`userCreate(),`
`20`	`20`	`userList(),`
`21`		`-userStatus(),`
	`21`	`+createUserStatusCommand(codersdk.UserStatusActive),`
	`22`	`+createUserStatusCommand(codersdk.UserStatusSuspended),`
`22`	`23`	`)`
`23`	`24`	`returncmd`
`24`	`25`	`}`

Lines changed: 1 addition & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,18 +10,6 @@ import (`
`10`	`10`	`"github.com/coder/coder/codersdk"`
`11`	`11`	`)`
`12`	`12`
`13`		`-funcuserStatus()*cobra.Command {`
`14`		`-cmd:=&cobra.Command{`
`15`		`-Use:"status",`
`16`		`-Short:"Update the status of a user",`
`17`		`-}`
`18`		`-cmd.AddCommand(`
`19`		`-createUserStatusCommand(codersdk.UserStatusActive),`
`20`		`-createUserStatusCommand(codersdk.UserStatusSuspended),`
`21`		`-)`
`22`		`-returncmd`
`23`		`-}`
`24`		`-`
`25`	`13`	`// createUserStatusCommand sets a user status.`
`26`	`14`	`funccreateUserStatusCommand(sdkStatus codersdk.UserStatus)*cobra.Command {`
`27`	`15`	`varverbstring`
`@@ -48,7 +36,7 @@ func createUserStatusCommand(sdkStatus codersdk.UserStatus) *cobra.Command {`
`48`	`36`	`Short:short,`
`49`	`37`	`Args:cobra.ExactArgs(1),`
`50`	`38`	`Aliases:aliases,`
`51`		`-Example:fmt.Sprintf("coder usersstatus%s example_user",verb),`
	`39`	`+Example:fmt.Sprintf("coder users %s example_user",verb),`
`52`	`40`	`RunE:func(cmd*cobra.Command,args []string)error {`
`53`	`41`	`client,err:=createClient(cmd)`
`54`	`42`	`iferr!=nil {`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func TestUserStatus(t *testing.T) {`
`22`	`22`
`23`	`23`	`//nolint:paralleltest`
`24`	`24`	`t.Run("StatusSelf",func(t*testing.T) {`
`25`		`-cmd,root:=clitest.New(t,"users","status","suspend","me")`
	`25`	`+cmd,root:=clitest.New(t,"users","suspend","me")`
`26`	`26`	`clitest.SetupConfig(t,client,root)`
`27`	`27`	`// Yes to the prompt`
`28`	`28`	`cmd.SetIn(bytes.NewReader([]byte("yes\n")))`
`@@ -36,7 +36,7 @@ func TestUserStatus(t *testing.T) {`
`36`	`36`	`t.Run("StatusOther",func(t*testing.T) {`
`37`	`37`	`require.Equal(t,otherUser.Status,codersdk.UserStatusActive,"start as active")`
`38`	`38`
`39`		`-cmd,root:=clitest.New(t,"users","status","suspend",otherUser.Username)`
	`39`	`+cmd,root:=clitest.New(t,"users","suspend",otherUser.Username)`
`40`	`40`	`clitest.SetupConfig(t,client,root)`
`41`	`41`	`// Yes to the prompt`
`42`	`42`	`cmd.SetIn(bytes.NewReader([]byte("yes\n")))`
`@@ -48,8 +48,8 @@ func TestUserStatus(t *testing.T) {`
`48`	`48`	`require.NoError(t,err,"fetch suspended user")`
`49`	`49`	`require.Equal(t,otherUser.Status,codersdk.UserStatusSuspended,"suspended user")`
`50`	`50`
`51`		`-// Set back to active`
`52`		`-cmd,root=clitest.New(t,"users","status","active",otherUser.Username)`
	`51`	`+// Set back to active. Try using a uuid as well`
	`52`	`+cmd,root=clitest.New(t,"users","activate",otherUser.ID.String())`
`53`	`53`	`clitest.SetupConfig(t,client,root)`
`54`	`54`	`// Yes to the prompt`
`55`	`55`	`cmd.SetIn(bytes.NewReader([]byte("yes\n")))`

Comments

(0)