review comments

Signed-off-by: Ignasi Barrera <ignasi@tetrate.io>

filterapi/filterconfig.go

@@ -197,3 +197,13 @@ func UnmarshalConfigYaml(path string) (*Config, []byte, error) {
 	}
 	return &cfg, raw, nil
 }
+
+// MustLoadDefaultConfig loads the default configuration.
+// This panics if the configuration fails to be loaded.
+func MustLoadDefaultConfig() (*Config, []byte) {
+	var cfg Config
+	if err := yaml.Unmarshal([]byte(DefaultConfig), &cfg); err != nil {
+		panic(err)
+	}
+	return &cfg, []byte(DefaultConfig)
+}

filterapi/filterconfig_test.go

@@ -12,7 +12,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"k8s.io/apimachinery/pkg/util/yaml"
 
 	"github.com/envoyproxy/ai-gateway/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/extproc"
@@ -23,11 +22,15 @@ func TestDefaultConfig(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, server)
 
-	var cfg filterapi.Config
-	err = yaml.Unmarshal([]byte(filterapi.DefaultConfig), &cfg)
-	require.NoError(t, err)
+	cfg, raw := filterapi.MustLoadDefaultConfig()
+	require.Equal(t, []byte(filterapi.DefaultConfig), raw)
+	require.Equal(t, &filterapi.Config{
+		Schema:                   filterapi.VersionedAPISchema{Name: filterapi.APISchemaOpenAI},
+		SelectedBackendHeaderKey: "x-ai-eg-selected-backend",
+		ModelNameHeaderKey:       "x-ai-eg-model",
+	}, cfg)
 
-	err = server.LoadConfig(t.Context(), &cfg)
+	err = server.LoadConfig(t.Context(), cfg)
 	require.NoError(t, err)
 }
 

internal/extproc/watcher.go

@@ -13,8 +13,6 @@ import (
 	"strings"
 	"time"
 
-	"k8s.io/apimachinery/pkg/util/yaml"
-
 	"github.com/envoyproxy/ai-gateway/filterapi"
 )
 
@@ -76,7 +74,7 @@ func (cw *configWatcher) loadConfig(ctx context.Context) error {
 	if err != nil && os.IsNotExist(err) {
 		// If the file does not exist, do not fail (which could lead to the extproc process to terminate)
 		// Instead, load the default configuration and keep running unconfigured
-		cfg, raw, err = loadDefaultConfig()
+		cfg, raw = filterapi.MustLoadDefaultConfig()
 	}
 	// If reading the file fails, or loading the default config fails, abort
 	if err != nil {
@@ -131,12 +129,3 @@ func (cw *configWatcher) diff(oldConfig, newConfig string) {
 		}
 	}
 }
-
-// loadDefaultConfig loads the default configuration when the given config file path is not found.
-func loadDefaultConfig() (*filterapi.Config, []byte, error) {
-	var cfg filterapi.Config
-	if err := yaml.Unmarshal([]byte(filterapi.DefaultConfig), &cfg); err != nil {
-		return nil, nil, err
-	}
-	return &cfg, []byte(filterapi.DefaultConfig), nil
-}

internal/extproc/watcher_test.go

@@ -77,13 +77,11 @@ func TestStartConfigWatcher(t *testing.T) {
 	path := tmpdir + "/config.yaml"
 	rcv := &mockReceiver{}
 
-	ctx, cancel := context.WithCancel(t.Context())
-	defer cancel()
 	logger, buf := newTestLoggerWithBuffer()
-	err := StartConfigWatcher(ctx, path, rcv, logger, time.Millisecond*100)
+	err := StartConfigWatcher(t.Context(), path, rcv, logger, time.Millisecond*100)
 	require.NoError(t, err)
 
-	defaultCfg, _, err := loadDefaultConfig()
+	defaultCfg, _ := filterapi.MustLoadDefaultConfig()
 	require.NoError(t, err)
 
 	// Verify the default config has been loaded.