Use native pipeline discovery and independent secrets bootstrap
This commit is contained in:
@@ -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]{
|
||||
|
||||
Reference in New Issue
Block a user