Fix Lint on Windows and enable the job

[NO NEW TESTS NEEDED] Purely refactoring

Signed-off-by: Matt Heon <mheon@redhat.com>

Author: mheon

cmd/podman-wslkerninst/main.go

@@ -16,9 +16,12 @@ import (
 )
 
 const (
+	//nolint:stylecheck
 	MB_ICONWARNING = 0x00000030
-	MB_OK          = 0x00000000
-	MB_DEFBUTTON1  = 0x00000000
+	//nolint:stylecheck
+	MB_OK = 0x00000000
+	//nolint:stylecheck
+	MB_DEFBUTTON1 = 0x00000000
 )
 
 const KernelWarning = "WSL Kernel installation did not complete successfully. " +
@@ -85,7 +88,7 @@ func warn(title string, caption string) int {
 
 func main() {
 	args := os.Args
-	setupLogging(path.Base(args[0]))
+	_, _ = setupLogging(path.Base(args[0]))
 	if wutil.IsWSLInstalled() {
 		// nothing to do
 		logrus.Info("WSL Kernel already installed")

cmd/winpath/main.go

@@ -18,13 +18,19 @@ import (
 type operation int
 
 const (
-	HWND_BROADCAST             = 0xFFFF
-	WM_SETTINGCHANGE           = 0x001A
-	SMTO_ABORTIFHUNG           = 0x0002
-	ERR_BAD_ARGS               = 0x000A
-	OPERATION_FAILED           = 0x06AC
-	Environment                = "Environment"
-	Add              operation = iota
+	//nolint:stylecheck
+	HWND_BROADCAST = 0xFFFF
+	//nolint:stylecheck
+	WM_SETTINGCHANGE = 0x001A
+	//nolint:stylecheck
+	SMTO_ABORTIFHUNG = 0x0002
+	//nolint:stylecheck
+	ERR_BAD_ARGS = 0x000A
+	//nolint:stylecheck
+	OPERATION_FAILED = 0x06AC
+
+	Environment           = "Environment"
+	Add         operation = iota
 	Remove
 	Open
 	NotSpecified
@@ -143,6 +149,8 @@ func removePathFromRegistry(path string) error {
 		return err
 	}
 
+	// No point preallocating we can't know how big the array needs to be.
+	//nolint:prealloc
 	var elements []string
 	for _, element := range strings.Split(existing, ";") {
 		if strings.EqualFold(element, path) {
@@ -174,6 +182,7 @@ func broadcastEnvironmentChange() {
 	user32 := syscall.NewLazyDLL("user32")
 	proc := user32.NewProc("SendMessageTimeoutW")
 	millis := 3000
+	//nolint:dogsled
 	_, _, _ = proc.Call(HWND_BROADCAST, WM_SETTINGCHANGE, 0, uintptr(unsafe.Pointer(env)), SMTO_ABORTIFHUNG, uintptr(millis), 0)
 }
 

contrib/cirrus/runner.sh

@@ -281,7 +281,8 @@ function _run_altbuild() {
             rm -rf $context_dir
             ;;
         *Windows*)
-            showrun make lint GOOS=windows || true  # TODO: Enable when code passes check
+	    showrun make .install.pre-commit
+            showrun make lint GOOS=windows CGO_ENABLED=0
             showrun make podman-remote-release-windows_amd64.zip
             ;;
         *RPM*)

hack/golangci-lint.sh

@@ -15,7 +15,7 @@ set -e
 BUILD_TAGS_DEFAULT="apparmor,seccomp,selinux"
 BUILD_TAGS_ABI="$BUILD_TAGS_DEFAULT,systemd"
 BUILD_TAGS_TUNNEL="$BUILD_TAGS_DEFAULT,remote"
-BUILD_TAGS_REMOTE="remote"
+BUILD_TAGS_REMOTE="remote,containers_image_openpgp"
 
 SKIP_DIRS_ABI=""
 SKIP_DIRS_TUNNEL="pkg/api,pkg/domain/infra/abi"
@@ -40,6 +40,6 @@ for to_lint in "${to_lint[@]}"; do
     # Make it really easy for a developer to copy-paste the command-line
     # to focus or debug a single, specific linting category.
     set -x
-    ./bin/golangci-lint run --build-tags="${!tags_var}" --skip-dirs="${!skip_var}" "$@"
+    ./bin/golangci-lint run --timeout=10m --build-tags="${!tags_var}" --skip-dirs="${!skip_var}" "$@"
   )
 done

pkg/bindings/containers/term_windows.go

@@ -61,7 +61,6 @@ func notifyWinChange(ctx context.Context, winChange chan os.Signal, stdin *os.Fi
 			}
 		}
 	}()
-
 }
 
 func getTermSize(stdin *os.File, stdout *os.File) (width, height int, err error) {

pkg/machine/e2e/config_test.go

@@ -236,7 +236,9 @@ func isWSL() bool {
 	return isVmtype(define.WSLVirt)
 }
 
-//nolint:unused
+// Only used on Windows
+//
+//nolint:unparam,unused
 func runSystemCommand(binary string, cmdArgs []string, timeout time.Duration, wait bool) (*machineSession, error) {
 	GinkgoWriter.Println(binary + " " + strings.Join(cmdArgs, " "))
 	c := exec.Command(binary, cmdArgs...)

pkg/machine/e2e/init_windows_test.go

@@ -38,12 +38,12 @@ var _ = Describe("podman machine init - windows only", func() {
 		Expect(session).To(Exit(0))
 
 		defer func() {
-			_, err := runSystemCommand(wutil.FindWSL(),  []string{"--terminate", "podman-net-usermode"}, defaultTimeout, true)
+			_, err := runSystemCommand(wutil.FindWSL(), []string{"--terminate", "podman-net-usermode"}, defaultTimeout, true)
 			if err != nil {
 				fmt.Println("unable to terminate podman-net-usermode")
 			}
 
-			_, err = runSystemCommand(wutil.FindWSL(),  []string{"--unregister", "podman-net-usermode"}, defaultTimeout, true)
+			_, err = runSystemCommand(wutil.FindWSL(), []string{"--unregister", "podman-net-usermode"}, defaultTimeout, true)
 			if err != nil {
 				fmt.Println("unable to unregister podman-net-usermode")
 			}
@@ -87,6 +87,7 @@ var _ = Describe("podman machine init - windows only", func() {
 		}()
 		i := new(initMachine)
 		session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath)).run()
+		Expect(err).ToNot(HaveOccurred())
 		Expect(session).To(Exit(125))
 		Expect(session.errorToString()).To(ContainSubstring("already exists on hypervisor"))
 	})

pkg/machine/fedora_windows.go

@@ -14,7 +14,7 @@ func DetermineMachineArch() string {
 	current, _ := syscall.GetCurrentProcess()
 
 	if err := windows.IsWow64Process2(windows.Handle(current), &machine, &native); err != nil {
-		logrus.Warnf("Failure detecting native system architecture, %s: %w", fallbackMsg, err)
+		logrus.Warnf("Failure detecting native system architecture, %s: %v", fallbackMsg, err)
 		// Fall-back to binary arch
 		return runtime.GOARCH
 	}
@@ -26,7 +26,7 @@ func DetermineMachineArch() string {
 	case 0x8664:
 		return "amd64"
 	default:
-		logrus.Warnf("Unknown or unsupported native system architecture [%d], %s", fallbackMsg)
+		logrus.Warnf("Unknown or unsupported native system architecture [%d], %s", native, fallbackMsg)
 		return runtime.GOARCH
 	}
 }

pkg/machine/gvproxy.go

@@ -3,38 +3,10 @@ package machine
 import (
 	"fmt"
 	"strconv"
-	"time"
 
 	"github.com/containers/podman/v5/pkg/machine/define"
-	psutil "github.com/shirou/gopsutil/v3/process"
 )
 
-const (
-	loops     = 8
-	sleepTime = time.Millisecond * 1
-)
-
-// backoffForProcess checks if the process still exists, for something like
-// sigterm. If the process still exists after loops and sleep time are exhausted,
-// an error is returned
-func backoffForProcess(p *psutil.Process) error {
-	sleepInterval := sleepTime
-	for i := 0; i < loops; i++ {
-		running, err := p.IsRunning()
-		if err != nil {
-			return fmt.Errorf("checking if process running: %w", err)
-		}
-		if !running {
-			return nil
-		}
-
-		time.Sleep(sleepInterval)
-		// double the time
-		sleepInterval += sleepInterval
-	}
-	return fmt.Errorf("process %d has not ended", p.Pid)
-}
-
 // CleanupGVProxy reads the --pid-file for gvproxy attempts to stop it
 func CleanupGVProxy(f define.VMFile) error {
 	gvPid, err := f.Read()

pkg/machine/gvproxy_unix.go

@@ -6,11 +6,38 @@ import (
 	"errors"
 	"fmt"
 	"syscall"
+	"time"
 
 	psutil "github.com/shirou/gopsutil/v3/process"
 	"github.com/sirupsen/logrus"
 )
 
+const (
+	loops     = 8
+	sleepTime = time.Millisecond * 1
+)
+
+// backoffForProcess checks if the process still exists, for something like
+// sigterm. If the process still exists after loops and sleep time are exhausted,
+// an error is returned
+func backoffForProcess(p *psutil.Process) error {
+	sleepInterval := sleepTime
+	for i := 0; i < loops; i++ {
+		running, err := p.IsRunning()
+		if err != nil {
+			return fmt.Errorf("checking if process running: %w", err)
+		}
+		if !running {
+			return nil
+		}
+
+		time.Sleep(sleepInterval)
+		// double the time
+		sleepInterval += sleepInterval
+	}
+	return fmt.Errorf("process %d has not ended", p.Pid)
+}
+
 // / waitOnProcess takes a pid and sends a sigterm to it. it then waits for the
 // process to not exist.  if the sigterm does not end the process after an interval,
 // then sigkill is sent.  it also waits for the process to exit after the sigkill too.