Merge pull request #2125 from alexandear/enable-errorlint

Enable errorlint and fix up issues

Author: AkihiroSuda

.golangci.yml

@@ -36,7 +36,7 @@ linters:
   # - dupl
   - dupword
   - errcheck
-  # - errorlint
+  - errorlint
   # - exhaustive
   # - exhaustivestruct
   # - exportloopref
@@ -100,6 +100,8 @@ linters-settings:
     - sprintfQuotedString
     - builtinShadow
     - filepathJoin
+  errorlint:
+    asserts: false
 issues:
   # Maximum issues count per one linter.
   max-issues-per-linter: 0

cmd/limactl/disk.go

@@ -264,7 +264,7 @@ func diskDeleteAction(cmd *cobra.Command, args []string) error {
 		}
 
 		if err := deleteDisk(disk); err != nil {
-			return fmt.Errorf("failed to delete disk %q: %v", diskName, err)
+			return fmt.Errorf("failed to delete disk %q: %w", diskName, err)
 		}
 		logrus.Infof("Deleted %q (%q)", diskName, disk.Dir)
 	}

cmd/limactl/edit.go

@@ -96,7 +96,7 @@ func editAction(cmd *cobra.Command, args []string) error {
 	if err := limayaml.Validate(*y, true); err != nil {
 		rejectedYAML := "lima.REJECTED.yaml"
 		if writeErr := os.WriteFile(rejectedYAML, yBytes, 0o644); writeErr != nil {
-			return fmt.Errorf("the YAML is invalid, attempted to save the buffer as %q but failed: %v: %w", rejectedYAML, writeErr, err)
+			return fmt.Errorf("the YAML is invalid, attempted to save the buffer as %q but failed: %w: %w", rejectedYAML, writeErr, err)
 		}
 		// TODO: may need to support editing the rejected YAML
 		return fmt.Errorf("the YAML is invalid, saved the buffer as %q: %w", rejectedYAML, err)

cmd/limactl/start.go

@@ -189,7 +189,7 @@ func loadOrCreateInstance(cmd *cobra.Command, args []string, createOnly bool) (*
 			return nil, errors.New("must pass instance name with --name when reading template from stdin")
 		}
 		st.yBytes, err = io.ReadAll(os.Stdin)
-		if err != nil && err != io.EOF {
+		if err != nil {
 			return nil, fmt.Errorf("unexpected error reading stdin: %w", err)
 		}
 		// see if the tty was set explicitly or not
@@ -322,7 +322,7 @@ func createInstance(ctx context.Context, st *creatorState, saveBrokenEditorBuffe
 		}
 		rejectedYAML := "lima.REJECTED.yaml"
 		if writeErr := os.WriteFile(rejectedYAML, st.yBytes, 0o644); writeErr != nil {
-			return nil, fmt.Errorf("the YAML is invalid, attempted to save the buffer as %q but failed: %v: %w", rejectedYAML, writeErr, err)
+			return nil, fmt.Errorf("the YAML is invalid, attempted to save the buffer as %q but failed: %w: %w", rejectedYAML, writeErr, err)
 		}
 		return nil, fmt.Errorf("the YAML is invalid, saved the buffer as %q: %w", rejectedYAML, err)
 	}
@@ -374,7 +374,7 @@ func chooseNextCreatorState(st *creatorState, yq string) (*creatorState, error)
 		}
 		ans, err := uiutil.Select(message, options)
 		if err != nil {
-			if err == uiutil.InterruptErr {
+			if errors.Is(err, uiutil.InterruptErr) {
 				logrus.Fatal("Interrupted by user")
 			}
 			logrus.WithError(err).Warn("Failed to open TUI")

pkg/fileutils/download.go

@@ -60,11 +60,7 @@ func Errors(errs []error) error {
 		if errors.Is(err, ErrSkipped) {
 			logrus.Debug(err)
 		} else {
-			if finalErr == nil {
-				finalErr = err
-			} else {
-				finalErr = fmt.Errorf("%v, %w", finalErr, err)
-			}
+			finalErr = errors.Join(finalErr, err)
 		}
 	}
 	if len(errs) > 0 && finalErr == nil {

pkg/networks/reconcile/reconcile.go

@@ -227,7 +227,7 @@ func stopNetwork(config *networks.YAML, name string) error {
 	}
 	if isUsernet {
 		if err := usernet.Stop(name); err != nil {
-			return fmt.Errorf("failed to stop usernet %q: %v", name, err)
+			return fmt.Errorf("failed to stop usernet %q: %w", name, err)
 		}
 		return nil
 	}

pkg/networks/sudoers.go

@@ -102,7 +102,7 @@ func (config *YAML) VerifySudoAccess(sudoersFile string) error {
 			}
 			logrus.Debugf("%q does not exist; passwordLessSudo error: %s", sudoersFile, err)
 		}
-		return fmt.Errorf("can't read %q: %s (Hint: %s)", sudoersFile, err, hint)
+		return fmt.Errorf("can't read %q: %w: (Hint: %s)", sudoersFile, err, hint)
 	}
 	sudoers, err := Sudoers()
 	if err != nil {

pkg/osutil/rosetta_darwin.go

@@ -1,6 +1,7 @@
 package osutil
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/sirupsen/logrus"
@@ -11,7 +12,7 @@ func IsBeingRosettaTranslated() bool {
 	ret, err := unix.SysctlUint32("sysctl.proc_translated")
 	if err != nil {
 		const fallback = false
-		if err == unix.ENOENT {
+		if errors.Is(err, unix.ENOENT) {
 			return false
 		}
 

pkg/vz/vm_darwin.go

@@ -455,7 +455,7 @@ func attachDisks(driver *driver.BaseDriver, vmConfig *vz.VirtualMachineConfigura
 		diskName := d.Name
 		disk, err := store.InspectDisk(diskName)
 		if err != nil {
-			return fmt.Errorf("failed to run load disk %q: %q", diskName, err)
+			return fmt.Errorf("failed to run load disk %q: %w", diskName, err)
 		}
 
 		if disk.Instance != "" {
@@ -464,7 +464,7 @@ func attachDisks(driver *driver.BaseDriver, vmConfig *vz.VirtualMachineConfigura
 		logrus.Infof("Mounting disk %q on %q", diskName, disk.MountPoint)
 		err = disk.Lock(driver.Instance.Dir)
 		if err != nil {
-			return fmt.Errorf("failed to run lock disk %q: %q", diskName, err)
+			return fmt.Errorf("failed to run lock disk %q: %w", diskName, err)
 		}
 		extraDiskPath := filepath.Join(disk.Dir, filenames.DataDisk)
 		// ConvertToRaw is a NOP if no conversion is needed

pkg/vz/vz_driver_darwin.go

@@ -156,7 +156,7 @@ func (l *LimaVzDriver) Start(ctx context.Context) (chan error, error) {
 	vm, errCh, err := startVM(ctx, l.BaseDriver)
 	if err != nil {
 		if errors.Is(err, vz.ErrUnsupportedOSVersion) {
-			return nil, fmt.Errorf("vz driver requires macOS 13 or higher to run: %q", err)
+			return nil, fmt.Errorf("vz driver requires macOS 13 or higher to run: %w", err)
 		}
 		return nil, err
 	}