Merge pull request #1066 from AkihiroSuda/dev

refactor (no substantial code change)

Author: AkihiroSuda

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Run golangci-lint
       uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.48.0
+        version: v1.49.0
         args: --verbose
     - name: Run yamllint
       run: yamllint .

.golangci.yml

@@ -22,7 +22,6 @@ run:
 linters:
   disable-all: true
   enable:
-  - deadcode
   - depguard
   - gofmt
   - goimports
@@ -31,9 +30,7 @@ linters:
   - misspell
   - nakedret
   # - prealloc
-  - structcheck
   - typecheck
-  - varcheck
   # - asciicheck
   # - bodyclose
   # - dogsled
@@ -76,9 +73,10 @@ linters:
   # - stylecheck
   # - testpackage
   # - tparallel
+  - revive
   # - unconvert
   # - unparam
-  # - unused
+  - unused
   # - whitespace
   # - wrapcheck
   # - wsl

cmd/lima-guestagent/install_systemd_linux.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lima-vm/lima/pkg/templateutil"
+	"github.com/lima-vm/lima/pkg/textutil"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -68,5 +68,5 @@ func generateSystemdUnit() ([]byte, error) {
 	m := map[string]string{
 		"Binary": selfExeAbs,
 	}
-	return templateutil.Execute(systemdUnitTemplate, m)
+	return textutil.ExecuteTemplate(systemdUnitTemplate, m)
 }

cmd/limactl/edit.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/lima-vm/lima/pkg/editutil"
 	"github.com/lima-vm/lima/pkg/limayaml"
 	networks "github.com/lima-vm/lima/pkg/networks/reconcile"
 	"github.com/lima-vm/lima/pkg/start"
@@ -55,8 +56,8 @@ func editAction(cmd *cobra.Command, args []string) error {
 	hdr := fmt.Sprintf("# Please edit the following configuration for Lima instance %q\n", instName)
 	hdr += "# and an empty file will abort the edit.\n"
 	hdr += "\n"
-	hdr += generateEditorWarningHeader()
-	yBytes, err := openEditor(instName, yContent, hdr)
+	hdr += editutil.GenerateEditorWarningHeader()
+	yBytes, err := editutil.OpenEditor(instName, yContent, hdr)
 	if err != nil {
 		return err
 	}

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/info.go

@@ -4,9 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/lima-vm/lima/pkg/limayaml"
-	"github.com/lima-vm/lima/pkg/store/dirnames"
-	"github.com/lima-vm/lima/pkg/version"
+	"github.com/lima-vm/lima/pkg/infoutil"
 	"github.com/spf13/cobra"
 )
 
@@ -20,37 +18,8 @@ func newInfoCommand() *cobra.Command {
 	return infoCommand
 }
 
-type TemplateYAML struct {
-	Name     string `json:"name"`
-	Location string `json:"location"`
-}
-
-type Info struct {
-	Version         string             `json:"version"`
-	Templates       []TemplateYAML     `json:"templates"`
-	DefaultTemplate *limayaml.LimaYAML `json:"defaultTemplate"`
-	LimaHome        string             `json:"limaHome"`
-	// TODO: add diagnostic info of QEMU
-}
-
 func infoAction(cmd *cobra.Command, args []string) error {
-	b, err := readDefaultTemplate()
-	if err != nil {
-		return err
-	}
-	y, err := limayaml.Load(b, "")
-	if err != nil {
-		return err
-	}
-	info := &Info{
-		Version:         version.Version,
-		DefaultTemplate: y,
-	}
-	info.Templates, err = listTemplateYAMLs()
-	if err != nil {
-		return err
-	}
-	info.LimaHome, err = dirnames.LimaDir()
+	info, err := infoutil.GetInfo()
 	if err != nil {
 		return err
 	}