Mar 14, 2024 · Mar 14, 2024 · Mar 14, 2024 · Mar 14, 2024
diff --git a/cli/organization_test.go b/cli/organization_test.go
 package cli_test

 import (
 "encoding/json"
 "net/http"
 "net/http/httptest"
 "net/url"
 "testing"
 "time"

 "github.com/google/uuid"
 "github.com/stretchr/testify/require"

 "github.com/coder/coder/v2/cli/clitest"
 func TestCurrentOrganization(t *testing.T) {
 t.Parallel()

 // This test emulates 2 cases:
 // 1. The user is not a part of the default organization, but only belongs to one.
 // 2. The user is connecting to an older Coder instance.
 t.Run("no-default", func(t *testing.T) {
 t.Parallel()

 orgID := uuid.New()
 srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 json.NewEncoder(w).Encode([]codersdk.Organization{
 {
 ID:        orgID,
 Name:      "not-default",
 CreatedAt: time.Now(),
 UpdatedAt: time.Now(),
 IsDefault: false,
 },
 })
 }))
 defer srv.Close()

 client := codersdk.New(must(url.Parse(srv.URL)))
 inv, root := clitest.New(t, "organizations", "show", "current")
 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(orgID.String())
 })

 t.Run("OnlyID", func(t *testing.T) {
 t.Parallel()
 ownerClient := coderdtest.New(t, nil)
 pty.ExpectMatch(exp.ID.String())
 })
 }

 func must[V any](v V, err error) V {
 if err != nil {
 panic(err)
 }
 return v
 }
diff --git a/cli/root.go b/cli/root.go
 return org.IsDefault
 })
 if index < 0 {
 return codersdk.Organization{}, xerrors.Errorf("unable to determine current organization. Use 'coder set <org>' to select an organization to use")
 if len(orgs) == 1 {
 // If there is no "isDefault", but only 1 org is present. We can just
 // assume the single organization is correct. This is mainly a helper
 // for cli hitting an old instance, or a user that belongs to a single
 // org that is not the default.
 return orgs[0], nil
 }
 return codersdk.Organization{}, xerrors.Errorf("unable to determine current organization. Use 'coder org set <org>' to select an organization to use")
 }

 return orgs[index], nil
Original file line number	Diff line number	Diff line change
		@@ -1,8 +1,14 @@
		package cli_test

		import (
		"encoding/json"
		"net/http"
		"net/http/httptest"
		"net/url"
		"testing"
		"time"

		"github.com/google/uuid"
		"github.com/stretchr/testify/require"

		"github.com/coder/coder/v2/cli/clitest"
Expand All		@@ -16,6 +22,38 @@ import (
		func TestCurrentOrganization(t *testing.T) {
		t.Parallel()

		// This test emulates 2 cases:
		// 1. The user is not a part of the default organization, but only belongs to one.
		// 2. The user is connecting to an older Coder instance.
		t.Run("no-default", func(t *testing.T) {
		t.Parallel()

		orgID := uuid.New()
		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
		json.NewEncoder(w).Encode([]codersdk.Organization{
		{
		ID: orgID,
		Name: "not-default",
		CreatedAt: time.Now(),
		UpdatedAt: time.Now(),
		IsDefault: false,
		},
		})
		}))
		defer srv.Close()

		client := codersdk.New(must(url.Parse(srv.URL)))
		inv, root := clitest.New(t, "organizations", "show", "current")
		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(orgID.String())
		})

		t.Run("OnlyID", func(t *testing.T) {
		t.Parallel()
		ownerClient := coderdtest.New(t, nil)
Expand DownExpand Up		@@ -108,3 +146,10 @@ func TestOrganizationSwitch(t *testing.T) {
		pty.ExpectMatch(exp.ID.String())
		})
		}

		func must[V any](v V, err error) V {
		if err != nil {
		panic(err)
		}
		return v
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -749,7 +749,14 @@ 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 set <org>' to select an organization to use")
		if len(orgs) == 1 {
		// If there is no "isDefault", but only 1 org is present. We can just
		// assume the single organization is correct. This is mainly a helper
		// for cli hitting an old instance, or a user that belongs to a single
		// org that is not the default.
		return orgs[0], nil
		}
		return codersdk.Organization{}, xerrors.Errorf("unable to determine current organization. Use 'coder org set <org>' to select an organization to use")
		}

		return orgs[index], nil
Expand Down