vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2025-09-02 02:29:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve validation error messages

Browse source
This commit is contained in:
Daniel 2022-02-25 15:56:40 +01:00
parent 92c16b1c88
commit 874214ea59
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/validate.go
View file

@ -92,7 +92,7 @@ func validateValue(option *Option, value interface{}) (*valueCache, error) { //n
for pos, entry := range v { for pos, entry := range v {
s, ok := entry.(string) s, ok := entry.(string)
if !ok { if !ok {
return nil, fmt.Errorf("validation of option %s failed: element %+v at index %d is not a string", option.Key, entry, pos) return nil, fmt.Errorf("validation of option %s failed: element %+v (#%d) is not a string", option.Key, entry, pos+1)
} }
vConverted[pos] = s vConverted[pos] = s
} }
@ -109,11 +109,11 @@ func validateValue(option *Option, value interface{}) (*valueCache, error) { //n
if option.compiledRegex != nil { if option.compiledRegex != nil {
for pos, entry := range v { for pos, entry := range v {
if !option.compiledRegex.MatchString(entry) { if !option.compiledRegex.MatchString(entry) {
return nil, fmt.Errorf("validation of option %s failed: string \"%s\" at index %d did not match validation regex", option.Key, entry, pos) return nil, fmt.Errorf("validation of option %s failed: string \"%s\" (#%d) did not match validation regex", option.Key, entry, pos+1)
} }
if err := isAllowedPossibleValue(option, entry); err != nil { if err := isAllowedPossibleValue(option, entry); err != nil {
return nil, fmt.Errorf("validation of option %s failed: string %q at index %d is not allowed", option.Key, entry, pos) return nil, fmt.Errorf("validation of option %s failed: string %q (#%d) is not allowed", option.Key, entry, pos+1)
} }
} }
} }