Ran goimports over everything.

hatched · Jan 7, 2020 · 64de293 · 64de293
1 parent efc88bb
commit 64de293
Show file tree

Hide file tree

Showing 186 changed files with 317 additions and 205 deletions.
diff --git a/api/base/mocks/caller_mock.go b/api/base/mocks/caller_mock.go
diff --git a/api/base/mocks/clientfacade_mock.go b/api/base/mocks/clientfacade_mock.go
diff --git a/api/instancemutater/mocks/caller_mock.go b/api/instancemutater/mocks/caller_mock.go
diff --git a/api/instancemutater/mocks/machinemutater_mock.go b/api/instancemutater/mocks/machinemutater_mock.go
diff --git a/api/modelmanager/modelmanager.go b/api/modelmanager/modelmanager.go
@@ -16,8 +16,8 @@ import (
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/core/instance"
 	"github.com/juju/juju/core/model"
-	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/core/permission"
+	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/rpc"
 )
 

diff --git a/api/watcher/watcher_test.go b/api/watcher/watcher_test.go
@@ -24,11 +24,11 @@ import (
 	"github.com/juju/juju/core/crossmodel"
 	"github.com/juju/juju/core/life"
 	"github.com/juju/juju/core/migration"
+	"github.com/juju/juju/core/permission"
 	"github.com/juju/juju/core/status"
 	corewatcher "github.com/juju/juju/core/watcher"
 	"github.com/juju/juju/core/watcher/watchertest"
 	"github.com/juju/juju/juju/testing"
-	"github.com/juju/juju/core/permission"
 	"github.com/juju/juju/state"
 	coretesting "github.com/juju/juju/testing"
 	"github.com/juju/juju/testing/factory"

diff --git a/apiserver/admin.go b/apiserver/admin.go
@@ -21,8 +21,8 @@ import (
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/core/auditlog"
 	"github.com/juju/juju/core/network"
-	"github.com/juju/juju/feature"
 	"github.com/juju/juju/core/permission"
+	"github.com/juju/juju/feature"
 	"github.com/juju/juju/rpc"
 	"github.com/juju/juju/state"
 	statepresence "github.com/juju/juju/state/presence"

diff --git a/apiserver/admin_test.go b/apiserver/admin_test.go
@@ -38,8 +38,8 @@ import (
 	"github.com/juju/juju/core/migration"
 	"github.com/juju/juju/core/model"
 	"github.com/juju/juju/core/network"
-	jujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/core/permission"
+	jujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/rpc"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/testing"

diff --git a/apiserver/common/crossmodel/interface.go b/apiserver/common/crossmodel/interface.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/juju/juju/core/crossmodel"
 	"github.com/juju/juju/core/firewall"
-	"github.com/juju/juju/core/status"
 	"github.com/juju/juju/core/permission"
+	"github.com/juju/juju/core/status"
 	"github.com/juju/juju/state"
 )
 

diff --git a/apiserver/common/mocks/authorizer_mock.go b/apiserver/common/mocks/authorizer_mock.go
diff --git a/apiserver/common/mocks/leadership.go b/apiserver/common/mocks/leadership.go
diff --git a/apiserver/common/mocks/upgradeseries.go b/apiserver/common/mocks/upgradeseries.go
diff --git a/apiserver/common/modelmanagerinterface.go b/apiserver/common/modelmanagerinterface.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/juju/juju/controller"
 	"github.com/juju/juju/core/network"
+	"github.com/juju/juju/core/permission"
 	"github.com/juju/juju/core/status"
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/config"
-	"github.com/juju/juju/core/permission"
 	"github.com/juju/juju/state"
 )
 

diff --git a/apiserver/facade/interface.go b/apiserver/facade/interface.go
@@ -10,8 +10,8 @@ import (
 	"github.com/juju/juju/core/leadership"
 	"github.com/juju/juju/core/lease"
 	"github.com/juju/juju/core/multiwatcher"
-	"github.com/juju/juju/core/presence"
 	"github.com/juju/juju/core/permission"
+	"github.com/juju/juju/core/presence"
 	"github.com/juju/juju/state"
 )
 

diff --git a/apiserver/facade/mocks/facade_mock.go b/apiserver/facade/mocks/facade_mock.go
diff --git a/apiserver/facades/agent/instancemutater/mocks/instancemutater_mock.go b/apiserver/facades/agent/instancemutater/mocks/instancemutater_mock.go
diff --git a/apiserver/facades/agent/instancemutater/mocks/modelcache_mock.go b/apiserver/facades/agent/instancemutater/mocks/modelcache_mock.go
diff --git a/apiserver/facades/agent/instancemutater/mocks/state_mock.go b/apiserver/facades/agent/instancemutater/mocks/state_mock.go
diff --git a/apiserver/facades/agent/instancemutater/mocks/watcher_mock.go b/apiserver/facades/agent/instancemutater/mocks/watcher_mock.go
diff --git a/apiserver/facades/agent/meterstatus/mocks/meterstatus_mock.go b/apiserver/facades/agent/meterstatus/mocks/meterstatus_mock.go
diff --git a/apiserver/facades/agent/provisioner/mocks/containerizer_mock.go b/apiserver/facades/agent/provisioner/mocks/containerizer_mock.go
diff --git a/apiserver/facades/agent/provisioner/mocks/package_mock.go b/apiserver/facades/agent/provisioner/mocks/package_mock.go
diff --git a/apiserver/facades/agent/uniter/mocks/lxdprofile.go b/apiserver/facades/agent/uniter/mocks/lxdprofile.go
diff --git a/apiserver/facades/agent/upgradesteps/mocks/state_mock.go b/apiserver/facades/agent/upgradesteps/mocks/state_mock.go
diff --git a/apiserver/facades/agent/upgradesteps/mocks/upgradesteps_mock.go b/apiserver/facades/agent/upgradesteps/mocks/upgradesteps_mock.go
diff --git a/apiserver/facades/client/application/application.go b/apiserver/facades/client/application/application.go
@@ -36,9 +36,9 @@ import (
 	"github.com/juju/juju/core/lxdprofile"
 	"github.com/juju/juju/core/model"
 	"github.com/juju/juju/core/network"
+	"github.com/juju/juju/core/permission"
 	"github.com/juju/juju/core/status"
 	"github.com/juju/juju/environs"
-	"github.com/juju/juju/core/permission"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/state/stateenvirons"
 	"github.com/juju/juju/storage"

diff --git a/apiserver/facades/client/application/mocks/charm_mock.go b/apiserver/facades/client/application/mocks/charm_mock.go
diff --git a/apiserver/facades/client/application/mocks/charmstore_mock.go b/apiserver/facades/client/application/mocks/charmstore_mock.go
diff --git a/apiserver/facades/client/application/mocks/interface_mock.go b/apiserver/facades/client/application/mocks/interface_mock.go