Use native configuration validation and diagnostics
This commit is contained in:
@@ -81,7 +81,7 @@ func TestNormalizeLoadAndValidate(t *testing.T) {
|
||||
report: true
|
||||
bogus: true
|
||||
`,
|
||||
wantLoadErr: "strict decode failed",
|
||||
wantLoadErr: "decode.unknown_field",
|
||||
},
|
||||
}
|
||||
|
||||
@@ -98,13 +98,13 @@ func TestNormalizeLoadAndValidate(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
|
||||
}
|
||||
if err != nil && tt.wantValidateErr != "" {
|
||||
if !strings.Contains(err.Error(), tt.wantValidateErr) {
|
||||
if !strings.Contains(configurationErrorText(err), tt.wantValidateErr) {
|
||||
t.Fatalf("load validation error = %v, want %q", err, tt.wantValidateErr)
|
||||
}
|
||||
return
|
||||
@@ -122,8 +122,8 @@ func TestNormalizeLoadAndValidate(t *testing.T) {
|
||||
if err == nil {
|
||||
t.Fatalf("expected validation error containing %q, got nil", tt.wantValidateErr)
|
||||
}
|
||||
if !strings.Contains(err.Error(), tt.wantValidateErr) {
|
||||
t.Fatalf("validation error = %q, want to contain %q", err.Error(), tt.wantValidateErr)
|
||||
if !strings.Contains(configurationErrorText(err), tt.wantValidateErr) {
|
||||
t.Fatalf("validation error = %q, want to contain %q", configurationErrorText(err), tt.wantValidateErr)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user