cmd/limactl: split guessarg (no code change)

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

cmd/limactl/guessarg/guessarg.go

@@ -0,0 +1,64 @@
+package guessarg
+
+import (
+	"fmt"
+	"net/url"
+	"path"
+	"path/filepath"
+	"strings"
+
+	"github.com/containerd/containerd/identifiers"
+)
+
+func SeemsTemplateURL(arg string) (bool, *url.URL) {
+	u, err := url.Parse(arg)
+	if err != nil {
+		return false, u
+	}
+	return u.Scheme == "template", u
+}
+
+func SeemsHTTPURL(arg string) bool {
+	u, err := url.Parse(arg)
+	if err != nil {
+		return false
+	}
+	if u.Scheme != "http" && u.Scheme != "https" {
+		return false
+	}
+	return true
+}
+
+func SeemsFileURL(arg string) bool {
+	u, err := url.Parse(arg)
+	if err != nil {
+		return false
+	}
+	return u.Scheme == "file"
+}
+
+func SeemsYAMLPath(arg string) bool {
+	if strings.Contains(arg, "/") {
+		return true
+	}
+	lower := strings.ToLower(arg)
+	return strings.HasSuffix(lower, ".yml") || strings.HasSuffix(lower, ".yaml")
+}
+
+func InstNameFromURL(urlStr string) (string, error) {
+	u, err := url.Parse(urlStr)
+	if err != nil {
+		return "", err
+	}
+	return InstNameFromYAMLPath(path.Base(u.Path))
+}
+
+func InstNameFromYAMLPath(yamlPath string) (string, error) {
+	s := strings.ToLower(filepath.Base(yamlPath))
+	s = strings.TrimSuffix(strings.TrimSuffix(s, ".yml"), ".yaml")
+	s = strings.ReplaceAll(s, ".", "-")
+	if err := identifiers.Validate(s); err != nil {
+		return "", fmt.Errorf("filename %q is invalid: %w", yamlPath, err)
+	}
+	return s, nil
+}

cmd/limactl/start.go

@@ -4,14 +4,13 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"net/url"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/containerd/containerd/identifiers"
+	"github.com/lima-vm/lima/cmd/limactl/guessarg"
 	"github.com/lima-vm/lima/pkg/editutil"
 	"github.com/lima-vm/lima/pkg/ioutilx"
 	"github.com/lima-vm/lima/pkg/limayaml"
@@ -73,7 +72,7 @@ func loadOrCreateInstance(cmd *cobra.Command, args []string) (*store.Instance, e
 	}
 	const yBytesLimit = 4 * 1024 * 1024 // 4MiB
 
-	if ok, u := argSeemsTemplateURL(arg); ok {
+	if ok, u := guessarg.SeemsTemplateURL(arg); ok {
 		// No need to use SecureJoin here. https://github.com/lima-vm/lima/pull/805#discussion_r853411702
 		templateName := filepath.Join(u.Host, u.Path)
 		logrus.Debugf("interpreting argument %q as a template name %q", arg, templateName)
@@ -85,9 +84,9 @@ func loadOrCreateInstance(cmd *cobra.Command, args []string) (*store.Instance, e
 		if err != nil {
 			return nil, err
 		}
-	} else if argSeemsHTTPURL(arg) {
+	} else if guessarg.SeemsHTTPURL(arg) {
 		if st.instName == "" {
-			st.instName, err = instNameFromURL(arg)
+			st.instName, err = guessarg.InstNameFromURL(arg)
 			if err != nil {
 				return nil, err
 			}
@@ -102,9 +101,9 @@ func loadOrCreateInstance(cmd *cobra.Command, args []string) (*store.Instance, e
 		if err != nil {
 			return nil, err
 		}
-	} else if argSeemsFileURL(arg) {
+	} else if guessarg.SeemsFileURL(arg) {
 		if st.instName == "" {
-			st.instName, err = instNameFromURL(arg)
+			st.instName, err = guessarg.InstNameFromURL(arg)
 			if err != nil {
 				return nil, err
 			}
@@ -119,9 +118,9 @@ func loadOrCreateInstance(cmd *cobra.Command, args []string) (*store.Instance, e
 		if err != nil {
 			return nil, err
 		}
-	} else if argSeemsYAMLPath(arg) {
+	} else if guessarg.SeemsYAMLPath(arg) {
 		if st.instName == "" {
-			st.instName, err = instNameFromYAMLPath(arg)
+			st.instName, err = guessarg.InstNameFromYAMLPath(arg)
 			if err != nil {
 				return nil, err
 			}
@@ -300,7 +299,7 @@ func chooseNextCreatorState(st *creatorState) (*creatorState, error) {
 				return st, fmt.Errorf("invalid answer %d for %d entries", ansEx, len(examples))
 			}
 			yamlPath := examples[ansEx].Location
-			st.instName, err = instNameFromYAMLPath(yamlPath)
+			st.instName, err = guessarg.InstNameFromYAMLPath(yamlPath)
 			if err != nil {
 				return nil, err
 			}
@@ -357,59 +356,6 @@ func startAction(cmd *cobra.Command, args []string) error {
 	return start.Start(ctx, inst)
 }
 
-func argSeemsTemplateURL(arg string) (bool, *url.URL) {
-	u, err := url.Parse(arg)
-	if err != nil {
-		return false, u
-	}
-	return u.Scheme == "template", u
-}
-
-func argSeemsHTTPURL(arg string) bool {
-	u, err := url.Parse(arg)
-	if err != nil {
-		return false
-	}
-	if u.Scheme != "http" && u.Scheme != "https" {
-		return false
-	}
-	return true
-}
-
-func argSeemsFileURL(arg string) bool {
-	u, err := url.Parse(arg)
-	if err != nil {
-		return false
-	}
-	return u.Scheme == "file"
-}
-
-func argSeemsYAMLPath(arg string) bool {
-	if strings.Contains(arg, "/") {
-		return true
-	}
-	lower := strings.ToLower(arg)
-	return strings.HasSuffix(lower, ".yml") || strings.HasSuffix(lower, ".yaml")
-}
-
-func instNameFromURL(urlStr string) (string, error) {
-	u, err := url.Parse(urlStr)
-	if err != nil {
-		return "", err
-	}
-	return instNameFromYAMLPath(path.Base(u.Path))
-}
-
-func instNameFromYAMLPath(yamlPath string) (string, error) {
-	s := strings.ToLower(filepath.Base(yamlPath))
-	s = strings.TrimSuffix(strings.TrimSuffix(s, ".yml"), ".yaml")
-	s = strings.ReplaceAll(s, ".", "-")
-	if err := identifiers.Validate(s); err != nil {
-		return "", fmt.Errorf("filename %q is invalid: %w", yamlPath, err)
-	}
-	return s, nil
-}
-
 func startBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	comp, _ := bashCompleteInstanceNames(cmd)
 	if templates, err := templatestore.Templates(); err == nil {

cmd/limactl/validate.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 
+	"github.com/lima-vm/lima/cmd/limactl/guessarg"
 	"github.com/lima-vm/lima/pkg/store"
 	"github.com/spf13/cobra"
 
@@ -25,7 +26,7 @@ func validateAction(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return fmt.Errorf("failed to load YAML file %q: %w", f, err)
 		}
-		if _, err := instNameFromYAMLPath(f); err != nil {
+		if _, err := guessarg.InstNameFromYAMLPath(f); err != nil {
 			return err
 		}
 		logrus.Infof("%q: OK", f)