Merge pull request #9988 from rancher-sandbox/rddepman/golangci-lint/2.10.1-to-2.11.2

rddepman: bump golangci-lint from 2.10.1 to 2.11.2

Author: jandubois

pkg/rancher-desktop/assets/dependencies.yaml

@@ -10,7 +10,7 @@ helm: 4.1.1
 dockerCLI: 29.3.0
 dockerBuildx: 0.32.1
 dockerCompose: 5.1.0
-golangci-lint: 2.10.1
+golangci-lint: 2.11.2
 trivy: 0.69.3
 steve: 0.1.0-beta9.1
 rancherDashboard: 2.11.1.rd3

src/go/guestagent/main.go

@@ -88,7 +88,35 @@ func main() {
 		log.Fatal("agent must run as root")
 	}
 
+	if !*enableContainerd &&
+		!*enableDocker {
+		log.Fatal("requires either -docker or -containerd enabled.")
+	}
+
+	if *enableContainerd &&
+		*enableDocker {
+		log.Fatal("requires either -docker or -containerd but not both.")
+	}
+
+	if err := runAgent(
+		*enableContainerd, *enableDocker, *enableKubernetes,
+		*containerdSock, *configPath, *k8sServiceListenerAddr,
+		*adminInstall, *k8sAPIPort, *tapIfaceIP,
+	); err != nil {
+		log.Fatal(err)
+	}
+
+	log.Info("Rancher Desktop Agent Shutting Down")
+}
+
+func runAgent(
+	enableContainerd, enableDocker, enableKubernetes bool,
+	containerdSock, configPath, k8sServiceListenerAddr string,
+	adminInstall bool,
+	k8sAPIPort, tapIfaceIP string,
+) error {
 	groupCtx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	group, ctx := errgroup.WithContext(groupCtx)
 
 	sigCh := make(chan os.Signal, 1)
@@ -100,51 +128,41 @@ func main() {
 		cancel()
 	}()
 
-	if !*enableContainerd &&
-		!*enableDocker {
-		log.Fatal("requires either -docker or -containerd enabled.")
-	}
-
-	if *enableContainerd &&
-		*enableDocker {
-		log.Fatal("requires either -docker or -containerd but not both.")
-	}
-
 	var portTracker tracker.Tracker
 
 	wslProxyForwarder := forwarder.NewWSLProxyForwarder(ctx, "/run/wsl-proxy.sock")
-	portTracker = tracker.NewAPITracker(ctx, wslProxyForwarder, tracker.GatewayBaseURL, *tapIfaceIP, *adminInstall)
+	portTracker = tracker.NewAPITracker(ctx, wslProxyForwarder, tracker.GatewayBaseURL, tapIfaceIP, adminInstall)
 	// Manually register the port for K8s API, we would
 	// only want to send this manual port mapping if both
 	// of the following conditions are met:
 	// 1) if kubernetes is enabled
 	// 2) when wsl-proxy for wsl-integration is enabled
-	if *enableKubernetes {
-		port, err := nat.NewPort("tcp", *k8sAPIPort)
+	if enableKubernetes {
+		port, err := nat.NewPort("tcp", k8sAPIPort)
 		if err != nil {
-			log.Fatalf("failed to parse port for k8s API: %v", err)
+			return fmt.Errorf("failed to parse port for k8s API: %w", err)
 		}
 		k8sAPIPortMapping := types.PortMapping{
 			Remove: false,
 			Ports: nat.PortMap{
 				port: []nat.PortBinding{
 					{
 						HostIP:   "127.0.0.1",
-						HostPort: *k8sAPIPort,
+						HostPort: k8sAPIPort,
 					},
 				},
 			},
 		}
 		if err := wslProxyForwarder.Send(k8sAPIPortMapping); err != nil {
-			log.Fatalf("failed to send a static portMapping event to wsl-proxy: %v", err)
+			return fmt.Errorf("failed to send a static portMapping event to wsl-proxy: %w", err)
 		}
-		log.Debugf("successfully forwarded k8s API port [%s] to wsl-proxy", *k8sAPIPort)
+		log.Debugf("successfully forwarded k8s API port [%s] to wsl-proxy", k8sAPIPort)
 	}
 
-	if *enableContainerd {
+	if enableContainerd {
 		group.Go(func() error {
 			for {
-				eventMonitor, err := containerd.NewEventMonitor(*containerdSock, portTracker)
+				eventMonitor, err := containerd.NewEventMonitor(containerdSock, portTracker)
 				if err != nil {
 					return fmt.Errorf("error initializing containerd event monitor: %w", err)
 				}
@@ -166,7 +184,7 @@ func main() {
 		})
 	}
 
-	if *enableDocker {
+	if enableDocker {
 		group.Go(func() error {
 			for {
 				eventMonitor, err := docker.NewEventMonitor(portTracker)
@@ -188,18 +206,18 @@ func main() {
 		})
 	}
 
-	if *enableKubernetes {
-		k8sServiceListenerIP := net.ParseIP(*k8sServiceListenerAddr)
+	if enableKubernetes {
+		k8sServiceListenerIP := net.ParseIP(k8sServiceListenerAddr)
 
 		if k8sServiceListenerIP == nil || (!k8sServiceListenerIP.Equal(net.IPv4zero) && !k8sServiceListenerIP.Equal(net.IPv4(127, 0, 0, 1))) {
-			log.Fatalf("empty or invalid input for Kubernetes service listener IP address %s. "+
-				"Valid options are 0.0.0.0 and 127.0.0.1.", *k8sServiceListenerAddr)
+			return fmt.Errorf("empty or invalid Kubernetes service listener IP address %s; "+
+				"valid options are 0.0.0.0 and 127.0.0.1", k8sServiceListenerAddr)
 		}
 
 		group.Go(func() error {
 			// Watch for kube
 			err := kube.WatchForServices(ctx,
-				*configPath,
+				configPath,
 				k8sServiceListenerIP,
 				portTracker)
 			if err != nil {
@@ -227,11 +245,7 @@ func main() {
 		return procScanner.ForwardPorts()
 	})
 
-	if err := group.Wait(); err != nil {
-		log.Fatal(err)
-	}
-
-	log.Info("Rancher Desktop Agent Shutting Down")
+	return group.Wait()
 }
 
 func tryConnectAPI(ctx context.Context, socketFile string, verify func(context.Context) error) error {

src/go/networking/cmd/host/switch_windows.go

@@ -60,14 +60,6 @@ func main() {
 		logrus.SetLevel(logrus.DebugLevel)
 	}
 
-	// config flags
-	ctx, cancel := context.WithCancel(context.Background())
-	groupErrs, ctx := errgroup.WithContext(ctx)
-
-	// catch user issued signals
-	sigChan := make(chan os.Signal, 1)
-	signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM, syscall.SIGINT)
-
 	subnet, err := config.ValidateSubnet(virtualSubnet)
 	if err != nil {
 		logrus.Fatal(err)
@@ -80,11 +72,26 @@ func main() {
 		logrus.Fatal(err)
 	}
 
-	cfg := newConfig(*subnet, portForwarding, debug)
+	if err := runSwitch(*subnet, portForwarding); err != nil {
+		logrus.Error(err)
+		os.Exit(1)
+	}
+}
+
+func runSwitch(subnet config.Subnet, portForwarding map[string]string) error {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	groupErrs, ctx := errgroup.WithContext(ctx)
+
+	// catch user issued signals
+	sigChan := make(chan os.Signal, 1)
+	signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM, syscall.SIGINT)
+
+	cfg := newConfig(subnet, portForwarding, debug)
 
 	ln, err := vsockHandshake(ctx, vsockHandshakePort, vsock.SignaturePhrase)
 	if err != nil {
-		logrus.Fatalf("handshake with peer process failed: %v", err)
+		return fmt.Errorf("handshake with peer process failed: %w", err)
 	}
 
 	logrus.Debugf("attempting to start a virtual network with the following config: %+v", cfg)
@@ -104,10 +111,7 @@ func main() {
 		}
 	})
 	// Wait for all of the go funcs to finish up
-	if err := groupErrs.Wait(); err != nil {
-		logrus.Error(err)
-		os.Exit(1)
-	}
+	return groupErrs.Wait()
 }
 
 func run(ctx context.Context, g *errgroup.Group, cfg *types.Configuration, ln net.Listener) error {