combine lookupUserImgs with findImg so we only return 1 image and an error

Faris Huskovic · Faris Huskovic · commit 9dbb3cb0ecb5 · 2020-10-27T09:59:51.000-05:00
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -84,33 +84,50 @@ 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) {
-	userImgs, err := lookupUserImgs(ctx, client, email, imgName, orgName)
+	switch {
+	case email == "":
+		return nil, xerrors.New("user email unset")
+	case imgName == "":
+		return nil, xerrors.New("image name unset")
+	}
+
+	imgs, err := getImgs(ctx, client, email, orgName)
 	if err != nil {
 		return nil, err
 	}
 
-	numImgs := len(userImgs)
+	var possibleMatches []coder.Image
 
-	if numImgs == 0 {
-		return nil, xerrors.New("image not found - did you forget to import this image?")
+	// The user may provide an image thats not an exact match
+	// to one of their imported images but they may be close.
+	// We can assist the user by collecting images that contain
+	// 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 {
+			return &img, nil
+		}
+		if strings.Contains(img.Repository, imgName) {
+			possibleMatches = append(possibleMatches, img)
+		}
 	}
 
-	if numImgs > 1 {
-		lines := []string{clog.Tipf("Did you mean?")}
-
-		for _, img := range userImgs {
-			lines = append(lines, img.Repository)
-		}
+	if len(possibleMatches) == 0 {
+		return nil, xerrors.New("image not found")
+	}
 
+	lines := []string{clog.Tipf("Did you mean?")}
 
-		clog.Fatal(
-			fmt.Sprintf("Found %d possible matches for %q.", numImgs, imgName),
-			lines...,
-		)
+	for _, img := range possibleMatches {
+		lines = append(lines, img.Repository)
 	}
-	return &userImgs[0], nil
+	return nil, clog.Fatal(
+		fmt.Sprintf("Found %d possible matches for %q.", len(possibleMatches), imgName),
+		lines...,
+	)
 }
 
+
 func getImgs(ctx context.Context, client *coder.Client, email, orgName string) ([]coder.Image, error) {
 	u, err := client.UserByEmail(ctx, email)
 	if err != nil {
@@ -136,40 +153,6 @@ func getImgs(ctx context.Context, client *coder.Client, email, orgName string) (
 	return nil, xerrors.Errorf("org name %q not found", orgName)
 }
 
-// returns all images that contain imgName as a substring and have been imported by the user.
-func lookupUserImgs(ctx context.Context, client *coder.Client, email, imgName, orgName string) ([]coder.Image, error) {
-	switch {
-	case email == "":
-		return nil, xerrors.New("user email unset")
-	case imgName == "":
-		return nil, xerrors.New("image name unset")
-	}
-
-	imgs, err := getImgs(ctx, client, email, orgName)
-	if err != nil {
-		return nil, err
-	}
-
-	var userImgs []coder.Image
-
-	// The user may provide an image thats not an exact match
-	// to one of their imported images but they may be close.
-	// We can assist the user by collecting images that contain
-	// the user provided image flag value as a substring.
-	for _, img := range imgs {
-		if strings.Contains(img.Repository, imgName) {
-			userImgs = append(userImgs, img)
-		}
-		// If it's an exact match we can overwrite the slice and exit the loop
-		// since we won't need the fuzzy matched images anymore.
-		if img.Repository == imgName {
-			userImgs = []coder.Image{img}
-			break
-		}
-	}
-	return userImgs, nil
-}
-
 func isMultiOrgMember(email string) (*bool, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
