change isMultiOrg so bool is not a pointer

Faris Huskovic · Faris Huskovic · commit dc19fa29c62e · 2020-10-27T14:05:06.000-05:00
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -178,22 +178,20 @@ func getImgs(ctx context.Context, conf getImgsConf) ([]coder.Image, error) {
 	return nil, xerrors.Errorf("org name %q not found", conf.orgName)
 }
 
-func isMultiOrgMember(ctx context.Context, email string) (*bool, error) {
+func isMultiOrgMember(ctx context.Context, email string) (bool, error) {
 	client, err := newClient()
 	if err != nil {
-		return nil, err
+		return false, err
 	}
 
 	u, err := client.UserByEmail(ctx, email)
 	if err != nil {
-		return nil, xerrors.New("email not found")
+		return false, xerrors.New("email not found")
 	}
 
 	orgs, err := client.Organizations(ctx)
 	if err != nil {
-		return nil, err
+		return false, err
 	}
-
-	isMulti := len(lookupUserOrgs(u, orgs)) > 1
-	return &isMulti, nil
+	return len(lookupUserOrgs(u, orgs)) > 1, nil
 }
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -172,7 +172,7 @@ coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955
 				return err
 			}
 
-			if *multiOrgMember && org == "" {
+			if multiOrgMember && org == "" {
 				return xerrors.New("org is required for multi-org members")
 			}
 
@@ -290,7 +290,7 @@ coder envs edit back-end-env --disk 20`,
 			}
 
 			// if the user belongs to multiple organizations we need them to specify which one.
-			if *multiOrgMember && org == "" {
+			if multiOrgMember && org == "" {
 				return xerrors.New("org is required for multi-org members")
 			}
 

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`	`return nil, xerrors.Errorf("org name %q not found", conf.orgName)`
`179`	`179`	`}`
`180`	`180`
`181`		`-func isMultiOrgMember(ctx context.Context, email string) (*bool, error) {`
	`181`	`+func isMultiOrgMember(ctx context.Context, email string) (bool, error) {`
`182`	`182`	`client, err := newClient()`
`183`	`183`	`if err != nil {`
`184`		`- return nil, err`
	`184`	`+ return false, err`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`u, err := client.UserByEmail(ctx, email)`
`188`	`188`	`if err != nil {`
`189`		`- return nil, xerrors.New("email not found")`
	`189`	`+ return false, xerrors.New("email not found")`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`orgs, err := client.Organizations(ctx)`
`193`	`193`	`if err != nil {`
`194`		`- return nil, err`
	`194`	`+ return false, err`
`195`	`195`	`}`
`196`		`-`
`197`		`- isMulti := len(lookupUserOrgs(u, orgs)) > 1`
`198`		`- return &isMulti, nil`
	`196`	`+ return len(lookupUserOrgs(u, orgs)) > 1, nil`
`199`	`197`	`}`
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`	`return err`
`173`	`173`	`}`
`174`	`174`
`175`		`- if *multiOrgMember && org == "" {`
	`175`	`+ if multiOrgMember && org == "" {`
`176`	`176`	`return xerrors.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`	`+ if multiOrgMember && org == "" {`
`294`	`294`	`return xerrors.New("org is required for multi-org members")`
`295`	`295`	`}`
`296`	`296`