Merge branch 'main' into main

MattMencel · web-flow · commit 11d6e0212fe3 · 2025-09-11T22:26:07.000-05:00
diff --git a/cmd/aigw/run.go b/cmd/aigw/run.go
@@ -29,9 +29,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/controller"
 	"github.com/envoyproxy/ai-gateway/internal/extensionserver"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 var (
diff --git a/cmd/aigw/run_test.go b/cmd/aigw/run_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/envoyproxy/ai-gateway/cmd/extproc/mainlib"
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	internaltesting "github.com/envoyproxy/ai-gateway/internal/testing"
 )
 
diff --git a/cmd/extproc/mainlib/main_test.go b/cmd/extproc/mainlib/main_test.go
@@ -26,7 +26,7 @@ import (
 	"google.golang.org/grpc/health"
 	"google.golang.org/grpc/health/grpc_health_v1"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/metrics"
 )
 
diff --git a/internal/controller/gateway.go b/internal/controller/gateway.go
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/yaml"
 
 	aigv1a1 "github.com/envoyproxy/ai-gateway/api/v1alpha1"
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/controller/rotators"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/internalapi"
 	"github.com/envoyproxy/ai-gateway/internal/llmcostcel"
 )
diff --git a/internal/controller/gateway_test.go b/internal/controller/gateway_test.go
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/yaml"
 
 	aigv1a1 "github.com/envoyproxy/ai-gateway/api/v1alpha1"
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/controller/rotators"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 func TestGatewayController_Reconcile(t *testing.T) {
diff --git a/internal/controller/rotators/gcp_oidc_token_rotator.go b/internal/controller/rotators/gcp_oidc_token_rotator.go
@@ -23,8 +23,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	aigv1a1 "github.com/envoyproxy/ai-gateway/api/v1alpha1"
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/controller/tokenprovider"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 const (
diff --git a/internal/extproc/backendauth/api_key.go b/internal/extproc/backendauth/api_key.go
@@ -13,7 +13,7 @@ import (
 	corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 // apiKeyHandler implements [Handler] for api key authz.
diff --git a/internal/extproc/backendauth/api_key_test.go b/internal/extproc/backendauth/api_key_test.go
@@ -12,7 +12,7 @@ import (
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 	"github.com/stretchr/testify/require"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 func TestNewAPIKeyHandler(t *testing.T) {
diff --git a/internal/extproc/backendauth/auth.go b/internal/extproc/backendauth/auth.go
@@ -11,7 +11,7 @@ import (
 
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 // Handler is the interface that deals with the backend auth for a specific backend.
diff --git a/internal/extproc/backendauth/auth_test.go b/internal/extproc/backendauth/auth_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 func TestNewHandler(t *testing.T) {
diff --git a/internal/extproc/backendauth/aws.go b/internal/extproc/backendauth/aws.go
@@ -23,7 +23,7 @@ import (
 	corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 // awsHandler implements [Handler] for AWS Bedrock authz.
diff --git a/internal/extproc/backendauth/aws_test.go b/internal/extproc/backendauth/aws_test.go
@@ -13,7 +13,7 @@ import (
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 	"github.com/stretchr/testify/require"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 func TestNewAWSHandler(t *testing.T) {
diff --git a/internal/extproc/backendauth/azure.go b/internal/extproc/backendauth/azure.go
@@ -13,7 +13,7 @@ import (
 	corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 type azureHandler struct {
diff --git a/internal/extproc/backendauth/azure_test.go b/internal/extproc/backendauth/azure_test.go
@@ -12,7 +12,7 @@ import (
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 	"github.com/stretchr/testify/require"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 func TestNewAzureHandler(t *testing.T) {
diff --git a/internal/extproc/backendauth/gcp.go b/internal/extproc/backendauth/gcp.go
@@ -12,7 +12,7 @@ import (
 	corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 type gcpHandler struct {
diff --git a/internal/extproc/backendauth/gcp_test.go b/internal/extproc/backendauth/gcp_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 func TestNewGCPHandler(t *testing.T) {
diff --git a/internal/extproc/chatcompletion_processor.go b/internal/extproc/chatcompletion_processor.go
@@ -21,11 +21,11 @@ import (
 	"github.com/tidwall/sjson"
 	"google.golang.org/protobuf/types/known/structpb"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/apischema/openai"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/backendauth"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/headermutator"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/translator"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/internalapi"
 	"github.com/envoyproxy/ai-gateway/internal/llmcostcel"
 	"github.com/envoyproxy/ai-gateway/internal/metrics"
diff --git a/internal/extproc/chatcompletion_processor_test.go b/internal/extproc/chatcompletion_processor_test.go
@@ -19,10 +19,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/structpb"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/apischema/openai"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/headermutator"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/translator"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/llmcostcel"
 	"github.com/envoyproxy/ai-gateway/internal/testing/testotel"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
diff --git a/internal/extproc/embeddings_processor.go b/internal/extproc/embeddings_processor.go
@@ -19,10 +19,10 @@ import (
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 	"google.golang.org/protobuf/types/known/structpb"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/apischema/openai"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/backendauth"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/translator"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/metrics"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
 )
diff --git a/internal/extproc/embeddings_processor_test.go b/internal/extproc/embeddings_processor_test.go
@@ -17,9 +17,9 @@ import (
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 	"github.com/stretchr/testify/require"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/apischema/openai"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/translator"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/llmcostcel"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
 )
diff --git a/internal/extproc/headermutator/header_mutator.go b/internal/extproc/headermutator/header_mutator.go
@@ -11,7 +11,7 @@ import (
 	corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 type HeaderMutator struct {
diff --git a/internal/extproc/headermutator/header_mutator_test.go b/internal/extproc/headermutator/header_mutator_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 func TestHeaderMutator_Mutate(t *testing.T) {
diff --git a/internal/extproc/messages_processor.go b/internal/extproc/messages_processor.go
@@ -17,10 +17,10 @@ import (
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 	"google.golang.org/protobuf/types/known/structpb"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/apischema/anthropic"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/backendauth"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/translator"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/internalapi"
 	"github.com/envoyproxy/ai-gateway/internal/metrics"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
diff --git a/internal/extproc/messages_processor_test.go b/internal/extproc/messages_processor_test.go
@@ -18,9 +18,9 @@ import (
 	"go.opentelemetry.io/otel/metric/noop"
 	"google.golang.org/protobuf/types/known/structpb"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	anthropicschema "github.com/envoyproxy/ai-gateway/internal/apischema/anthropic"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/translator"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/metrics"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
 )
diff --git a/internal/extproc/mocks_test.go b/internal/extproc/mocks_test.go
@@ -17,10 +17,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/metadata"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/apischema/openai"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/backendauth"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/translator"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/metrics"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
 )
diff --git a/internal/extproc/models_processor_test.go b/internal/extproc/models_processor_test.go
@@ -16,8 +16,8 @@ import (
 	typev3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
 	"github.com/stretchr/testify/require"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/apischema/openai"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
 )
 
diff --git a/internal/extproc/processor.go b/internal/extproc/processor.go
@@ -13,8 +13,8 @@ import (
 	extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 	"github.com/google/cel-go/cel"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/backendauth"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
 )
 
diff --git a/internal/extproc/server.go b/internal/extproc/server.go
@@ -25,8 +25,8 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/encoding/prototext"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/extproc/backendauth"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/internalapi"
 	"github.com/envoyproxy/ai-gateway/internal/llmcostcel"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
diff --git a/internal/extproc/server_test.go b/internal/extproc/server_test.go
@@ -24,7 +24,7 @@ import (
 	"google.golang.org/protobuf/encoding/prototext"
 	"google.golang.org/protobuf/types/known/structpb"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/internalapi"
 	"github.com/envoyproxy/ai-gateway/internal/llmcostcel"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
diff --git a/internal/extproc/watcher.go b/internal/extproc/watcher.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 // ConfigReceiver is an interface that can receive *filterapi.Config updates.
diff --git a/internal/extproc/watcher_test.go b/internal/extproc/watcher_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 // mockReceiver is a mock implementation of Receiver.
diff --git a/internal/filterapi/filterconfig.go b/internal/filterapi/filterconfig.go
@@ -6,9 +6,6 @@
 // Package filterapi provides the configuration for the AI Gateway-implemented filter
 // which is currently an external processor (See https://github.com/envoyproxy/ai-gateway/issues/90).
 //
-// This is a public package so that the filter can be testable without
-// depending on the Envoy Gateway as well as it can be used outside the Envoy AI Gateway.
-//
 // This configuration must be decoupled from the Envoy Gateway types as well as its implementation
 // details. Also, the configuration must not be tied with k8s so it can be tested and iterated
 // without the need for the k8s cluster.
diff --git a/internal/filterapi/filterconfig_test.go b/internal/filterapi/filterconfig_test.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/extproc"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
 )
 
diff --git a/internal/metrics/base_metrics.go b/internal/metrics/base_metrics.go
@@ -12,7 +12,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 // baseMetrics provides shared functionality for AI Gateway metrics implementations.
diff --git a/internal/metrics/chat_completion_metrics.go b/internal/metrics/chat_completion_metrics.go
@@ -12,7 +12,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 // chatCompletion is the implementation for the chat completion AI Gateway metrics.
diff --git a/internal/metrics/chat_completion_metrics_test.go b/internal/metrics/chat_completion_metrics_test.go
@@ -16,7 +16,7 @@ import (
 	"go.opentelemetry.io/otel/sdk/metric"
 	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 func TestNewProcessorMetrics(t *testing.T) {
diff --git a/internal/metrics/embeddings_metrics.go b/internal/metrics/embeddings_metrics.go
@@ -11,7 +11,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 // embeddings is the implementation for the embeddings AI Gateway metrics.
diff --git a/internal/metrics/embeddings_metrics_test.go b/internal/metrics/embeddings_metrics_test.go
@@ -12,7 +12,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 )
 
 func TestEmbeddings_RecordTokenUsage(t *testing.T) {
diff --git a/tests/extproc/bench_test.go b/tests/extproc/bench_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/yaml"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/tests/internal/testupstreamlib"
 )
 
diff --git a/tests/extproc/extproc_test.go b/tests/extproc/extproc_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/tests/internal/testenvironment"
 )
 
diff --git a/tests/extproc/real_providers_test.go b/tests/extproc/real_providers_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/yaml"
 
-	"github.com/envoyproxy/ai-gateway/filterapi"
+	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	internaltesting "github.com/envoyproxy/ai-gateway/internal/testing"
 )
 
diff --git a/tests/extproc/testupstream_test.go b/tests/extproc/testupstream_test.go

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ import (`
`29`	`29`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`30`	`30`	`"sigs.k8s.io/yaml"`
`31`	`31`
`32`		`- "github.com/envoyproxy/ai-gateway/filterapi"`
`33`	`32`	`"github.com/envoyproxy/ai-gateway/internal/controller"`
`34`	`33`	`"github.com/envoyproxy/ai-gateway/internal/extensionserver"`
	`34`	`+ "github.com/envoyproxy/ai-gateway/internal/filterapi"`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"github.com/stretchr/testify/require"`
`24`	`24`
`25`	`25`	`"github.com/envoyproxy/ai-gateway/cmd/extproc/mainlib"`
`26`		`- "github.com/envoyproxy/ai-gateway/filterapi"`
	`26`	`+ "github.com/envoyproxy/ai-gateway/internal/filterapi"`
`27`	`27`	`internaltesting "github.com/envoyproxy/ai-gateway/internal/testing"`
`28`	`28`	`)`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"google.golang.org/grpc/health"`
`27`	`27`	`"google.golang.org/grpc/health/grpc_health_v1"`
`28`	`28`
`29`		`- "github.com/envoyproxy/ai-gateway/filterapi"`
	`29`	`+ "github.com/envoyproxy/ai-gateway/internal/filterapi"`
`30`	`30`	`"github.com/envoyproxy/ai-gateway/internal/metrics"`
`31`	`31`	`)`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ import (`
`26`	`26`	`"sigs.k8s.io/yaml"`
`27`	`27`
`28`	`28`	`aigv1a1 "github.com/envoyproxy/ai-gateway/api/v1alpha1"`
`29`		`- "github.com/envoyproxy/ai-gateway/filterapi"`
`30`	`29`	`"github.com/envoyproxy/ai-gateway/internal/controller/rotators"`
	`30`	`+ "github.com/envoyproxy/ai-gateway/internal/filterapi"`
`31`	`31`	`"github.com/envoyproxy/ai-gateway/internal/internalapi"`
`32`	`32`	`"github.com/envoyproxy/ai-gateway/internal/llmcostcel"`
`33`	`33`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ import (`
`23`	`23`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`24`	`24`
`25`	`25`	`aigv1a1 "github.com/envoyproxy/ai-gateway/api/v1alpha1"`
`26`		`- "github.com/envoyproxy/ai-gateway/filterapi"`
`27`	`26`	`"github.com/envoyproxy/ai-gateway/internal/controller/tokenprovider"`
	`27`	`+ "github.com/envoyproxy/ai-gateway/internal/filterapi"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"`
`14`	`14`	`extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"`
`15`	`15`
`16`		`- "github.com/envoyproxy/ai-gateway/filterapi"`
	`16`	`+ "github.com/envoyproxy/ai-gateway/internal/filterapi"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`// apiKeyHandler implements [Handler] for api key authz.`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"`
`13`	`13`	`"github.com/stretchr/testify/require"`
`14`	`14`
`15`		`- "github.com/envoyproxy/ai-gateway/filterapi"`
	`15`	`+ "github.com/envoyproxy/ai-gateway/internal/filterapi"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func TestNewAPIKeyHandler(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`
`12`	`12`	`extprocv3 "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"`
`13`	`13`
`14`		`- "github.com/envoyproxy/ai-gateway/filterapi"`
	`14`	`+ "github.com/envoyproxy/ai-gateway/internal/filterapi"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`// Handler is the interface that deals with the backend auth for a specific backend.`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`
`11`	`11`	`"github.com/stretchr/testify/require"`
`12`	`12`
`13`		`- "github.com/envoyproxy/ai-gateway/filterapi"`
	`13`	`+ "github.com/envoyproxy/ai-gateway/internal/filterapi"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func TestNewHandler(t *testing.T) {`