Commitfc3336c

committed

Option to list all workspaces

From an admin POV, this will be helpful for various reasons.

1 parent3ebd102 commitfc3336cCopy full SHA for fc3336c

File tree

+47

-7

lines changed

+47

-7

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -215,10 +215,13 @@ func getWorkspacesByProvider(ctx context.Context, client coder.Client, wpName, u`
`215`	`215`	`returnnil,err`
`216`	`216`	`}`
`217`	`217`
`218`		`-workspaces,err=filterWorkspacesByUser(ctx,client,userEmail,workspaces)`
`219`		`-iferr!=nil {`
`220`		`-returnnil,err`
	`218`	`+ifuserEmail!="" {`
	`219`	`+workspaces,err=filterWorkspacesByUser(ctx,client,userEmail,workspaces)`
	`220`	`+iferr!=nil {`
	`221`	`+returnnil,err`
	`222`	`+}`
`221`	`223`	`}`
	`224`	`+`
`222`	`225`	`returnworkspaces,nil`
`223`	`226`	`}`
`224`	`227`

Lines changed: 13 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ const (`
`70`	`70`
`71`	`71`	`funclsWorkspacesCommand()*cobra.Command {`
`72`	`72`	`var (`
	`73`	`+allbool`
`73`	`74`	`outputFmtstring`
`74`	`75`	`userstring`
`75`	`76`	`providerstring`
`@@ -85,11 +86,18 @@ func lsWorkspacesCommand() *cobra.Command {`
`85`	`86`	`iferr!=nil {`
`86`	`87`	`returnerr`
`87`	`88`	`}`
`88`		`-workspaces,err:=getWorkspaces(ctx,client,user)`
`89`		`-iferr!=nil {`
`90`		`-returnerr`
	`89`	`+varworkspaces []coder.Workspace`
	`90`	`+if!all {`
	`91`	`+varerrerror`
	`92`	`+workspaces,err=getWorkspaces(ctx,client,user)`
	`93`	`+iferr!=nil {`
	`94`	`+returnerr`
	`95`	`+}`
	`96`	`+}else {`
	`97`	`+// If the user gave the all flag, then filtering by user doesn't make sense.`
	`98`	`+user=""`
`91`	`99`	`}`
`92`		`-ifprovider!="" {`
	`100`	`+ifprovider!=""\|\|all{`
`93`	`101`	`workspaces,err=getWorkspacesByProvider(ctx,client,provider,user)`
`94`	`102`	`iferr!=nil {`
`95`	`103`	`returnerr`
`@@ -124,6 +132,7 @@ func lsWorkspacesCommand() *cobra.Command {`
`124`	`132`	`},`
`125`	`133`	`}`
`126`	`134`
	`135`	`+cmd.Flags().BoolVar(&all,"all",false,"Get workspaces for all users")`
`127`	`136`	`cmd.Flags().StringVar(&user,"user",coder.Me,"Specify the user whose resources to target")`
`128`	`137`	`cmd.Flags().StringVarP(&outputFmt,"output","o",humanOutput,"human \| json")`
`129`	`138`	`cmd.Flags().StringVarP(&provider,"provider","p","","Filter workspaces by a particular workspace provider name.")`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,34 @@ func Test_workspaces_ls(t *testing.T) {`
`29`	`29`	`res.stdoutUnmarshals(t,&workspaces)`
`30`	`30`	`}`
`31`	`31`
	`32`	`+funcTest_workspaces_ls_all(t*testing.T) {`
	`33`	`+skipIfNoAuth(t)`
	`34`	`+for_,test:=range []struct {`
	`35`	`+namestring`
	`36`	`+command []string`
	`37`	`+assertfunc(rresult)`
	`38`	`+}{`
	`39`	`+{`
	`40`	`+name:"simple list",`
	`41`	`+command: []string{"workspaces","ls","--all"},`
	`42`	`+assert:func(rresult) {r.success(t) },`
	`43`	`+},`
	`44`	`+{`
	`45`	`+name:"list as json",`
	`46`	`+command: []string{"workspaces","ls","--all","--output","json"},`
	`47`	`+assert:func(rresult) {`
	`48`	`+varworkspaces []coder.Workspace`
	`49`	`+r.stdoutUnmarshals(t,&workspaces)`
	`50`	`+},`
	`51`	`+},`
	`52`	`+} {`
	`53`	`+test:=test`
	`54`	`+t.Run(test.name,func(t*testing.T) {`
	`55`	`+test.assert(execute(t,nil,test.command...))`
	`56`	`+})`
	`57`	`+}`
	`58`	`+}`
	`59`	`+`
`32`	`60`	`funcTest_workspaces_ls_by_provider(t*testing.T) {`
`33`	`61`	`skipIfNoAuth(t)`
`34`	`62`	`for_,test:=range []struct {`

Comments

(0)