Run golangci-lint on MacOS and Windows; fix lint issues

Signed-off-by: Oleksandr Redko <[email protected]>

Author: alexandear

.github/workflows/test.yml

@@ -163,6 +163,11 @@ jobs:
         go-version: 1.24.x
     - name: Unit tests
       run: go test -v ./...
+    - name: Run golangci-lint
+      uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9  # v8.0.0
+      with:
+        version: v2.1.0
+        args: --verbose
     - name: Make
       run: make
     - name: Integration tests (WSL2, Windows host)
@@ -190,6 +195,11 @@ jobs:
         go-version: 1.24.x
     - name: Unit tests
       run: go test -v ./...
+    - name: Run golangci-lint
+      uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9  # v8.0.0
+      with:
+        version: v2.1.0
+        args: --verbose
     - name: Make
       run: make
     - name: Install

pkg/hostagent/hostagent.go

@@ -313,11 +313,7 @@ func (a *HostAgent) Run(ctx context.Context) error {
 
 	// WSL instance SSH address isn't known until after VM start
 	if *a.instConfig.VMType == limayaml.WSL2 {
-		sshAddr, err := store.GetSSHAddress(a.instName)
-		if err != nil {
-			return err
-		}
-		a.instSSHAddress = sshAddr
+		a.instSSHAddress = store.InstanceSSHAddress
 	}
 
 	if a.instConfig.Video.Display != nil && *a.instConfig.Video.Display == "vnc" {

pkg/lockutil/lockutil_windows.go

@@ -29,7 +29,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// LockFile modified from https://github.com/boltdb/bolt/blob/v1.3.1/bolt_windows.go using MIT
+// LockFile modified from https://github.com/boltdb/bolt/blob/v1.3.1/bolt_windows.go using MIT.
 var (
 	modkernel32      = syscall.NewLazyDLL("kernel32.dll")
 	procLockFileEx   = modkernel32.NewProc("LockFileEx")
@@ -38,8 +38,8 @@ var (
 
 const (
 	// see https://msdn.microsoft.com/en-us/library/windows/desktop/aa365203(v=vs.85).aspx
-	LOCKFILE_EXCLUSIVE_LOCK   = 0x00000002
-	LOCKFILE_FAIL_IMMEDIATELY = 0x00000001
+	LOCKFILE_EXCLUSIVE_LOCK   = 0x00000002 //nolint:revive,staticcheck // var-naming: it's ok to use ALL_CAPS here
+	LOCKFILE_FAIL_IMMEDIATELY = 0x00000001 //nolint:revive,staticcheck // var-naming: it's ok to use ALL_CAPS here
 )
 
 func WithDirLock(dir string, fn func() error) error {

pkg/osutil/osutil_windows.go

@@ -16,7 +16,7 @@ import (
 // UnixPathMax is the value of UNIX_PATH_MAX.
 const UnixPathMax = 108
 
-// Stat is a selection of syscall.Stat_t
+// Stat is a selection of syscall.Stat_t.
 type Stat struct {
 	Uid uint32
 	Gid uint32
@@ -38,8 +38,8 @@ func SysKill(pid int, _ Signal) error {
 	return windows.GenerateConsoleCtrlEvent(syscall.CTRL_BREAK_EVENT, uint32(pid))
 }
 
-func Dup2(oldfd int, newfd syscall.Handle) (err error) {
-	return fmt.Errorf("unimplemented")
+func Dup2(_ int, _ syscall.Handle) error {
+	return errors.New("unimplemented")
 }
 
 func SignalName(sig os.Signal) string {
@@ -53,6 +53,6 @@ func SignalName(sig os.Signal) string {
 	}
 }
 
-func Sysctl(name string) (string, error) {
+func Sysctl(_ string) (string, error) {
 	return "", errors.New("sysctl: unimplemented on Windows")
 }

pkg/store/instance.go

@@ -38,6 +38,8 @@ const (
 	StatusBroken        Status = "Broken"
 	StatusStopped       Status = "Stopped"
 	StatusRunning       Status = "Running"
+
+	InstanceSSHAddress = "127.0.0.1"
 )
 
 type Instance struct {

pkg/store/instance_unix.go

@@ -10,7 +10,3 @@ import "github.com/lima-vm/lima/pkg/limayaml"
 func inspectStatus(instDir string, inst *Instance, y *limayaml.LimaYAML) {
 	inspectStatusWithPIDFiles(instDir, inst, y)
 }
-
-func GetSSHAddress(_ string) (string, error) {
-	return "127.0.0.1", nil
-}

pkg/store/instance_windows.go

@@ -25,12 +25,7 @@ func inspectStatus(instDir string, inst *Instance, y *limayaml.LimaYAML) {
 		inst.SSHLocalPort = 22
 
 		if inst.Status == StatusRunning {
-			sshAddr, err := GetSSHAddress(inst.Name)
-			if err == nil {
-				inst.SSHAddress = sshAddr
-			} else {
-				inst.Errors = append(inst.Errors, err)
-			}
+			inst.SSHAddress = InstanceSSHAddress
 		}
 	} else {
 		inspectStatusWithPIDFiles(instDir, inst, y)
@@ -75,7 +70,7 @@ func GetWslStatus(instName string) (string, error) {
 		return "", fmt.Errorf("failed to run `wsl --list --verbose`, err: %w (out=%q)", err, string(out))
 	}
 
-	if len(out) == 0 {
+	if out == "" {
 		return StatusBroken, fmt.Errorf("failed to read instance state for instance %q, try running `wsl --list --verbose` to debug, err: %w", instName, err)
 	}
 
@@ -115,7 +110,3 @@ func GetWslStatus(instName string) (string, error) {
 
 	return instState, nil
 }
-
-func GetSSHAddress(instName string) (string, error) {
-	return "127.0.0.1", nil
-}

pkg/vz/vz_driver_darwin.go

@@ -203,7 +203,6 @@ 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.Instance.Config.Video.Display)
 }
 

pkg/windows/registry_windows.go

@@ -146,7 +146,7 @@ func GetDistroID(name string) (string, error) {
 }
 
 // GetRandomFreeVSockPort gets a list of all registered VSock ports and returns a non-registered port.
-func GetRandomFreeVSockPort(min, max int) (int, error) {
+func GetRandomFreeVSockPort(minPort, maxPort int) (int, error) {
 	rootKey, err := getGuestCommunicationServicesKey(false)
 	if err != nil {
 		return 0, err
@@ -160,18 +160,18 @@ func GetRandomFreeVSockPort(min, max int) (int, error) {
 
 	type pair struct{ v, offset int }
 	tree := make([]pair, 1, len(used)+1)
-	tree[0] = pair{0, min}
+	tree[0] = pair{0, minPort}
 
 	sort.Ints(used)
 	for i, v := range used {
 		if tree[len(tree)-1].v+tree[len(tree)-1].offset == v {
 			tree[len(tree)-1].offset++
 		} else {
-			tree = append(tree, pair{v - min - i, min + i + 1})
+			tree = append(tree, pair{v - minPort - i, minPort + i + 1})
 		}
 	}
 
-	v := rand.IntN(max - min + 1 - len(used))
+	v := rand.IntN(maxPort - minPort + 1 - len(used))
 
 	for len(tree) > 1 {
 		m := len(tree) / 2

pkg/wsl2/wsl_driver_windows.go

@@ -151,10 +151,9 @@ func (l *LimaWslDriver) Start(ctx context.Context) (chan error, error) {
 	return errCh, err
 }
 
-// Requires WSLg, which requires specific version of WSL2 to be installed.
+// CanRunGUI requires WSLg, which requires specific version of WSL2 to be installed.
 // TODO: Add check and add support for WSLg (instead of VNC) to hostagent.
 func (l *LimaWslDriver) CanRunGUI() bool {
-	// return *l.InstConfig.Video.Display == "wsl"
 	return false
 }