Merge remote-tracking branch 'upstream/main'

Author: tstromberg

go.mod

@@ -3,13 +3,9 @@ module github.com/codeGROOVE-dev/sprinkler
 go 1.25.4
 
 require (
-	github.com/codeGROOVE-dev/retry v1.3.1
-	golang.org/x/crypto v0.46.0
-	golang.org/x/net v0.48.0
+	github.com/codeGROOVE-dev/retry v1.3.0
+	golang.org/x/crypto v0.44.0
+	golang.org/x/net v0.47.0
 )
 
-require (
-	github.com/codeGROOVE-dev/fido v1.10.0 // indirect
-	github.com/puzpuzpuz/xsync/v4 v4.2.0 // indirect
-	golang.org/x/text v0.32.0 // indirect
-)
+require golang.org/x/text v0.31.0 // indirect

go.sum

@@ -1,20 +1,8 @@
-github.com/codeGROOVE-dev/fido v1.10.0 h1:i4Wb6LDd5nD/4Fnp47KAVUVhG1O1mN5jSRbCYPpBYjw=
-github.com/codeGROOVE-dev/fido v1.10.0/go.mod h1:/mqfMeKCTYTGt/Y0cWm6gh8gYBKG1w8xBsTDmu+A/pU=
-github.com/codeGROOVE-dev/retry v1.2.0 h1:xYpYPX2PQZmdHwuiQAGGzsBm392xIMl4nfMEFApQnu8=
-github.com/codeGROOVE-dev/retry v1.2.0/go.mod h1:8OgefgV1XP7lzX2PdKlCXILsYKuz6b4ZpHa/20iLi8E=
-github.com/codeGROOVE-dev/retry v1.3.1 h1:BAkfDzs6FssxLCGWGgM97bb+6/8GTa40Cs147vXkJOg=
-github.com/codeGROOVE-dev/retry v1.3.1/go.mod h1:+b3huqYGY1+ZJyuCmR8nBVLjd3WJ7qAFss+sI4s6FSc=
-github.com/puzpuzpuz/xsync/v4 v4.2.0 h1:dlxm77dZj2c3rxq0/XNvvUKISAmovoXF4a4qM6Wvkr0=
-github.com/puzpuzpuz/xsync/v4 v4.2.0/go.mod h1:VJDmTCJMBt8igNxnkQd86r+8KUeN1quSfNKu5bLYFQo=
-golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
-golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
-golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
-golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
-golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
-golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+github.com/codeGROOVE-dev/retry v1.3.0 h1:/+ipAWRJLL6y1R1vprYo0FSjSBvH6fE5j9LKXjpD54g=
+github.com/codeGROOVE-dev/retry v1.3.0/go.mod h1:8OgefgV1XP7lzX2PdKlCXILsYKuz6b4ZpHa/20iLi8E=
+golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
+golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=

pkg/client/client_test.go

@@ -2474,7 +2474,7 @@ func TestWritePumpContextCancellation(t *testing.T) {
 	// Should exit with context error
 	select {
 	case err := <-errCh:
-		if err != context.Canceled {
+		if !errors.Is(err, context.Canceled) {
 			t.Errorf("Expected context.Canceled, got: %v", err)
 		}
 	case <-time.After(1 * time.Second):
@@ -2523,11 +2523,9 @@ func TestReadEventsContextCancellation(t *testing.T) {
 		ticker := time.NewTicker(100 * time.Millisecond)
 		defer ticker.Stop()
 		for range 30 { // Try for 3 seconds max
-			select {
-			case <-ticker.C:
-				msg := map[string]string{"type": "ping"}
-				_ = websocket.JSON.Send(ws, msg)
-			}
+			<-ticker.C
+			msg := map[string]string{"type": "ping"}
+			_ = websocket.JSON.Send(ws, msg)
 		}
 	}))
 	defer srv.Close()
@@ -2560,7 +2558,7 @@ func TestReadEventsContextCancellation(t *testing.T) {
 	// Should exit when context times out
 	select {
 	case err := <-errCh:
-		if err != nil && err != context.DeadlineExceeded {
+		if err != nil && !errors.Is(err, context.DeadlineExceeded) {
 			t.Logf("readEvents exited with: %v (acceptable)", err)
 		}
 	case <-time.After(1 * time.Second):
@@ -2699,7 +2697,6 @@ func TestConnectWithWSSOrigin(t *testing.T) {
 	_ = client.Start(ctx)
 }
 
-
 // TestConnectEventTypesWildcard tests connecting with wildcard event type.
 func TestConnectEventTypesWildcard(t *testing.T) {
 	srv := newMockServer(t, true)
@@ -2769,7 +2766,7 @@ func TestWriteChannelBackpressure(t *testing.T) {
 			"message": "Connected",
 		})
 
-		for i := 0; i < 200; i++ {
+		for i := range 200 {
 			event := map[string]any{
 				"type":       "event",
 				"event_type": "push",
@@ -2883,7 +2880,7 @@ func TestWriteChannelClosedDuringOperation(t *testing.T) {
 			"message": "Connected",
 		})
 
-		for i := 0; i < 100; i++ {
+		for i := range 100 {
 			event := map[string]any{
 				"type":       "event",
 				"event_type": "push",
@@ -2962,7 +2959,7 @@ func TestReadTimeoutDuringGracefulShutdown(t *testing.T) {
 func TestConcurrentWebSocketClose(t *testing.T) {
 	t.Parallel()
 
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		srv := httptest.NewServer(websocket.Handler(func(ws *websocket.Conn) {
 			var sub map[string]any
 			_ = websocket.JSON.Receive(ws, &sub)

pkg/github/client_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -107,8 +106,8 @@ func TestAuthenticatedUser_RateLimit(t *testing.T) {
 	attempts := 0
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		attempts++
-		w.Header().Set("X-RateLimit-Remaining", "0")
-		w.Header().Set("X-RateLimit-Reset", "1234567890")
+		w.Header().Set("X-RateLimit-Remaining", "0")      //nolint:canonicalheader // GitHub API header
+		w.Header().Set("X-RateLimit-Reset", "1234567890") //nolint:canonicalheader // GitHub API header
 		w.WriteHeader(http.StatusForbidden)
 		_, _ = w.Write([]byte(`{"message":"API rate limit exceeded"}`))
 	}))
@@ -841,16 +840,6 @@ func TestLargeResponseBody(t *testing.T) {
 }
 
 // TestBrokenPipeError simulates a broken pipe during response read.
-type brokenReader struct{}
-
-func (b *brokenReader) Read(p []byte) (n int, err error) {
-	return 0, io.ErrUnexpectedEOF
-}
-
-func (b *brokenReader) Close() error {
-	return nil
-}
-
 // TestUnexpectedStatusCodes tests handling of various unexpected status codes.
 func TestUnexpectedStatusCodes(t *testing.T) {
 	t.Parallel()
@@ -869,6 +858,7 @@ func TestUnexpectedStatusCodes(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
 			attempts := 0
 			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				attempts++
@@ -903,6 +893,7 @@ func TestMockClient(t *testing.T) {
 	t.Parallel()
 
 	t.Run("UserAndOrgs success", func(t *testing.T) {
+		t.Parallel()
 		mock := &MockClient{
 			Username: "testuser",
 			Orgs:     []string{"org1", "org2"},
@@ -926,6 +917,7 @@ func TestMockClient(t *testing.T) {
 	})
 
 	t.Run("UserAndOrgs error", func(t *testing.T) {
+		t.Parallel()
 		mockErr := fmt.Errorf("mock error")
 		mock := &MockClient{
 			Err: mockErr,
@@ -943,6 +935,7 @@ func TestMockClient(t *testing.T) {
 	})
 
 	t.Run("ValidateOrgMembership success", func(t *testing.T) {
+		t.Parallel()
 		mock := &MockClient{
 			Username: "testuser",
 			Orgs:     []string{"org1", "org2"},
@@ -969,6 +962,7 @@ func TestMockClient(t *testing.T) {
 	})
 
 	t.Run("ValidateOrgMembership not member", func(t *testing.T) {
+		t.Parallel()
 		mock := &MockClient{
 			Username: "testuser",
 			Orgs:     []string{"org1", "org2"},
@@ -993,6 +987,7 @@ func TestMockClient(t *testing.T) {
 	})
 
 	t.Run("ValidateOrgMembership error", func(t *testing.T) {
+		t.Parallel()
 		mockErr := fmt.Errorf("mock validation error")
 		mock := &MockClient{
 			Err: mockErr,
@@ -1010,6 +1005,7 @@ func TestMockClient(t *testing.T) {
 	})
 
 	t.Run("multiple calls tracking", func(t *testing.T) {
+		t.Parallel()
 		mock := &MockClient{
 			Username: "testuser",
 			Orgs:     []string{"org1"},
@@ -1462,13 +1458,15 @@ func TestUserAndOrgs_TokenTypeDetection(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
 			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				if r.URL.Path == "/installation/repositories" {
+				switch r.URL.Path {
+				case "/installation/repositories":
 					w.WriteHeader(http.StatusNotFound)
-				} else if r.URL.Path == "/user" {
+				case "/user":
 					w.WriteHeader(http.StatusOK)
 					_ = json.NewEncoder(w).Encode(User{Login: "testuser"})
-				} else if r.URL.Path == "/user/orgs" {
+				case "/user/orgs":
 					w.WriteHeader(http.StatusOK)
 					_ = json.NewEncoder(w).Encode([]Organization{})
 				}

pkg/logger/logger_test.go

@@ -369,28 +369,28 @@ func TestAllFunctionsWithNilContext(t *testing.T) {
 	SetLogger(logger)
 
 	// Test Info with nil context
-	Info(nil, "info with nil context", Fields{"key": "value"})
+	Info(context.TODO(), "info with nil context", Fields{"key": "value"})
 	if !strings.Contains(buf.String(), "info with nil context") {
 		t.Error("Info did not handle nil context")
 	}
 
 	// Test Warn with nil context
 	buf.Reset()
-	Warn(nil, "warn with nil context", Fields{"key": "value"})
+	Warn(context.TODO(), "warn with nil context", Fields{"key": "value"})
 	if !strings.Contains(buf.String(), "warn with nil context") {
 		t.Error("Warn did not handle nil context")
 	}
 
 	// Test Error with nil context
 	buf.Reset()
 	err := errors.New("test error")
-	Error(nil, "error with nil context", err, Fields{"key": "value"})
+	Error(context.TODO(), "error with nil context", err, Fields{"key": "value"})
 	if !strings.Contains(buf.String(), "error with nil context") {
 		t.Error("Error did not handle nil context")
 	}
 
 	// Test Debug with nil context
 	buf.Reset()
-	Debug(nil, "debug with nil context", Fields{"key": "value"})
+	Debug(context.TODO(), "debug with nil context", Fields{"key": "value"})
 	// Debug is filtered by default, just ensure no panic
 }

pkg/security/security_test.go

@@ -361,7 +361,7 @@ func TestConnectionLimiterReservationMaxIPEntries(t *testing.T) {
 
 	// Fill up to near-max entries to trigger eviction logic
 	// maxIPEntries is 10000, so we create many inactive entries
-	for i := 0; i < 10005; i++ {
+	for i := range 10005 {
 		ip := fmt.Sprintf("192.168.%d.%d", i/256, i%256)
 		// Create reservation then cancel to make it inactive
 		token := limiter.Reserve(ip)
@@ -404,7 +404,7 @@ func TestConnectionLimiterEvictWithAllActive(t *testing.T) {
 	defer limiter.Stop()
 
 	// Create many active connections (no inactive to evict)
-	for i := 0; i < 10005; i++ {
+	for i := range 10005 {
 		ip := fmt.Sprintf("192.168.%d.%d", i/256, i%256)
 		token := limiter.Reserve(ip)
 		if token != "" {

pkg/srv/websocket_test.go

@@ -2548,6 +2548,7 @@ func TestWebSocketCloseErrors(t *testing.T) {
 	t.Parallel()
 
 	t.Run("close already closed connection", func(t *testing.T) {
+		t.Parallel()
 		server := httptest.NewServer(websocket.Handler(func(ws *websocket.Conn) {
 			time.Sleep(50 * time.Millisecond)
 		}))
@@ -2567,6 +2568,7 @@ func TestWebSocketCloseErrors(t *testing.T) {
 	})
 
 	t.Run("close with broken pipe", func(t *testing.T) {
+		t.Parallel()
 		// Simulate broken pipe by forcefully closing underlying connection
 		server := httptest.NewServer(websocket.Handler(func(ws *websocket.Conn) {
 			time.Sleep(20 * time.Millisecond)
@@ -2675,7 +2677,7 @@ func TestConcurrentClientCloseOperations(t *testing.T) {
 	go hub.Run(ctx)
 	defer hub.Stop()
 
-	for i := 0; i < 50; i++ {
+	for i := range 50 {
 		client := &Client{
 			ID:      fmt.Sprintf("test-client-%d", i),
 			send:    make(chan Event, 10),
@@ -2685,7 +2687,7 @@ func TestConcurrentClientCloseOperations(t *testing.T) {
 
 		// Trigger multiple concurrent closes
 		var wg sync.WaitGroup
-		for j := 0; j < 5; j++ {
+		for range 5 {
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
@@ -2758,9 +2760,9 @@ func TestValidateAuthConcurrentAccess(t *testing.T) {
 
 	// Create many concurrent WebSocket connections
 	var wg sync.WaitGroup
-	for i := 0; i < 20; i++ {
+	for range 20 {
 		wg.Add(1)
-		go func(id int) {
+		go func() {
 			defer wg.Done()
 
 			server := httptest.NewServer(websocket.Handler(func(ws *websocket.Conn) {
@@ -2780,7 +2782,7 @@ func TestValidateAuthConcurrentAccess(t *testing.T) {
 			}
 
 			_, _ = handler.validateAuth(ctx, ws, sub, "test-token", "127.0.0.1")
-		}(i)
+		}()
 	}
 	wg.Wait()
 }
@@ -2799,7 +2801,7 @@ func TestHandleRapidDisconnectReconnect(t *testing.T) {
 
 	handler := NewWebSocketHandlerForTest(hub, connLimiter, nil)
 
-	for i := 0; i < 30; i++ {
+	for range 30 {
 		server := httptest.NewServer(websocket.Handler(handler.Handle))
 
 		wsURL := "ws" + strings.TrimPrefix(server.URL, "http")