Commitdc19fa2

Faris Huskovic

committed

change isMultiOrg so bool is not a pointer

1 parenta3dfa5d commitdc19fa2Copy full SHA for dc19fa2

File tree

-9

lines changed

-9

lines changed

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,22 +178,20 @@ 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) {`
	`181`	`+funcisMultiOrgMember(ctx context.Context,emailstring) (bool,error) {`
`182`	`182`	`client,err:=newClient()`
`183`	`183`	`iferr!=nil {`
`184`		`-returnnil,err`
	`184`	`+returnfalse,err`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`u,err:=client.UserByEmail(ctx,email)`
`188`	`188`	`iferr!=nil {`
`189`		`-returnnil,xerrors.New("email not found")`
	`189`	`+returnfalse,xerrors.New("email not found")`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`orgs,err:=client.Organizations(ctx)`
`193`	`193`	`iferr!=nil {`
`194`		`-returnnil,err`
	`194`	`+returnfalse,err`
`195`	`195`	`}`
`196`		`-`
`197`		`-isMulti:=len(lookupUserOrgs(u,orgs))>1`
`198`		`-return&isMulti,nil`
	`196`	`+returnlen(lookupUserOrgs(u,orgs))>1,nil`
`199`	`197`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955`
`172`	`172`	`returnerr`
`173`	`173`	`}`
`174`	`174`
`175`		`-if*multiOrgMember&&org=="" {`
	`175`	`+ifmultiOrgMember&&org=="" {`
`176`	`176`	`returnxerrors.New("org is required for multi-org members")`
`177`	`177`	`}`
`178`	`178`
@@ -290,7 +290,7 @@ coder envs edit back-end-env --disk 20`,
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`// if the user belongs to multiple organizations we need them to specify which one.`
`293`		`-if*multiOrgMember&&org=="" {`
	`293`	`+ifmultiOrgMember&&org=="" {`
`294`	`294`	`returnxerrors.New("org is required for multi-org members")`
`295`	`295`	`}`
`296`	`296`

Comments

(0)