chore: address comments

Author: ssncferreira

intercept/client_headers.go

@@ -25,16 +25,18 @@ var nonForwardedHeaders = []string{
 }
 
 // authHeaders are headers that carry authentication credentials from the
-// client. These are stripped because the SDK re-injects the correct
-// provider credentials (API key or per-user token).
+// client. The upstream request is built by the SDK, which sets the correct
+// provider credentials via option.WithAPIKey. Client auth headers are
+// stripped here and the provider credentials are re-injected by
+// BuildUpstreamHeaders from the SDK-built request.
 var authHeaders = []string{
 	"Authorization",
 	"X-Api-Key",
 }
 
-// SanitizeClientHeaders returns a copy of the client headers with hop-by-hop,
+// PrepareClientHeaders returns a copy of the client headers with hop-by-hop,
 // transport, and auth headers removed.
-func SanitizeClientHeaders(clientHeaders http.Header) http.Header {
+func PrepareClientHeaders(clientHeaders http.Header) http.Header {
 	sanitized := clientHeaders.Clone()
 	for _, h := range hopByHopHeaders {
 		sanitized.Del(h)
@@ -52,7 +54,7 @@ func SanitizeClientHeaders(clientHeaders http.Header) http.Header {
 // It starts from the sanitized client headers, then preserves specific
 // headers from the SDK-built request that must not be overwritten.
 func BuildUpstreamHeaders(sdkHeader http.Header, clientHeaders http.Header, authHeaderName string) http.Header {
-	headers := SanitizeClientHeaders(clientHeaders)
+	headers := PrepareClientHeaders(clientHeaders)
 
 	// Preserve the auth header set by the SDK from the provider configuration.
 	if v := sdkHeader.Get(authHeaderName); v != "" {

intercept/client_headers_test.go

@@ -14,7 +14,7 @@ func TestSanitizeClientHeaders(t *testing.T) {
 	t.Run("nil input returns empty header", func(t *testing.T) {
 		t.Parallel()
 
-		result := SanitizeClientHeaders(nil)
+		result := PrepareClientHeaders(nil)
 		require.Empty(t, result)
 	})
 
@@ -29,7 +29,7 @@ func TestSanitizeClientHeaders(t *testing.T) {
 			"X-Custom":          {"preserved"},
 		}
 
-		result := SanitizeClientHeaders(input)
+		result := PrepareClientHeaders(input)
 
 		assert.Empty(t, result.Get("Connection"))
 		assert.Empty(t, result.Get("Keep-Alive"))
@@ -48,7 +48,7 @@ func TestSanitizeClientHeaders(t *testing.T) {
 			"X-Custom":        {"preserved"},
 		}
 
-		result := SanitizeClientHeaders(input)
+		result := PrepareClientHeaders(input)
 
 		assert.Empty(t, result.Get("Host"))
 		assert.Empty(t, result.Get("Accept-Encoding"))
@@ -65,7 +65,7 @@ func TestSanitizeClientHeaders(t *testing.T) {
 			"X-Custom":      {"preserved"},
 		}
 
-		result := SanitizeClientHeaders(input)
+		result := PrepareClientHeaders(input)
 
 		assert.Empty(t, result.Get("Authorization"))
 		assert.Empty(t, result.Get("X-Api-Key"))
@@ -79,7 +79,7 @@ func TestSanitizeClientHeaders(t *testing.T) {
 			"X-Custom": {"value-1", "value-2"},
 		}
 
-		result := SanitizeClientHeaders(input)
+		result := PrepareClientHeaders(input)
 
 		require.Equal(t, []string{"value-1", "value-2"}, result["X-Custom"])
 	})
@@ -93,7 +93,7 @@ func TestSanitizeClientHeaders(t *testing.T) {
 		}
 		originalCopy := input.Clone()
 
-		_ = SanitizeClientHeaders(input)
+		_ = PrepareClientHeaders(input)
 
 		require.Equal(t, originalCopy, input)
 	})

provider/openai_test.go

@@ -18,6 +18,11 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
+const (
+	chatCompletionResponse = `{"id":"chatcmpl-123","object":"chat.completion","created":1677652288,"model":"gpt-4","choices":[{"index":0,"message":{"role":"assistant","content":"Hello!"},"finish_reason":"stop"}],"usage":{"prompt_tokens":9,"completion_tokens":12,"total_tokens":21}}`
+	responsesAPIResponse   = `{"id":"resp-123","object":"response","created_at":1677652288,"model":"gpt-5","output":[],"usage":{"input_tokens":5,"output_tokens":10,"total_tokens":15}}`
+)
+
 type message struct {
 	Role    string
 	Content string
@@ -166,7 +171,8 @@ func TestOpenAI_CreateInterceptor(t *testing.T) {
 			receivedHeaders = r.Header.Clone()
 			w.Header().Set("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			_, _ = w.Write([]byte(`{"id":"chatcmpl-123","object":"chat.completion","created":1677652288,"model":"gpt-4","choices":[{"index":0,"message":{"role":"assistant","content":"Hello!"},"finish_reason":"stop"}],"usage":{"prompt_tokens":9,"completion_tokens":12,"total_tokens":21}}`))
+			_, err := w.Write([]byte(chatCompletionResponse))
+			require.NoError(t, err)
 		}))
 		t.Cleanup(mockUpstream.Close)
 
@@ -207,7 +213,8 @@ func TestOpenAI_CreateInterceptor(t *testing.T) {
 			receivedHeaders = r.Header.Clone()
 			w.Header().Set("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			_, _ = w.Write([]byte(`{"id":"resp-123","object":"response","created_at":1677652288,"model":"gpt-5","output":[],"usage":{"input_tokens":5,"output_tokens":10,"total_tokens":15}}`))
+			_, err := w.Write([]byte(responsesAPIResponse))
+			require.NoError(t, err)
 		}))
 		t.Cleanup(mockUpstream.Close)