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

@@ -4,6 +4,7 @@ import (
"bytes"
"errors"
"fmt"
"os"
"path/filepath"
"reflect"
"strings"
@@ -17,9 +18,6 @@ type pipelineResolutionMetadata struct {
sources []string
selectedOverlay *pipelineOverlaySelection
effectiveDigest string
logicalNotariusConfig string
logicalNotariusWorking string
logicalNotariusCaptured bool
artifactFamilies map[string]ScriptoriumArtifactFamilyConfig
artifactFamiliesExpanded bool
configkitMetadata configkit.Metadata
@@ -52,12 +50,18 @@ func loadPipelineWithConfigKit(path string, opts PipelineLoadOptions) (*Pipeline
}
func loadPipelineConfigKitResult(source configkit.Source, overlay string) (*configkit.Result[PipelineConfig], error) {
invocationDir, err := os.Getwd()
if err != nil {
return nil, fmt.Errorf("capture invocation directory: %w", err)
}
return configkit.Load(source, configkit.Options[PipelineConfig]{
Imports: true,
Overlay: overlay,
Definition: configkit.Definition[PipelineConfig]{
Defaults: pipelineConfigDefaults,
Resolve: resolvePipelineConfig,
Resolve: func(cfg *PipelineConfig, resolution *configkit.Resolution) error {
return resolvePipelineConfig(cfg, resolution, invocationDir)
},
Validate: validatePipelineConfigKit,
},
})
@@ -154,7 +158,19 @@ func defaultPublishOutputs() []PublishOutputRule {
return outputs
}
func resolvePipelineConfig(cfg *PipelineConfig, resolution *configkit.Resolution) error {
func resolvePipelineConfig(cfg *PipelineConfig, resolution *configkit.Resolution, invocationDir string) error {
resolveHostResource(resolution, configkit.Keys("workspace", "root"), &cfg.Workspace.Root, invocationDir)
resolveHostResource(resolution, configkit.Keys("campaigns", "root"), &cfg.Campaigns.Root, invocationDir)
resolveHostResource(resolution, configkit.Keys("spool", "root"), &cfg.Spool.Root, invocationDir)
resolveHostResource(resolution, configkit.Keys("cache", "root"), &cfg.Cache.Root, invocationDir)
resolveHostResource(resolution, configkit.Keys("audita", "config_path"), &cfg.Audita.ConfigPath, invocationDir)
if cfg.Scriptorium != nil {
resolveHostResource(resolution, configkit.Keys("scriptorium", "config_path"), &cfg.Scriptorium.ConfigPath, invocationDir)
}
if cfg.Notarius != nil {
resolveHostResource(resolution, configkit.Keys("notarius", "config_path"), &cfg.Notarius.ConfigPath, invocationDir)
resolveHostResource(resolution, configkit.Keys("notarius", "working_directory"), &cfg.Notarius.WorkingDirectory, invocationDir)
}
backend := strings.ToLower(strings.TrimSpace(cfg.Storage.Backend))
if backend != cfg.Storage.Backend {
configkit.Normalize(resolution, configkit.Keys("storage", "backend"), &cfg.Storage.Backend, backend, "canonical storage backend")
@@ -279,7 +295,7 @@ func pipelineMetadataFromConfigKit(result *configkit.Result[PipelineConfig], opt
}
func pipelineMetadataPaths(cfg *PipelineConfig) ([]projectedPipelineValue, error) {
effective, err := projectionDetailedRecords(projectEffectivePipeline(cfg, false))
effective, err := projectionDetailedRecords(projectEffectivePipeline(cfg))
if err != nil {
return nil, err
}