Import order as goimports does

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

acme/account.go

@@ -7,11 +7,12 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"errors"
-	"github.com/containous/traefik/log"
-	"github.com/xenolf/lego/acme"
 	"reflect"
 	"sync"
 	"time"
+
+	"github.com/containous/traefik/log"
+	"github.com/xenolf/lego/acme"
 )
 
 // Account is used to store lets encrypt registration info

acme/acme.go

@@ -5,6 +5,12 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
+	"io/ioutil"
+	fmtlog "log"
+	"os"
+	"strings"
+	"time"
+
 	"github.com/BurntSushi/ty/fun"
 	"github.com/cenk/backoff"
 	"github.com/containous/staert"
@@ -14,11 +20,6 @@ import (
 	"github.com/containous/traefik/types"
 	"github.com/xenolf/lego/acme"
 	"github.com/xenolf/lego/providers/dns"
-	"io/ioutil"
-	fmtlog "log"
-	"os"
-	"strings"
-	"time"
 )
 
 var (

acme/acme_test.go

@@ -2,12 +2,13 @@ package acme
 
 import (
 	"encoding/base64"
-	"github.com/xenolf/lego/acme"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
 	"sync"
 	"testing"
+
+	"github.com/xenolf/lego/acme"
 )
 
 func TestDomainsSet(t *testing.T) {

acme/challengeProvider.go

@@ -2,15 +2,15 @@ package acme
 
 import (
 	"crypto/tls"
+	"fmt"
 	"strings"
 	"sync"
+	"time"
 
-	"fmt"
 	"github.com/cenk/backoff"
 	"github.com/containous/traefik/cluster"
 	"github.com/containous/traefik/log"
 	"github.com/xenolf/lego/acme"
-	"time"
 )
 
 var _ acme.ChallengeProviderTimeout = (*challengeProvider)(nil)

acme/localStore.go

@@ -3,10 +3,11 @@ package acme
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/containous/traefik/cluster"
-	"github.com/containous/traefik/log"
 	"io/ioutil"
 	"sync"
+
+	"github.com/containous/traefik/cluster"
+	"github.com/containous/traefik/log"
 )
 
 var _ cluster.Store = (*LocalStore)(nil)

cluster/datastore.go

@@ -4,14 +4,15 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"sync"
+	"time"
+
 	"github.com/cenk/backoff"
 	"github.com/containous/staert"
 	"github.com/containous/traefik/job"
 	"github.com/containous/traefik/log"
 	"github.com/docker/libkv/store"
 	"github.com/satori/go.uuid"
-	"sync"
-	"time"
 )
 
 // Metadata stores Object plus metadata

cluster/leadership.go

@@ -2,12 +2,13 @@ package cluster
 
 import (
 	"context"
+	"time"
+
 	"github.com/cenk/backoff"
 	"github.com/containous/traefik/log"
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/types"
 	"github.com/docker/leadership"
-	"time"
 )
 
 // Leadership allows leadership election using a KV store

cmd/bug.go

@@ -4,13 +4,14 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/containous/flaeg"
-	"github.com/mvdan/xurls"
 	"net/url"
 	"os/exec"
 	"regexp"
 	"runtime"
 	"text/template"
+
+	"github.com/containous/flaeg"
+	"github.com/mvdan/xurls"
 )
 
 var (

cmd/version.go

@@ -2,12 +2,13 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/containous/flaeg"
-	"github.com/containous/traefik/version"
 	"io"
 	"os"
 	"runtime"
 	"text/template"
+
+	"github.com/containous/flaeg"
+	"github.com/containous/traefik/version"
 )
 
 var versionTemplate = `Version:      {{.Version}}

job/job.go

@@ -1,8 +1,9 @@
 package job
 
 import (
-	"github.com/cenk/backoff"
 	"time"
+
+	"github.com/cenk/backoff"
 )
 
 var (

job/job_test.go

@@ -1,9 +1,10 @@
 package job
 
 import (
-	"github.com/cenk/backoff"
 	"testing"
 	"time"
+
+	"github.com/cenk/backoff"
 )
 
 func TestJobBackOff(t *testing.T) {

log/logger.go

@@ -1,8 +1,9 @@
 package log
 
 import (
-	"github.com/Sirupsen/logrus"
 	"io"
+
+	"github.com/Sirupsen/logrus"
 )
 
 var (

middlewares/authenticator.go

@@ -2,12 +2,13 @@ package middlewares
 
 import (
 	"fmt"
+	"net/http"
+	"strings"
+
 	"github.com/abbot/go-http-auth"
 	"github.com/codegangsta/negroni"
 	"github.com/containous/traefik/log"
 	"github.com/containous/traefik/types"
-	"net/http"
-	"strings"
 )
 
 // Authenticator is a middleware that provides HTTP basic and digest authentication

middlewares/authenticator_test.go

@@ -2,13 +2,14 @@ package middlewares
 
 import (
 	"fmt"
-	"github.com/codegangsta/negroni"
-	"github.com/containous/traefik/types"
-	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/codegangsta/negroni"
+	"github.com/containous/traefik/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestBasicAuthFail(t *testing.T) {

middlewares/compress.go

@@ -1,8 +1,9 @@
 package middlewares
 
 import (
-	"github.com/NYTimes/gziphandler"
 	"net/http"
+
+	"github.com/NYTimes/gziphandler"
 )
 
 // Compress is a middleware that allows redirections

middlewares/handlerSwitcher.go

@@ -1,9 +1,10 @@
 package middlewares
 
 import (
+	"net/http"
+
 	"github.com/containous/mux"
 	"github.com/containous/traefik/safe"
-	"net/http"
 )
 
 // HandlerSwitcher allows hot switching of http.ServeMux

middlewares/logger_test.go

@@ -2,8 +2,6 @@ package middlewares
 
 import (
 	"fmt"
-	shellwords "github.com/mattn/go-shellwords"
-	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -11,6 +9,9 @@ import (
 	"path/filepath"
 	"runtime"
 	"testing"
+
+	shellwords "github.com/mattn/go-shellwords"
+	"github.com/stretchr/testify/assert"
 )
 
 type logtestResponseWriter struct{}

middlewares/retry.go

@@ -3,10 +3,11 @@ package middlewares
 import (
 	"bufio"
 	"bytes"
-	"github.com/containous/traefik/log"
-	"github.com/vulcand/oxy/utils"
 	"net"
 	"net/http"
+
+	"github.com/containous/traefik/log"
+	"github.com/vulcand/oxy/utils"
 )
 
 var (

middlewares/rewrite.go

@@ -1,9 +1,10 @@
 package middlewares
 
 import (
+	"net/http"
+
 	"github.com/containous/traefik/log"
 	"github.com/vulcand/vulcand/plugin/rewrite"
-	"net/http"
 )
 
 // Rewrite is a middleware that allows redirections

provider/boltdb.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"fmt"
+
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/types"
 	"github.com/docker/libkv/store"

provider/consul.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"fmt"
+
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/types"
 	"github.com/docker/libkv/store"

provider/docker_test.go

@@ -9,9 +9,8 @@ import (
 	docker "github.com/docker/engine-api/types"
 	"github.com/docker/engine-api/types/container"
 	"github.com/docker/engine-api/types/network"
+	"github.com/docker/engine-api/types/swarm"
 	"github.com/docker/go-connections/nat"
-
-	swarm "github.com/docker/engine-api/types/swarm"
 )
 
 func TestDockerGetFrontendName(t *testing.T) {

provider/etcd.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"fmt"
+
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/types"
 	"github.com/docker/libkv/store"

provider/eureka.go

@@ -1,17 +1,18 @@
 package provider
 
 import (
+	"io/ioutil"
+	"strconv"
+	"strings"
+	"text/template"
+	"time"
+
 	"github.com/ArthurHlt/go-eureka-client/eureka"
 	log "github.com/Sirupsen/logrus"
 	"github.com/cenk/backoff"
 	"github.com/containous/traefik/job"
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/types"
-	"io/ioutil"
-	"strconv"
-	"strings"
-	"text/template"
-	"time"
 )
 
 // Eureka holds configuration of the Eureka provider.

provider/eureka_test.go

@@ -1,8 +1,9 @@
 package provider
 
 import (
-	"github.com/ArthurHlt/go-eureka-client/eureka"
 	"testing"
+
+	"github.com/ArthurHlt/go-eureka-client/eureka"
 )
 
 func TestEurekaGetPort(t *testing.T) {

provider/kubernetes.go

@@ -7,16 +7,14 @@ import (
 	"text/template"
 	"time"
 
-	"k8s.io/client-go/1.5/pkg/api/v1"
+	"github.com/cenk/backoff"
-	"k8s.io/client-go/1.5/pkg/util/intstr"
+	"github.com/containous/traefik/job"
-
 	"github.com/containous/traefik/log"
 	"github.com/containous/traefik/provider/k8s"
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/types"
-
+	"k8s.io/client-go/1.5/pkg/api/v1"
-	"github.com/cenk/backoff"
+	"k8s.io/client-go/1.5/pkg/util/intstr"
-	"github.com/containous/traefik/job"
 )
 
 var _ Provider = (*Kubernetes)(nil)

provider/kubernetes_test.go

@@ -5,12 +5,11 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/containous/traefik/provider/k8s"
+	"github.com/containous/traefik/types"
 	"k8s.io/client-go/1.5/pkg/api/v1"
 	"k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/1.5/pkg/util/intstr"
-
-	"github.com/containous/traefik/provider/k8s"
-	"github.com/containous/traefik/types"
 )
 
 func TestLoadIngresses(t *testing.T) {

provider/kv.go

@@ -2,12 +2,12 @@
 package provider
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 	"text/template"
 	"time"
 
-	"errors"
 	"github.com/BurntSushi/ty/fun"
 	"github.com/cenk/backoff"
 	"github.com/containous/traefik/job"

provider/kv_test.go

@@ -2,14 +2,14 @@ package provider
 
 import (
 	"errors"
-	"github.com/containous/traefik/types"
+	"reflect"
+	"sort"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/containous/traefik/types"
 	"github.com/docker/libkv/store"
-	"reflect"
-	"sort"
 )
 
 func TestKvList(t *testing.T) {

provider/marathon.go

@@ -2,14 +2,13 @@ package provider
 
 import (
 	"errors"
+	"math"
 	"net"
+	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"text/template"
-
-	"math"
-	"net/http"
 	"time"
 
 	"github.com/BurntSushi/ty/fun"

provider/marathon_test.go

@@ -1,11 +1,10 @@
 package provider
 
 import (
+	"errors"
 	"reflect"
 	"testing"
 
-	"errors"
-
 	"github.com/containous/traefik/mocks"
 	"github.com/containous/traefik/types"
 	"github.com/gambol99/go-marathon"

provider/mesos.go

@@ -2,11 +2,10 @@ package provider
 
 import (
 	"errors"
+	"fmt"
 	"strconv"
 	"strings"
 	"text/template"
-
-	"fmt"
 	"time"
 
 	"github.com/BurntSushi/ty/fun"
@@ -16,7 +15,8 @@ import (
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/types"
 	"github.com/mesos/mesos-go/detector"
-	_ "github.com/mesos/mesos-go/detector/zoo" // Registers the ZK detector
+	// Register mesos zoo the detector
+	_ "github.com/mesos/mesos-go/detector/zoo"
 	"github.com/mesosphere/mesos-dns/detect"
 	"github.com/mesosphere/mesos-dns/logging"
 	"github.com/mesosphere/mesos-dns/records"

provider/provider.go

@@ -2,15 +2,14 @@ package provider
 
 import (
 	"bytes"
-	"io/ioutil"
-	"strings"
-	"text/template"
-	"unicode"
-
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
+	"io/ioutil"
 	"os"
+	"strings"
+	"text/template"
+	"unicode"
 
 	"github.com/BurntSushi/toml"
 	"github.com/containous/traefik/autogen"

provider/zk.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"fmt"
+
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/types"
 	"github.com/docker/libkv/store"

safe/routine.go

@@ -2,9 +2,10 @@ package safe
 
 import (
 	"context"
-	"github.com/containous/traefik/log"
 	"runtime/debug"
 	"sync"
+
+	"github.com/containous/traefik/log"
 )
 
 type routine struct {

types/types.go

@@ -4,9 +4,10 @@ import (
 	"encoding"
 	"errors"
 	"fmt"
+	"strings"
+
 	"github.com/docker/libkv/store"
 	"github.com/ryanuber/go-glob"
-	"strings"
 )
 
 // Backend holds backend configuration.

version/version.go

@@ -1,10 +1,11 @@
 package version
 
 import (
+	"net/url"
+
 	"github.com/containous/traefik/log"
 	"github.com/google/go-github/github"
 	goversion "github.com/hashicorp/go-version"
-	"net/url"
 )
 
 var (