Move command outside status subgroup

Emyrk · Emyrk · commit 2ed42499aba4 · 2022-05-13T15:06:55.000-05:00
diff --git a/cli/users.go b/cli/users.go
@@ -18,7 +18,8 @@ func users() *cobra.Command {
 	cmd.AddCommand(
 		userCreate(),
 		userList(),
-		userStatus(),
+		createUserStatusCommand(codersdk.UserStatusActive),
+		createUserStatusCommand(codersdk.UserStatusSuspended),
 	)
 	return cmd
 }
diff --git a/cli/userstatus.go b/cli/userstatus.go
@@ -10,18 +10,6 @@ import (
 	"github.com/coder/coder/codersdk"
 )
 
-func userStatus() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "status",
-		Short: "Update the status of a user",
-	}
-	cmd.AddCommand(
-		createUserStatusCommand(codersdk.UserStatusActive),
-		createUserStatusCommand(codersdk.UserStatusSuspended),
-	)
-	return cmd
-}
-
 // createUserStatusCommand sets a user status.
 func createUserStatusCommand(sdkStatus codersdk.UserStatus) *cobra.Command {
 	var verb string
@@ -48,7 +36,7 @@ func createUserStatusCommand(sdkStatus codersdk.UserStatus) *cobra.Command {
 		Short:   short,
 		Args:    cobra.ExactArgs(1),
 		Aliases: aliases,
-		Example: fmt.Sprintf("coder users status %s example_user", verb),
+		Example: fmt.Sprintf("coder users %s example_user", verb),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			client, err := createClient(cmd)
 			if err != nil {
diff --git a/cli/userstatus_test.go b/cli/userstatus_test.go
@@ -22,7 +22,7 @@ func TestUserStatus(t *testing.T) {
 
 	//nolint:paralleltest
 	t.Run("StatusSelf", func(t *testing.T) {
-		cmd, root := clitest.New(t, "users", "status", "suspend", "me")
+		cmd, root := clitest.New(t, "users", "suspend", "me")
 		clitest.SetupConfig(t, client, root)
 		// Yes to the prompt
 		cmd.SetIn(bytes.NewReader([]byte("yes\n")))
@@ -36,7 +36,7 @@ func TestUserStatus(t *testing.T) {
 	t.Run("StatusOther", func(t *testing.T) {
 		require.Equal(t, otherUser.Status, codersdk.UserStatusActive, "start as active")
 
-		cmd, root := clitest.New(t, "users", "status", "suspend", otherUser.Username)
+		cmd, root := clitest.New(t, "users", "suspend", otherUser.Username)
 		clitest.SetupConfig(t, client, root)
 		// Yes to the prompt
 		cmd.SetIn(bytes.NewReader([]byte("yes\n")))
@@ -48,8 +48,8 @@ func TestUserStatus(t *testing.T) {
 		require.NoError(t, err, "fetch suspended user")
 		require.Equal(t, otherUser.Status, codersdk.UserStatusSuspended, "suspended user")
 
-		// Set back to active
-		cmd, root = clitest.New(t, "users", "status", "active", otherUser.Username)
+		// Set back to active. Try using a uuid as well
+		cmd, root = clitest.New(t, "users", "activate", otherUser.ID.String())
 		clitest.SetupConfig(t, client, root)
 		// Yes to the prompt
 		cmd.SetIn(bytes.NewReader([]byte("yes\n")))

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`	`return cmd`
`24`	`25`	`}`