feat: load explicit configuration references and remove implicit env overlays

database/configOverlay_test.go

@@ -2,19 +2,27 @@ package database
 
 import (
 	"encoding/json"
+	"git.yuntuo.hk/k2safe/go-omni/config"
+	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 	"time"
 )
 
-func TestApplyEnvPreservesFilePoolAndHidesDSN(t *testing.T) {
+func TestExplicitConfigPreservesPoolAndHidesDSN(t *testing.T) {
 	cfg := DefaultConfig()
+	cfg.Driver = "mysql"
+	path := filepath.Join(t.TempDir(), "db.yaml")
+	if err := os.WriteFile(path, []byte("dsn: \"${OMNI_TEST_DSN}\"\nmaxIdleConns: \"${OMNI_TEST_MAX_IDLE_CONNS}\"\nmaxOpenConns: \"${OMNI_TEST_MAX_OPEN_CONNS:-3}\""), 0600); err != nil {
+		t.Fatal(err)
+	}
 	cfg.MaxOpenConns = 3
 	cfg.MaxIdleConns = 1
 	cfg.PingTimeout = time.Second
 	t.Setenv("OMNI_TEST_DSN", "user:secret@tcp(localhost:3306)/test")
 	t.Setenv("OMNI_TEST_MAX_IDLE_CONNS", "0")
-	got, err := ApplyEnv(cfg, "OMNI_TEST_")
+	got, err := config.LoadProject(path, cfg)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -29,7 +37,7 @@ func TestApplyEnvPreservesFilePoolAndHidesDSN(t *testing.T) {
 		t.Fatalf("unsafe config encoding: %s", data)
 	}
 	t.Setenv("OMNI_TEST_MAX_OPEN_CONNS", "bad")
-	if _, err = ApplyEnv(cfg, "OMNI_TEST_"); err == nil {
+	if _, err = config.LoadProject(path, cfg); err == nil {
 		t.Fatal("invalid override accepted")
 	}
 }