collect find img params in struct

Faris Huskovic · Faris Huskovic · commit e6daf5c84137 · 2020-10-27T13:34:39.000-05:00
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -83,19 +83,26 @@ func findEnv(ctx context.Context, client *coder.Client, envName, userEmail strin
 	)
 }
 
-func findImg(ctx context.Context, client *coder.Client, email, imgName, orgName string) (*coder.Image, error) {
+type findImgConf struct {
+	client  *coder.Client
+	email   string
+	imgName string
+	orgName string
+}
+
+func findImg(ctx context.Context, conf findImgConf) (*coder.Image, error) {
 	switch {
-	case email == "":
+	case conf.email == "":
 		return nil, xerrors.New("user email unset")
-	case imgName == "":
+	case conf.imgName == "":
 		return nil, xerrors.New("image name unset")
 	}
 
 	imgs, err := getImgs(ctx,
 		getImgsConf{
-			client:  client,
-			email:   email,
-			orgName: orgName,
+			client:  conf.client,
+			email:   conf.email,
+			orgName: conf.orgName,
 		},
 	)
 	if err != nil {
@@ -110,10 +117,10 @@ func findImg(ctx context.Context, client *coder.Client, email, imgName, orgName
 	// the user provided image flag value as a substring.
 	for _, img := range imgs {
 		// If it's an exact match we can just return and exit.
-		if img.Repository == imgName {
+		if img.Repository == conf.imgName {
 			return &img, nil
 		}
-		if strings.Contains(img.Repository, imgName) {
+		if strings.Contains(img.Repository, conf.imgName) {
 			possibleMatches = append(possibleMatches, img)
 		}
 	}
@@ -128,7 +135,7 @@ func findImg(ctx context.Context, client *coder.Client, email, imgName, orgName
 		lines = append(lines, img.Repository)
 	}
 	return nil, clog.Fatal(
-		fmt.Sprintf("Found %d possible matches for %q.", len(possibleMatches), imgName),
+		fmt.Sprintf("Found %d possible matches for %q.", len(possibleMatches), conf.imgName),
 		lines...,
 	)
 }
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -181,7 +181,14 @@ coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955
 				return err
 			}
 
-			importedImg, err := findImg(cmd.Context(), client, *user, img, org)
+			importedImg, err := findImg(cmd.Context(),
+				findImgConf{
+					client:  client,
+					email:   *user,
+					imgName: img,
+					orgName: org,
+				},
+			)
 			if err != nil {
 				return err
 			}
@@ -422,10 +429,12 @@ func buildUpdateReq(ctx context.Context, conf updateConf) (*coder.UpdateEnvironm
 	// If this is not empty it means the user is requesting to change the environment image.
 	if conf.image != "" {
 		importedImg, err := findImg(ctx,
-			conf.client,
-			*conf.user,
-			conf.image,
-			conf.orgName,
+			findImgConf{
+				client:  conf.client,
+				email:   *conf.user,
+				imgName: conf.image,
+				orgName: conf.orgName,
+			},
 		)
 		if err != nil {
 			return nil, err

Original file line number	Diff line number	Diff line change
`@@ -83,19 +83,26 @@ func findEnv(ctx context.Context, client *coder.Client, envName, userEmail strin`
`83`	`83`	`)`
`84`	`84`	`}`
`85`	`85`
`86`		`-func findImg(ctx context.Context, client coder.Client, email, imgName, orgName string) (coder.Image, error) {`
	`86`	`+type findImgConf struct {`
	`87`	`+ client *coder.Client`
	`88`	`+ email string`
	`89`	`+ imgName string`
	`90`	`+ orgName string`
	`91`	`+}`
	`92`	`+`
	`93`	`+func findImg(ctx context.Context, conf findImgConf) (*coder.Image, error) {`
`87`	`94`	`switch {`
`88`		`- case email == "":`
	`95`	`+ case conf.email == "":`
`89`	`96`	`return nil, xerrors.New("user email unset")`
`90`		`- case imgName == "":`
	`97`	`+ case conf.imgName == "":`
`91`	`98`	`return nil, xerrors.New("image name unset")`
`92`	`99`	`}`
`93`	`100`
`94`	`101`	`imgs, err := getImgs(ctx,`
`95`	`102`	`getImgsConf{`
`96`		`- client: client,`
`97`		`- email: email,`
`98`		`- orgName: orgName,`
	`103`	`+ client: conf.client,`
	`104`	`+ email: conf.email,`
	`105`	`+ orgName: conf.orgName,`
`99`	`106`	`},`
`100`	`107`	`)`
`101`	`108`	`if err != nil {`
`@@ -110,10 +117,10 @@ func findImg(ctx context.Context, client *coder.Client, email, imgName, orgName`
`110`	`117`	`// the user provided image flag value as a substring.`
`111`	`118`	`for _, img := range imgs {`
`112`	`119`	`// If it's an exact match we can just return and exit.`
`113`		`- if img.Repository == imgName {`
	`120`	`+ if img.Repository == conf.imgName {`
`114`	`121`	`return &img, nil`
`115`	`122`	`}`
`116`		`- if strings.Contains(img.Repository, imgName) {`
	`123`	`+ if strings.Contains(img.Repository, conf.imgName) {`
`117`	`124`	`possibleMatches = append(possibleMatches, img)`
`118`	`125`	`}`
`119`	`126`	`}`
`@@ -128,7 +135,7 @@ func findImg(ctx context.Context, client *coder.Client, email, imgName, orgName`
`128`	`135`	`lines = append(lines, img.Repository)`
`129`	`136`	`}`
`130`	`137`	`return nil, clog.Fatal(`
`131`		`- fmt.Sprintf("Found %d possible matches for %q.", len(possibleMatches), imgName),`
	`138`	`+ fmt.Sprintf("Found %d possible matches for %q.", len(possibleMatches), conf.imgName),`
`132`	`139`	`lines...,`
`133`	`140`	`)`
`134`	`141`	`}`