Propagate cancellation and preserve resumable state
This commit is contained in:
@@ -69,7 +69,7 @@ func (a *configurationAcquisition) bootstrap(ctx context.Context) error {
|
||||
a.deps.secretsBootstrap.selection = selectedString(a.selection.SecretsDir)
|
||||
a.deps.secretsBootstrap.selectionSet = true
|
||||
}
|
||||
return a.deps.secretsBootstrap.load(a.deps.loadSecretsDir, a.deps.diagnostics)
|
||||
return errors.Join(a.deps.secretsBootstrap.load(a.deps.loadSecretsDir, a.deps.diagnostics), ctx.Err())
|
||||
}
|
||||
|
||||
func (a *configurationAcquisition) Pipeline(ctx context.Context) (*config.PipelineConfig, error) {
|
||||
@@ -82,12 +82,10 @@ func (a *configurationAcquisition) Pipeline(ctx context.Context) (*config.Pipeli
|
||||
path, cfg, err := loadPipelineConfigWithDependencies(a.selection.Config.Value,
|
||||
config.PipelineLoadOptions{Overlay: selectedString(a.selection.Overlay), Overrides: a.pipelineOverrides},
|
||||
selectedString(a.selection.SecretsDir), a.deps)
|
||||
err = errors.Join(err, ctx.Err())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
a.pipeline, a.pipelinePath = cfg, path
|
||||
return cfg, nil
|
||||
}
|
||||
@@ -115,12 +113,10 @@ func (a *configurationAcquisition) Campaign(ctx context.Context) (*config.Campai
|
||||
return nil, err
|
||||
}
|
||||
cfg, err := config.LoadCampaign(path)
|
||||
err = errors.Join(err, ctx.Err())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if a.selection.Campaign.Set && config.CampaignID(cfg) != a.selection.Campaign.Value {
|
||||
return nil, &config.SessionIdentityError{Source: path, Field: "campaign_id", Expected: a.selection.Campaign.Value, Actual: config.CampaignID(cfg)}
|
||||
}
|
||||
@@ -144,12 +140,10 @@ func (a *configurationAcquisition) Party(ctx context.Context) (*config.ResolvedP
|
||||
}
|
||||
}
|
||||
party, err := config.ResolveParty(a.campaignPath, campaign, selectedString(a.selection.PartyFile))
|
||||
err = errors.Join(err, ctx.Err())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
a.party = &party
|
||||
return a.party, nil
|
||||
}
|
||||
@@ -175,16 +169,15 @@ func (a *configurationAcquisition) Session(ctx context.Context) (*config.Session
|
||||
return nil, err
|
||||
}
|
||||
session, err := config.LoadSessionWithOptions(path, opts)
|
||||
err = errors.Join(err, ctx.Err())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
a.session = &acquiredSession{Config: session, Path: path, Source: config.SessionSource{Source: "session_config", LocalPath: path}}
|
||||
return session, nil
|
||||
}
|
||||
session, path, err := config.DiscoverSession(config.DefaultSessionConfigSearchPaths, opts)
|
||||
err = errors.Join(err, ctx.Err())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -204,6 +197,7 @@ func (a *configurationAcquisition) Session(ctx context.Context) (*config.Session
|
||||
}
|
||||
base.Pipeline, base.PipelinePath = pipeline, a.pipelinePath
|
||||
loaded, err := loadRemoteSessionConfig(ctx, base, opts, a.deps)
|
||||
err = errors.Join(err, ctx.Err())
|
||||
if err != nil {
|
||||
if loaded != nil && loaded.cleanup != nil {
|
||||
err = errors.Join(err, loaded.cleanup())
|
||||
@@ -246,6 +240,7 @@ func (a *configurationAcquisition) Domain(ctx context.Context) (*config.Config,
|
||||
}
|
||||
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)
|
||||
err = errors.Join(err, ctx.Err())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -279,6 +274,7 @@ func (a *configurationAcquisition) Catalog(ctx context.Context) (*config.Artifac
|
||||
party = *selected
|
||||
}
|
||||
catalog, err := config.DeriveArtifactCatalog(pipeline, party)
|
||||
err = errors.Join(err, ctx.Err())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user