Resolve pipeline resources from their source locations

This commit is contained in:
2026-11-17 22:09:58 +00:00
parent 6593ccbeaf
commit c3023cb609
10 changed files with 209 additions and 88 deletions

View File

@@ -30,7 +30,7 @@ func LoadPipelineWithOptions(path string, opts PipelineLoadOptions) (*PipelineCo
if err != nil {
return nil, err
}
return finalizeLoadedPipeline(EffectivePipelineRootPath(cfg), cfg)
return finalizeLoadedPipeline(cfg)
}
// LoadPipelineOverlayPair resolves two overlays as independent ConfigKit loads.
@@ -51,11 +51,7 @@ func LoadPipelineOverlayPair(path, leftOverlay, rightOverlay string) (*PipelineC
return left, right, nil
}
func finalizeLoadedPipeline(path string, cfg *PipelineConfig) (*PipelineConfig, error) {
captureLogicalNotariusPaths(cfg)
if err := resolveNotariusPaths(cfg, path); err != nil {
return nil, fmt.Errorf("load pipeline config: %w", err)
}
func finalizeLoadedPipeline(cfg *PipelineConfig) (*PipelineConfig, error) {
finalizeArtifactDependencies(cfg)
if err := finalizePipelineResolution(cfg); err != nil {
return nil, fmt.Errorf("load pipeline config: %w", err)
@@ -427,36 +423,3 @@ func shortName(path, fallback string) string {
}
return base
}
func resolveNotariusPaths(cfg *PipelineConfig, pipelinePath string) error {
if cfg == nil || cfg.Notarius == nil || !cfg.Notarius.Enabled {
return nil
}
pipelineAbs, err := filepath.Abs(pipelinePath)
if err != nil {
return fmt.Errorf("resolve pipeline config path %q: %w", pipelinePath, err)
}
baseDir := filepath.Dir(pipelineAbs)
resolve := func(value string) (string, error) {
trimmed := strings.TrimSpace(value)
if trimmed == "" {
return "", nil
}
if !filepath.IsAbs(trimmed) {
trimmed = filepath.Join(baseDir, trimmed)
}
return filepath.Abs(trimmed)
}
resolvedConfigPath, err := resolve(cfg.Notarius.ConfigPath)
if err != nil {
return fmt.Errorf("resolve pipeline.notarius.config_path: %w", err)
}
cfg.Notarius.ConfigPath = resolvedConfigPath
workingDirectory, err := resolve(cfg.Notarius.WorkingDirectory)
if err != nil {
return fmt.Errorf("resolve pipeline.notarius.working_directory: %w", err)
}
cfg.Notarius.WorkingDirectory = workingDirectory
return nil
}