Publish outputs to checked destinations and preserve failure evidence
This commit is contained in:
@@ -3,6 +3,7 @@ package preflight
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"slices"
|
||||
|
||||
@@ -19,7 +20,7 @@ type Input struct {
|
||||
Transcript *schema.SourceTranscript
|
||||
Output diagnostics.OutputSelection
|
||||
InitialReports diagnostics.ReportBundle
|
||||
FailedReports func(error, []diagnostics.FileFailure) diagnostics.ReportBundle
|
||||
FailedReports diagnostics.ReportRenderer
|
||||
Debug *DebugInput
|
||||
}
|
||||
|
||||
@@ -61,30 +62,20 @@ func Prepare(ctx context.Context, input Input) (*Prepared, error) {
|
||||
return nil, err
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
_ = session.Close()
|
||||
return nil, err
|
||||
return nil, errors.Join(err, session.Close())
|
||||
}
|
||||
failedReports := func(primary error) func([]diagnostics.FileFailure) diagnostics.ReportBundle {
|
||||
return func(failures []diagnostics.FileFailure) diagnostics.ReportBundle {
|
||||
if input.FailedReports == nil {
|
||||
return diagnostics.ReportBundle{}
|
||||
}
|
||||
return input.FailedReports(primary, failures)
|
||||
}
|
||||
}
|
||||
if err := session.Initialize(input.InitialReports, failedReports(nil)); err != nil {
|
||||
return nil, err
|
||||
if err := session.Initialize(ctx, input.InitialReports, input.FailedReports); err != nil {
|
||||
return nil, errors.Join(err, session.Close())
|
||||
}
|
||||
cancelOutput := func(err error) error {
|
||||
failed := failedReports(err)
|
||||
return session.Finish(err, nil, failed(nil), failed)
|
||||
return session.Finish(ctx, err, nil, input.FailedReports)
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, cancelOutput(err)
|
||||
}
|
||||
result := &Prepared{Output: session}
|
||||
if input.Debug != nil {
|
||||
result.Debug, result.Warnings = session.PrepareDebug(input.Debug.WorkDir, input.Debug.RunID, input.Debug.Metadata, input.Debug.EffectiveConfig)
|
||||
result.Debug, result.Warnings = diagnostics.PrepareDebug(input.Debug.WorkDir, input.Debug.RunID, input.Debug.Metadata, input.Debug.EffectiveConfig)
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, cancelOutput(err)
|
||||
|
||||
Reference in New Issue
Block a user