Switch error message

Emyrk · Emyrk · commit 9a7aba6604b6 · 2024-02-22T08:23:43.000-06:00
diff --git a/cli/organization.go b/cli/organization.go
@@ -4,6 +4,8 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"slices"
+	"strings"
 
 	"github.com/coder/coder/v2/cli/clibase"
 	"github.com/coder/coder/v2/cli/cliui"
@@ -21,6 +23,7 @@ func (r *RootCmd) organizations() *clibase.Cmd {
 		},
 		Children: []*clibase.Cmd{
 			r.currentOrganization(),
+			r.switchOrganization(),
 		},
 	}
 
@@ -51,13 +54,44 @@ func (r *RootCmd) switchOrganization() *clibase.Cmd {
 		),
 		Options: clibase.OptionSet{},
 		Handler: func(inv *clibase.Invocation) error {
+			orgArg := inv.Args[0]
 			conf := r.createConfig()
+			orgs, err := client.OrganizationsByUser(inv.Context(), codersdk.Me)
+			if err != nil {
+				return fmt.Errorf("failed to get organizations: %w", err)
+			}
+
 			// If the user passes an empty string, we want to remove the organization
-			if inv.Args[0] == "" {
+			if orgArg == "" {
 				err := conf.Organization().Delete()
 				if err != nil && !errors.Is(err, os.ErrNotExist) {
 					return fmt.Errorf("failed to unset organization: %w", err)
 				}
+			} else {
+				index := slices.IndexFunc(orgs, func(org codersdk.Organization) bool {
+					return org.Name == orgArg || org.ID.String() == orgArg
+				})
+				if index < 0 {
+					names := make([]string, 0, len(orgs))
+					for _, org := range orgs {
+						names = append(names, org.Name)
+					}
+
+					// Using this error for better error message formatting
+					err := &codersdk.Error{
+						Response: codersdk.Response{
+							Message: fmt.Sprintf("Organization %q not found.", orgArg),
+							Detail:  "Ensure the organization argument is correct and you are a member of it.",
+						},
+						Helper: fmt.Sprintf("Valid organizations you can switch to: %q", strings.Join(names, ", ")),
+					}
+					return err
+				}
+
+				err := conf.Organization().Write(orgs[index].ID.String())
+				if err != nil {
+					return fmt.Errorf("failed to write organization to config file: %w", err)
+				}
 			}
 
 			return nil
diff --git a/cli/root.go b/cli/root.go
@@ -1192,8 +1192,12 @@ func formatRunCommandError(err *clibase.RunCommandError, opts *formatOpts) strin
 func formatCoderSDKError(from string, err *codersdk.Error, opts *formatOpts) string {
 	var str strings.Builder
 	if opts.Verbose {
-		_, _ = str.WriteString(pretty.Sprint(headLineStyle(), fmt.Sprintf("API request error to \"%s:%s\". Status code %d", err.Method(), err.URL(), err.StatusCode())))
-		_, _ = str.WriteString("\n")
+		// If all these fields are empty, then do not print this information.
+		// This can occur if the error is being used outside the api.
+		if !(err.Method() == "" && err.URL() == "" && err.StatusCode() == 0) {
+			_, _ = str.WriteString(pretty.Sprint(headLineStyle(), fmt.Sprintf("API request error to \"%s:%s\". Status code %d", err.Method(), err.URL(), err.StatusCode())))
+			_, _ = str.WriteString("\n")
+		}
 	}
 	// Always include this trace. Users can ignore this.
 	if from != "" {
