switch -> set

Emyrk · Emyrk · commit 98666fd7d7d3 · 2024-02-23T11:12:52.000-06:00
diff --git a/cli/organization.go b/cli/organization.go
@@ -38,16 +38,16 @@ func (r *RootCmd) switchOrganization() *clibase.Cmd {
 	client := new(codersdk.Client)
 
 	cmd := &clibase.Cmd{
-		Use:   "switch <organization name | ID>",
-		Short: "Switch the organization used by the cli. Pass an empty string to reset to the default organization.",
-		Long: "Switch the organization used by the cli. Pass an empty string to reset to the default organization.\n" + formatExamples(
+		Use:   "set <organization name | ID>",
+		Short: "set the organization used by the CLI. Pass an empty string to reset to the default organization.",
+		Long: "set the organization used by the CLI. Pass an empty string to reset to the default organization.\n" + formatExamples(
 			example{
 				Description: "Remove the current organization and defer to the default.",
-				Command:     "coder organizations switch ''",
+				Command:     "coder organizations set ''",
 			},
 			example{
 				Description: "Switch to a custom organization.",
-				Command:     "coder organizations switch my-org",
+				Command:     "coder organizations set my-org",
 			},
 		),
 		Middleware: clibase.Chain(
@@ -118,7 +118,7 @@ func (r *RootCmd) switchOrganization() *clibase.Cmd {
 				var sdkError *codersdk.Error
 				if errors.As(err, &sdkError) {
 					if sdkError.Helper == "" && sdkError.StatusCode() != 500 {
-						sdkError.Helper = `If this error persists, try unsetting your org with 'coder organizations switch ""'`
+						sdkError.Helper = `If this error persists, try unsetting your org with 'coder organizations set ""'`
 					}
 					return sdkError
 				}
@@ -167,13 +167,15 @@ func promptUserSelectOrg(inv *clibase.Invocation, conf config.Root, orgs []coder
 		defaultOrg = orgs[index].Name
 	}
 
-	const deselectOption = "--Deselect--"
+	// deselectOption is the option to delete the organization config file and defer
+	// to default behavior.
+	const deselectOption = "[Default]"
 	if defaultOrg == "" {
 		defaultOrg = deselectOption
 	}
 
 	// Pull value from a prompt
-	_, _ = fmt.Fprintln(inv.Stdout, pretty.Sprint(cliui.DefaultStyles.Wrap, "Select an organization below to switch the current cli context to:"))
+	_, _ = fmt.Fprintln(inv.Stdout, pretty.Sprint(cliui.DefaultStyles.Wrap, "Select an organization below to set the current CLI context to:"))
 	value, err := cliui.Select(inv, cliui.SelectOptions{
 		Options:    append([]string{deselectOption}, orgNames(orgs)...),
 		Default:    defaultOrg,
diff --git a/cli/organization_test.go b/cli/organization_test.go
@@ -66,7 +66,7 @@ func TestOrganizationSwitch(t *testing.T) {
 		exp, err := client.OrganizationByName(ctx, codersdk.Me, "foo")
 		require.NoError(t, err)
 
-		inv, root := clitest.New(t, "organizations", "switch", "foo")
+		inv, root := clitest.New(t, "organizations", "set", "foo")
 		clitest.SetupConfig(t, client, root)
 		pty := ptytest.New(t).Attach(inv)
 		errC := make(chan error)
diff --git a/cli/root.go b/cli/root.go
@@ -733,7 +733,7 @@ func CurrentOrganization(r *RootCmd, inv *clibase.Invocation, client *codersdk.C
 		return org.IsDefault
 	})
 	if index < 0 {
-		return codersdk.Organization{}, xerrors.Errorf("unable to determine current organization. Use 'coder organizations switch <org>' to select an organization to use")
+		return codersdk.Organization{}, xerrors.Errorf("unable to determine current organization. Use 'coder set <org>' to select an organization to use")
 	}
 
 	return orgs[index], nil

Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ func CurrentOrganization(r RootCmd, inv clibase.Invocation, client *codersdk.C`
`733`	`733`	`return org.IsDefault`
`734`	`734`	`})`
`735`	`735`	`if index < 0 {`
`736`		`- return codersdk.Organization{}, xerrors.Errorf("unable to determine current organization. Use 'coder organizations switch <org>' to select an organization to use")`
	`736`	`+ return codersdk.Organization{}, xerrors.Errorf("unable to determine current organization. Use 'coder set <org>' to select an organization to use")`
`737`	`737`	`}`
`738`	`738`
`739`	`739`	`return orgs[index], nil`