Use native configuration validation and diagnostics

This commit is contained in:
2026-11-20 15:22:57 +00:00
parent 7e45ffca43
commit 39b4bddbc9
47 changed files with 351 additions and 308 deletions

View File

@@ -74,11 +74,11 @@ inputs:
if err == nil {
t.Fatal("expected error, got nil")
}
if !strings.Contains(err.Error(), "session_id mismatch") {
t.Fatalf("error = %q, want mismatch context", err.Error())
if !strings.Contains(configurationErrorText(err), "session_id mismatch") {
t.Fatalf("error = %q, want mismatch context", configurationErrorText(err))
}
if strings.Contains(err.Error(), "rendered") {
t.Fatalf("error = %q, should not mention rendered session", err.Error())
if strings.Contains(configurationErrorText(err), "rendered") {
t.Fatalf("error = %q, should not mention rendered session", configurationErrorText(err))
}
}
@@ -105,11 +105,11 @@ inputs:
if err == nil {
t.Fatal("expected error, got nil")
}
if !strings.Contains(err.Error(), "previous_session_id mismatch") {
t.Fatalf("error = %q, want mismatch context", err.Error())
if !strings.Contains(configurationErrorText(err), "previous_session_id mismatch") {
t.Fatalf("error = %q, want mismatch context", configurationErrorText(err))
}
if strings.Contains(err.Error(), "rendered") {
t.Fatalf("error = %q, should not mention rendered session", err.Error())
if strings.Contains(configurationErrorText(err), "rendered") {
t.Fatalf("error = %q, should not mention rendered session", configurationErrorText(err))
}
}
@@ -122,7 +122,7 @@ func TestLoadSessionWithOptionsRequiresExpectedPreviousSession(t *testing.T) {
}
_, err := LoadSessionWithOptions(sessionPath, SessionLoadOptions{PreviousSessionID: "2026-04-26"})
if err == nil || !strings.Contains(err.Error(), "previous_session_id is required") {
if err == nil || !strings.Contains(configurationErrorText(err), "previous_session_id is required") {
t.Fatalf("LoadSessionWithOptions() error = %v, want missing previous-session expectation error", err)
}
}
@@ -147,8 +147,8 @@ inputs:
if err == nil {
t.Fatal("expected error, got nil")
}
if !strings.Contains(err.Error(), "strict decode failed") {
t.Fatalf("error = %q, want strict-decode context", err.Error())
if !strings.Contains(configurationErrorText(err), "decode.unknown_field") {
t.Fatalf("error = %q, want strict-decode context", configurationErrorText(err))
}
}
@@ -204,8 +204,8 @@ func TestLoadSessionBytesWithOptionsStrictDecode(t *testing.T) {
if err == nil {
t.Fatal("expected strict decode error, got nil")
}
if !strings.Contains(err.Error(), "strict decode failed") {
t.Fatalf("error = %q, want strict decode context", err.Error())
if !strings.Contains(configurationErrorText(err), "decode.unknown_field") {
t.Fatalf("error = %q, want strict decode context", configurationErrorText(err))
}
}
@@ -214,8 +214,8 @@ func TestLoadSessionBytesWithOptionsMismatchFails(t *testing.T) {
if err == nil {
t.Fatal("expected mismatch error, got nil")
}
if !strings.Contains(err.Error(), "session_id mismatch") {
t.Fatalf("error = %q, want mismatch context", err.Error())
if !strings.Contains(configurationErrorText(err), "session_id mismatch") {
t.Fatalf("error = %q, want mismatch context", configurationErrorText(err))
}
}
@@ -225,22 +225,22 @@ func TestLoadSessionBytesWithOptionsRequiresExpectedPreviousSession(t *testing.T
[]byte("session_id: 2026-05-03\n"+standaloneSessionFields),
SessionLoadOptions{PreviousSessionID: "2026-04-26"},
)
if err == nil || !strings.Contains(err.Error(), "previous_session_id is required") {
if err == nil || !strings.Contains(configurationErrorText(err), "previous_session_id is required") {
t.Fatalf("LoadSessionBytesWithOptions() error = %v, want missing previous-session expectation error", err)
}
}
func assertConcreteSessionTemplateError(t *testing.T, err error, vars ...string) {
t.Helper()
if !strings.Contains(err.Error(), "session.yml must be concrete") {
t.Fatalf("error = %q, want concrete session guidance", err.Error())
if !strings.Contains(configurationErrorText(err), "session.yml must be concrete") {
t.Fatalf("error = %q, want concrete session guidance", configurationErrorText(err))
}
if !strings.Contains(err.Error(), "run narratio session init") {
t.Fatalf("error = %q, want session init guidance", err.Error())
if !strings.Contains(configurationErrorText(err), "run narratio session init") {
t.Fatalf("error = %q, want session init guidance", configurationErrorText(err))
}
for _, name := range vars {
if !strings.Contains(err.Error(), name) {
t.Fatalf("error = %q, want variable %q", err.Error(), name)
if !strings.Contains(configurationErrorText(err), name) {
t.Fatalf("error = %q, want variable %q", configurationErrorText(err), name)
}
}
}