Support independent native configuration comparisons and overrides
This commit is contained in:
@@ -4,8 +4,6 @@ import (
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -61,11 +59,3 @@ func recomputePipelineEffectiveDigest(cfg *PipelineConfig) error {
|
||||
cfg.resolution.effectiveDigest = hex.EncodeToString(digest[:])
|
||||
return nil
|
||||
}
|
||||
|
||||
// DiffEffectivePipelines compares the authoritative native load results.
|
||||
func DiffEffectivePipelines(left, right *PipelineConfig) ([]configkit.Difference, error) {
|
||||
if left == nil || right == nil || left.ConfigKitResult() == nil || right.ConfigKitResult() == nil {
|
||||
return nil, fmt.Errorf("resolved pipelines are required")
|
||||
}
|
||||
return configkit.Diff(left.ConfigKitResult(), right.ConfigKitResult())
|
||||
}
|
||||
|
||||
@@ -18,8 +18,9 @@ func LoadPipeline(path string) (*PipelineConfig, error) {
|
||||
// PipelineLoadOptions carries an optional explicit overlay selection. Nil,
|
||||
// empty, and the exact name "default" select the base configuration.
|
||||
type PipelineLoadOptions struct {
|
||||
Overlay *string
|
||||
Search *configkit.Search
|
||||
Overlay *string
|
||||
Search *configkit.Search
|
||||
Overrides []configkit.Override
|
||||
}
|
||||
|
||||
// LoadPipelineWithOptions loads pipeline configuration with strict field
|
||||
@@ -32,24 +33,6 @@ func LoadPipelineWithOptions(path string, opts PipelineLoadOptions) (*PipelineCo
|
||||
return finalizeLoadedPipeline(cfg)
|
||||
}
|
||||
|
||||
// LoadPipelineOverlayPair resolves two overlays as independent ConfigKit loads.
|
||||
func LoadPipelineOverlayPair(path, leftOverlay, rightOverlay string) (*PipelineConfig, *PipelineConfig, error) {
|
||||
if leftOverlay == rightOverlay {
|
||||
return nil, nil, fmt.Errorf("load pipeline overlays: left and right overlay selections must differ")
|
||||
}
|
||||
leftOptions := PipelineLoadOptions{Overlay: &leftOverlay}
|
||||
rightOptions := PipelineLoadOptions{Overlay: &rightOverlay}
|
||||
left, err := LoadPipelineWithOptions(path, leftOptions)
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("load left pipeline overlay: %w", err)
|
||||
}
|
||||
right, err := LoadPipelineWithOptions(path, rightOptions)
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("load right pipeline overlay: %w", err)
|
||||
}
|
||||
return left, right, nil
|
||||
}
|
||||
|
||||
func finalizeLoadedPipeline(cfg *PipelineConfig) (*PipelineConfig, error) {
|
||||
if err := finalizePipelineResolution(cfg); err != nil {
|
||||
return nil, fmt.Errorf("load pipeline config: %w", err)
|
||||
|
||||
@@ -46,7 +46,7 @@ func loadPipelineWithConfigKit(path string, opts PipelineLoadOptions) (*Pipeline
|
||||
}
|
||||
source = configkit.SearchConfig("narratio", search, configkit.SearchOptions{Required: true})
|
||||
}
|
||||
result, err := loadPipelineConfigKitResult(source, overlay)
|
||||
result, err := loadPipelineConfigKitResult(source, overlay, opts.Overrides)
|
||||
if err != nil {
|
||||
return nil, describePipelineLoadError(err)
|
||||
}
|
||||
@@ -55,14 +55,15 @@ func loadPipelineWithConfigKit(path string, opts PipelineLoadOptions) (*Pipeline
|
||||
return cfg, nil
|
||||
}
|
||||
|
||||
func loadPipelineConfigKitResult(source configkit.Source, overlay string) (*configkit.Result[PipelineConfig], error) {
|
||||
func loadPipelineConfigKitResult(source configkit.Source, overlay string, overrides []configkit.Override) (*configkit.Result[PipelineConfig], error) {
|
||||
invocationDir, err := os.Getwd()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("capture invocation directory: %w", err)
|
||||
}
|
||||
return configkit.Load(source, configkit.Options[PipelineConfig]{
|
||||
Imports: true,
|
||||
Overlay: overlay,
|
||||
Imports: true,
|
||||
Overrides: overrides,
|
||||
Overlay: overlay,
|
||||
Definition: configkit.Definition[PipelineConfig]{
|
||||
Defaults: pipelineConfigDefaults,
|
||||
Resolve: func(cfg *PipelineConfig, resolution *configkit.Resolution) error {
|
||||
|
||||
Reference in New Issue
Block a user