Report completed runs through native presentation and preserve failure outcomes
This commit is contained in:
@@ -11,6 +11,7 @@ import (
|
||||
frameworkdebug "gitea.maximumdirect.net/eric/notarius/internal/framework/debug"
|
||||
"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
|
||||
"gitea.maximumdirect.net/eric/notarius/internal/preflight"
|
||||
"go.maximumdirect.net/ckconfig"
|
||||
"go.maximumdirect.net/commandkit"
|
||||
"go.maximumdirect.net/configkit"
|
||||
"go.maximumdirect.net/promptkit"
|
||||
@@ -31,6 +32,14 @@ func pipelineRunCommand(version string, newState func() *nativeLoaders, modules
|
||||
if err != nil {
|
||||
return pipelineConfigurationFailure(err)
|
||||
}
|
||||
diagnostics, _ := ckconfig.AdaptDiagnostics("Configuration\n", result.Sources(), result.Diagnostics())
|
||||
for _, diagnostic := range diagnostics {
|
||||
if diagnostic.Severity == commandkit.SeverityWarning {
|
||||
_ = invocation.Reporter().AtEnd().Warn("", diagnostic.Write)
|
||||
} else {
|
||||
_ = invocation.Reporter().AtEnd().Info("", diagnostic.Write)
|
||||
}
|
||||
}
|
||||
loaded, err := config.FromResult(result)
|
||||
if err != nil {
|
||||
return pipelineInvalidConfiguration(err)
|
||||
@@ -53,20 +62,20 @@ func pipelineRunCommand(version string, newState func() *nativeLoaders, modules
|
||||
}
|
||||
finish := func(outcome commandkit.Outcome) commandkit.Outcome {
|
||||
if err := capture.Finalize(captureOutcome(), outcome.Cause); err != nil {
|
||||
message := err.Error()
|
||||
if published {
|
||||
message += fmt.Sprintf("\nArtifacts: %s", outputDirectory)
|
||||
}
|
||||
if capture.Path() != "" {
|
||||
message += fmt.Sprintf("\nDebug capture: %s", capture.Path())
|
||||
}
|
||||
if outcome.Status == 0 {
|
||||
outcome = commandkit.Failure(message)
|
||||
outcome = commandkit.Failure(err.Error())
|
||||
} else {
|
||||
outcome = outcome.WithExplanation(message)
|
||||
outcome = outcome.WithExplanation(err.Error(), outcome.Explanation.Details...)
|
||||
}
|
||||
outcome = outcome.WithCause(err)
|
||||
}
|
||||
if outcome.Status != 0 {
|
||||
availableOutput := ""
|
||||
if published {
|
||||
availableOutput = outputDirectory
|
||||
}
|
||||
outcome = outcome.WithExplanation(outcome.Explanation.Message+runLocations(availableOutput, capture.Path()), outcome.Explanation.Details...)
|
||||
}
|
||||
return outcome
|
||||
}
|
||||
capture, err = startRunDebug(input.Debug, cfg.Debug.Directory, runID, startedAt)
|
||||
@@ -107,13 +116,13 @@ func pipelineRunCommand(version string, newState func() *nativeLoaders, modules
|
||||
}
|
||||
}
|
||||
if err := preflight.Validate(invocation.Context, effective.ResolvedPipeline, catalog, engine); err != nil {
|
||||
return finish(pipelineInvalidConfiguration(err))
|
||||
return finish(pipelineResourceFailure(err))
|
||||
}
|
||||
workingDirectory, err := os.Getwd()
|
||||
if err != nil {
|
||||
return finish(commandkit.Failure(err.Error()).WithCause(err))
|
||||
}
|
||||
materialized, diagnostics, err := pipeline.MaterializeReferences(effective.ResolvedPipeline, catalog, pipeline.ReferenceMaterializationOptions{ConfigPath: loaded.MainSourcePath(), WorkingDir: workingDirectory})
|
||||
materialized, referenceDiagnostics, err := pipeline.MaterializeReferences(effective.ResolvedPipeline, catalog, pipeline.ReferenceMaterializationOptions{ConfigPath: loaded.MainSourcePath(), WorkingDir: workingDirectory})
|
||||
if err != nil {
|
||||
return finish(commandkit.Failure(err.Error()).WithCause(err))
|
||||
}
|
||||
@@ -138,7 +147,9 @@ func pipelineRunCommand(version string, newState func() *nativeLoaders, modules
|
||||
recorder = newRunEvidenceRecorder(capture, result)
|
||||
}
|
||||
group := &promptkit.ExecutionGroup{}
|
||||
output, err = pipeline.New().Run(invocation.Context, pipeline.RunInput{Prepared: prepared, Path: input.InputFile.Value, RawInput: raw, SessionID: sessionID, RunID: runID, StartedAt: startedAt, Diagnostics: diagnostics, Cache: cache, Debug: recorder, Workers: cfg.Concurrency.Workers, Executions: group, Execution: contracts.ExecutionOptions{Execution: input.Overrides.Execution.Execution, TransientRetries: input.Overrides.Execution.TransientRetries}})
|
||||
_ = invocation.Reporter().Progress(fmt.Sprintf("Running pipeline %q.", effective.ResolvedPipeline.ID))
|
||||
output, err = pipeline.New().Run(invocation.Context, pipeline.RunInput{Prepared: prepared, Path: input.InputFile.Value, RawInput: raw, SessionID: sessionID, RunID: runID, StartedAt: startedAt, Diagnostics: referenceDiagnostics, Cache: cache, Debug: recorder, Workers: cfg.Concurrency.Workers, Executions: group, Execution: contracts.ExecutionOptions{Execution: input.Overrides.Execution.Execution, TransientRetries: input.Overrides.Execution.TransientRetries}})
|
||||
reportRunDiagnostics(invocation.Reporter(), output.Diagnostics)
|
||||
if err != nil {
|
||||
return finish(commandkit.Failure(err.Error()).WithCause(err))
|
||||
}
|
||||
@@ -146,7 +157,11 @@ func pipelineRunCommand(version string, newState func() *nativeLoaders, modules
|
||||
return finish(commandkit.Failure(err.Error()).WithCause(err))
|
||||
}
|
||||
published = true
|
||||
return finish(commandkit.Success())
|
||||
outcome := finish(commandkit.Success())
|
||||
if outcome.Status != 0 {
|
||||
return outcome
|
||||
}
|
||||
return reportRunResult(invocation, runResult{Pipeline: effective.ResolvedPipeline.ID, ArtifactCount: output.ArtifactCount(), OutputDirectory: outputDirectory, DebugDirectory: capture.Path(), FallbackCount: output.FallbackCount})
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user