Commit5c5d265

committed

chore: implement cli list organization members

1 parentbbe23ed commit5c5d265Copy full SHA for 5c5d265

File tree

+105

-10

lines changed

+105

-10

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,10 @@ import (`
`18`	`18`
`19`	`19`	`func (rRootCmd)organizations()serpent.Command {`
`20`	`20`	`cmd:=&serpent.Command{`
`21`		`-Annotations:workspaceCommand,`
`22`		`-Use:"organizations [subcommand]",`
`23`		`-Short:"Organization related commands",`
`24`		`-Aliases: []string{"organization","org","orgs"},`
`25`		`-Hidden:true,// Hidden until these commands are complete.`
	`21`	`+Use:"organizations [subcommand]",`
	`22`	`+Short:"Organization related commands",`
	`23`	`+Aliases: []string{"organization","org","orgs"},`
	`24`	`+Hidden:true,// Hidden until these commands are complete.`
`26`	`25`	`Handler:func(inv*serpent.Invocation)error {`
`27`	`26`	`returninv.Command.HelpHandler(inv)`
`28`	`27`	`},`
`@@ -31,6 +30,7 @@ func (r RootCmd) organizations() serpent.Command {`
`31`	`30`	`r.switchOrganization(),`
`32`	`31`	`r.createOrganization(),`
`33`	`32`	`r.organizationRoles(),`
	`33`	`+r.organizationMembers(),`
`34`	`34`	`},`
`35`	`35`	`}`
`36`	`36`

Lines changed: 52 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,52 @@`
	`1`	`+package cli`
	`2`	`+`
	`3`	`+import (`
	`4`	`+"fmt"`
	`5`	`+`
	`6`	`+"golang.org/x/xerrors"`
	`7`	`+`
	`8`	`+"github.com/coder/coder/v2/cli/cliui"`
	`9`	`+"github.com/coder/coder/v2/codersdk"`
	`10`	`+"github.com/coder/serpent"`
	`11`	`+)`
	`12`	`+`
	`13`	`+func (rRootCmd)organizationMembers()serpent.Command {`
	`14`	`+formatter:=cliui.NewOutputFormatter(`
	`15`	`+cliui.TableFormat([]codersdk.OrganizationMemberWithName{}, []string{"username","organization_roles"}),`
	`16`	`+cliui.JSONFormat(),`
	`17`	`+)`
	`18`	`+`
	`19`	`+client:=new(codersdk.Client)`
	`20`	`+cmd:=&serpent.Command{`
	`21`	`+Use:"members",`
	`22`	`+Short:"List all organization members",`
	`23`	`+Aliases: []string{"member"},`
	`24`	`+Middleware:serpent.Chain(`
	`25`	`+serpent.RequireNArgs(0),`
	`26`	`+r.InitClient(client),`
	`27`	`+),`
	`28`	`+Handler:func(inv*serpent.Invocation)error {`
	`29`	`+ctx:=inv.Context()`
	`30`	`+organization,err:=CurrentOrganization(r,inv,client)`
	`31`	`+iferr!=nil {`
	`32`	`+returnerr`
	`33`	`+}`
	`34`	`+`
	`35`	`+res,err:=client.OrganizationMembers(ctx,organization.ID)`
	`36`	`+iferr!=nil {`
	`37`	`+returnxerrors.Errorf("fetch members: %w",err)`
	`38`	`+}`
	`39`	`+`
	`40`	`+out,err:=formatter.Format(inv.Context(),res)`
	`41`	`+iferr!=nil {`
	`42`	`+returnerr`
	`43`	`+}`
	`44`	`+`
	`45`	`+_,err=fmt.Fprintln(inv.Stdout,out)`
	`46`	`+returnerr`
	`47`	`+},`
	`48`	`+}`
	`49`	`+formatter.AttachOptions(&cmd.Options)`
	`50`	`+`
	`51`	`+returncmd`
	`52`	`+}`

Lines changed: 36 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,36 @@`
	`1`	`+package cli_test`
	`2`	`+`
	`3`	`+import (`
	`4`	`+"bytes"`
	`5`	`+"testing"`
	`6`	`+`
	`7`	`+"github.com/stretchr/testify/require"`
	`8`	`+`
	`9`	`+"github.com/coder/coder/v2/cli/clitest"`
	`10`	`+"github.com/coder/coder/v2/coderd/coderdtest"`
	`11`	`+"github.com/coder/coder/v2/coderd/rbac"`
	`12`	`+"github.com/coder/coder/v2/testutil"`
	`13`	`+)`
	`14`	`+`
	`15`	`+funcTestListOrganizationMembers(t*testing.T) {`
	`16`	`+t.Parallel()`
	`17`	`+`
	`18`	`+t.Run("OK",func(t*testing.T) {`
	`19`	`+t.Parallel()`
	`20`	`+`
	`21`	`+ownerClient:=coderdtest.New(t,&coderdtest.Options{})`
	`22`	`+owner:=coderdtest.CreateFirstUser(t,ownerClient)`
	`23`	`+client,user:=coderdtest.CreateAnotherUser(t,ownerClient,owner.OrganizationID,rbac.RoleUserAdmin())`
	`24`	`+`
	`25`	`+ctx:=testutil.Context(t,testutil.WaitMedium)`
	`26`	`+inv,root:=clitest.New(t,"organization","members","-c","user_id,username,roles")`
	`27`	`+clitest.SetupConfig(t,client,root)`
	`28`	`+`
	`29`	`+buf:=new(bytes.Buffer)`
	`30`	`+inv.Stdout=buf`
	`31`	`+err:=inv.WithContext(ctx).Run()`
	`32`	`+require.NoError(t,err)`
	`33`	`+require.Contains(t,buf.String(),user.Username)`
	`34`	`+require.Contains(t,buf.String(),owner.UserID.String())`
	`35`	`+})`
	`36`	`+}`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,11 @@ type Organization struct {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`typeOrganizationMemberstruct {`
`54`		-UserID uuid.UUID`db:"user_id" json:"user_id" format:"uuid"`
`55`		-OrganizationID uuid.UUID`db:"organization_id" json:"organization_id" format:"uuid"`
`56`		-CreatedAt time.Time`db:"created_at" json:"created_at" format:"date-time"`
`57`		-UpdatedAt time.Time`db:"updated_at" json:"updated_at" format:"date-time"`
`58`		-Roles []SlimRole`db:"roles" json:"roles"`
	`54`	+UserID uuid.UUID`table:"user id" json:"user_id" format:"uuid"`
	`55`	+OrganizationID uuid.UUID`table:"organization id" json:"organization_id" format:"uuid"`
	`56`	+CreatedAt time.Time`table:"created at" json:"created_at" format:"date-time"`
	`57`	+UpdatedAt time.Time`table:"updated at" json:"updated_at" format:"date-time"`
	`58`	+Roles []SlimRole`table:"organization_roles" json:"roles"`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`typeOrganizationMemberWithNamestruct {`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,13 @@ type SlimRole struct {`
`19`	`19`	OrganizationIDstring`json:"organization_id,omitempty"`
`20`	`20`	`}`
`21`	`21`
	`22`	`+func (sSlimRole)String()string {`
	`23`	`+ifs.DisplayName!="" {`
	`24`	`+returns.DisplayName`
	`25`	`+}`
	`26`	`+returns.Name`
	`27`	`+}`
	`28`	`+`
`22`	`29`	`typeAssignableRolesstruct {`
`23`	`30`	Role`table:"r,recursive_inline"`
`24`	`31`	Assignablebool`json:"assignable" table:"assignable"`

Comments

(0)