Use native pipeline discovery and independent secrets bootstrap
This commit is contained in:
@@ -5,16 +5,14 @@ import "gitea.maximumdirect.net/eric/narratio/internal/artifactmodel"
|
||||
// Default filesystem locations for config lookup when config path flags are
|
||||
// omitted. Order is highest to lowest precedence.
|
||||
const (
|
||||
DefaultPipelineConfigPathUsrLocal = "/usr/local/etc/narratio/pipeline.yml"
|
||||
DefaultPipelineConfigPathEtc = "/etc/narratio/pipeline.yml"
|
||||
DefaultSessionConfigPathUsrLocal = "/usr/local/etc/narratio/session.yml"
|
||||
DefaultSessionConfigPathEtc = "/etc/narratio/session.yml"
|
||||
DefaultStorageS3RootPrefix = "dnd"
|
||||
DefaultWorkspaceRoot = "/var/lib/narratio"
|
||||
DefaultCampaignsRoot = "/usr/local/share/narratio/campaigns"
|
||||
DefaultSpoolRoot = "/var/spool/narratio"
|
||||
DefaultCacheRoot = "/var/cache/narratio"
|
||||
DefaultCacheS3Audio = true
|
||||
DefaultSessionConfigPathUsrLocal = "/usr/local/etc/narratio/session.yml"
|
||||
DefaultSessionConfigPathEtc = "/etc/narratio/session.yml"
|
||||
DefaultStorageS3RootPrefix = "dnd"
|
||||
DefaultWorkspaceRoot = "/var/lib/narratio"
|
||||
DefaultCampaignsRoot = "/usr/local/share/narratio/campaigns"
|
||||
DefaultSpoolRoot = "/var/spool/narratio"
|
||||
DefaultCacheRoot = "/var/cache/narratio"
|
||||
DefaultCacheS3Audio = true
|
||||
|
||||
DefaultWhisperXLanguage = "en"
|
||||
DefaultWhisperXTimeout = "30m"
|
||||
@@ -104,16 +102,6 @@ var DefaultPublishOutputs = []PublishOutputRule{
|
||||
{Source: artifactmodel.SourceTranscriptFinalTrimmedMarkdown, Dest: artifactmodel.TranscriptPathFinalTrimmedMarkdown},
|
||||
}
|
||||
|
||||
// DefaultPipelineConfigSearchPaths defines the default search order for
|
||||
// pipeline.yml when callers do not provide an explicit path.
|
||||
//
|
||||
// Keep this in a variable so future defaults can be extended without changing
|
||||
// call sites.
|
||||
var DefaultPipelineConfigSearchPaths = []string{
|
||||
DefaultPipelineConfigPathUsrLocal,
|
||||
DefaultPipelineConfigPathEtc,
|
||||
}
|
||||
|
||||
// DefaultSessionConfigSearchPaths defines the default search order for
|
||||
// session.yml when callers do not provide an explicit path.
|
||||
//
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"gitea.maximumdirect.net/eric/narratio/internal/fileops"
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
|
||||
// LoadPipeline loads pipeline configuration from a YAML file with strict field checking.
|
||||
@@ -19,6 +20,7 @@ func LoadPipeline(path string) (*PipelineConfig, error) {
|
||||
// empty, and the exact name "default" select the base configuration.
|
||||
type PipelineLoadOptions struct {
|
||||
Overlay *string
|
||||
Search *configkit.Search
|
||||
}
|
||||
|
||||
// LoadPipelineWithOptions loads pipeline configuration with strict field
|
||||
@@ -28,7 +30,7 @@ func LoadPipelineWithOptions(path string, opts PipelineLoadOptions) (*PipelineCo
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return finalizeLoadedPipeline(path, cfg)
|
||||
return finalizeLoadedPipeline(EffectivePipelineRootPath(cfg), cfg)
|
||||
}
|
||||
|
||||
// LoadPipelineOverlayPair resolves two overlays as independent ConfigKit loads.
|
||||
|
||||
@@ -34,7 +34,15 @@ type pipelineOverlaySelection struct {
|
||||
|
||||
func loadPipelineWithConfigKit(path string, opts PipelineLoadOptions) (*PipelineConfig, error) {
|
||||
overlay := selectedPipelineOverlayName(opts)
|
||||
result, err := loadPipelineConfigKitResult(path, overlay)
|
||||
source := configkit.File(strings.TrimSpace(path))
|
||||
if strings.TrimSpace(path) == "" {
|
||||
search := configkit.Searches(configkit.WorkingDirectory(), configkit.UserConfigDirectory(), configkit.UnixSystemDirectories())
|
||||
if opts.Search != nil {
|
||||
search = *opts.Search
|
||||
}
|
||||
source = configkit.SearchConfig("narratio", search, configkit.SearchOptions{Required: true})
|
||||
}
|
||||
result, err := loadPipelineConfigKitResult(source, overlay)
|
||||
if err != nil {
|
||||
return nil, describePipelineLoadError(err)
|
||||
}
|
||||
@@ -43,8 +51,8 @@ func loadPipelineWithConfigKit(path string, opts PipelineLoadOptions) (*Pipeline
|
||||
return &cfg, nil
|
||||
}
|
||||
|
||||
func loadPipelineConfigKitResult(path, overlay string) (*configkit.Result[PipelineConfig], error) {
|
||||
return configkit.Load(configkit.File(path), configkit.Options[PipelineConfig]{
|
||||
func loadPipelineConfigKitResult(source configkit.Source, overlay string) (*configkit.Result[PipelineConfig], error) {
|
||||
return configkit.Load(source, configkit.Options[PipelineConfig]{
|
||||
Imports: true,
|
||||
Overlay: overlay,
|
||||
Definition: configkit.Definition[PipelineConfig]{
|
||||
|
||||
87
internal/config/pipeline_discovery_test.go
Normal file
87
internal/config/pipeline_discovery_test.go
Normal file
@@ -0,0 +1,87 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
|
||||
func TestPipelineDiscoverySelectsFirstSourceAndExplicitFileWins(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
first := filepath.Join(dir, "first.yml")
|
||||
second := filepath.Join(dir, "second.yml")
|
||||
for path, root := range map[string]string{first: "/first", second: "/second"} {
|
||||
if err := os.WriteFile(path, []byte("workspace:\n root: "+root+"\n"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
search := configkit.SearchPaths(first, second)
|
||||
for _, test := range []struct{ explicit, root, path string }{
|
||||
{"", "/first", first},
|
||||
{second, "/second", second},
|
||||
} {
|
||||
cfg, err := LoadPipelineWithOptions(test.explicit, PipelineLoadOptions{Search: &search})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if cfg.Workspace.Root != test.root || EffectivePipelineRootPath(cfg) != test.path {
|
||||
t.Fatalf("selected root = %q, source = %q", cfg.Workspace.Root, EffectivePipelineRootPath(cfg))
|
||||
}
|
||||
}
|
||||
if _, err := LoadPipelineWithOptions(filepath.Join(dir, "missing.yml"), PipelineLoadOptions{Search: &search}); err == nil {
|
||||
t.Fatal("missing explicit file fell back to search")
|
||||
}
|
||||
if err := os.WriteFile(first, []byte("workspace: [invalid\n"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := LoadPipelineWithOptions("", PipelineLoadOptions{Search: &search}); err == nil || !strings.Contains(err.Error(), first) {
|
||||
t.Fatalf("invalid selected source should fail: %v", err)
|
||||
}
|
||||
missing := configkit.SearchPaths(filepath.Join(dir, "missing.yml"))
|
||||
if _, err := LoadPipelineWithOptions("", PipelineLoadOptions{Search: &missing}); err == nil {
|
||||
t.Fatal("empty required search succeeded")
|
||||
}
|
||||
}
|
||||
|
||||
func TestPipelineDiscoveryUsesWorkingDirectoryBeforeUserConfig(t *testing.T) {
|
||||
working := t.TempDir()
|
||||
user := t.TempDir()
|
||||
t.Setenv("XDG_CONFIG_HOME", user)
|
||||
original, err := os.Getwd()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.Chdir(working); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _ = os.Chdir(original) })
|
||||
userDir := filepath.Join(user, "narratio")
|
||||
if err := os.MkdirAll(userDir, 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
userPath := filepath.Join(userDir, "config.yml")
|
||||
localPath := filepath.Join(working, "narratio.yml")
|
||||
for path, root := range map[string]string{userPath: "/user", localPath: "/working"} {
|
||||
if err := os.WriteFile(path, []byte("workspace:\n root: "+root+"\n"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
search := configkit.Searches(configkit.WorkingDirectory(), configkit.UserConfigDirectory())
|
||||
for _, want := range []string{localPath, userPath} {
|
||||
cfg, err := LoadPipelineWithOptions("", PipelineLoadOptions{Search: &search})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got := EffectivePipelineRootPath(cfg); got != want {
|
||||
t.Fatalf("selected %q, want %q", got, want)
|
||||
}
|
||||
if want == localPath {
|
||||
if err := os.Remove(localPath); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user