chore: lint fixes part 1 (automatic fixes)

Author: pawbana

api.go

@@ -3,14 +3,15 @@ package aibridge
 import (
 	"context"
 
+	"github.com/prometheus/client_golang/prometheus"
+	"go.opentelemetry.io/otel/trace"
+
 	"cdr.dev/slog/v3"
 	"github.com/coder/aibridge/config"
 	aibcontext "github.com/coder/aibridge/context"
 	"github.com/coder/aibridge/metrics"
 	"github.com/coder/aibridge/provider"
 	"github.com/coder/aibridge/recorder"
-	"github.com/prometheus/client_golang/prometheus"
-	"go.opentelemetry.io/otel/trace"
 )
 
 // Const + Type + function aliases for backwards compatibility.

bridge.go

@@ -11,6 +11,12 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/hashicorp/go-multierror"
+	"github.com/sony/gobreaker/v2"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/trace"
+	"golang.org/x/xerrors"
+
 	"cdr.dev/slog/v3"
 	"github.com/coder/aibridge/circuitbreaker"
 	aibcontext "github.com/coder/aibridge/context"
@@ -19,10 +25,6 @@ import (
 	"github.com/coder/aibridge/provider"
 	"github.com/coder/aibridge/recorder"
 	"github.com/coder/aibridge/tracing"
-	"github.com/hashicorp/go-multierror"
-	"github.com/sony/gobreaker/v2"
-	"go.opentelemetry.io/otel/codes"
-	"go.opentelemetry.io/otel/trace"
 )
 
 const (
@@ -67,10 +69,10 @@ func validateProviders(providers []provider.Provider) error {
 	for _, prov := range providers {
 		name := prov.Name()
 		if !validProviderName.MatchString(name) {
-			return fmt.Errorf("invalid provider name %q: must contain only lowercase alphanumeric characters and hyphens", name)
+			return xerrors.Errorf("invalid provider name %q: must contain only lowercase alphanumeric characters and hyphens", name)
 		}
 		if names[name] {
-			return fmt.Errorf("duplicate provider name: %q", name)
+			return xerrors.Errorf("duplicate provider name: %q", name)
 		}
 		names[name] = true
 	}
@@ -125,7 +127,7 @@ func NewRequestBridge(ctx context.Context, providers []provider.Provider, rec re
 					slog.F("prefix", prov.RoutePrefix()),
 					slog.F("path", path),
 				)
-				return nil, fmt.Errorf("failed to configure provider '%v': failed to join bridged path: %w", providerName, err)
+				return nil, xerrors.Errorf("failed to configure provider '%v': failed to join bridged path: %w", providerName, err)
 			}
 			mux.Handle(route, handler)
 		}
@@ -144,7 +146,7 @@ func NewRequestBridge(ctx context.Context, providers []provider.Provider, rec re
 					slog.F("prefix", prov.RoutePrefix()),
 					slog.F("path", path),
 				)
-				return nil, fmt.Errorf("failed to configure provider '%v': failed to join passed through path: %w", providerName, err)
+				return nil, xerrors.Errorf("failed to configure provider '%v': failed to join passed through path: %w", providerName, err)
 			}
 			mux.Handle(route, http.StripPrefix(prov.RoutePrefix(), ftr))
 		}
@@ -325,7 +327,7 @@ func (b *RequestBridge) Shutdown(ctx context.Context) error {
 		select {
 		case <-ctx.Done():
 			// Cancel all inflight requests, if any are still running.
-			b.logger.Debug(ctx, "shutdown context canceled; cancelling inflight requests", slog.Error(ctx.Err()))
+			b.logger.Debug(ctx, "shutdown context canceled; canceling inflight requests", slog.Error(ctx.Err()))
 			b.inflightCancel()
 			<-done
 			err = ctx.Err()
@@ -347,8 +349,8 @@ func (b *RequestBridge) InflightRequests() int32 {
 	return b.inflightReqs.Load()
 }
 
-// mergeContexts merges two contexts together, so that if either is cancelled
-// the returned context is cancelled. The context values will only be used from
+// mergeContexts merges two contexts together, so that if either is canceled
+// the returned context is canceled. The context values will only be used from
 // the first context.
 func mergeContexts(base, other context.Context) context.Context {
 	ctx, cancel := context.WithCancel(base)

bridge_test.go

@@ -5,12 +5,13 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"cdr.dev/slog/v3/sloggers/slogtest"
 	"github.com/coder/aibridge/config"
 	"github.com/coder/aibridge/internal/testutil"
 	"github.com/coder/aibridge/provider"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestValidateProvider_Names(t *testing.T) {

buildinfo/buildinfo_test.go

@@ -3,8 +3,9 @@ package buildinfo_test
 import (
 	"testing"
 
-	"github.com/coder/aibridge/buildinfo"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/coder/aibridge/buildinfo"
 )
 
 func TestBuildInfo(t *testing.T) {

circuitbreaker/circuitbreaker.go

@@ -7,14 +7,16 @@ import (
 	"sync"
 	"time"
 
+	"github.com/sony/gobreaker/v2"
+	"golang.org/x/xerrors"
+
 	"github.com/coder/aibridge/config"
 	"github.com/coder/aibridge/metrics"
-	"github.com/sony/gobreaker/v2"
 )
 
 // ErrCircuitOpen is returned by Execute when the circuit breaker is open
 // and the request was rejected without calling the handler.
-var ErrCircuitOpen = errors.New("circuit breaker is open")
+var ErrCircuitOpen = xerrors.New("circuit breaker is open")
 
 // DefaultIsFailure returns true for standard HTTP status codes that typically
 // indicate upstream overload.
@@ -153,7 +155,7 @@ func (p *ProviderCircuitBreakers) Execute(endpoint, model string, w http.Respons
 	_, err := cb.Execute(func() (struct{}, error) {
 		handlerErr = handler(sw)
 		if p.isFailure(sw.statusCode) {
-			return struct{}{}, fmt.Errorf("upstream error: %d", sw.statusCode)
+			return struct{}{}, xerrors.Errorf("upstream error: %d", sw.statusCode)
 		}
 		return struct{}{}, nil
 	})

circuitbreaker/circuitbreaker_test.go

@@ -8,9 +8,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coder/aibridge/config"
 	"github.com/sony/gobreaker/v2"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/coder/aibridge/config"
 )
 
 func TestExecute_PerModelIsolation(t *testing.T) {

intercept/actor_headers.go

@@ -5,8 +5,9 @@ import (
 	"strings"
 
 	ant_option "github.com/anthropics/anthropic-sdk-go/option"
-	"github.com/coder/aibridge/context"
 	oai_option "github.com/openai/openai-go/v3/option"
+
+	"github.com/coder/aibridge/context"
 )
 
 const (

intercept/actor_headers_test.go

@@ -3,10 +3,11 @@ package intercept
 import (
 	"testing"
 
-	"github.com/coder/aibridge/context"
-	"github.com/coder/aibridge/recorder"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
+
+	"github.com/coder/aibridge/context"
+	"github.com/coder/aibridge/recorder"
 )
 
 func TestNilActor(t *testing.T) {

intercept/apidump/apidump.go

@@ -12,11 +12,14 @@ import (
 	"slices"
 	"strings"
 
+	"golang.org/x/xerrors"
+
 	"cdr.dev/slog/v3"
 
-	"github.com/coder/quartz"
 	"github.com/google/uuid"
 	"github.com/tidwall/pretty"
+
+	"github.com/coder/quartz"
 )
 
 const (
@@ -71,7 +74,7 @@ type dumper struct {
 func (d *dumper) dumpRequest(req *http.Request) error {
 	dumpPath := d.dumpPath + SuffixRequest
 	if err := os.MkdirAll(filepath.Dir(dumpPath), 0o755); err != nil {
-		return fmt.Errorf("create dump dir: %w", err)
+		return xerrors.Errorf("create dump dir: %w", err)
 	}
 
 	// Read and restore body
@@ -80,7 +83,7 @@ func (d *dumper) dumpRequest(req *http.Request) error {
 		var err error
 		bodyBytes, err = io.ReadAll(req.Body)
 		if err != nil {
-			return fmt.Errorf("read request body: %w", err)
+			return xerrors.Errorf("read request body: %w", err)
 		}
 		req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
 	}
@@ -91,18 +94,18 @@ func (d *dumper) dumpRequest(req *http.Request) error {
 	var buf bytes.Buffer
 	_, err := fmt.Fprintf(&buf, "%s %s %s\r\n", req.Method, req.URL.RequestURI(), req.Proto)
 	if err != nil {
-		return fmt.Errorf("write request uri: %w", err)
+		return xerrors.Errorf("write request uri: %w", err)
 	}
 	err = d.writeRedactedHeaders(&buf, req.Header, sensitiveRequestHeaders, map[string]string{
 		"Content-Length": fmt.Sprintf("%d", len(prettyBody)),
 	})
 	if err != nil {
-		return fmt.Errorf("write request headers: %w", err)
+		return xerrors.Errorf("write request headers: %w", err)
 	}
 
 	_, err = fmt.Fprintf(&buf, "\r\n")
 	if err != nil {
-		return fmt.Errorf("write request header terminator: %w", err)
+		return xerrors.Errorf("write request header terminator: %w", err)
 	}
 	buf.Write(prettyBody)
 	buf.WriteByte('\n')
@@ -117,15 +120,15 @@ func (d *dumper) dumpResponse(resp *http.Response) error {
 	var headerBuf bytes.Buffer
 	_, err := fmt.Fprintf(&headerBuf, "%s %s\r\n", resp.Proto, resp.Status)
 	if err != nil {
-		return fmt.Errorf("write response status: %w", err)
+		return xerrors.Errorf("write response status: %w", err)
 	}
 	err = d.writeRedactedHeaders(&headerBuf, resp.Header, sensitiveResponseHeaders, nil)
 	if err != nil {
-		return fmt.Errorf("write response headers: %w", err)
+		return xerrors.Errorf("write response headers: %w", err)
 	}
 	_, err = fmt.Fprintf(&headerBuf, "\r\n")
 	if err != nil {
-		return fmt.Errorf("write response header terminator: %w", err)
+		return xerrors.Errorf("write response header terminator: %w", err)
 	}
 
 	// Wrap the response body to capture it as it streams
@@ -175,7 +178,7 @@ func (d *dumper) writeRedactedHeaders(w io.Writer, headers http.Header, sensitiv
 			if override, ok := overrides[key]; ok {
 				_, err := fmt.Fprintf(w, "%s: %s\r\n", key, override)
 				if err != nil {
-					return fmt.Errorf("write response header override: %w", err)
+					return xerrors.Errorf("write response header override: %w", err)
 				}
 			}
 			continue
@@ -190,7 +193,7 @@ func (d *dumper) writeRedactedHeaders(w io.Writer, headers http.Header, sensitiv
 			}
 			_, err := fmt.Fprintf(w, "%s: %s\r\n", key, value)
 			if err != nil {
-				return fmt.Errorf("write response headers: %w", err)
+				return xerrors.Errorf("write response headers: %w", err)
 			}
 		}
 	}

intercept/apidump/apidump_test.go

@@ -10,11 +10,12 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+
 	"cdr.dev/slog/v3"
 	"cdr.dev/slog/v3/sloggers/slogtest"
 	"github.com/coder/quartz"
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/require"
 )
 
 // findDumpFile finds a dump file matching the pattern in the given directory.