Merge pull request #92 from vdemeester/linting-some-packages

Linting some packages

README.md

@@ -85,6 +85,7 @@ You need either [Docker](https://github.com/docker/docker) and `make`, or `go` a
 #### Setting up your `go` environment
 - You need `go` v1.5
 - You need to set `export GO15VENDOREXPERIMENT=1` environment variable
+- You need `go-bindata` to be able to use `go generate` command (needed to build) : `go get github.com/jteeuwen/go-bindata/...`.
 - If you clone Træfɪk into something like `~/go/src/github.com/traefik`, your `GOPATH` variable will have to be set to `~/go`: export `GOPATH=~/go`.
 
 #### Using `Docker` and `Makefile`

boltdb.go

@@ -1,14 +0,0 @@
-package main
-
-type BoltDbProvider struct {
-	Watch      bool
-	Endpoint   string
-	Prefix     string
-	Filename   string
-	KvProvider *KvProvider
-}
-
-func (provider *BoltDbProvider) Provide(configurationChan chan<- configMessage) error {
-	provider.KvProvider = NewBoltDbProvider(provider)
-	return provider.KvProvider.provide(configurationChan)
-}

build.Dockerfile

@@ -3,6 +3,7 @@ FROM golang:1.5
 RUN go get github.com/Masterminds/glide
 RUN go get github.com/mitchellh/gox
 RUN go get github.com/tcnksm/ghr
+RUN go get github.com/jteeuwen/go-bindata/...
 
 # Which docker version to test on
 ENV DOCKER_VERSION 1.6.2

configuration.go

@@ -1,9 +1,10 @@
 package main
 
 import (
-	"errors"
-	"strings"
 	"time"
+
+	"github.com/emilevauge/traefik/provider"
+	"github.com/emilevauge/traefik/types"
 )
 
 type GlobalConfiguration struct {
@@ -14,14 +15,14 @@ type GlobalConfiguration struct {
 	CertFile, KeyFile         string
 	LogLevel                  string
 	ProvidersThrottleDuration time.Duration
-	Docker                    *DockerProvider
-	File                      *FileProvider
+	Docker                    *provider.Docker
+	File                      *provider.File
 	Web                       *WebProvider
-	Marathon                  *MarathonProvider
-	Consul                    *ConsulProvider
-	Etcd                      *EtcdProvider
-	Zookeeper                 *ZookepperProvider
-	Boltdb                    *BoltDbProvider
+	Marathon                  *provider.Marathon
+	Consul                    *provider.Consul
+	Etcd                      *provider.Etcd
+	Zookeeper                 *provider.Zookepper
+	Boltdb                    *provider.BoltDb
 }
 
 func NewGlobalConfiguration() *GlobalConfiguration {
@@ -35,79 +36,4 @@ func NewGlobalConfiguration() *GlobalConfiguration {
 	return globalConfiguration
 }
 
-// Backend configuration
-type Backend struct {
-	Servers        map[string]Server `json:"servers,omitempty"`
-	CircuitBreaker *CircuitBreaker   `json:"circuitBreaker,omitempty"`
-	LoadBalancer   *LoadBalancer     `json:"loadBalancer,omitempty"`
-}
-
-// LoadBalancer configuration
-type LoadBalancer struct {
-	Method string `json:"method,omitempty"`
-}
-
-// CircuitBreaker configuration
-type CircuitBreaker struct {
-	Expression string `json:"expression,omitempty"`
-}
-
-// Server configuration
-type Server struct {
-	URL    string `json:"url,omitempty"`
-	Weight int    `json:"weight,omitempty"`
-}
-
-// Route configuration
-type Route struct {
-	Rule  string `json:"rule,omitempty"`
-	Value string `json:"value,omitempty"`
-}
-
-// Frontend configuration
-type Frontend struct {
-	PassHostHeader bool             `json:"passHostHeader,omitempty"`
-	Backend        string           `json:"backend,omitempty"`
-	Routes         map[string]Route `json:"routes,omitempty"`
-}
-
-// Configuration of a provider
-type Configuration struct {
-	Backends  map[string]*Backend  `json:"backends,omitempty"`
-	Frontends map[string]*Frontend `json:"frontends,omitempty"`
-}
-
-// Load Balancer Method
-type LoadBalancerMethod uint8
-
-const (
-	// wrr (default) = Weighted Round Robin
-	wrr LoadBalancerMethod = iota
-	// drr = Dynamic Round Robin
-	drr
-)
-
-var loadBalancerMethodNames = []string{
-	"wrr",
-	"drr",
-}
-
-func NewLoadBalancerMethod(loadBalancer *LoadBalancer) (LoadBalancerMethod, error) {
-	if loadBalancer != nil {
-		for i, name := range loadBalancerMethodNames {
-			if strings.EqualFold(name, loadBalancer.Method) {
-				return LoadBalancerMethod(i), nil
-			}
-		}
-	}
-	return wrr, ErrInvalidLoadBalancerMethod
-}
-
-var ErrInvalidLoadBalancerMethod = errors.New("Invalid method, using default")
-
-type configMessage struct {
-	providerName  string
-	configuration *Configuration
-}
-
-type configs map[string]*Configuration
+type configs map[string]*types.Configuration

consul.go

@@ -1,14 +0,0 @@
-package main
-
-type ConsulProvider struct {
-	Watch      bool
-	Endpoint   string
-	Prefix     string
-	Filename   string
-	KvProvider *KvProvider
-}
-
-func (provider *ConsulProvider) Provide(configurationChan chan<- configMessage) error {
-	provider.KvProvider = NewConsulProvider(provider)
-	return provider.KvProvider.provide(configurationChan)
-}

etcd.go

@@ -1,14 +0,0 @@
-package main
-
-type EtcdProvider struct {
-	Watch      bool
-	Endpoint   string
-	Prefix     string
-	Filename   string
-	KvProvider *KvProvider
-}
-
-func (provider *EtcdProvider) Provide(configurationChan chan<- configMessage) error {
-	provider.KvProvider = NewEtcdProvider(provider)
-	return provider.KvProvider.provide(configurationChan)
-}

file_test.go

@@ -1 +0,0 @@
-package main

generate.go

@@ -2,9 +2,8 @@
 Copyright
 */
 
-//go:generate go get github.com/jteeuwen/go-bindata/...
-//go:generate rm -vf gen.go
-//go:generate go-bindata -o gen.go static/... templates/...
+//go:generate rm -vf autogen/gen.go
+//go:generate go-bindata -pkg autogen -o autogen/gen.go ./static/... ./templates/...
 
 //go:generate mkdir -p vendor/github.com/docker/docker/autogen/dockerversion
 //go:generate cp script/dockerversion vendor/github.com/docker/docker/autogen/dockerversion/dockerversion.go

middlewares/cbreaker.go

@@ -1,6 +1,3 @@
-/*
-Copyright
-*/
 package middlewares
 
 import (
@@ -9,10 +6,12 @@ import (
 	"github.com/mailgun/oxy/cbreaker"
 )
 
+// CircuitBreaker holds the oxy circuit breaker.
 type CircuitBreaker struct {
 	circuitBreaker *cbreaker.CircuitBreaker
 }
 
+// NewCircuitBreaker returns a new CircuitBreaker.
 func NewCircuitBreaker(next http.Handler, expression string, options ...cbreaker.CircuitBreakerOption) *CircuitBreaker {
 	circuitBreaker, _ := cbreaker.New(next, expression, options...)
 	return &CircuitBreaker{circuitBreaker}

middlewares/logger.go

@@ -1,6 +1,3 @@
-/*
-Copyright
-*/
 package middlewares
 
 import (
@@ -16,7 +13,7 @@ type Logger struct {
 	file *os.File
 }
 
-// NewLogger returns a new Logger instance
+// NewLogger returns a new Logger instance.
 func NewLogger(file string) *Logger {
 	if len(file) > 0 {
 		fi, err := os.OpenFile(file, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
@@ -36,6 +33,7 @@ func (l *Logger) ServeHTTP(rw http.ResponseWriter, r *http.Request, next http.Ha
 	}
 }
 
+// Close closes the logger (i.e. the file).
 func (l *Logger) Close() {
 	l.file.Close()
 }

middlewares/routes.go

@@ -1,6 +1,3 @@
-/*
-Copyright
-*/
 package middlewares
 
 import (
@@ -11,10 +8,12 @@ import (
 	"github.com/gorilla/mux"
 )
 
+// Routes holds the gorilla mux routes (for the API & co).
 type Routes struct {
 	router *mux.Router
 }
 
+// NewRoutes return a Routes based on the given router.
 func NewRoutes(router *mux.Router) *Routes {
 	return &Routes{router}
 }

middlewares/websocket.go

@@ -1,20 +1,20 @@
-/*
-Copyright
-*/
 package middlewares
 
 import (
-	log "github.com/Sirupsen/logrus"
-	"github.com/mailgun/oxy/roundrobin"
 	"net/http"
 	"strings"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/mailgun/oxy/roundrobin"
 )
 
+// WebsocketUpgrader holds Websocket configuration.
 type WebsocketUpgrader struct {
 	rr *roundrobin.RoundRobin
 }
 
+// NewWebsocketUpgrader returns a new WebsocketUpgrader.
 func NewWebsocketUpgrader(rr *roundrobin.RoundRobin) *WebsocketUpgrader {
 	wu := WebsocketUpgrader{
 		rr: rr,

provider.go

@@ -1,5 +0,0 @@
-package main
-
-type Provider interface {
-	Provide(configurationChan chan<- configMessage) error
-}

provider/boltdb.go

@@ -0,0 +1,19 @@
+package provider
+
+import "github.com/emilevauge/traefik/types"
+
+// BoltDb holds configurations of the BoltDb provider.
+type BoltDb struct {
+	Watch      bool
+	Endpoint   string
+	Prefix     string
+	Filename   string
+	KvProvider *Kv
+}
+
+// Provide allows the provider to provide configurations to traefik
+// using the given configuration channel.
+func (provider *BoltDb) Provide(configurationChan chan<- types.ConfigMessage) error {
+	provider.KvProvider = NewBoltDbProvider(provider)
+	return provider.KvProvider.provide(configurationChan)
+}

provider/consul.go

@@ -0,0 +1,19 @@
+package provider
+
+import "github.com/emilevauge/traefik/types"
+
+// Consul holds configurations of the Consul provider.
+type Consul struct {
+	Watch      bool
+	Endpoint   string
+	Prefix     string
+	Filename   string
+	KvProvider *Kv
+}
+
+// Provide allows the provider to provide configurations to traefik
+// using the given configuration channel.
+func (provider *Consul) Provide(configurationChan chan<- types.ConfigMessage) error {
+	provider.KvProvider = NewConsulProvider(provider)
+	return provider.KvProvider.provide(configurationChan)
+}

provider/docker.go

@@ -1,77 +1,83 @@
-package main
+package provider
 
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"strconv"
 	"strings"
 	"text/template"
 	"time"
 
-	"fmt"
 	"github.com/BurntSushi/toml"
 	"github.com/BurntSushi/ty/fun"
 	log "github.com/Sirupsen/logrus"
 	"github.com/cenkalti/backoff"
+	"github.com/emilevauge/traefik/autogen"
+	"github.com/emilevauge/traefik/types"
 	"github.com/fsouza/go-dockerclient"
 )
 
-type DockerProvider struct {
+// Docker holds configurations of the Docker provider.
+type Docker struct {
 	Watch    bool
 	Endpoint string
 	Filename string
 	Domain   string
 }
 
-func (provider *DockerProvider) Provide(configurationChan chan<- configMessage) error {
-	if dockerClient, err := docker.NewClient(provider.Endpoint); err != nil {
+// 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)
+	if err != nil {
 		log.Errorf("Failed to create a client for docker, error: %s", err)
 		return err
-	} else {
-		err := dockerClient.Ping()
-		if err != nil {
-			log.Errorf("Docker connection error %+v", err)
-			return err
-		}
-		log.Debug("Docker connection established")
-		if provider.Watch {
-			dockerEvents := make(chan *docker.APIEvents)
-			dockerClient.AddEventListener(dockerEvents)
-			log.Debug("Docker listening")
-			go func() {
-				operation := func() error {
-					for {
-						event := <-dockerEvents
-						if event == nil {
-							return errors.New("Docker event nil")
-							//							log.Fatalf("Docker connection error")
-						}
-						if event.Status == "start" || event.Status == "die" {
-							log.Debugf("Docker event receveived %+v", event)
-							configuration := provider.loadDockerConfig(dockerClient)
-							if configuration != nil {
-								configurationChan <- configMessage{"docker", configuration}
-							}
+	}
+	err = dockerClient.Ping()
+	if err != nil {
+		log.Errorf("Docker connection error %+v", err)
+		return err
+	}
+	log.Debug("Docker connection established")
+	if provider.Watch {
+		dockerEvents := make(chan *docker.APIEvents)
+		dockerClient.AddEventListener(dockerEvents)
+		log.Debug("Docker listening")
+		go func() {
+			operation := func() error {
+				for {
+					event := <-dockerEvents
+					if event == nil {
+						return errors.New("Docker event nil")
+						//							log.Fatalf("Docker connection error")
+					}
+					if event.Status == "start" || event.Status == "die" {
+						log.Debugf("Docker event receveived %+v", event)
+						configuration := provider.loadDockerConfig(dockerClient)
+						if configuration != nil {
+							configurationChan <- types.ConfigMessage{"docker", configuration}
 						}
 					}
 				}
-				notify := func(err error, time time.Duration) {
-					log.Errorf("Docker connection error %+v, retrying in %s", err, time)
-				}
-				err := backoff.RetryNotify(operation, backoff.NewExponentialBackOff(), notify)
-				if err != nil {
-					log.Fatalf("Cannot connect to docker server %+v", err)
-				}
-			}()
-		}
-
-		configuration := provider.loadDockerConfig(dockerClient)
-		configurationChan <- configMessage{"docker", configuration}
+			}
+			notify := func(err error, time time.Duration) {
+				log.Errorf("Docker connection error %+v, retrying in %s", err, time)
+			}
+			err := backoff.RetryNotify(operation, backoff.NewExponentialBackOff(), notify)
+			if err != nil {
+				log.Fatalf("Cannot connect to docker server %+v", err)
+			}
+		}()
 	}
+
+	configuration := provider.loadDockerConfig(dockerClient)
+	configurationChan <- types.ConfigMessage{"docker", configuration}
 	return nil
 }
 
-func (provider *DockerProvider) loadDockerConfig(dockerClient *docker.Client) *Configuration {
+func (provider *Docker) loadDockerConfig(dockerClient *docker.Client) *types.Configuration {
 	var DockerFuncMap = template.FuncMap{
 		"getBackend": func(container docker.Container) string {
 			if label, err := provider.getLabel(container, "traefik.backend"); err == nil {
@@ -118,7 +124,7 @@ func (provider *DockerProvider) loadDockerConfig(dockerClient *docker.Client) *C
 			return strings.Replace(s3, s1, s2, -1)
 		},
 	}
-	configuration := new(Configuration)
+	configuration := new(types.Configuration)
 	containerList, _ := dockerClient.ListContainers(docker.ListContainersOptions{})
 	containersInspected := []docker.Container{}
 	frontends := map[string][]docker.Container{}
@@ -174,7 +180,7 @@ func (provider *DockerProvider) loadDockerConfig(dockerClient *docker.Client) *C
 			return nil
 		}
 	} else {
-		buf, err := Asset("templates/docker.tmpl")
+		buf, err := autogen.Asset("templates/docker.tmpl")
 		if err != nil {
 			log.Error("Error reading file", err)
 		}
@@ -199,17 +205,17 @@ func (provider *DockerProvider) loadDockerConfig(dockerClient *docker.Client) *C
 	return configuration
 }
 
-func (provider *DockerProvider) getFrontendName(container docker.Container) string {
+func (provider *Docker) getFrontendName(container docker.Container) string {
 	// Replace '.' with '-' in quoted keys because of this issue https://github.com/BurntSushi/toml/issues/78
 	frontendName := fmt.Sprintf("%s-%s", provider.GetFrontendRule(container), provider.GetFrontendValue(container))
 	return strings.Replace(frontendName, ".", "-", -1)
 }
 
-func (provider *DockerProvider) getEscapedName(name string) string {
+func (provider *Docker) getEscapedName(name string) string {
 	return strings.Replace(name, "/", "", -1)
 }
 
-func (provider *DockerProvider) getLabel(container docker.Container, label string) (string, error) {
+func (provider *Docker) getLabel(container docker.Container, label string) (string, error) {
 	for key, value := range container.Config.Labels {
 		if key == label {
 			return value, nil
@@ -218,26 +224,30 @@ func (provider *DockerProvider) getLabel(container docker.Container, label strin
 	return "", errors.New("Label not found:" + label)
 }
 
-func (provider *DockerProvider) getLabels(container docker.Container, labels []string) (map[string]string, error) {
+func (provider *Docker) getLabels(container docker.Container, labels []string) (map[string]string, error) {
 	foundLabels := map[string]string{}
 	for _, label := range labels {
-		if foundLabel, err := provider.getLabel(container, label); err != nil {
+		foundLabel, err := provider.getLabel(container, label)
+		if err != nil {
 			return nil, errors.New("Label not found: " + label)
-		} else {
-			foundLabels[label] = foundLabel
 		}
+		foundLabels[label] = foundLabel
 	}
 	return foundLabels, nil
 }
 
-func (provider *DockerProvider) GetFrontendValue(container docker.Container) string {
+// GetFrontendValue returns the frontend value for the specified container, using
+// it's label. It returns a default one if the label is not present.
+func (provider *Docker) GetFrontendValue(container docker.Container) string {
 	if label, err := provider.getLabel(container, "traefik.frontend.value"); err == nil {
 		return label
 	}
 	return provider.getEscapedName(container.Name) + "." + provider.Domain
 }
 
-func (provider *DockerProvider) GetFrontendRule(container docker.Container) string {
+// GetFrontendRule returns the frontend rule for the specified container, using
+// it's label. It returns a default one (Host) if the label is not present.
+func (provider *Docker) GetFrontendRule(container docker.Container) string {
 	if label, err := provider.getLabel(container, "traefik.frontend.rule"); err == nil {
 		return label
 	}

provider/etcd.go

@@ -0,0 +1,19 @@
+package provider
+
+import "github.com/emilevauge/traefik/types"
+
+// Etcd holds configurations of the Etcd provider.
+type Etcd struct {
+	Watch      bool
+	Endpoint   string
+	Prefix     string
+	Filename   string
+	KvProvider *Kv
+}
+
+// Provide allows the provider to provide configurations to traefik
+// using the given configuration channel.
+func (provider *Etcd) Provide(configurationChan chan<- types.ConfigMessage) error {
+	provider.KvProvider = NewEtcdProvider(provider)
+	return provider.KvProvider.provide(configurationChan)
+}

provider/file.go

@@ -1,4 +1,4 @@
-package main
+package provider
 
 import (
 	"os"
@@ -7,15 +7,19 @@ import (
 
 	"github.com/BurntSushi/toml"
 	log "github.com/Sirupsen/logrus"
+	"github.com/emilevauge/traefik/types"
 	"gopkg.in/fsnotify.v1"
 )
 
-type FileProvider struct {
+// File holds configurations of the File provider.
+type File struct {
 	Watch    bool
 	Filename string
 }
 
-func (provider *FileProvider) Provide(configurationChan chan<- configMessage) error {
+// Provide allows the provider to provide configurations to traefik
+// using the given configuration channel.
+func (provider *File) Provide(configurationChan chan<- types.ConfigMessage) error {
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
 		log.Error("Error creating file watcher", err)
@@ -38,9 +42,9 @@ func (provider *FileProvider) Provide(configurationChan chan<- configMessage) er
 				case event := <-watcher.Events:
 					if strings.Contains(event.Name, file.Name()) {
 						log.Debug("File event:", event)
-						configuration := provider.LoadFileConfig(file.Name())
+						configuration := provider.loadFileConfig(file.Name())
 						if configuration != nil {
-							configurationChan <- configMessage{"file", configuration}
+							configurationChan <- types.ConfigMessage{"file", configuration}
 						}
 					}
 				case error := <-watcher.Errors:
@@ -55,13 +59,13 @@ func (provider *FileProvider) Provide(configurationChan chan<- configMessage) er
 		}
 	}
 
-	configuration := provider.LoadFileConfig(file.Name())
-	configurationChan <- configMessage{"file", configuration}
+	configuration := provider.loadFileConfig(file.Name())
+	configurationChan <- types.ConfigMessage{"file", configuration}
 	return nil
 }
 
-func (provider *FileProvider) LoadFileConfig(filename string) *Configuration {
-	configuration := new(Configuration)
+func (provider *File) loadFileConfig(filename string) *types.Configuration {
+	configuration := new(types.Configuration)
 	if _, err := toml.DecodeFile(filename, configuration); err != nil {
 		log.Error("Error reading file:", err)
 		return nil

provider/file_test.go

@@ -0,0 +1 @@
+package provider

provider/kv.go

@@ -1,27 +1,28 @@
-/*
-Copyright
-*/
-package main
+// Package provider holds the different provider implementation.
+package provider
 
 import (
 	"bytes"
+	"errors"
+	"strings"
+	"text/template"
+	"time"
+
+	"github.com/BurntSushi/toml"
+	"github.com/BurntSushi/ty/fun"
+	log "github.com/Sirupsen/logrus"
 	"github.com/docker/libkv"
+	"github.com/docker/libkv/store"
 	"github.com/docker/libkv/store/boltdb"
 	"github.com/docker/libkv/store/consul"
 	"github.com/docker/libkv/store/etcd"
 	"github.com/docker/libkv/store/zookeeper"
-	"strings"
-	"text/template"
-
-	"errors"
-	"github.com/BurntSushi/toml"
-	"github.com/BurntSushi/ty/fun"
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/libkv/store"
-	"time"
+	"github.com/emilevauge/traefik/autogen"
+	"github.com/emilevauge/traefik/types"
 )
 
-type KvProvider struct {
+// Kv holds common configurations of key-value providers.
+type Kv struct {
 	Watch     bool
 	Endpoint  string
 	Prefix    string
@@ -30,8 +31,9 @@ type KvProvider struct {
 	kvclient  store.Store
 }
 
-func NewConsulProvider(provider *ConsulProvider) *KvProvider {
-	kvProvider := new(KvProvider)
+// NewConsulProvider returns a Consul provider.
+func NewConsulProvider(provider *Consul) *Kv {
+	kvProvider := new(Kv)
 	kvProvider.Watch = provider.Watch
 	kvProvider.Endpoint = provider.Endpoint
 	kvProvider.Prefix = provider.Prefix
@@ -40,8 +42,9 @@ func NewConsulProvider(provider *ConsulProvider) *KvProvider {
 	return kvProvider
 }
 
-func NewEtcdProvider(provider *EtcdProvider) *KvProvider {
-	kvProvider := new(KvProvider)
+// NewEtcdProvider returns a Etcd provider.
+func NewEtcdProvider(provider *Etcd) *Kv {
+	kvProvider := new(Kv)
 	kvProvider.Watch = provider.Watch
 	kvProvider.Endpoint = provider.Endpoint
 	kvProvider.Prefix = provider.Prefix
@@ -50,8 +53,9 @@ func NewEtcdProvider(provider *EtcdProvider) *KvProvider {
 	return kvProvider
 }
 
-func NewZkProvider(provider *ZookepperProvider) *KvProvider {
-	kvProvider := new(KvProvider)
+// NewZkProvider returns a Zookepper provider.
+func NewZkProvider(provider *Zookepper) *Kv {
+	kvProvider := new(Kv)
 	kvProvider.Watch = provider.Watch
 	kvProvider.Endpoint = provider.Endpoint
 	kvProvider.Prefix = provider.Prefix
@@ -60,8 +64,9 @@ func NewZkProvider(provider *ZookepperProvider) *KvProvider {
 	return kvProvider
 }
 
-func NewBoltDbProvider(provider *BoltDbProvider) *KvProvider {
-	kvProvider := new(KvProvider)
+// NewBoltDbProvider returns a BoldDb provider.
+func NewBoltDbProvider(provider *BoltDb) *Kv {
+	kvProvider := new(Kv)
 	kvProvider.Watch = provider.Watch
 	kvProvider.Endpoint = provider.Endpoint
 	kvProvider.Prefix = provider.Prefix
@@ -70,7 +75,7 @@ func NewBoltDbProvider(provider *BoltDbProvider) *KvProvider {
 	return kvProvider
 }
 
-func (provider *KvProvider) provide(configurationChan chan<- configMessage) error {
+func (provider *Kv) provide(configurationChan chan<- types.ConfigMessage) error {
 	switch provider.StoreType {
 	case store.CONSUL:
 		consul.Register()
@@ -109,19 +114,19 @@ func (provider *KvProvider) provide(configurationChan chan<- configMessage) erro
 				<-chanKeys
 				configuration := provider.loadConfig()
 				if configuration != nil {
-					configurationChan <- configMessage{string(provider.StoreType), configuration}
+					configurationChan <- types.ConfigMessage{string(provider.StoreType), configuration}
 				}
 				defer close(stopCh)
 			}
 		}()
 	}
 	configuration := provider.loadConfig()
-	configurationChan <- configMessage{string(provider.StoreType), configuration}
+	configurationChan <- types.ConfigMessage{string(provider.StoreType), configuration}
 	return nil
 }
 
-func (provider *KvProvider) loadConfig() *Configuration {
-	configuration := new(Configuration)
+func (provider *Kv) loadConfig() *types.Configuration {
+	configuration := new(types.Configuration)
 	templateObjects := struct {
 		Prefix string
 	}{
@@ -167,7 +172,7 @@ func (provider *KvProvider) loadConfig() *Configuration {
 			return nil
 		}
 	} else {
-		buf, err := Asset("templates/kv.tmpl")
+		buf, err := autogen.Asset("templates/kv.tmpl")
 		if err != nil {
 			log.Error("Error reading file", err)
 		}

provider/marathon.go

@@ -1,28 +1,33 @@
-package main
+package provider
 
 import (
 	"bytes"
+	"errors"
 	"strconv"
 	"strings"
 	"text/template"
 
-	"errors"
 	"github.com/BurntSushi/toml"
 	"github.com/BurntSushi/ty/fun"
 	log "github.com/Sirupsen/logrus"
+	"github.com/emilevauge/traefik/autogen"
+	"github.com/emilevauge/traefik/types"
 	"github.com/gambol99/go-marathon"
 )
 
-type MarathonProvider struct {
+// Marathon holds configuration of the Marathon provider.
+type Marathon struct {
 	Watch            bool
 	Endpoint         string
-	marathonClient   marathon.Marathon
 	Domain           string
 	Filename         string
 	NetworkInterface string
+	marathonClient   marathon.Marathon
 }
 
-func (provider *MarathonProvider) Provide(configurationChan chan<- configMessage) error {
+// Provide allows the provider to provide configurations to traefik
+// using the given configuration channel.
+func (provider *Marathon) Provide(configurationChan chan<- types.ConfigMessage) error {
 	config := marathon.NewDefaultConfig()
 	config.URL = provider.Endpoint
 	config.EventsInterface = provider.NetworkInterface
@@ -43,7 +48,7 @@ func (provider *MarathonProvider) Provide(configurationChan chan<- configMessage
 					log.Debug("Marathon event receveived", event)
 					configuration := provider.loadMarathonConfig()
 					if configuration != nil {
-						configurationChan <- configMessage{"marathon", configuration}
+						configurationChan <- types.ConfigMessage{"marathon", configuration}
 					}
 				}
 			}()
@@ -51,11 +56,11 @@ func (provider *MarathonProvider) Provide(configurationChan chan<- configMessage
 	}
 
 	configuration := provider.loadMarathonConfig()
-	configurationChan <- configMessage{"marathon", configuration}
+	configurationChan <- types.ConfigMessage{"marathon", configuration}
 	return nil
 }
 
-func (provider *MarathonProvider) loadMarathonConfig() *Configuration {
+func (provider *Marathon) loadMarathonConfig() *types.Configuration {
 	var MarathonFuncMap = template.FuncMap{
 		"getPort": func(task marathon.Task) string {
 			for _, port := range task.Ports {
@@ -103,7 +108,7 @@ func (provider *MarathonProvider) loadMarathonConfig() *Configuration {
 		"getFrontendValue": provider.GetFrontendValue,
 		"getFrontendRule":  provider.GetFrontendRule,
 	}
-	configuration := new(Configuration)
+	configuration := new(types.Configuration)
 
 	applications, err := provider.marathonClient.Applications(nil)
 	if err != nil {
@@ -187,7 +192,7 @@ func (provider *MarathonProvider) loadMarathonConfig() *Configuration {
 			return nil
 		}
 	} else {
-		buf, err := Asset("templates/marathon.tmpl")
+		buf, err := autogen.Asset("templates/marathon.tmpl")
 		if err != nil {
 			log.Error("Error reading file", err)
 		}
@@ -223,7 +228,7 @@ func getApplication(task marathon.Task, apps []marathon.Application) (marathon.A
 	return marathon.Application{}, errors.New("Application not found: " + task.AppID)
 }
 
-func (provider *MarathonProvider) getLabel(application marathon.Application, label string) (string, error) {
+func (provider *Marathon) getLabel(application marathon.Application, label string) (string, error) {
 	for key, value := range application.Labels {
 		if key == label {
 			return value, nil
@@ -232,18 +237,22 @@ func (provider *MarathonProvider) getLabel(application marathon.Application, lab
 	return "", errors.New("Label not found:" + label)
 }
 
-func (provider *MarathonProvider) getEscapedName(name string) string {
+func (provider *Marathon) getEscapedName(name string) string {
 	return strings.Replace(name, "/", "", -1)
 }
 
-func (provider *MarathonProvider) GetFrontendValue(application marathon.Application) string {
+// GetFrontendValue returns the frontend value for the specified application, using
+// it's label. It returns a default one if the label is not present.
+func (provider *Marathon) GetFrontendValue(application marathon.Application) string {
 	if label, err := provider.getLabel(application, "traefik.frontend.value"); err == nil {
 		return label
 	}
 	return provider.getEscapedName(application.ID) + "." + provider.Domain
 }
 
-func (provider *MarathonProvider) GetFrontendRule(application marathon.Application) string {
+// GetFrontendRule returns the frontend rule for the specified application, using
+// it's label. It returns a default one (Host) if the label is not present.
+func (provider *Marathon) GetFrontendRule(application marathon.Application) string {
 	if label, err := provider.getLabel(application, "traefik.frontend.rule"); err == nil {
 		return label
 	}

provider/provider.go

@@ -0,0 +1,10 @@
+package provider
+
+import "github.com/emilevauge/traefik/types"
+
+// Provider defines methods of a provider.
+type Provider interface {
+	// Provide allows the provider to provide configurations to traefik
+	// using the given configuration channel.
+	Provide(configurationChan chan<- types.ConfigMessage) error
+}

provider/zk.go

@@ -0,0 +1,19 @@
+package provider
+
+import "github.com/emilevauge/traefik/types"
+
+// Zookepper holds configurations of the Zookepper provider.
+type Zookepper struct {
+	Watch      bool
+	Endpoint   string
+	Prefix     string
+	Filename   string
+	KvProvider *Kv
+}
+
+// Provide allows the provider to provide configurations to traefik
+// using the given configuration channel.
+func (provider *Zookepper) Provide(configurationChan chan<- types.ConfigMessage) error {
+	provider.KvProvider = NewZkProvider(provider)
+	return provider.KvProvider.provide(configurationChan)
+}

script/binary

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-if ! test -e gen.go; then
+if ! test -e autogen/gen.go; then
 	echo >&2 'error: generate must be run before binary'
 	false
 fi

script/crossbinary

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-if ! test -e gen.go; then
-	echo >&2 'error: generate must be run before binary'
+if ! test -e autogen/gen.go; then
+	echo >&2 'error: generate must be run before crossbinary'
 	false
 fi
 

script/test-unit

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-if ! test -e gen.go; then
-	echo >&2 'error: generate must be run before binary'
+if ! test -e autogen/gen.go; then
+	echo >&2 'error: generate must be run before test-unit'
 	false
 fi
 

traefik.go

@@ -2,21 +2,24 @@ package main
 
 import (
 	"crypto/tls"
+	"errors"
 	fmtlog "log"
 	"net/http"
 	"net/url"
 	"os"
 	"os/signal"
 	"reflect"
+	"runtime"
 	"strings"
 	"syscall"
 	"time"
 
-	"errors"
 	"github.com/BurntSushi/toml"
 	log "github.com/Sirupsen/logrus"
 	"github.com/codegangsta/negroni"
 	"github.com/emilevauge/traefik/middlewares"
+	"github.com/emilevauge/traefik/provider"
+	"github.com/emilevauge/traefik/types"
 	"github.com/gorilla/mux"
 	"github.com/mailgun/manners"
 	"github.com/mailgun/oxy/cbreaker"
@@ -24,7 +27,6 @@ import (
 	"github.com/mailgun/oxy/roundrobin"
 	"github.com/thoas/stats"
 	"gopkg.in/alecthomas/kingpin.v2"
-	"runtime"
 )
 
 var (
@@ -42,15 +44,15 @@ func main() {
 	fmtlog.SetFlags(fmtlog.Lshortfile | fmtlog.LstdFlags)
 	var srv *manners.GracefulServer
 	var configurationRouter *mux.Router
-	var configurationChan = make(chan configMessage, 10)
+	var configurationChan = make(chan types.ConfigMessage, 10)
 	defer close(configurationChan)
-	var configurationChanValidated = make(chan configMessage, 10)
+	var configurationChanValidated = make(chan types.ConfigMessage, 10)
 	defer close(configurationChanValidated)
 	var sigs = make(chan os.Signal, 1)
 	defer close(sigs)
 	var stopChan = make(chan bool)
 	defer close(stopChan)
-	var providers = []Provider{}
+	var providers = []provider.Provider{}
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
 
 	// load global configuration
@@ -84,22 +86,22 @@ func main() {
 	// listen new configurations from providers
 	go func() {
 		lastReceivedConfiguration := time.Unix(0, 0)
-		lastConfigs := make(map[string]*configMessage)
+		lastConfigs := make(map[string]*types.ConfigMessage)
 		for {
 			configMsg := <-configurationChan
-			log.Infof("Configuration receveived from provider %s: %#v", configMsg.providerName, configMsg.configuration)
-			lastConfigs[configMsg.providerName] = &configMsg
+			log.Infof("Configuration receveived from provider %s: %#v", configMsg.ProviderName, configMsg.Configuration)
+			lastConfigs[configMsg.ProviderName] = &configMsg
 			if time.Now().After(lastReceivedConfiguration.Add(time.Duration(globalConfiguration.ProvidersThrottleDuration))) {
-				log.Infof("Last %s config received more than %s, OK", configMsg.providerName, globalConfiguration.ProvidersThrottleDuration)
+				log.Infof("Last %s config received more than %s, OK", configMsg.ProviderName, globalConfiguration.ProvidersThrottleDuration)
 				// last config received more than n s ago
 				configurationChanValidated <- configMsg
 			} else {
-				log.Infof("Last %s config received less than %s, waiting...", configMsg.providerName, globalConfiguration.ProvidersThrottleDuration)
+				log.Infof("Last %s config received less than %s, waiting...", configMsg.ProviderName, globalConfiguration.ProvidersThrottleDuration)
 				go func() {
 					<-time.After(globalConfiguration.ProvidersThrottleDuration)
 					if time.Now().After(lastReceivedConfiguration.Add(time.Duration(globalConfiguration.ProvidersThrottleDuration))) {
-						log.Infof("Waited for %s config, OK", configMsg.providerName)
-						configurationChanValidated <- *lastConfigs[configMsg.providerName]
+						log.Infof("Waited for %s config, OK", configMsg.ProviderName)
+						configurationChanValidated <- *lastConfigs[configMsg.ProviderName]
 					}
 				}()
 			}
@@ -109,9 +111,9 @@ func main() {
 	go func() {
 		for {
 			configMsg := <-configurationChanValidated
-			if configMsg.configuration == nil {
-				log.Info("Skipping empty configuration")
-			} else if reflect.DeepEqual(currentConfigurations[configMsg.providerName], configMsg.configuration) {
+			if configMsg.Configuration == nil {
+				log.Info("Skipping empty Configuration")
+			} else if reflect.DeepEqual(currentConfigurations[configMsg.ProviderName], configMsg.Configuration) {
 				log.Info("Skipping same configuration")
 			} else {
 				// Copy configurations to new map so we don't change current if LoadConfig fails
@@ -119,7 +121,7 @@ func main() {
 				for k, v := range currentConfigurations {
 					newConfigurations[k] = v
 				}
-				newConfigurations[configMsg.providerName] = configMsg.configuration
+				newConfigurations[configMsg.ProviderName] = configMsg.Configuration
 
 				newConfigurationRouter, err := LoadConfig(newConfigurations, globalConfiguration)
 				if err == nil {
@@ -299,12 +301,12 @@ func LoadConfig(configurations configs, globalConfiguration *GlobalConfiguration
 				if configuration.Backends[frontend.Backend] == nil {
 					return nil, errors.New("Backend not found: " + frontend.Backend)
 				}
-				lbMethod, err := NewLoadBalancerMethod(configuration.Backends[frontend.Backend].LoadBalancer)
+				lbMethod, err := types.NewLoadBalancerMethod(configuration.Backends[frontend.Backend].LoadBalancer)
 				if err != nil {
-					configuration.Backends[frontend.Backend].LoadBalancer = &LoadBalancer{Method: "wrr"}
+					configuration.Backends[frontend.Backend].LoadBalancer = &types.LoadBalancer{Method: "wrr"}
 				}
 				switch lbMethod {
-				case drr:
+				case types.Drr:
 					log.Infof("Creating load-balancer drr")
 					rebalancer, _ := roundrobin.NewRebalancer(rr, roundrobin.RebalancerLogger(oxyLogger))
 					lb = rebalancer
@@ -316,7 +318,7 @@ func LoadConfig(configurations configs, globalConfiguration *GlobalConfiguration
 						log.Infof("Creating server %s %s", serverName, url.String())
 						rebalancer.UpsertServer(url, roundrobin.Weight(server.Weight))
 					}
-				case wrr:
+				case types.Wrr:
 					log.Infof("Creating load-balancer wrr")
 					lb = middlewares.NewWebsocketUpgrader(rr)
 					for serverName, server := range configuration.Backends[frontend.Backend].Servers {

types/types.go

@@ -0,0 +1,84 @@
+package types
+
+import (
+	"errors"
+	"strings"
+)
+
+// Backend holds backend configuration.
+type Backend struct {
+	Servers        map[string]Server `json:"servers,omitempty"`
+	CircuitBreaker *CircuitBreaker   `json:"circuitBreaker,omitempty"`
+	LoadBalancer   *LoadBalancer     `json:"loadBalancer,omitempty"`
+}
+
+// LoadBalancer holds load balancing configuration.
+type LoadBalancer struct {
+	Method string `json:"method,omitempty"`
+}
+
+// CircuitBreaker holds circuit breaker configuration.
+type CircuitBreaker struct {
+	Expression string `json:"expression,omitempty"`
+}
+
+// Server holds server configuration.
+type Server struct {
+	URL    string `json:"url,omitempty"`
+	Weight int    `json:"weight,omitempty"`
+}
+
+// Route holds route configuration.
+type Route struct {
+	Rule  string `json:"rule,omitempty"`
+	Value string `json:"value,omitempty"`
+}
+
+// Frontend holds frontend configuration.
+type Frontend struct {
+	Backend        string           `json:"backend,omitempty"`
+	Routes         map[string]Route `json:"routes,omitempty"`
+	PassHostHeader bool             `json:"passHostHeader,omitempty"`
+}
+
+// LoadBalancerMethod holds the method of load balancing to use.
+type LoadBalancerMethod uint8
+
+const (
+	// Wrr (default) = Weighted Round Robin
+	Wrr LoadBalancerMethod = iota
+	// Drr = Dynamic Round Robin
+	Drr
+)
+
+var loadBalancerMethodNames = []string{
+	"Wrr",
+	"Drr",
+}
+
+// NewLoadBalancerMethod create a new LoadBalancerMethod from a given LoadBalancer.
+func NewLoadBalancerMethod(loadBalancer *LoadBalancer) (LoadBalancerMethod, error) {
+	if loadBalancer != nil {
+		for i, name := range loadBalancerMethodNames {
+			if strings.EqualFold(name, loadBalancer.Method) {
+				return LoadBalancerMethod(i), nil
+			}
+		}
+	}
+	return Wrr, ErrInvalidLoadBalancerMethod
+}
+
+// ErrInvalidLoadBalancerMethod is thrown when the specified load balancing method is invalid.
+var ErrInvalidLoadBalancerMethod = errors.New("Invalid method, using default")
+
+// Configuration of a provider.
+type Configuration struct {
+	Backends  map[string]*Backend  `json:"backends,omitempty"`
+	Frontends map[string]*Frontend `json:"frontends,omitempty"`
+}
+
+// ConfigMessage hold configuration information exchanged between parts of traefik.
+type ConfigMessage struct {
+	ProviderName  string
+	Configuration *Configuration
+}

web.go

@@ -8,6 +8,8 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/elazarl/go-bindata-assetfs"
+	"github.com/emilevauge/traefik/autogen"
+	"github.com/emilevauge/traefik/types"
 	"github.com/gorilla/mux"
 	"github.com/unrolled/render"
 )
@@ -23,7 +25,7 @@ var (
 	})
 )
 
-func (provider *WebProvider) Provide(configurationChan chan<- configMessage) error {
+func (provider *WebProvider) Provide(configurationChan chan<- types.ConfigMessage) error {
 	systemRouter := mux.NewRouter()
 
 	// health route
@@ -41,11 +43,11 @@ func (provider *WebProvider) Provide(configurationChan chan<- configMessage) err
 			return
 		}
 
-		configuration := new(Configuration)
+		configuration := new(types.Configuration)
 		body, _ := ioutil.ReadAll(request.Body)
 		err := json.Unmarshal(body, configuration)
 		if err == nil {
-			configurationChan <- configMessage{"web", configuration}
+			configurationChan <- types.ConfigMessage{"web", configuration}
 			getConfigHandler(response, request)
 		} else {
 			log.Errorf("Error parsing configuration %+v", err)
@@ -65,7 +67,7 @@ func (provider *WebProvider) Provide(configurationChan chan<- configMessage) err
 	systemRouter.Methods("GET").Path("/").HandlerFunc(func(response http.ResponseWriter, request *http.Request) {
 		http.Redirect(response, request, "/dashboard/", 302)
 	})
-	systemRouter.Methods("GET").PathPrefix("/dashboard/").Handler(http.StripPrefix("/dashboard/", http.FileServer(&assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, Prefix: "static"})))
+	systemRouter.Methods("GET").PathPrefix("/dashboard/").Handler(http.StripPrefix("/dashboard/", http.FileServer(&assetfs.AssetFS{Asset: autogen.Asset, AssetDir: autogen.AssetDir, Prefix: "static"})))
 
 	go func() {
 		if len(provider.CertFile) > 0 && len(provider.KeyFile) > 0 {

zk.go

@@ -1,14 +0,0 @@
-package main
-
-type ZookepperProvider struct {
-	Watch      bool
-	Endpoint   string
-	Prefix     string
-	Filename   string
-	KvProvider *KvProvider
-}
-
-func (provider *ZookepperProvider) Provide(configurationChan chan<- configMessage) error {
-	provider.KvProvider = NewZkProvider(provider)
-	return provider.KvProvider.provide(configurationChan)
-}