Expose native session planning and artifact catalogs
This commit is contained in:
@@ -25,6 +25,7 @@ type configurationAcquisition struct {
|
||||
session *acquiredSession
|
||||
previousSessionID string
|
||||
domain *config.Config
|
||||
catalog *config.ArtifactCatalog
|
||||
pipelineOverrides []configkit.Override
|
||||
}
|
||||
|
||||
@@ -239,10 +240,11 @@ func (a *configurationAcquisition) Domain(ctx context.Context) (*config.Config,
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
base, err := config.LoadPipelineCampaignWithParty(a.pipelinePath, pipeline, a.campaignPath, campaign, *party)
|
||||
catalog, err := a.Catalog(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
base := config.LoadedPipelineCampaign{PipelinePath: a.pipelinePath, Pipeline: pipeline, CampaignPath: a.campaignPath, Campaign: campaign, Party: *party, ArtifactCatalog: catalog}
|
||||
cfg, err := config.ResolveLoadedPipelineCampaign(base, a.session.Path, session, a.session.Source)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -259,3 +261,27 @@ func (a *configurationAcquisition) Close() error {
|
||||
a.session.cleanup = nil
|
||||
return cleanup()
|
||||
}
|
||||
|
||||
func (a *configurationAcquisition) Catalog(ctx context.Context) (*config.ArtifactCatalog, error) {
|
||||
pipeline, err := a.Pipeline(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if a.catalog != nil {
|
||||
return a.catalog, nil
|
||||
}
|
||||
var party config.ResolvedParty
|
||||
if a.party != nil || a.selection.PartyFile.Set || a.selection.Campaign.Set || a.selection.CampaignFile.Set || (pipeline.Scriptorium != nil && len(pipeline.Scriptorium.ArtifactFamilies) != 0) {
|
||||
selected, err := a.Party(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
party = *selected
|
||||
}
|
||||
catalog, err := config.DeriveArtifactCatalog(pipeline, party)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
a.catalog = catalog
|
||||
return catalog, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user