Removes getBool from kv provider, fixes https://github.com/emilevauge/traefik/issues/117
This commit is contained in:
parent
4abb4c6489
commit
e728f32a15
3 changed files with 4 additions and 71 deletions
|
@ -11,7 +11,6 @@ import (
|
|||
"github.com/docker/libkv"
|
||||
"github.com/docker/libkv/store"
|
||||
"github.com/emilevauge/traefik/types"
|
||||
"strconv"
|
||||
)
|
||||
|
||||
// Kv holds common configurations of key-value providers.
|
||||
|
@ -76,7 +75,6 @@ func (provider *Kv) loadConfig() *types.Configuration {
|
|||
var KvFuncMap = template.FuncMap{
|
||||
"List": provider.list,
|
||||
"Get": provider.get,
|
||||
"GetBool": provider.getBool,
|
||||
"Last": provider.last,
|
||||
}
|
||||
|
||||
|
@ -114,16 +112,6 @@ func (provider *Kv) get(keys ...string) string {
|
|||
return string(keyPair.Value)
|
||||
}
|
||||
|
||||
func (provider *Kv) getBool(keys ...string) bool {
|
||||
value := provider.get(keys...)
|
||||
b, err := strconv.ParseBool(string(value))
|
||||
if err != nil {
|
||||
log.Error("Error getting key: ", strings.Join(keys, ""), err)
|
||||
return false
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
func (provider *Kv) last(key string) string {
|
||||
splittedKey := strings.Split(key, "/")
|
||||
return splittedKey[len(splittedKey)-1]
|
||||
|
|
|
@ -194,61 +194,6 @@ func TestKvGet(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestKvGetBool(t *testing.T) {
|
||||
cases := []struct {
|
||||
provider *Kv
|
||||
keys []string
|
||||
expected bool
|
||||
}{
|
||||
{
|
||||
provider: &Kv{
|
||||
kvclient: &Mock{
|
||||
KVPairs: []*store.KVPair{
|
||||
{
|
||||
Key: "foo",
|
||||
Value: []byte("true"),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
keys: []string{"foo"},
|
||||
expected: true,
|
||||
},
|
||||
{
|
||||
provider: &Kv{
|
||||
kvclient: &Mock{
|
||||
KVPairs: []*store.KVPair{
|
||||
{
|
||||
Key: "foo",
|
||||
Value: []byte("false"),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
keys: []string{"foo"},
|
||||
expected: false,
|
||||
},
|
||||
}
|
||||
|
||||
for _, c := range cases {
|
||||
actual := c.provider.getBool(c.keys...)
|
||||
if actual != c.expected {
|
||||
t.Fatalf("expected %v, got %v for %v and %v", c.expected, actual, c.keys, c.provider)
|
||||
}
|
||||
}
|
||||
|
||||
// Error case
|
||||
provider := &Kv{
|
||||
kvclient: &Mock{
|
||||
Error: true,
|
||||
},
|
||||
}
|
||||
actual := provider.get("anything")
|
||||
if actual != "" {
|
||||
t.Fatalf("Should have return nil, got %v", actual)
|
||||
}
|
||||
}
|
||||
|
||||
func TestKvLast(t *testing.T) {
|
||||
cases := []struct {
|
||||
key string
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
{{$frontend := Last .}}
|
||||
[frontends.{{$frontend}}]
|
||||
backend = "{{Get . "/backend"}}"
|
||||
passHostHeader = "{{GetBool . "/passHostHeader"}}"
|
||||
passHostHeader = {{Get . "/passHostHeader"}}
|
||||
{{$routes := List . "/routes/"}}
|
||||
{{range $routes}}
|
||||
[frontends.{{$frontend}}.routes.{{Last .}}]
|
||||
|
|
Loading…
Reference in a new issue