all: sort imports canonically

This PR is entirely automatically generated - it contains just the changes made by doing: sortimports ./... in the root of the juju repo. (see github.com/rogpeppe/sortimports for the implementation of the sortimports tool)
sdg0919 · Mar 6, 2017 · 6257053 · 6257053
1 parent db5a507
commit 6257053
Show file tree

Hide file tree

Showing 226 changed files with 346 additions and 293 deletions.
diff --git a/api/authentication/visitor.go b/api/authentication/visitor.go
@@ -9,7 +9,6 @@ import (
 	"net/url"
 
 	"github.com/juju/errors"
-
 	"gopkg.in/macaroon-bakery.v1/httpbakery"
 )
 

diff --git a/api/authentication/visitor_test.go b/api/authentication/visitor_test.go
@@ -9,11 +9,12 @@ import (
 	"net/http/httptest"
 	"net/url"
 
-	"github.com/juju/juju/api/authentication"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/macaroon-bakery.v1/httpbakery"
+
+	"github.com/juju/juju/api/authentication"
 )
 
 type VisitorSuite struct {

diff --git a/api/certpool_test.go b/api/certpool_test.go
@@ -10,12 +10,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/juju/juju/cert"
 	"github.com/juju/loggo"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/juju/api"
+	"github.com/juju/juju/cert"
 	"github.com/juju/juju/testing"
 )
 

diff --git a/api/cloud/cloud.go b/api/cloud/cloud.go
@@ -4,9 +4,9 @@
 package cloud
 
 import (
+	"github.com/juju/errors"
 	"gopkg.in/juju/names.v2"
 
-	"github.com/juju/errors"
 	"github.com/juju/juju/api/base"
 	"github.com/juju/juju/apiserver/params"
 	jujucloud "github.com/juju/juju/cloud"

diff --git a/api/controller/controller_test.go b/api/controller/controller_test.go
@@ -7,7 +7,9 @@ import (
 	"encoding/json"
 	"errors"
 
+	jujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
+	"github.com/juju/utils"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/names.v2"
 	"gopkg.in/macaroon.v1"
@@ -17,8 +19,6 @@ import (
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/environs"
-	jujutesting "github.com/juju/testing"
-	"github.com/juju/utils"
 )
 
 type Suite struct {

diff --git a/api/export_test.go b/api/export_test.go
@@ -6,12 +6,13 @@ package api
 import (
 	"github.com/gorilla/websocket"
 	"github.com/juju/errors"
-	"github.com/juju/juju/api/base"
-	"github.com/juju/juju/network"
 	"github.com/juju/utils/clock"
 	"gopkg.in/juju/names.v2"
 	"gopkg.in/macaroon-bakery.v1/httpbakery"
 	"gopkg.in/macaroon.v1"
+
+	"github.com/juju/juju/api/base"
+	"github.com/juju/juju/network"
 )
 
 var (

diff --git a/api/interface.go b/api/interface.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/juju/errors"
+	"github.com/juju/utils/set"
 	"github.com/juju/version"
 	"gopkg.in/juju/names.v2"
 	"gopkg.in/macaroon-bakery.v1/httpbakery"
@@ -27,7 +28,6 @@ import (
 	"github.com/juju/juju/api/uniter"
 	"github.com/juju/juju/api/upgrader"
 	"github.com/juju/juju/network"
-	"github.com/juju/utils/set"
 )
 
 // Info encapsulates information about a server holding juju state and

diff --git a/api/logfwd/lastsent_test.go b/api/logfwd/lastsent_test.go
@@ -4,6 +4,8 @@
 package logfwd_test
 
 import (
+	"time"
+
 	"github.com/juju/errors"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
@@ -14,7 +16,6 @@ import (
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/state"
-	"time"
 )
 
 type LastSentSuite struct {

diff --git a/api/machineactions/machineactions.go b/api/machineactions/machineactions.go
@@ -8,11 +8,12 @@ package machineactions
 
 import (
 	"github.com/juju/errors"
+	"gopkg.in/juju/names.v2"
+
 	"github.com/juju/juju/api/base"
 	apiwatcher "github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/watcher"
-	"gopkg.in/juju/names.v2"
 )
 
 type Client struct {

diff --git a/api/proxyupdater/proxyupdater.go b/api/proxyupdater/proxyupdater.go
@@ -7,12 +7,13 @@ import (
 	"fmt"
 
 	"github.com/juju/errors"
+	"github.com/juju/utils/proxy"
+	"gopkg.in/juju/names.v2"
+
 	"github.com/juju/juju/api/base"
 	apiwatcher "github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/watcher"
-	"github.com/juju/utils/proxy"
-	"gopkg.in/juju/names.v2"
 )
 
 const proxyUpdaterFacade = "ProxyUpdater"

diff --git a/api/proxyupdater/proxyupdater_test.go b/api/proxyupdater/proxyupdater_test.go
@@ -7,14 +7,14 @@ import (
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils/proxy"
 	gc "gopkg.in/check.v1"
+	"gopkg.in/juju/names.v2"
 
 	"github.com/juju/juju/api/base"
 	apitesting "github.com/juju/juju/api/base/testing"
 	"github.com/juju/juju/api/proxyupdater"
 	"github.com/juju/juju/apiserver/params"
 	coretesting "github.com/juju/juju/testing"
 	"github.com/juju/juju/watcher"
-	"gopkg.in/juju/names.v2"
 )
 
 type ProxyUpdaterSuite struct {

diff --git a/apiserver/applicationscaler/facade.go b/apiserver/applicationscaler/facade.go
@@ -5,12 +5,13 @@ package applicationscaler
 
 import (
 	"github.com/juju/errors"
+	"gopkg.in/juju/names.v2"
+
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/state/watcher"
-	"gopkg.in/juju/names.v2"
 )
 
 // Backend exposes functionality required by Facade.

diff --git a/apiserver/backups/shim.go b/apiserver/backups/shim.go
@@ -5,6 +5,7 @@ package backups
 
 import (
 	"github.com/juju/errors"
+
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/state"

diff --git a/apiserver/block/state.go b/apiserver/block/state.go
@@ -4,8 +4,9 @@
 package block
 
 import (
-	"github.com/juju/juju/state"
 	names "gopkg.in/juju/names.v2"
+
+	"github.com/juju/juju/state"
 )
 
 type blockAccess interface {

diff --git a/apiserver/cert_test.go b/apiserver/cert_test.go
@@ -8,13 +8,13 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/juju/juju/cert"
 	"github.com/juju/loggo"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/juju/api"
 	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/cert"
 	coretesting "github.com/juju/juju/testing"
 )
 

diff --git a/apiserver/cloud/cloud_test.go b/apiserver/cloud/cloud_test.go
@@ -4,12 +4,12 @@
 package cloud_test
 
 import (
+	"github.com/juju/errors"
 	gitjujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/names.v2"
 
-	"github.com/juju/errors"
 	cloudfacade "github.com/juju/juju/apiserver/cloud"
 	"github.com/juju/juju/apiserver/params"
 	apiservertesting "github.com/juju/juju/apiserver/testing"

diff --git a/apiserver/common/instancetypes.go b/apiserver/common/instancetypes.go
@@ -5,6 +5,7 @@ package common
 
 import (
 	"github.com/juju/errors"
+
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/constraints"
 	"github.com/juju/juju/environs"

diff --git a/apiserver/common/modelstatus.go b/apiserver/common/modelstatus.go
@@ -4,9 +4,8 @@
 package common
 
 import (
-	"gopkg.in/juju/names.v2"
-
 	"github.com/juju/errors"
+	"gopkg.in/juju/names.v2"
 
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/apiserver/params"

diff --git a/apiserver/common/modeluser.go b/apiserver/common/modeluser.go
@@ -6,9 +6,8 @@ package common
 import (
 	"time"
 
-	"gopkg.in/juju/names.v2"
-
 	"github.com/juju/errors"
+	"gopkg.in/juju/names.v2"
 
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/permission"

diff --git a/apiserver/discoverspaces/discoverspaces.go b/apiserver/discoverspaces/discoverspaces.go
@@ -5,6 +5,7 @@ package discoverspaces
 
 import (
 	"github.com/juju/errors"
+
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/common/networkingcommon"
 	"github.com/juju/juju/apiserver/facade"

diff --git a/apiserver/hostkeyreporter/shim.go b/apiserver/hostkeyreporter/shim.go
@@ -5,6 +5,7 @@ package hostkeyreporter
 
 import (
 	"github.com/juju/errors"
+
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/state"
 )

diff --git a/apiserver/httpattachment/attachment.go b/apiserver/httpattachment/attachment.go
@@ -17,6 +17,7 @@ import (
 	"strings"
 
 	"github.com/juju/errors"
+
 	"github.com/juju/juju/apiserver/params"
 )
 

diff --git a/apiserver/imagemanager/state.go b/apiserver/imagemanager/state.go
@@ -4,9 +4,10 @@
 package imagemanager
 
 import (
+	names "gopkg.in/juju/names.v2"
+
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/state/imagestorage"
-	names "gopkg.in/juju/names.v2"
 )
 
 type stateInterface interface {

diff --git a/apiserver/imagemetadata/state.go b/apiserver/imagemetadata/state.go
@@ -4,10 +4,11 @@
 package imagemetadata
 
 import (
+	names "gopkg.in/juju/names.v2"
+
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/state/cloudimagemetadata"
-	names "gopkg.in/juju/names.v2"
 )
 
 type metadataAcess interface {

diff --git a/apiserver/introspection.go b/apiserver/introspection.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 
 	"github.com/juju/errors"
+
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/permission"

diff --git a/apiserver/machineactions/machineactions.go b/apiserver/machineactions/machineactions.go
@@ -7,11 +7,12 @@
 package machineactions
 
 import (
+	"gopkg.in/juju/names.v2"
+
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/state"
-	"gopkg.in/juju/names.v2"
 )
 
 type Backend interface {

diff --git a/apiserver/machineactions/shim.go b/apiserver/machineactions/shim.go
@@ -5,11 +5,12 @@
 package machineactions
 
 import (
+	"gopkg.in/juju/names.v2"
+
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/apiserver/facade"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/state"
-	"gopkg.in/juju/names.v2"
 )
 
 func init() {

diff --git a/apiserver/machinemanager/state.go b/apiserver/machinemanager/state.go
@@ -4,11 +4,12 @@
 package machinemanager
 
 import (
+	names "gopkg.in/juju/names.v2"
+
 	"github.com/juju/juju/cloud"
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/instance"
 	"github.com/juju/juju/state"
-	names "gopkg.in/juju/names.v2"
 )
 
 type stateInterface interface {

diff --git a/apiserver/metricsender/metricsender_test.go b/apiserver/metricsender/metricsender_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	wireformat "github.com/juju/romulus/wireformat/metrics"
+	jujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils/clock"
 	gc "gopkg.in/check.v1"
@@ -17,7 +18,6 @@ import (
 	jujujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/testing/factory"
-	jujutesting "github.com/juju/testing"
 )
 
 type MetricSenderSuite struct {

diff --git a/apiserver/metricsender/testing/mocksender.go b/apiserver/metricsender/testing/mocksender.go
@@ -6,10 +6,10 @@ package testing
 import (
 	"fmt"
 
-	"github.com/juju/juju/state"
-
 	wireformat "github.com/juju/romulus/wireformat/metrics"
 	"github.com/juju/utils"
+
+	"github.com/juju/juju/state"
 )
 
 // MockSender implements the metric sender interface.

diff --git a/apiserver/metricsmanager/metricsmanager_test.go b/apiserver/metricsmanager/metricsmanager_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/juju/errors"
+	jujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/names.v2"
@@ -20,7 +21,6 @@ import (
 	jujujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/testing/factory"
-	jujutesting "github.com/juju/testing"
 )
 
 type metricsManagerSuite struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ import ( @@
     	"net/url"
     	"github.com/juju/errors"
     	"gopkg.in/macaroon-bakery.v1/httpbakery"
     )
@@ Expand Down @@