chore: implement cli list organization members

Emyrk · Emyrk · commit 05b98fde8e7b · 2024-06-12T13:49:15.000-05:00
diff --git a/cli/organization.go b/cli/organization.go
@@ -18,11 +18,10 @@ import (
 
 func (r *RootCmd) organizations() *serpent.Command {
 	cmd := &serpent.Command{
-		Annotations: workspaceCommand,
-		Use:         "organizations [subcommand]",
-		Short:       "Organization related commands",
-		Aliases:     []string{"organization", "org", "orgs"},
-		Hidden:      true, // Hidden until these commands are complete.
+		Use:     "organizations [subcommand]",
+		Short:   "Organization related commands",
+		Aliases: []string{"organization", "org", "orgs"},
+		Hidden:  true, // Hidden until these commands are complete.
 		Handler: func(inv *serpent.Invocation) error {
 			return inv.Command.HelpHandler(inv)
 		},
@@ -31,6 +30,7 @@ func (r *RootCmd) organizations() *serpent.Command {
 			r.switchOrganization(),
 			r.createOrganization(),
 			r.organizationRoles(),
+			r.organizationMembers(),
 		},
 	}
 
diff --git a/cli/organizationmembers.go b/cli/organizationmembers.go
@@ -0,0 +1,52 @@
+package cli
+
+import (
+	"fmt"
+
+	"golang.org/x/xerrors"
+
+	"github.com/coder/coder/v2/cli/cliui"
+	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/serpent"
+)
+
+func (r *RootCmd) organizationMembers() *serpent.Command {
+	formatter := cliui.NewOutputFormatter(
+		cliui.TableFormat([]codersdk.OrganizationMemberWithName{}, []string{"username", "organization_roles"}),
+		cliui.JSONFormat(),
+	)
+
+	client := new(codersdk.Client)
+	cmd := &serpent.Command{
+		Use:     "members",
+		Short:   "List all organization members",
+		Aliases: []string{"member"},
+		Middleware: serpent.Chain(
+			serpent.RequireNArgs(0),
+			r.InitClient(client),
+		),
+		Handler: func(inv *serpent.Invocation) error {
+			ctx := inv.Context()
+			organization, err := CurrentOrganization(r, inv, client)
+			if err != nil {
+				return err
+			}
+
+			res, err := client.OrganizationMembers(ctx, organization.ID)
+			if err != nil {
+				return xerrors.Errorf("fetch members: %w", err)
+			}
+
+			out, err := formatter.Format(inv.Context(), res)
+			if err != nil {
+				return err
+			}
+
+			_, err = fmt.Fprintln(inv.Stdout, out)
+			return err
+		},
+	}
+	formatter.AttachOptions(&cmd.Options)
+
+	return cmd
+}
diff --git a/cli/organizationmembers_test.go b/cli/organizationmembers_test.go
@@ -0,0 +1,36 @@
+package cli_test
+
+import (
+	"bytes"
+	"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/testutil"
+)
+
+func TestListOrganizationMembers(t *testing.T) {
+	t.Parallel()
+
+	t.Run("OK", func(t *testing.T) {
+		t.Parallel()
+
+		ownerClient := coderdtest.New(t, &coderdtest.Options{})
+		owner := coderdtest.CreateFirstUser(t, ownerClient)
+		client, user := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID, rbac.RoleUserAdmin())
+
+		ctx := testutil.Context(t, testutil.WaitMedium)
+		inv, root := clitest.New(t, "organization", "members", "-c", "user_id,username,roles")
+		clitest.SetupConfig(t, client, root)
+
+		buf := new(bytes.Buffer)
+		inv.Stdout = buf
+		err := inv.WithContext(ctx).Run()
+		require.NoError(t, err)
+		require.Contains(t, buf.String(), user.Username)
+		require.Contains(t, buf.String(), owner.UserID.String())
+	})
+}
diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -50,11 +50,11 @@ type Organization struct {
 }
 
 type OrganizationMember struct {
-	UserID         uuid.UUID  `db:"user_id" json:"user_id" format:"uuid"`
-	OrganizationID uuid.UUID  `db:"organization_id" json:"organization_id" format:"uuid"`
-	CreatedAt      time.Time  `db:"created_at" json:"created_at" format:"date-time"`
-	UpdatedAt      time.Time  `db:"updated_at" json:"updated_at" format:"date-time"`
-	Roles          []SlimRole `db:"roles" json:"roles"`
+	UserID         uuid.UUID  `table:"user id" json:"user_id" format:"uuid"`
+	OrganizationID uuid.UUID  `table:"organization id" json:"organization_id" format:"uuid"`
+	CreatedAt      time.Time  `table:"created at" json:"created_at" format:"date-time"`
+	UpdatedAt      time.Time  `table:"updated at" json:"updated_at" format:"date-time"`
+	Roles          []SlimRole `table:"organization_roles" json:"roles"`
 }
 
 type OrganizationMemberWithName struct {
diff --git a/codersdk/roles.go b/codersdk/roles.go
@@ -19,6 +19,13 @@ type SlimRole struct {
 	OrganizationID string `json:"organization_id,omitempty"`
 }
 
+func (s SlimRole) String() string {
+	if s.DisplayName != "" {
+		return s.DisplayName
+	}
+	return s.Name
+}
+
 type AssignableRoles struct {
 	Role       `table:"r,recursive_inline"`
 	Assignable bool `json:"assignable" table:"assignable"`
