Merge pull request #122 from emilevauge/add-getBool-kvprovider

Add GetBool function in KV provider, used by passHostHeader

docs/index.md

@@ -404,6 +404,14 @@ watch = true
 # Optional
 #
 # filename = "docker.tmpl"
+
+# Enable docker TLS connection
+#
+#  [docker.tls]
+#  ca = "/etc/ssl/ca.crt"
+#  cert = "/etc/ssl/docker.crt"
+#  key = "/etc/ssl/docker.key"
+#  insecureskipverify = true
 ```
 
 Labels can be used on containers to override default behaviour:

provider/docker.go

@@ -20,13 +20,33 @@ type Docker struct {
 	baseProvider
 	Endpoint string
 	Domain   string
+	TLS      *DockerTLS
+}
+
+// DockerTLS holds TLS specific configurations
+type DockerTLS struct {
+	CA                 string
+	Cert               string
+	Key                string
+	InsecureSkipVerify bool
 }
 
 // Provide allows the provider to provide configurations to traefik
 // using the given configuration channel.
 func (provider *Docker) Provide(configurationChan chan<- types.ConfigMessage) error {
 
-	dockerClient, err := docker.NewClient(provider.Endpoint)
+	var dockerClient *docker.Client
+	var err error
+
+	if provider.TLS != nil {
+		dockerClient, err = docker.NewTLSClient(provider.Endpoint,
+			provider.TLS.Cert, provider.TLS.Key, provider.TLS.CA)
+		if err == nil {
+			dockerClient.TLSConfig.InsecureSkipVerify = provider.TLS.InsecureSkipVerify
+		}
+	} else {
+		dockerClient, err = docker.NewClient(provider.Endpoint)
+	}
 	if err != nil {
 		log.Errorf("Failed to create a client for docker, error: %s", err)
 		return err

provider/kv.go

@@ -11,6 +11,7 @@ import (
 	"github.com/docker/libkv"
 	"github.com/docker/libkv/store"
 	"github.com/emilevauge/traefik/types"
+	"strconv"
 )
 
 // Kv holds common configurations of key-value providers.
@@ -73,9 +74,10 @@ func (provider *Kv) loadConfig() *types.Configuration {
 		provider.Prefix,
 	}
 	var KvFuncMap = template.FuncMap{
-		"List": provider.list,
-		"Get":  provider.get,
-		"Last": provider.last,
+		"List":    provider.list,
+		"Get":     provider.get,
+		"GetBool": provider.getBool,
+		"Last":    provider.last,
 	}
 
 	configuration, err := provider.getConfiguration("templates/kv.tmpl", KvFuncMap, templateObjects)
@@ -104,7 +106,7 @@ func (provider *Kv) get(keys ...string) string {
 	joinedKeys := strings.Join(keys, "")
 	keyPair, err := provider.kvclient.Get(joinedKeys)
 	if err != nil {
-		log.Debug("Error getting key: ", joinedKeys, err)
+		log.Error("Error getting key: ", joinedKeys, err)
 		return ""
 	} else if keyPair == nil {
 		return ""
@@ -112,6 +114,16 @@ 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]

provider/kv_test.go

@@ -194,6 +194,61 @@ 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

templates/kv.tmpl

@@ -28,7 +28,7 @@
     {{$frontend := Last .}}
     [frontends.{{$frontend}}]
     backend = "{{Get . "/backend"}}"
-    passHostHeader = "{{Get . "/passHostHeader"}}"
+    passHostHeader = "{{GetBool . "/passHostHeader"}}"
     {{$routes := List . "/routes/"}}
         {{range $routes}}
         [frontends.{{$frontend}}.routes.{{Last .}}]

traefik.sample.toml

@@ -138,6 +138,14 @@
 #
 # filename = "docker.tmpl"
 
+# Enable docker TLS connection
+#
+#  [docker.tls]
+#  ca = "/etc/ssl/ca.crt"
+#  cert = "/etc/ssl/docker.crt"
+#  key = "/etc/ssl/docker.key"
+#  insecureskipverify = true
+
 
 ################################################################
 # Mesos/Marathon configuration backend