Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 08:44:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

more strict with whitespace

Browse Source 
Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2020-01-25 17:04:16 +01:00
parent 1812b5d73b
commit e73999680b
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugin/traffic/setup.go
View File

@@ -141,13 +141,37 @@ func parseLocality(s string) ([]xds.Locality, error) {
default: default:
return nil, fmt.Errorf("too many location specifiers: %q", s) return nil, fmt.Errorf("too many location specifiers: %q", s)
case 1: case 1:
locs = append(locs, xds.Locality{Region: l[0]}) l0 := strings.TrimSpace(l[0])
if l0 == "" {
return nil, fmt.Errorf("empty location specifer: %q", l[0])
}
locs = append(locs, xds.Locality{Region: l0})
continue continue
case 2: case 2:
locs = append(locs, xds.Locality{Region: l[0], Zone: l[1]}) l0 := strings.TrimSpace(l[0])
if l0 == "" {
return nil, fmt.Errorf("empty location specifer: %q", l[0])
}
l1 := strings.TrimSpace(l[1])
if l1 == "" {
return nil, fmt.Errorf("empty location specifer: %q", l[1])
}
locs = append(locs, xds.Locality{Region: l0, Zone: l1})
continue continue
case 3: case 3:
locs = append(locs, xds.Locality{Region: l[0], Zone: l[1], SubZone: l[2]}) l0 := strings.TrimSpace(l[0])
if l0 == "" {
return nil, fmt.Errorf("empty location specifer: %q", l[0])
}
l1 := strings.TrimSpace(l[1])
if l1 == "" {
return nil, fmt.Errorf("empty location specifer: %q", l[1])
}
l2 := strings.TrimSpace(l[2])
if l2 == "" {
return nil, fmt.Errorf("empty location specifer: %q", l[2])
}
locs = append(locs, xds.Locality{Region: l0, Zone: l1, SubZone: l2})
continue continue
} }