Delegate configuration discovery to ConfigKit

This commit is contained in:
2026-11-17 20:51:06 +00:00
parent 716bc62991
commit 349ace0528
4 changed files with 16 additions and 59 deletions

View File

@@ -5,21 +5,28 @@ import (
"fmt"
"io"
"os"
"strings"
"gitea.maximumdirect.net/eric/notarius/internal/core/config"
configkit "go.maximumdirect.net/configkit"
)
func loadConfigKit(configPath, overlay string, overrides []configkit.Override, opts Options) (*config.LoadedConfig, string, error) {
path, err := discoverConfigPath(configPath, opts)
if err != nil {
return nil, "", err
var source configkit.Source
if path := strings.TrimSpace(configPath); path != "" {
source = configkit.File(path)
} else if path, ok := opts.LookupEnv("NOTARIUS_CONFIG"); ok && strings.TrimSpace(path) != "" {
source = configkit.File(strings.TrimSpace(path))
} else {
source = configkit.SearchConfig("notarius", configkit.Searches(
configkit.WorkingDirectory(), configkit.UserConfigDirectory(), configkit.UnixSystemDirectories(),
), configkit.SearchOptions{Required: true})
}
workingDirectory, err := os.Getwd()
if err != nil {
return nil, "", fmt.Errorf("determine invocation directory: %w", err)
}
loaded, err := config.Load(path, config.LoadOptions{Overlay: overlay, Overrides: overrides, InvocationDirectory: workingDirectory})
loaded, err := config.LoadSource(source, config.LoadOptions{Overlay: overlay, Overrides: overrides, InvocationDirectory: workingDirectory})
if err != nil {
return nil, "", err
}