Use native configuration validation and diagnostics
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
@@ -53,7 +54,7 @@ func documentResource(resolution *configkit.Resolution, path configkit.Path, val
|
||||
resolveHostResource(resolution, path, value, invocationDir)
|
||||
}
|
||||
|
||||
func campaignDefinition(invocationDir string, sources map[string]string) configkit.Definition[CampaignConfig] {
|
||||
func campaignDefinition(invocationDir string, sources map[string]string, expected string) configkit.Definition[CampaignConfig] {
|
||||
return configkit.Definition[CampaignConfig]{Resolve: func(cfg *CampaignConfig, resolution *configkit.Resolution) error {
|
||||
documentResource(resolution, configkit.Keys("session_template_file"), &cfg.SessionTemplateFile, invocationDir, sources)
|
||||
inputs := configkit.Keys("inputs")
|
||||
@@ -68,7 +69,10 @@ func campaignDefinition(invocationDir string, sources map[string]string) configk
|
||||
documentResource(resolution, inputs.Key(field.name), field.value, invocationDir, sources)
|
||||
}
|
||||
return nil
|
||||
}, Validate: validateCampaignConfigKit}
|
||||
}, Validate: func(cfg *CampaignConfig, v *configkit.Validation) {
|
||||
validateCampaignConfigKit(cfg, v)
|
||||
validateIdentity(v, "campaign_id", expected, CampaignID(cfg))
|
||||
}}
|
||||
}
|
||||
|
||||
func sessionDefinition(invocationDir string, sources map[string]string, label string, opts SessionLoadOptions) configkit.Definition[SessionConfig] {
|
||||
@@ -101,6 +105,12 @@ func sessionDefinition(invocationDir string, sources map[string]string, label st
|
||||
if !hasSource {
|
||||
return
|
||||
}
|
||||
validateIdentity(validation, "session_id", strings.TrimSpace(opts.SessionID), strings.TrimSpace(cfg.SessionID))
|
||||
validateIdentity(validation, "previous_session_id", strings.TrimSpace(opts.PreviousSessionID), strings.TrimSpace(cfg.PreviousSessionID))
|
||||
if opts.Campaign != nil {
|
||||
validateIdentity(validation, "campaign", CampaignID(opts.Campaign), cfg.Campaign)
|
||||
}
|
||||
|
||||
data, err := json.Marshal(cfg)
|
||||
if err != nil {
|
||||
validation.Error(configkit.Keys(), "cannot inspect session configuration")
|
||||
@@ -138,15 +148,16 @@ func applyCampaignSessionDefaults(cfg *SessionConfig, resolution *configkit.Reso
|
||||
}
|
||||
}
|
||||
|
||||
func loadCampaignWithConfigKit(path string) (*CampaignConfig, error) {
|
||||
// LoadCampaignWithIdentity validates an optional asserted identity within the native load.
|
||||
func LoadCampaignWithIdentity(path, expected string) (*CampaignConfig, error) {
|
||||
invocationDir, err := os.Getwd()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
sources := make(map[string]string)
|
||||
result, err := configkit.Load(configkit.File(path), configkit.Options[CampaignConfig]{Imports: true, Definition: campaignDefinition(invocationDir, sources)})
|
||||
result, err := configkit.Load(configkit.File(path), configkit.Options[CampaignConfig]{Imports: true, Definition: campaignDefinition(invocationDir, sources, expected)})
|
||||
if err != nil {
|
||||
return nil, describeConfigKitLoadError("campaign", err)
|
||||
return nil, fmt.Errorf("load campaign config: %w", err)
|
||||
}
|
||||
cfg := &result.Config
|
||||
cfg.resolution = &documentResolution{campaign: result, sources: sources}
|
||||
@@ -180,7 +191,7 @@ func loadSessionSourceWithFilesystem(source configkit.Source, label string, opts
|
||||
sources := make(map[string]string)
|
||||
result, err := configkit.Load(source, configkit.Options[SessionConfig]{Imports: imports, Filesystem: filesystem, Definition: sessionDefinition(invocationDir, sources, label, opts)})
|
||||
if err != nil {
|
||||
return nil, "", describeConfigKitLoadError("session", err)
|
||||
return nil, "", fmt.Errorf("load session config: %w", err)
|
||||
}
|
||||
acquired := result.Sources()
|
||||
if len(acquired) == 0 {
|
||||
@@ -191,9 +202,6 @@ func loadSessionSourceWithFilesystem(source configkit.Source, label string, opts
|
||||
selected = label
|
||||
}
|
||||
cfg := &result.Config
|
||||
if err := validateSessionIdentity(selected, cfg, opts); err != nil {
|
||||
return nil, "", err
|
||||
}
|
||||
cfg.resolution = &documentResolution{session: result, sources: sources}
|
||||
return cfg, filepath.Clean(selected), nil
|
||||
}
|
||||
@@ -203,3 +211,11 @@ func loadSessionSourceWithFilesystem(source configkit.Source, label string, opts
|
||||
func DiscoverSession(candidates []string, opts SessionLoadOptions) (*SessionConfig, string, error) {
|
||||
return loadSessionSource(configkit.SearchConfig("narratio", configkit.SearchPaths(candidates...)), "", opts, true)
|
||||
}
|
||||
|
||||
func validateIdentity(v *configkit.Validation, field, expected, actual string) {
|
||||
if expected != "" && actual == "" {
|
||||
v.Error(configkit.Keys(field), fmt.Sprintf("%s is required when %q is selected", field, expected))
|
||||
} else if expected != "" && actual != expected {
|
||||
v.Error(configkit.Keys(field), fmt.Sprintf("%s mismatch: selected %q does not match %q", field, expected, actual))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user