remove prompt

ethanndickson · ethanndickson · commit ec8ff1a61f52 · 2025-02-03T07:14:50.000Z
diff --git a/cli/testdata/coder_tokens_remove_--help.golden b/cli/testdata/coder_tokens_remove_--help.golden
@@ -1,15 +1,11 @@
 coder v0.0.0-devel
 
 USAGE:
-  coder tokens remove [flags] <name|id|token>
+  coder tokens remove <name|id|token>
 
   Delete a token
 
   Aliases: delete, rm
 
-OPTIONS:
-  -y, --yes bool
-          Bypass prompts.
-
 ———
 Run `coder --help` for a list of global options.
diff --git a/cli/tokens.go b/cli/tokens.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/coder/coder/v2/cli/cliui"
 	"github.com/coder/coder/v2/codersdk"
-	"github.com/coder/pretty"
 	"github.com/coder/serpent"
 )
 
@@ -232,9 +231,6 @@ func (r *RootCmd) removeToken() *serpent.Command {
 			serpent.RequireNArgs(1),
 			r.InitClient(client),
 		),
-		Options: serpent.OptionSet{
-			cliui.SkipPromptOption(),
-		},
 		Handler: func(inv *serpent.Invocation) error {
 			token, err := client.APIKeyByName(inv.Context(), codersdk.Me, inv.Args[0])
 			if err != nil {
@@ -246,33 +242,6 @@ func (r *RootCmd) removeToken() *serpent.Command {
 				}
 			}
 
-			var prompt string
-			if token.TokenName == "" {
-				prompt = fmt.Sprintf("Are you sure you want to delete the token with ID %s?\n  ",
-					pretty.Sprint(cliui.DefaultStyles.Code, token.ID),
-				)
-			} else {
-				prompt = fmt.Sprintf("Are you sure you want to delete the token with the name %s? (ID: %s)\n  ",
-					pretty.Sprint(cliui.DefaultStyles.Code, token.TokenName),
-					pretty.Sprint(cliui.DefaultStyles.Code, token.ID),
-				)
-			}
-
-			if !token.LastUsed.IsZero() {
-				prompt = fmt.Sprintf("%sIt was last used on %s.", prompt, pretty.Sprint(cliui.DefaultStyles.Code, token.LastUsed.String()))
-			} else {
-				prompt = fmt.Sprintf("%sIt has never been used.", prompt)
-			}
-
-			_, err = cliui.Prompt(inv, cliui.PromptOptions{
-				Text:      prompt,
-				IsConfirm: true,
-				Default:   cliui.ConfirmYes,
-			})
-			if err != nil {
-				return err
-			}
-
 			err = client.DeleteAPIKey(inv.Context(), codersdk.Me, token.ID)
 			if err != nil {
 				return xerrors.Errorf("delete api key: %w", err)
diff --git a/cli/tokens_test.go b/cli/tokens_test.go
@@ -114,7 +114,7 @@ func TestTokens(t *testing.T) {
 	require.Equal(t, id, tokens[0].ID)
 
 	// Delete by name
-	inv, root = clitest.New(t, "tokens", "rm", "token-one", "--yes")
+	inv, root = clitest.New(t, "tokens", "rm", "token-one")
 	clitest.SetupConfig(t, client, root)
 	buf = new(bytes.Buffer)
 	inv.Stdout = buf
@@ -125,7 +125,7 @@ func TestTokens(t *testing.T) {
 	require.Contains(t, res, "deleted")
 
 	// Delete by ID
-	inv, root = clitest.New(t, "tokens", "rm", secondTokenID, "--yes")
+	inv, root = clitest.New(t, "tokens", "rm", secondTokenID)
 	clitest.SetupConfig(t, client, root)
 	buf = new(bytes.Buffer)
 	inv.Stdout = buf
@@ -147,7 +147,7 @@ func TestTokens(t *testing.T) {
 	fourthToken := res
 
 	// Delete by token
-	inv, root = clitest.New(t, "tokens", "rm", fourthToken, "--yes")
+	inv, root = clitest.New(t, "tokens", "rm", fourthToken)
 	clitest.SetupConfig(t, client, root)
 	buf = new(bytes.Buffer)
 	inv.Stdout = buf
diff --git a/docs/reference/cli/tokens_remove.md b/docs/reference/cli/tokens_remove.md
