Use derived artifact catalogs throughout planning and execution
This commit is contained in:
@@ -46,7 +46,7 @@ func prepareInvocation(ctx context.Context, cfg *config.Config, plan BoundedPlan
|
||||
effectiveArtifacts := opts.EffectiveArtifacts
|
||||
if !effectiveArtifacts.Resolved() && cfg != nil && cfg.Pipeline != nil && cfg.Pipeline.Scriptorium != nil {
|
||||
var err error
|
||||
effectiveArtifacts, err = resolveEffectiveArtifacts(cfg, nil)
|
||||
effectiveArtifacts, err = resolveEffectiveArtifacts(cfg, opts.SelectedArtifacts)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("resolve effective artifacts: %w", err)
|
||||
}
|
||||
@@ -59,6 +59,13 @@ func prepareInvocation(ctx context.Context, cfg *config.Config, plan BoundedPlan
|
||||
}
|
||||
}
|
||||
|
||||
if cfg != nil {
|
||||
effectiveArtifacts = effectiveArtifacts.WithOrigins(effectiveArtifactOrigins(cfg.ArtifactCatalog))
|
||||
}
|
||||
if len(opts.SelectedArtifacts) > 0 {
|
||||
opts.SelectedArtifacts = effectiveArtifacts.Keys()
|
||||
}
|
||||
|
||||
runID, err := dependencies.newRunID()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("generate run id: %w", err)
|
||||
|
||||
Reference in New Issue
Block a user