coder · Emyrk · Feb 26, 2024 · Feb 21, 2024 · Feb 21, 2024 · Feb 22, 2024
diff --git a/cli/config/file.go b/cli/config/file.go
@@ -70,6 +70,14 @@ func (r Root) PostgresPort() File {
 // File provides convenience methods for interacting with *os.File.
 type File string
 
+func (f File) Exists() bool {
+	if f == "" {
+		return false
+	}
+	_, err := os.Stat(string(f))
+	return err == nil
+}
+
 // Delete deletes the file.
 func (f File) Delete() error {
 	if f == "" {

diff --git a/cli/create.go b/cli/create.go
@@ -43,7 +43,7 @@ func (r *RootCmd) create() *clibase.Cmd {
 		),
 		Middleware: clibase.Chain(r.InitClient(client)),
 		Handler: func(inv *clibase.Invocation) error {
-			organization, err := CurrentOrganization(inv, client)
+			organization, err := CurrentOrganization(r, inv, client)
 			if err != nil {
 				return err
 			}

diff --git a/cli/organization.go b/cli/organization.go
@@ -0,0 +1,86 @@
+package cli
+
+import (
+	"fmt"
+
+	"github.com/coder/coder/v2/cli/clibase"
+	"github.com/coder/coder/v2/cli/cliui"
+	"github.com/coder/coder/v2/codersdk"
+)
+
+func (r *RootCmd) organizations() *clibase.Cmd {
+	cmd := &clibase.Cmd{
+		Annotations: workspaceCommand,
+		Use:         "organizations { current }",
+		Short:       "Organization related commands",
+		Aliases:     []string{"organization", "org", "orgs"},
+		Hidden:      true, // Hidden until these commands are complete.
+		Handler: func(inv *clibase.Invocation) error {
+			return inv.Command.HelpHandler(inv)
+		},
+		Children: []*clibase.Cmd{
+			r.currentOrganization(),
+		},
+	}
+
+	cmd.Options = clibase.OptionSet{}
+	return cmd
+}
+
+func (r *RootCmd) currentOrganization() *clibase.Cmd {
+	var (
+		client    = new(codersdk.Client)
+		formatter = cliui.NewOutputFormatter(
+			cliui.ChangeFormatterData(cliui.TextFormat(), func(data any) (any, error) {
+				typed, ok := data.([]codersdk.Organization)
+				if !ok {
+					// This should never happen
+					return "", fmt.Errorf("expected []Organization, got %T", data)
+				}
+				if len(typed) != 1 {
+					return "", fmt.Errorf("expected 1 organization, got %d", len(typed))
+				}
+				return fmt.Sprintf("Current organization: %s (%s)\n", typed[0].Name, typed[0].ID.String()), nil
+			}),
+			cliui.TableFormat([]codersdk.Organization{}, []string{"id", "name", "default"}),
+			cliui.JSONFormat(),
+		)
+		onlyID = false
+	)
+	cmd := &clibase.Cmd{
+		Use:   "current",
+		Short: "Show the current selected organization the cli will use.",
+		Middleware: clibase.Chain(
+			r.InitClient(client),
+		),
+		Options: clibase.OptionSet{
+			{
+				Name:        "only-id",
+				Description: "Only print the organization ID.",
+				Required:    false,
+				Flag:        "only-id",
+				Value:       clibase.BoolOf(&onlyID),
+			},
+		},
+		Handler: func(inv *clibase.Invocation) error {
+			org, err := CurrentOrganization(r, inv, client)
+			if err != nil {
+				return err
+			}
+
+			if onlyID {
+				_, _ = fmt.Fprintf(inv.Stdout, "%s\n", org.ID)
+			} else {
+				out, err := formatter.Format(inv.Context(), []codersdk.Organization{org})
+				if err != nil {
+					return err
+				}
+				_, _ = fmt.Fprint(inv.Stdout, out)
+			}
+			return nil
+		},
+	}
+	formatter.AttachOptions(&cmd.Options)
+
+	return cmd
+}
diff --git a/cli/organization_test.go b/cli/organization_test.go
@@ -0,0 +1,45 @@
+package cli_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/v2/cli/clitest"
+	"github.com/coder/coder/v2/coderd/coderdtest"
+	"github.com/coder/coder/v2/coderd/rbac"
+	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/coder/v2/pty/ptytest"
+	"github.com/coder/coder/v2/testutil"
+)
+
+func TestCurrentOrganization(t *testing.T) {
+	t.Parallel()
+
+	t.Run("OnlyID", func(t *testing.T) {
+		t.Parallel()
+		ownerClient := coderdtest.New(t, nil)
+		first := coderdtest.CreateFirstUser(t, ownerClient)
+		// Owner is required to make orgs
+		client, _ := coderdtest.CreateAnotherUser(t, ownerClient, first.OrganizationID, rbac.RoleOwner())
+
+		ctx := testutil.Context(t, testutil.WaitMedium)
+		orgs := []string{"foo", "bar"}
+		for _, orgName := range orgs {
+			_, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+				Name: orgName,
+			})
+			require.NoError(t, err)
+		}
+
+		inv, root := clitest.New(t, "organizations", "current", "--only-id")
+		clitest.SetupConfig(t, client, root)
+		pty := ptytest.New(t).Attach(inv)
+		errC := make(chan error)
+		go func() {
+			errC <- inv.Run()
+		}()
+		require.NoError(t, <-errC)
+		pty.ExpectMatch(first.OrganizationID.String())
+	})
+}
diff --git a/cli/root.go b/cli/root.go
@@ -94,6 +94,7 @@ func (r *RootCmd) Core() []*clibase.Cmd {
 		r.tokens(),
 		r.users(),
 		r.version(defaultVersionInfo),
+		r.organizations(),
 
 		// Workspace Commands
 		r.autoupdate(),
@@ -698,14 +699,44 @@ func (r *RootCmd) createAgentClient() (*agentsdk.Client, error) {
 }
 
 // CurrentOrganization returns the currently active organization for the authenticated user.
-func CurrentOrganization(inv *clibase.Invocation, client *codersdk.Client) (codersdk.Organization, error) {
+func CurrentOrganization(r *RootCmd, inv *clibase.Invocation, client *codersdk.Client) (codersdk.Organization, error) {
+	conf := r.createConfig()
+	selected := ""
+	if conf.Organization().Exists() {
+		org, err := conf.Organization().Read()
+		if err != nil {
+			return codersdk.Organization{}, fmt.Errorf("read selected organization from config file %q: %w", conf.Organization(), err)
+		}
+		selected = org
+	}
+
+	// Verify the org exists and the user is a member
 	orgs, err := client.OrganizationsByUser(inv.Context(), codersdk.Me)
 	if err != nil {
-		return codersdk.Organization{}, nil
+		return codersdk.Organization{}, err
 // We expect the cli to return an error, so we have to handle it 
 // ourselves. 
 go func() { 
 	cancel() 
 	err := inv.Run() 
 	assert.Error(t, err) 
 }() 
 // We expect the cli to return an error, so we have to handle it 
 // ourselves. 
 go func() { 
 	cancel() 
 	err := inv.Run() 
 	assert.Error(t, err) 
 }() 
 	}
-	// For now, we won't use the config to set this.
-	// Eventually, we will support changing using "coder switch <org>"
-	return orgs[0], nil
+
+	// User manually selected an organization
+	if selected != "" {
+		index := slices.IndexFunc(orgs, func(org codersdk.Organization) bool {
+			return org.Name == selected || org.ID.String() == selected
+		})
+
+		if index < 0 {
+			return codersdk.Organization{}, xerrors.Errorf("organization %q not found, are you sure you are a member of this organization?", selected)
+		}
+		return orgs[index], nil
+	}
+
+	// User did not select an organization, so use the default.
+	index := slices.IndexFunc(orgs, func(org codersdk.Organization) bool {
+		return org.IsDefault
+	})
+	if index < 0 {
+		return codersdk.Organization{}, xerrors.Errorf("unable to determine current organization. Use 'coder switch <org>' to select an organization to use")
+	}
+
+	return orgs[index], nil
 }
 
 func splitNamedWorkspace(identifier string) (owner string, workspaceName string, err error) {

diff --git a/cli/templatecreate.go b/cli/templatecreate.go
@@ -69,7 +69,7 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
 				}
 			}
 
-			organization, err := CurrentOrganization(inv, client)
+			organization, err := CurrentOrganization(r, inv, client)
 			if err != nil {
 				return err
 			}

diff --git a/cli/templatecreate_test.go b/cli/templatecreate_test.go
@@ -243,19 +243,7 @@ func TestTemplateCreate(t *testing.T) {
 			assert.Error(t, err)
 		}()
 
-		matches := []struct {
-			match string
-			write string
-		}{
-			{match: "Upload", write: "yes"},
-		}
-		for _, m := range matches {
-			pty.ExpectMatch(m.match)
-			if len(m.write) > 0 {
-				pty.WriteLine(m.write)
-			}
-		}
-
+		pty.ExpectMatch("context canceled")
 		<-ctx.Done()
 	})
 

diff --git a/cli/templatedelete.go b/cli/templatedelete.go
@@ -32,7 +32,7 @@ func (r *RootCmd) templateDelete() *clibase.Cmd {
 				templates     = []codersdk.Template{}
 			)
 
-			organization, err := CurrentOrganization(inv, client)
+			organization, err := CurrentOrganization(r, inv, client)
 			if err != nil {
 				return err
 			}

diff --git a/cli/templateedit.go b/cli/templateedit.go
@@ -79,7 +79,7 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 				}
 			}
 
-			organization, err := CurrentOrganization(inv, client)
+			organization, err := CurrentOrganization(r, inv, client)
 			if err != nil {
 				return xerrors.Errorf("get current organization: %w", err)
 			}

diff --git a/cli/templatelist.go b/cli/templatelist.go
@@ -25,7 +25,7 @@ func (r *RootCmd) templateList() *clibase.Cmd {
 			r.InitClient(client),
 		),
 		Handler: func(inv *clibase.Invocation) error {
-			organization, err := CurrentOrganization(inv, client)
+			organization, err := CurrentOrganization(r, inv, client)
 			if err != nil {
 				return err
 			}

diff --git a/cli/templatepull.go b/cli/templatepull.go
@@ -44,7 +44,7 @@ func (r *RootCmd) templatePull() *clibase.Cmd {
 				return xerrors.Errorf("either tar or zip can be selected")
 			}
 
-			organization, err := CurrentOrganization(inv, client)
+			organization, err := CurrentOrganization(r, inv, client)
 			if err != nil {
 				return xerrors.Errorf("get current organization: %w", err)
 			}

diff --git a/cli/templatepush.go b/cli/templatepush.go
@@ -46,7 +46,7 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
 		Handler: func(inv *clibase.Invocation) error {
 			uploadFlags.setWorkdir(workdir)
 
-			organization, err := CurrentOrganization(inv, client)
+			organization, err := CurrentOrganization(r, inv, client)
 			if err != nil {
 				return err
 			}

diff --git a/cli/templateversionarchive.go b/cli/templateversionarchive.go
@@ -47,7 +47,7 @@ func (r *RootCmd) setArchiveTemplateVersion(archive bool) *clibase.Cmd {
 				versions []codersdk.TemplateVersion
 			)
 
-			organization, err := CurrentOrganization(inv, client)
+			organization, err := CurrentOrganization(r, inv, client)
 			if err != nil {
 				return err
 			}
@@ -121,7 +121,7 @@ func (r *RootCmd) archiveTemplateVersions() *clibase.Cmd {
 				templates     = []codersdk.Template{}
 			)
 
-			organization, err := CurrentOrganization(inv, client)
+			organization, err := CurrentOrganization(r, inv, client)
 			if err != nil {
 				return err
 			}

diff --git a/cli/templateversions.go b/cli/templateversions.go
@@ -93,7 +93,7 @@ func (r *RootCmd) templateVersionsList() *clibase.Cmd {
 			},
 		},
 		Handler: func(inv *clibase.Invocation) error {
-			organization, err := CurrentOrganization(inv, client)
+			organization, err := CurrentOrganization(r, inv, client)
 			if err != nil {
 				return xerrors.Errorf("get current organization: %w", err)
 			}

diff --git a/cli/usercreate.go b/cli/usercreate.go
@@ -31,7 +31,7 @@ func (r *RootCmd) userCreate() *clibase.Cmd {
 			r.InitClient(client),
 		),
 		Handler: func(inv *clibase.Invocation) error {
-			organization, err := CurrentOrganization(inv, client)
+			organization, err := CurrentOrganization(r, inv, client)
 			if err != nil {
 				return err
 			}

diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -26,11 +26,11 @@ const (
 
 // Organization is the JSON representation of a Coder organization.
 type Organization struct {
-	ID        uuid.UUID `json:"id" validate:"required" format:"uuid"`
-	Name      string    `json:"name" validate:"required"`
-	CreatedAt time.Time `json:"created_at" validate:"required" format:"date-time"`
-	UpdatedAt time.Time `json:"updated_at" validate:"required" format:"date-time"`
-	IsDefault bool      `json:"is_default" validate:"required"`
+	ID        uuid.UUID `table:"id" json:"id" validate:"required" format:"uuid"`
+	Name      string    `table:"name,default_sort" json:"name" validate:"required"`
+	CreatedAt time.Time `table:"created_at" json:"created_at" validate:"required" format:"date-time"`
+	UpdatedAt time.Time `table:"updated_at" json:"updated_at" validate:"required" format:"date-time"`
+	IsDefault bool      `table:"default" json:"is_default" validate:"required"`
 }
 
 type OrganizationMember struct {

diff --git a/enterprise/cli/groupcreate.go b/enterprise/cli/groupcreate.go
@@ -29,7 +29,7 @@ func (r *RootCmd) groupCreate() *clibase.Cmd {
 		Handler: func(inv *clibase.Invocation) error {
 			ctx := inv.Context()
 
-			org, err := agpl.CurrentOrganization(inv, client)
+			org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)
 			if err != nil {
 				return xerrors.Errorf("current organization: %w", err)
 			}

diff --git a/enterprise/cli/groupdelete.go b/enterprise/cli/groupdelete.go
@@ -27,7 +27,7 @@ func (r *RootCmd) groupDelete() *clibase.Cmd {
 				groupName = inv.Args[0]
 			)
 
-			org, err := agpl.CurrentOrganization(inv, client)
+			org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)
 			if err != nil {
 				return xerrors.Errorf("current organization: %w", err)
 			}

diff --git a/enterprise/cli/groupedit.go b/enterprise/cli/groupedit.go
@@ -37,7 +37,7 @@ func (r *RootCmd) groupEdit() *clibase.Cmd {
 				groupName = inv.Args[0]
 			)
 
-			org, err := agpl.CurrentOrganization(inv, client)
+			org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)
 			if err != nil {
 				return xerrors.Errorf("current organization: %w", err)
 			}

diff --git a/enterprise/cli/grouplist.go b/enterprise/cli/grouplist.go
@@ -30,7 +30,7 @@ func (r *RootCmd) groupList() *clibase.Cmd {
 		Handler: func(inv *clibase.Invocation) error {
 			ctx := inv.Context()
 
-			org, err := agpl.CurrentOrganization(inv, client)
+			org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)
 			if err != nil {
 				return xerrors.Errorf("current organization: %w", err)
 			}