Migrate remaining configuration documents to ConfigKit
This commit is contained in:
@@ -65,9 +65,13 @@ func loadPipelineWithConfigKit(path string, opts PipelineLoadOptions) (*Pipeline
|
||||
}
|
||||
|
||||
func describePipelineLoadError(err error) error {
|
||||
return describeConfigKitLoadError("pipeline", err)
|
||||
}
|
||||
|
||||
func describeConfigKitLoadError(kind string, err error) error {
|
||||
var loadError *configkit.LoadError
|
||||
if !errors.As(err, &loadError) {
|
||||
return fmt.Errorf("load pipeline config: %w", err)
|
||||
return fmt.Errorf("load %s config: %w", kind, err)
|
||||
}
|
||||
var diagnostics bytes.Buffer
|
||||
resolved := loadError.Diagnostics()
|
||||
@@ -92,9 +96,9 @@ func describePipelineLoadError(err error) error {
|
||||
}
|
||||
}
|
||||
if writeErr := configkit.WriteDiagnostics(&diagnostics, resolved); writeErr != nil {
|
||||
return fmt.Errorf("load pipeline config: %w", err)
|
||||
return fmt.Errorf("load %s config: %w", kind, err)
|
||||
}
|
||||
return fmt.Errorf("load pipeline config: strict decode failed or validation failed: %w: %s", err, strings.TrimSpace(diagnostics.String()))
|
||||
return fmt.Errorf("load %s config: strict decode failed or validation failed: %w: %s", kind, err, strings.TrimSpace(diagnostics.String()))
|
||||
}
|
||||
|
||||
func selectedPipelineProfileName(opts PipelineLoadOptions) string {
|
||||
|
||||
Reference in New Issue
Block a user