Use native configuration validation and diagnostics
This commit is contained in:
@@ -47,7 +47,7 @@ func TestScriptoriumLoadAndValidate(t *testing.T) {
|
||||
binary: scriptorium
|
||||
bogus: true
|
||||
`,
|
||||
wantLoadErr: "strict decode failed",
|
||||
wantLoadErr: "decode.unknown_field",
|
||||
},
|
||||
{
|
||||
name: "missing binary defaults when section present",
|
||||
@@ -550,8 +550,8 @@ func TestScriptoriumLoadAndValidate(t *testing.T) {
|
||||
if err == nil {
|
||||
t.Fatalf("expected load error containing %q, got nil", tt.wantLoadErr)
|
||||
}
|
||||
if !strings.Contains(err.Error(), tt.wantLoadErr) {
|
||||
t.Fatalf("load error = %q, want to contain %q", err.Error(), tt.wantLoadErr)
|
||||
if !strings.Contains(configurationErrorText(err), tt.wantLoadErr) {
|
||||
t.Fatalf("load error = %q, want to contain %q", configurationErrorText(err), tt.wantLoadErr)
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -566,8 +566,8 @@ func TestScriptoriumLoadAndValidate(t *testing.T) {
|
||||
t.Fatalf("expected validation error containing %q, got nil", tt.wantValidateErr)
|
||||
}
|
||||
for _, fragment := range tt.wantValidateErr {
|
||||
if !strings.Contains(err.Error(), fragment) {
|
||||
t.Fatalf("validation error = %q, want to contain %q", err.Error(), fragment)
|
||||
if !strings.Contains(configurationErrorText(err), fragment) {
|
||||
t.Fatalf("validation error = %q, want to contain %q", configurationErrorText(err), fragment)
|
||||
}
|
||||
}
|
||||
return
|
||||
@@ -621,7 +621,7 @@ scriptorium:
|
||||
if err == nil {
|
||||
err = Validate(cfg)
|
||||
}
|
||||
if err == nil || !strings.Contains(err.Error(), "pipeline.scriptorium.artifacts.session_recap.inputs.transcript.source") || !strings.Contains(err.Error(), "unsupported") {
|
||||
if err == nil || !strings.Contains(configurationErrorText(err), "pipeline.scriptorium.artifacts.session_recap.inputs.transcript.source") || !strings.Contains(configurationErrorText(err), "unsupported") {
|
||||
t.Fatalf("Validate() error = %v, want source field and unsupported category", err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user