Remove unwanted trailing slash in key
Co-authored-by: Mathieu Lonjaret <mathieu.lonjaret@gmail.com>
This commit is contained in:
parent
32d88a977d
commit
ef9b79f85c
2 changed files with 6 additions and 1 deletions
|
@ -24,7 +24,7 @@ func DecodeToNode(pairs []*store.KVPair, rootName string, filters ...string) (*p
|
||||||
return nil, fmt.Errorf("invalid label root %s", rootName)
|
return nil, fmt.Errorf("invalid label root %s", rootName)
|
||||||
}
|
}
|
||||||
|
|
||||||
split := strings.Split(pair.Key[len(rootName)+1:], "/")
|
split := strings.FieldsFunc(pair.Key[len(rootName)+1:], func(c rune) bool { return c == '/' })
|
||||||
|
|
||||||
parts := []string{rootName}
|
parts := []string{rootName}
|
||||||
for _, fragment := range split {
|
for _, fragment := range split {
|
||||||
|
|
|
@ -28,6 +28,7 @@ func TestDecode(t *testing.T) {
|
||||||
"traefik/fieldf/Test2": "B",
|
"traefik/fieldf/Test2": "B",
|
||||||
"traefik/fieldg/0/name": "A",
|
"traefik/fieldg/0/name": "A",
|
||||||
"traefik/fieldg/1/name": "B",
|
"traefik/fieldg/1/name": "B",
|
||||||
|
"traefik/fieldh/": "foo",
|
||||||
},
|
},
|
||||||
expected: &sample{
|
expected: &sample{
|
||||||
FieldA: "bar",
|
FieldA: "bar",
|
||||||
|
@ -45,6 +46,7 @@ func TestDecode(t *testing.T) {
|
||||||
{Name: "A"},
|
{Name: "A"},
|
||||||
{Name: "B"},
|
{Name: "B"},
|
||||||
},
|
},
|
||||||
|
FieldH: "foo",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -61,6 +63,7 @@ func TestDecode(t *testing.T) {
|
||||||
"foo/bar/traefik/fieldf/Test2": "B",
|
"foo/bar/traefik/fieldf/Test2": "B",
|
||||||
"foo/bar/traefik/fieldg/0/name": "A",
|
"foo/bar/traefik/fieldg/0/name": "A",
|
||||||
"foo/bar/traefik/fieldg/1/name": "B",
|
"foo/bar/traefik/fieldg/1/name": "B",
|
||||||
|
"foo/bar/traefik/fieldh/": "foo",
|
||||||
},
|
},
|
||||||
expected: &sample{
|
expected: &sample{
|
||||||
FieldA: "bar",
|
FieldA: "bar",
|
||||||
|
@ -78,6 +81,7 @@ func TestDecode(t *testing.T) {
|
||||||
{Name: "A"},
|
{Name: "A"},
|
||||||
{Name: "B"},
|
{Name: "B"},
|
||||||
},
|
},
|
||||||
|
FieldH: "foo",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -107,6 +111,7 @@ type sample struct {
|
||||||
} `label:"allowEmpty"`
|
} `label:"allowEmpty"`
|
||||||
FieldF map[string]string
|
FieldF map[string]string
|
||||||
FieldG []sub
|
FieldG []sub
|
||||||
|
FieldH string
|
||||||
}
|
}
|
||||||
|
|
||||||
type sub struct {
|
type sub struct {
|
||||||
|
|
Loading…
Reference in a new issue