Merge branch 'lima-vm:master' into master

Author: Konikz

.github/workflows/test.yml

@@ -39,7 +39,7 @@ jobs:
     - name: Verify generated files
       run: make install-tools generate check-generated
     - name: Run golangci-lint
-      uses: golangci/golangci-lint-action@dec74fa03096ff515422f71d18d41307cacde373  # v7.0.0
+      uses: golangci/golangci-lint-action@a5307c8f68bcd21ff73283f8629eb09caa60d7a7  # v7.0.0
       with:
         version: v2.0.1
         args: --verbose
@@ -50,7 +50,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y shellcheck
     - name: Run file and directory name linter
-      uses: ls-lint/action@1887e6c0e7f2dfa81a2d67591f0eb7782720026f  # v2.2.3
+      uses: ls-lint/action@acc185de566968dd9b3ffc1b79dfc86e22306442  # v2.3.0
     - name: Run shellcheck
       run: find . -name '*.sh' | xargs shellcheck
     - name: Install shfmt

.golangci.yml

@@ -17,6 +17,7 @@ linters:
   - godot
   - govet
   - ineffassign
+  - intrange
   - misspell
   - nakedret
   - noctx

cmd/limactl/list.go

@@ -22,10 +22,10 @@ func fieldNames() []string {
 	names := []string{}
 	var data store.FormatData
 	t := reflect.TypeOf(data)
-	for i := 0; i < t.NumField(); i++ {
+	for i := range t.NumField() {
 		f := t.Field(i)
 		if f.Anonymous {
-			for j := 0; j < f.Type.NumField(); j++ {
+			for j := range f.Type.NumField() {
 				names = append(names, f.Type.Field(j).Name)
 			}
 		} else {

cmd/limactl/main.go

@@ -78,6 +78,7 @@ func newApp() *cobra.Command {
 	rootCmd.PersistentFlags().Bool("debug", false, "debug mode")
 	// TODO: "survey" does not support using cygwin terminal on windows yet
 	rootCmd.PersistentFlags().Bool("tty", isatty.IsTerminal(os.Stdout.Fd()), "Enable TUI interactions such as opening an editor. Defaults to true when stdout is a terminal. Set to false for automation.")
+	rootCmd.PersistentFlags().BoolP("yes", "y", false, "Alias of --tty=false")
 	rootCmd.PersistentPreRunE = func(cmd *cobra.Command, _ []string) error {
 		l, _ := cmd.Flags().GetString("log-level")
 		if l != "" {
@@ -139,6 +140,22 @@ func newApp() *cobra.Command {
 		if nfs {
 			return errors.New("must not run on NFS dir")
 		}
+
+		if cmd.Flags().Changed("yes") && cmd.Flags().Changed("tty") {
+			return errors.New("cannot use both --tty and --yes flags at the same time")
+		}
+
+		if cmd.Flags().Changed("yes") {
+			// Sets the value of the yesValue flag by using the yes flag.
+			yesValue, _ := cmd.Flags().GetBool("yes")
+			if yesValue {
+				// Sets to the default value false
+				err := cmd.Flags().Set("tty", "false")
+				if err != nil {
+					return err
+				}
+			}
+		}
 		return nil
 	}
 	rootCmd.AddGroup(&cobra.Group{ID: "basic", Title: "Basic Commands:"})

cmd/limactl/prune.go

@@ -4,6 +4,7 @@
 package main
 
 import (
+	"maps"
 	"os"
 
 	"github.com/lima-vm/lima/pkg/downloader"
@@ -73,9 +74,7 @@ func knownLocations() (map[string]limayaml.File, error) {
 		if err != nil {
 			return nil, err
 		}
-		for k, v := range locationsFromLimaYAML(instance.Config) {
-			locations[k] = v
-		}
+		maps.Copy(locations, locationsFromLimaYAML(instance.Config))
 	}
 
 	// Collect locations from templates
@@ -92,9 +91,7 @@ func knownLocations() (map[string]limayaml.File, error) {
 		if err != nil {
 			return nil, err
 		}
-		for k, v := range locationsFromLimaYAML(y) {
-			locations[k] = v
-		}
+		maps.Copy(locations, locationsFromLimaYAML(y))
 	}
 	return locations, nil
 }

pkg/cidata/cidata.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"net"
 	"net/url"
 	"os"
@@ -50,9 +51,7 @@ func setupEnv(instConfigEnv map[string]string, propagateProxyEnv bool, slirpGate
 		return env, err
 	}
 	// env.* settings from lima.yaml override system settings without giving a warning
-	for name, value := range instConfigEnv {
-		env[name] = value
-	}
+	maps.Copy(env, instConfigEnv)
 	// Current process environment setting override both system settings and env.*
 	lowerVars := []string{"ftp_proxy", "http_proxy", "https_proxy", "no_proxy"}
 	upperVars := make([]string, len(lowerVars))

pkg/downloader/downloader_test.go

@@ -91,7 +91,7 @@ func TestDownloadRemote(t *testing.T) {
 		t.Run("parallel", func(t *testing.T) {
 			cacheDir := filepath.Join(t.TempDir(), "cache")
 			results := make(chan downloadResult, parallelDownloads)
-			for i := 0; i < parallelDownloads; i++ {
+			for range parallelDownloads {
 				go func() {
 					// Parallel download is supported only for different instances with unique localPath.
 					localPath := filepath.Join(t.TempDir(), t.Name())
@@ -131,7 +131,7 @@ func TestDownloadRemote(t *testing.T) {
 		t.Run("parallel", func(t *testing.T) {
 			cacheDir := filepath.Join(t.TempDir(), "cache")
 			results := make(chan downloadResult, parallelDownloads)
-			for i := 0; i < parallelDownloads; i++ {
+			for range parallelDownloads {
 				go func() {
 					r, err := Download(context.Background(), "", dummyRemoteFileURL,
 						WithExpectedDigest(dummyRemoteFileDigest), WithCacheDir(cacheDir))
@@ -177,7 +177,7 @@ func TestDownloadRemote(t *testing.T) {
 
 func countResults(t *testing.T, results chan downloadResult) (downloaded, cached int) {
 	t.Helper()
-	for i := 0; i < parallelDownloads; i++ {
+	for range parallelDownloads {
 		result := <-results
 		if result.err != nil {
 			t.Errorf("Download failed: %s", result.err)

pkg/guestagent/procnettcp/procnettcp.go

@@ -65,7 +65,7 @@ func ParseWithEndian(r io.Reader, kind Kind, isBE bool) ([]Entry, error) {
 		fields := strings.Fields(line)
 		switch i {
 		case 0:
-			for j := 0; j < len(fields); j++ {
+			for j := range fields {
 				fieldNames[fields[j]] = j
 			}
 			if _, ok := fieldNames["local_address"]; !ok {
@@ -135,18 +135,18 @@ func ParseAddressWithEndian(s string, isBE bool) (net.IP, uint16, error) {
 	}
 
 	ipBytes := make([]byte, len(split[0])/2) // 4 bytes (8 chars) or 16 bytes (32 chars)
-	for i := 0; i < len(split[0])/8; i++ {
+	for i := range len(split[0]) / 8 {
 		quartet := split[0][8*i : 8*(i+1)]
 		quartetB, err := hex.DecodeString(quartet) // surprisingly little endian, per 4 bytes, on little endian hosts
 		if err != nil {
 			return nil, 0, fmt.Errorf("unparsable address %q: unparsable quartet %q: %w", s, quartet, err)
 		}
 		if isBE {
-			for j := 0; j < len(quartetB); j++ {
+			for j := range quartetB {
 				ipBytes[4*i+j] = quartetB[j]
 			}
 		} else {
-			for j := 0; j < len(quartetB); j++ {
+			for j := range quartetB {
 				ipBytes[4*i+len(quartetB)-1-j] = quartetB[j]
 			}
 		}

pkg/hostagent/requirements.go

@@ -23,7 +23,7 @@ func (a *HostAgent) waitForRequirements(label string, requirements []requirement
 
 	for i, req := range requirements {
 	retryLoop:
-		for j := 0; j < retries; j++ {
+		for j := range retries {
 			logrus.Infof("Waiting for the %s requirement %d of %d: %q", label, i+1, len(requirements), req.description)
 			err := a.waitForRequirement(req)
 			if err == nil {

pkg/limatmpl/embed_test.go

@@ -437,7 +437,7 @@ func RunEmbedTest(t *testing.T, tc embedTestCase) {
 		assert.NilError(t, err, tc.description)
 	}
 	tmpl := &limatmpl.Template{
-		Bytes:   []byte(fmt.Sprintf("base: base0.yaml\n%s", tc.template)),
+		Bytes:   fmt.Appendf(nil, "base: base0.yaml\n%s", tc.template),
 		Locator: "tmpl.yaml",
 	}
 	// Don't include `base` property if base0 is a script

pkg/limatmpl/locator.go

@@ -191,7 +191,7 @@ images:
 - location: %q
   arch: %q
 `
-	tmpl.Bytes = []byte(fmt.Sprintf(template, imageArch, locator, imageArch))
+	tmpl.Bytes = fmt.Appendf(nil, template, imageArch, locator, imageArch)
 	tmpl.Name = InstNameFromImageURL(locator, imageArch)
 	return true
 }

pkg/limayaml/defaults.go

@@ -9,6 +9,7 @@ import (
 	_ "embed"
 	"errors"
 	"fmt"
+	"maps"
 	"net"
 	"os"
 	"os/user"
@@ -470,15 +471,9 @@ func FillDefault(y, d, o *LimaYAML, filePath string, warn bool) {
 
 	hosts := make(map[string]string)
 	// Values can be either names or IP addresses. Name values are canonicalized in the hostResolver.
-	for k, v := range d.HostResolver.Hosts {
-		hosts[k] = v
-	}
-	for k, v := range y.HostResolver.Hosts {
-		hosts[k] = v
-	}
-	for k, v := range o.HostResolver.Hosts {
-		hosts[k] = v
-	}
+	maps.Copy(hosts, d.HostResolver.Hosts)
+	maps.Copy(hosts, y.HostResolver.Hosts)
+	maps.Copy(hosts, o.HostResolver.Hosts)
 	y.HostResolver.Hosts = hosts
 
 	y.Provision = slices.Concat(o.Provision, y.Provision, d.Provision)
@@ -852,27 +847,15 @@ func FillDefault(y, d, o *LimaYAML, filePath string, warn bool) {
 	}
 
 	env := make(map[string]string)
-	for k, v := range d.Env {
-		env[k] = v
-	}
-	for k, v := range y.Env {
-		env[k] = v
-	}
-	for k, v := range o.Env {
-		env[k] = v
-	}
+	maps.Copy(env, d.Env)
+	maps.Copy(env, y.Env)
+	maps.Copy(env, o.Env)
 	y.Env = env
 
 	param := make(map[string]string)
-	for k, v := range d.Param {
-		param[k] = v
-	}
-	for k, v := range y.Param {
-		param[k] = v
-	}
-	for k, v := range o.Param {
-		param[k] = v
-	}
+	maps.Copy(param, d.Param)
+	maps.Copy(param, y.Param)
+	maps.Copy(param, o.Param)
 	y.Param = param
 
 	if y.CACertificates.RemoveDefaults == nil {

pkg/limayaml/validate.go

@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"slices"
 	"strconv"
 	"strings"
 	"unicode"
@@ -198,10 +199,8 @@ func Validate(y *LimaYAML, warn bool) error {
 		return fmt.Errorf("field `mountType` must be %q or %q or %q, or %q, got %q", REVSSHFS, NINEP, VIRTIOFS, WSLMount, *y.MountType)
 	}
 
-	for _, f := range y.MountTypesUnsupported {
-		if f == *y.MountType {
-			return fmt.Errorf("field `mountType` must not be one of %v (`mountTypesUnsupported`), got %q", y.MountTypesUnsupported, *y.MountType)
-		}
+	if slices.Contains(y.MountTypesUnsupported, *y.MountType) {
+		return fmt.Errorf("field `mountType` must not be one of %v (`mountTypesUnsupported`), got %q", y.MountTypesUnsupported, *y.MountType)
 	}
 
 	if warn && runtime.GOOS != "linux" {
@@ -341,7 +340,7 @@ func Validate(y *LimaYAML, warn bool) error {
 				return err
 			}
 		}
-		for j := 0; j < 2; j++ {
+		for j := range 2 {
 			if err := validatePort(fmt.Sprintf("%s.guestPortRange[%d]", field, j), rule.GuestPortRange[j]); err != nil {
 				return err
 			}

pkg/lockutil/lockutil_test.go

@@ -21,7 +21,7 @@ func TestWithDirLock(t *testing.T) {
 	log := filepath.Join(dir, "log")
 
 	errc := make(chan error, 10)
-	for i := 0; i < parallel; i++ {
+	for i := range parallel {
 		go func() {
 			err := WithDirLock(dir, func() error {
 				if _, err := os.Stat(log); err == nil {
@@ -43,7 +43,7 @@ func TestWithDirLock(t *testing.T) {
 		}()
 	}
 
-	for i := 0; i < parallel; i++ {
+	for range parallel {
 		err := <-errc
 		if err != nil {
 			t.Error(err)

pkg/nativeimgutil/nativeimgutil.go

@@ -23,6 +23,17 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+// Disk image size must be aigned to sector size. Qemu block layer is rounding
+// up the size to 512 bytes. Apple virtualization framework reject disks not
+// aligned to 512 bytes.
+const sectorSize = 512
+
+// RoundUp rounds size up to sectorSize.
+func RoundUp(size int) int {
+	sectors := (size + sectorSize - 1) / sectorSize
+	return sectors * sectorSize
+}
+
 // CreateRawDataDisk creates an empty raw data disk.
 func CreateRawDataDisk(dir string, size int) error {
 	dataDisk := filepath.Join(dir, filenames.DataDisk)
@@ -34,13 +45,15 @@ func CreateRawDataDisk(dir string, size int) error {
 		return err
 	}
 	defer f.Close()
-	return f.Truncate(int64(size))
+	roundedSize := RoundUp(size)
+	return f.Truncate(int64(roundedSize))
 }
 
 // ResizeRawDataDisk resizes a raw data disk.
 func ResizeRawDataDisk(dir string, size int) error {
 	dataDisk := filepath.Join(dir, filenames.DataDisk)
-	return os.Truncate(dataDisk, int64(size))
+	roundedSize := RoundUp(size)
+	return os.Truncate(dataDisk, int64(roundedSize))
 }
 
 // ConvertToRaw converts a source disk into a raw disk.

pkg/nativeimgutil/nativeimgutil_test.go

@@ -13,6 +13,24 @@ import (
 	"gotest.tools/v3/assert"
 )
 
+func TestRoundUp(t *testing.T) {
+	tests := []struct {
+		Size    int
+		Rounded int
+	}{
+		{0, 0},
+		{1, 512},
+		{511, 512},
+		{512, 512},
+		{123456789, 123457024},
+	}
+	for _, tc := range tests {
+		if RoundUp(tc.Size) != tc.Rounded {
+			t.Errorf("expected %d, got %d", tc.Rounded, tc.Size)
+		}
+	}
+}
+
 func createImg(name, format, size string) error {
 	return exec.Command("qemu-img", "create", name, "-f", format, size).Run()
 }

pkg/networks/validate.go

@@ -21,7 +21,7 @@ func (c *Config) Validate() error {
 	paths := reflect.ValueOf(&c.Paths).Elem()
 	pathsMap := make(map[string]string, paths.NumField())
 	var socketVMNetNotFound bool
-	for i := 0; i < paths.NumField(); i++ {
+	for i := range paths.NumField() {
 		// extract YAML name from struct tag; strip options like "omitempty"
 		name := paths.Type().Field(i).Tag.Get("yaml")
 		if i := strings.IndexRune(name, ','); i > -1 {