Commit0ee26d4

Faris Huskovic

committed

isMultiOrgMember should accept client not create

1 parent9d1ed0d commit0ee26d4Copy full SHA for 0ee26d4

File tree

-13

lines changed

-13

lines changed

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,12 +178,7 @@ func getImgs(ctx context.Context, conf getImgsConf) ([]coder.Image, error) {`
`178`	`178`	`returnnil,xerrors.Errorf("org name %q not found",conf.orgName)`
`179`	`179`	`}`
`180`	`180`
`181`		`-funcisMultiOrgMember(ctx context.Context,emailstring) (bool,error) {`
`182`		`-client,err:=newClient()`
`183`		`-iferr!=nil {`
`184`		`-returnfalse,err`
`185`		`-}`
`186`		`-`
	`181`	`+funcisMultiOrgMember(ctx context.Context,client*coder.Client,emailstring) (bool,error) {`
`187`	`182`	`u,err:=client.UserByEmail(ctx,email)`
`188`	`183`	`iferr!=nil {`
`189`	`184`	`returnfalse,xerrors.New("email not found")`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -167,20 +167,20 @@ coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955`
`167`	`167`	`returnxerrors.New("image unset")`
`168`	`168`	`}`
`169`	`169`
`170`		`-multiOrgMember,err:=isMultiOrgMember(cmd.Context(),*user)`
	`170`	`+client,err:=newClient()`
`171`	`171`	`iferr!=nil {`
`172`	`172`	`returnerr`
`173`	`173`	`}`
`174`	`174`
`175`		`-ifmultiOrgMember&&org=="" {`
`176`		`-returnxerrors.New("org is required for multi-org members")`
`177`		`-}`
`178`		`-`
`179`		`-client,err:=newClient()`
	`175`	`+multiOrgMember,err:=isMultiOrgMember(cmd.Context(),client,*user)`
`180`	`176`	`iferr!=nil {`
`181`	`177`	`returnerr`
`182`	`178`	`}`
`183`	`179`
	`180`	`+ifmultiOrgMember&&org=="" {`
	`181`	`+returnxerrors.New("org is required for multi-org members")`
	`182`	`+}`
	`183`	`+`
`184`	`184`	`importedImg,err:=findImg(cmd.Context(),`
`185`	`185`	`findImgConf{`
`186`	`186`	`client:client,`
@@ -284,7 +284,7 @@ coder envs edit back-end-env --disk 20`,
`284`	`284`	`returnerr`
`285`	`285`	`}`
`286`	`286`
`287`		`-multiOrgMember,err:=isMultiOrgMember(cmd.Context(),*user)`
	`287`	`+multiOrgMember,err:=isMultiOrgMember(cmd.Context(),client,*user)`
`288`	`288`	`iferr!=nil {`
`289`	`289`	`returnerr`
`290`	`290`	`}`

Comments

(0)