Commit56b570a

committed

Fixes

1 parent36ececb commit56b570aCopy full SHA for 56b570a

File tree

+18

-12

lines changed

+18

-12

lines changed

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ func lookupUserOrgs(user *coder.User, orgs []coder.Organization) []coder.Organiz`
`32`	`32`	`returnuserOrgs`
`33`	`33`	`}`
`34`	`34`
	`35`	`+// getAllWorkspaces gets all workspaces for all users, on all providers.`
	`36`	`+funcgetAllWorkspaces(ctx context.Context,client coder.Client) ([]coder.Workspace,error) {`
	`37`	`+returnclient.Workspaces(ctx)`
	`38`	`+}`
	`39`	`+`
`35`	`40`	`// getWorkspaces returns all workspaces for the user.`
`36`	`41`	`funcgetWorkspaces(ctx context.Context,client coder.Client,emailstring) ([]coder.Workspace,error) {`
`37`	`42`	`user,err:=client.UserByEmail(ctx,email)`
`@@ -215,11 +220,9 @@ func getWorkspacesByProvider(ctx context.Context, client coder.Client, wpName, u`
`215`	`220`	`returnnil,err`
`216`	`221`	`}`
`217`	`222`
`218`		`-ifuserEmail!="" {`
`219`		`-workspaces,err=filterWorkspacesByUser(ctx,client,userEmail,workspaces)`
`220`		`-iferr!=nil {`
`221`		`-returnnil,err`
`222`		`-}`
	`223`	`+workspaces,err=filterWorkspacesByUser(ctx,client,userEmail,workspaces)`
	`224`	`+iferr!=nil {`
	`225`	`+returnnil,err`
`223`	`226`	`}`
`224`	`227`
`225`	`228`	`returnworkspaces,nil`

Lines changed: 10 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,21 +87,24 @@ func lsWorkspacesCommand() *cobra.Command {`
`87`	`87`	`returnerr`
`88`	`88`	`}`
`89`	`89`	`varworkspaces []coder.Workspace`
`90`		`-if!all {`
	`90`	`+ifall {`
`91`	`91`	`varerrerror`
`92`		`-workspaces,err=getWorkspaces(ctx,client,user)`
	`92`	`+workspaces,err=getAllWorkspaces(ctx,client)`
`93`	`93`	`iferr!=nil {`
`94`	`94`	`returnerr`
`95`	`95`	`}`
`96`		`-}else {`
`97`		`-// If the user gave the all flag, then filtering by user doesn't make sense.`
`98`		`-user=""`
`99`		`-}`
`100`		`-ifprovider!=""\|\|all {`
	`96`	`+}elseifprovider!="" {`
	`97`	`+varerrerror`
`101`	`98`	`workspaces,err=getWorkspacesByProvider(ctx,client,provider,user)`
`102`	`99`	`iferr!=nil {`
`103`	`100`	`returnerr`
`104`	`101`	`}`
	`102`	`+}else {`
	`103`	`+varerrerror`
	`104`	`+workspaces,err=getWorkspaces(ctx,client,user)`
	`105`	`+iferr!=nil {`
	`106`	`+returnerr`
	`107`	`+}`
`105`	`108`	`}`
`106`	`109`	`iflen(workspaces)<1 {`
`107`	`110`	`clog.LogInfo("no workspaces found")`

Comments

(0)