modernize: run gopls modernize to bring up to 1.25 (#2920)

integration/api_auth_test.go

@@ -98,7 +98,7 @@ func TestAPIAuthenticationBypass(t *testing.T) {
 
 		// Should NOT contain user data after "Unauthorized"
 		// This is the security bypass - if users array is present, auth was bypassed
-		var jsonCheck map[string]interface{}
+		var jsonCheck map[string]any
 		jsonErr := json.Unmarshal(body, &jsonCheck)
 
 		// If we can unmarshal JSON and it contains "users", that's the bypass
@@ -278,8 +278,8 @@ func TestAPIAuthenticationBypassCurl(t *testing.T) {
 		var responseBody string
 
 		for _, line := range lines {
-			if strings.HasPrefix(line, "HTTP_CODE:") {
-				httpCode = strings.TrimPrefix(line, "HTTP_CODE:")
+			if after, ok := strings.CutPrefix(line, "HTTP_CODE:"); ok {
+				httpCode = after
 			} else {
 				responseBody += line
 			}
@@ -324,8 +324,8 @@ func TestAPIAuthenticationBypassCurl(t *testing.T) {
 		var responseBody string
 
 		for _, line := range lines {
-			if strings.HasPrefix(line, "HTTP_CODE:") {
-				httpCode = strings.TrimPrefix(line, "HTTP_CODE:")
+			if after, ok := strings.CutPrefix(line, "HTTP_CODE:"); ok {
+				httpCode = after
 			} else {
 				responseBody += line
 			}
@@ -359,8 +359,8 @@ func TestAPIAuthenticationBypassCurl(t *testing.T) {
 		var responseBody string
 
 		for _, line := range lines {
-			if strings.HasPrefix(line, "HTTP_CODE:") {
-				httpCode = strings.TrimPrefix(line, "HTTP_CODE:")
+			if after, ok := strings.CutPrefix(line, "HTTP_CODE:"); ok {
+				httpCode = after
 			} else {
 				responseBody += line
 			}
@@ -459,9 +459,9 @@ func TestGRPCAuthenticationBypass(t *testing.T) {
 		outputStr := strings.ToLower(output)
 		assert.True(t,
 			strings.Contains(outputStr, "unauthenticated") ||
-			strings.Contains(outputStr, "invalid token") ||
-			strings.Contains(outputStr, "failed to validate token") ||
-			strings.Contains(outputStr, "authentication"),
+				strings.Contains(outputStr, "invalid token") ||
+				strings.Contains(outputStr, "failed to validate token") ||
+				strings.Contains(outputStr, "authentication"),
 			"Error should indicate authentication failure, got: %s", output)
 
 		// Should NOT leak user data
@@ -609,9 +609,9 @@ cli:
 		outputStr := strings.ToLower(output)
 		assert.True(t,
 			strings.Contains(outputStr, "unauthenticated") ||
-			strings.Contains(outputStr, "invalid token") ||
-			strings.Contains(outputStr, "failed to validate token") ||
-			strings.Contains(outputStr, "authentication"),
+				strings.Contains(outputStr, "invalid token") ||
+				strings.Contains(outputStr, "failed to validate token") ||
+				strings.Contains(outputStr, "authentication"),
 			"Error should indicate authentication failure, got: %s", output)
 
 		// Should NOT leak user data

integration/helpers.go

@@ -56,13 +56,6 @@ type NodeSystemStatus struct {
 	NodeStore        bool
 }
 
-// requireNotNil validates that an object is not nil and fails the test if it is.
-// This helper provides consistent error messaging for nil checks in integration tests.
-func requireNotNil(t *testing.T, object interface{}) {
-	t.Helper()
-	require.NotNil(t, object)
-}
-
 // requireNoErrHeadscaleEnv validates that headscale environment creation succeeded.
 // Provides specific error context for headscale environment setup failures.
 func requireNoErrHeadscaleEnv(t *testing.T, err error) {

integration/hsic/hsic.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"maps"
 	"net/http"
 	"net/netip"
 	"os"
@@ -132,9 +133,7 @@ func WithCustomTLS(cert, key []byte) Option {
 // can be used to override Headscale configuration.
 func WithConfigEnv(configEnv map[string]string) Option {
 	return func(hsic *HeadscaleInContainer) {
-		for key, value := range configEnv {
-			hsic.env[key] = value
-		}
+		maps.Copy(hsic.env, configEnv)
 	}
 }
 

integration/scenario.go

@@ -14,6 +14,7 @@ import (
 	"net/netip"
 	"net/url"
 	"os"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
@@ -1159,10 +1160,8 @@ func (s *Scenario) FindTailscaleClientByIP(ip netip.Addr) (TailscaleClient, erro
 
 	for _, client := range clients {
 		ips, _ := client.IPs()
-		for _, ip2 := range ips {
-			if ip == ip2 {
-				return client, nil
-			}
+		if slices.Contains(ips, ip) {
+			return client, nil
 		}
 	}