Merge pull request #137 from dylanmei/marathon_route_names_with_slashes

Marathon tmpl converts slashes in Marathon app names to dashes

Dockerfile

@@ -1,4 +1,5 @@
 FROM scratch
 COPY script/ca-certificates.crt /etc/ssl/certs/
 COPY dist/traefik /
+EXPOSE 80
 ENTRYPOINT ["/traefik"]

glide.yaml

@@ -43,7 +43,7 @@ import:
   - package: github.com/alecthomas/units
     ref:     6b4e7dc5e3143b85ea77909c72caf89416fc2915
   - package: github.com/gambol99/go-marathon
-    ref:     0ba31bcb0d7633ba1888d744c42990eb15281cf1
+    ref:     8ce3f764250b2de3f2c627d12ca7dd21bd5e7f93
   - package: github.com/mailgun/predicate
     ref:     cb0bff91a7ab7cf7571e661ff883fc997bc554a3
   - package: github.com/thoas/stats
@@ -142,3 +142,8 @@ import:
   - package: github.com/codahale/hdrhistogram
     ref:     954f16e8b9ef0e5d5189456aa4c1202758e04f17
   - package: github.com/gorilla/websocket
+  - package: github.com/donovanhide/eventsource
+    ref:     d8a3071799b98cacd30b6da92f536050ccfe6da4
+  - package: github.com/golang/glog
+    ref:     fca8c8854093a154ff1eb580aae10276ad6b1b5f
+

provider/kv.go

@@ -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.
@@ -74,10 +73,9 @@ func (provider *Kv) loadConfig() *types.Configuration {
 		provider.Prefix,
 	}
 	var KvFuncMap = template.FuncMap{
-		"List":    provider.list,
-		"Get":     provider.get,
-		"GetBool": provider.getBool,
-		"Last":    provider.last,
+		"List": provider.list,
+		"Get":  provider.get,
+		"Last": provider.last,
 	}
 
 	configuration, err := provider.getConfiguration("templates/kv.tmpl", KvFuncMap, templateObjects)
@@ -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]

provider/kv_test.go

@@ -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

provider/marathon.go

@@ -23,7 +23,7 @@ type Marathon struct {
 
 type lightMarathonClient interface {
 	Applications(url.Values) (*marathon.Applications, error)
-	AllTasks() (*marathon.Tasks, error)
+	AllTasks(v url.Values) (*marathon.Tasks, error)
 }
 
 // Provide allows the provider to provide configurations to traefik
@@ -85,7 +85,7 @@ func (provider *Marathon) loadMarathonConfig() *types.Configuration {
 		return nil
 	}
 
-	tasks, err := provider.marathonClient.AllTasks()
+	tasks, err := provider.marathonClient.AllTasks((url.Values{"status": []string{"running"}}))
 	if err != nil {
 		log.Errorf("Failed to create a client for marathon, error: %s", err)
 		return nil

provider/marathon_test.go

@@ -24,7 +24,7 @@ func (c *fakeClient) Applications(url.Values) (*marathon.Applications, error) {
 	return c.applications, nil
 }
 
-func (c *fakeClient) AllTasks() (*marathon.Tasks, error) {
+func (c *fakeClient) AllTasks(v url.Values) (*marathon.Tasks, error) {
 	if c.tasksError {
 		return nil, errors.New("error")
 	}

templates/kv.tmpl

@@ -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 .}}]

templates/marathon.tmpl

@@ -9,7 +9,7 @@
   [frontends.frontend{{.ID | replace "/" "-"}}]
   backend = "backend{{.ID | replace "/" "-"}}"
   passHostHeader = {{getPassHostHeader .}}
-    [frontends.frontend-{{.ID | replace "/" ""}}.routes.route-host-{{.ID | replace "/" ""}}]
+    [frontends.frontend{{.ID | replace "/" "-"}}.routes.route-host{{.ID | replace "/" "-"}}]
     rule = "{{getFrontendRule .}}"
     value = "{{getFrontendValue .}}"
 {{end}}