From c2c6aee18a7faec084d29ef50f3e35cce47a659f Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Mon, 18 Feb 2019 07:52:03 +0100 Subject: [PATCH] Applies new goimports recommendations. --- anonymize/anonymize_config_test.go | 2 +- api/dashboard.go | 2 +- api/handler.go | 2 +- cluster/datastore.go | 2 +- cmd/traefik/traefik.go | 2 +- config/static/static_config.go | 2 +- integration/etcd3_test.go | 2 +- old/api/dashboard.go | 2 +- old/api/handler.go | 2 +- old/provider/etcd/etcd.go | 2 +- old/provider/kubernetes/weight_allocator_test.go | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anonymize/anonymize_config_test.go b/anonymize/anonymize_config_test.go index c6ce7bdf7..46db64622 100644 --- a/anonymize/anonymize_config_test.go +++ b/anonymize/anonymize_config_test.go @@ -14,7 +14,7 @@ import ( "github.com/containous/traefik/provider/file" traefiktls "github.com/containous/traefik/tls" "github.com/containous/traefik/types" - "github.com/elazarl/go-bindata-assetfs" + assetfs "github.com/elazarl/go-bindata-assetfs" ) func TestDo_globalConfiguration(t *testing.T) { diff --git a/api/dashboard.go b/api/dashboard.go index b5529c7cd..cee9b3c9e 100644 --- a/api/dashboard.go +++ b/api/dashboard.go @@ -5,7 +5,7 @@ import ( "github.com/containous/mux" "github.com/containous/traefik/log" - "github.com/elazarl/go-bindata-assetfs" + assetfs "github.com/elazarl/go-bindata-assetfs" ) // DashboardHandler expose dashboard routes diff --git a/api/handler.go b/api/handler.go index f43b1a2d2..47ca06575 100644 --- a/api/handler.go +++ b/api/handler.go @@ -10,7 +10,7 @@ import ( "github.com/containous/traefik/safe" "github.com/containous/traefik/types" "github.com/containous/traefik/version" - "github.com/elazarl/go-bindata-assetfs" + assetfs "github.com/elazarl/go-bindata-assetfs" thoasstats "github.com/thoas/stats" "github.com/unrolled/render" ) diff --git a/cluster/datastore.go b/cluster/datastore.go index a9b7340b3..400ccf658 100644 --- a/cluster/datastore.go +++ b/cluster/datastore.go @@ -13,7 +13,7 @@ import ( "github.com/containous/traefik/job" "github.com/containous/traefik/log" "github.com/containous/traefik/safe" - "github.com/satori/go.uuid" + uuid "github.com/satori/go.uuid" ) // Metadata stores Object plus metadata diff --git a/cmd/traefik/traefik.go b/cmd/traefik/traefik.go index a9187f003..b7d80a70d 100644 --- a/cmd/traefik/traefik.go +++ b/cmd/traefik/traefik.go @@ -37,7 +37,7 @@ import ( "github.com/containous/traefik/types" "github.com/containous/traefik/version" "github.com/coreos/go-systemd/daemon" - "github.com/elazarl/go-bindata-assetfs" + assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/ogier/pflag" "github.com/sirupsen/logrus" "github.com/vulcand/oxy/roundrobin" diff --git a/config/static/static_config.go b/config/static/static_config.go index b5114413a..0f32190d6 100644 --- a/config/static/static_config.go +++ b/config/static/static_config.go @@ -30,7 +30,7 @@ import ( "github.com/containous/traefik/tracing/jaeger" "github.com/containous/traefik/tracing/zipkin" "github.com/containous/traefik/types" - "github.com/elazarl/go-bindata-assetfs" + assetfs "github.com/elazarl/go-bindata-assetfs" jaegercli "github.com/uber/jaeger-client-go" "github.com/xenolf/lego/challenge/dns01" ) diff --git a/integration/etcd3_test.go b/integration/etcd3_test.go index 85386fb93..806d8313d 100644 --- a/integration/etcd3_test.go +++ b/integration/etcd3_test.go @@ -10,7 +10,7 @@ import ( "github.com/abronan/valkeyrie" "github.com/abronan/valkeyrie/store" - "github.com/abronan/valkeyrie/store/etcd/v3" + etcdv3 "github.com/abronan/valkeyrie/store/etcd/v3" "github.com/containous/traefik/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" diff --git a/old/api/dashboard.go b/old/api/dashboard.go index bb7c60d15..b2489a58a 100644 --- a/old/api/dashboard.go +++ b/old/api/dashboard.go @@ -5,7 +5,7 @@ import ( "github.com/containous/mux" "github.com/containous/traefik/old/log" - "github.com/elazarl/go-bindata-assetfs" + assetfs "github.com/elazarl/go-bindata-assetfs" ) // DashboardHandler expose dashboard routes diff --git a/old/api/handler.go b/old/api/handler.go index 3e03f3491..628aa76f6 100644 --- a/old/api/handler.go +++ b/old/api/handler.go @@ -9,7 +9,7 @@ import ( "github.com/containous/traefik/old/types" "github.com/containous/traefik/safe" "github.com/containous/traefik/version" - "github.com/elazarl/go-bindata-assetfs" + assetfs "github.com/elazarl/go-bindata-assetfs" thoas_stats "github.com/thoas/stats" "github.com/unrolled/render" ) diff --git a/old/provider/etcd/etcd.go b/old/provider/etcd/etcd.go index 0c0859f5b..586473648 100644 --- a/old/provider/etcd/etcd.go +++ b/old/provider/etcd/etcd.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/abronan/valkeyrie/store" - "github.com/abronan/valkeyrie/store/etcd/v3" + etcdv3 "github.com/abronan/valkeyrie/store/etcd/v3" "github.com/containous/traefik/old/provider" "github.com/containous/traefik/old/provider/kv" "github.com/containous/traefik/old/types" diff --git a/old/provider/kubernetes/weight_allocator_test.go b/old/provider/kubernetes/weight_allocator_test.go index d3b4a45da..2af98904e 100644 --- a/old/provider/kubernetes/weight_allocator_test.go +++ b/old/provider/kubernetes/weight_allocator_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" )