Merge pull request #2509 from alexandear/fix-revive-error-strings

Uncapitalize error messages; enable revive.error-strings

Author: jandubois

.golangci.yml

@@ -106,6 +106,8 @@ linters-settings:
   errorlint:
     asserts: false
   revive:
+    # Set below 0.8 to enable error-strings
+    confidence: 0.6
     # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
     rules:
     - name: blank-imports

cmd/limactl/copy.go

@@ -98,7 +98,7 @@ func copyAction(cmd *cobra.Command, args []string) error {
 		}
 	}
 	if legacySSH && len(instDirs) > 1 {
-		return fmt.Errorf("More than one (instance) host is involved in this command, this is only supported for openSSH v8.0 or higher")
+		return fmt.Errorf("more than one (instance) host is involved in this command, this is only supported for openSSH v8.0 or higher")
 	}
 	scpFlags = append(scpFlags, "-3", "--")
 	scpArgs = append(scpFlags, scpArgs...)

cmd/limactl/disk.go

@@ -27,7 +27,7 @@ func newDiskCommand() *cobra.Command {
 
   Delete a disk:
   $ limactl disk delete DISK
-  
+
   Resize a disk:
   $ limactl disk resize DISK --size SIZE`,
 		SilenceUsage:  true,
@@ -106,7 +106,7 @@ func diskCreateAction(cmd *cobra.Command, args []string) error {
 		if rerr != nil {
 			err = errors.Join(err, fmt.Errorf("failed to remove a directory %q: %w", diskDir, rerr))
 		}
-		return fmt.Errorf("Failed to create %s disk in %q: %w", format, diskDir, err)
+		return fmt.Errorf("failed to create %s disk in %q: %w", format, diskDir, err)
 	}
 
 	return nil

pkg/qemu/entitlementutil/entitlementutil.go

@@ -51,7 +51,7 @@ func Sign(qExe string) error {
   </dict>
 </plist>`
 	if _, err = ent.WriteString(entXML); err != nil {
-		return fmt.Errorf("Failed to write to a temporary file %q for signing QEMU binary: %w", entName, err)
+		return fmt.Errorf("failed to write to a temporary file %q for signing QEMU binary: %w", entName, err)
 	}
 	ent.Close()
 	signCmd := exec.Command("codesign", "--sign", "-", "--entitlements", entName, "--force", qExe)

pkg/qemu/qemu.go

@@ -998,7 +998,7 @@ func FindVirtiofsd(qemuExe string) (string, error) {
 		}
 	}
 
-	return "", errors.New("Failed to locate virtiofsd")
+	return "", errors.New("failed to locate virtiofsd")
 }
 
 func VirtiofsdCmdline(cfg Config, mountIndex int) ([]string, error) {

pkg/qemu/qemu_driver.go

@@ -288,7 +288,7 @@ func (l *LimaQemuDriver) killVhosts() error {
 	var errs []error
 	for i, vhost := range l.vhostCmds {
 		if err := vhost.Process.Kill(); err != nil && !errors.Is(err, os.ErrProcessDone) {
-			errs = append(errs, fmt.Errorf("Failed to kill virtiofsd instance #%d: %w", i, err))
+			errs = append(errs, fmt.Errorf("failed to kill virtiofsd instance #%d: %w", i, err))
 		}
 	}
 

pkg/vz/errors_darwin.go

@@ -4,4 +4,5 @@ package vz
 
 import "errors"
 
+//nolint:revive // error-strings
 var errRosettaUnsupported = errors.New("Rosetta is unsupported on non-ARM64 hosts")

pkg/vz/vz_driver_darwin.go

@@ -182,6 +182,7 @@ func (l *LimaVzDriver) RunGUI() error {
 	if l.CanRunGUI() {
 		return l.machine.StartGraphicApplication(1920, 1200)
 	}
+	//nolint:revive // error-strings
 	return fmt.Errorf("RunGUI is not supported for the given driver '%s' and display '%s'", "vz", *l.Yaml.Video.Display)
 }