feat: load explicit configuration references and remove implicit env overlays

examples/userService/internal/settings/config.go

@@ -3,14 +3,11 @@ package settings
 
 import (
 	"errors"
-	"fmt"
 	"git.yuntuo.hk/k2safe/go-omni/config"
 	"git.yuntuo.hk/k2safe/go-omni/database"
 	"git.yuntuo.hk/k2safe/go-omni/logx"
 	"git.yuntuo.hk/k2safe/go-omni/storage"
 	"net/url"
-	"os"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -38,40 +35,7 @@ func Default() Config {
 	}}
 }
 
-// Load uses defaults -> strict YAML/JSON -> nonempty environment variables.
-// Pass an empty path to use only defaults and environment.
-func Load(path string) (Config, error) {
-	cfg := Default()
-	var err error
-	if path != "" {
-		cfg, err = config.DecodeFile(path, cfg)
-		if err != nil {
-			return Config{}, err
-		}
-	}
-	cfg.Server, err = config.ApplyEnv(cfg.Server, "")
-	if err != nil {
-		return Config{}, err
-	}
-	// A stream explicitly selected by environment overrides a file profile.
-	if output := strings.TrimSpace(os.Getenv("GO_OMNI_LOG_OUTPUT")); output != "" && strings.TrimSpace(os.Getenv("GO_OMNI_LOG_FILE")) == "" {
-		cfg.Server.Log.File = ""
-		cfg.Server.Log.Rotation = logx.RotationConfig{}
-	}
-
-	if err = cfg.Storage.applyEnv(); err != nil {
-		return Config{}, err
-	}
-
-	cfg.Database, err = database.ApplyEnv(cfg.Database, "")
-	if err != nil {
-		return Config{}, err
-	}
-	if err = cfg.Validate(); err != nil {
-		return Config{}, err
-	}
-	return cfg, nil
-}
+func Load(path string) (Config, error) { return config.LoadProject(path, Default()) }
 func (c Config) Validate() error {
 
 	if err := c.Database.Validate(); err != nil {
@@ -108,62 +72,17 @@ type StorageConfig struct {
 	ContentTypes   []string      `json:"contentTypes"`
 	LinkTTL        time.Duration `json:"linkTtl"`
 	RequestTimeout time.Duration `json:"requestTimeout"`
-	// Secrets are environment-only and cannot be populated by config files.
-	FilesToken   string `json:"-"`
-	SigningKey   string `json:"-"`
-	AccessKey    string `json:"-"`
-	SecretKey    string `json:"-"`
-	SessionToken string `json:"-"`
+	// The file explicitly selects secret environment references.
+	FilesToken   string `json:"filesToken"`
+	SigningKey   string `json:"signingKey"`
+	AccessKey    string `json:"accessKey"`
+	SecretKey    string `json:"secretKey"`
+	SessionToken string `json:"sessionToken"`
 }
 
 func (s StorageConfig) Policy() storage.UploadPolicy {
 	return storage.UploadPolicy{MaxBytes: s.MaxBytes, ContentTypes: s.ContentTypes}
 }
-func (s *StorageConfig) applyEnv() error {
-	values := map[string]*string{
-		"GO_OMNI_STORAGE_ROOT": &s.Root, "GO_OMNI_STORAGE_PUBLIC_URL": &s.PublicURL,
-		"GO_OMNI_STORAGE_ENDPOINT": &s.Endpoint, "GO_OMNI_STORAGE_REGION": &s.Region,
-		"GO_OMNI_STORAGE_BUCKET": &s.Bucket, "GO_OMNI_STORAGE_ACCOUNT_ID": &s.AccountID,
-		"GO_OMNI_STORAGE_SIGNING_KEY": &s.SigningKey, "GO_OMNI_FILES_TOKEN": &s.FilesToken,
-		"GO_OMNI_STORAGE_ACCESS_KEY": &s.AccessKey, "GO_OMNI_STORAGE_SECRET_KEY": &s.SecretKey,
-		"GO_OMNI_STORAGE_SESSION_TOKEN": &s.SessionToken,
-	}
-	for name, target := range values {
-		if value := strings.TrimSpace(os.Getenv(name)); value != "" {
-			*target = value
-		}
-	}
-	for name, target := range map[string]*time.Duration{"GO_OMNI_STORAGE_LINK_TTL": &s.LinkTTL, "GO_OMNI_STORAGE_REQUEST_TIMEOUT": &s.RequestTimeout} {
-		if value := strings.TrimSpace(os.Getenv(name)); value != "" {
-			v, err := time.ParseDuration(value)
-			if err != nil {
-				return fmt.Errorf("%s must be a duration", name)
-			}
-			*target = v
-		}
-	}
-	if value := os.Getenv("GO_OMNI_STORAGE_MAX_BYTES"); value != "" {
-		v, err := strconv.ParseInt(value, 10, 64)
-		if err != nil {
-			return errors.New("GO_OMNI_STORAGE_MAX_BYTES must be an integer")
-		}
-		s.MaxBytes = v
-	}
-	if value := os.Getenv("GO_OMNI_STORAGE_SECURE"); value != "" {
-		v, err := strconv.ParseBool(value)
-		if err != nil {
-			return errors.New("GO_OMNI_STORAGE_SECURE must be a boolean")
-		}
-		s.Secure = v
-	}
-	if value := strings.TrimSpace(os.Getenv("GO_OMNI_STORAGE_CONTENT_TYPES")); value != "" {
-		s.ContentTypes = strings.Split(value, ",")
-		for i := range s.ContentTypes {
-			s.ContentTypes[i] = strings.TrimSpace(s.ContentTypes[i])
-		}
-	}
-	return nil
-}
 func (s StorageConfig) Validate() error {
 	if s.Provider != "local" {
 		return errors.New("storage.provider must match the adapter selected at generation")
@@ -186,7 +105,7 @@ func (s StorageConfig) Validate() error {
 		return errors.New("storage.publicUrl must be an absolute HTTP(S) URL ending in /storage/object")
 	}
 	if len(s.SigningKey) < 32 {
-		return errors.New("set GO_OMNI_STORAGE_SIGNING_KEY to a stable secret of at least 32 bytes")
+		return errors.New("storage.signingKey requires a stable secret of at least 32 bytes")
 	}
 
 	return nil