Skip to content

Commit

Permalink
Run goimports.
Browse files Browse the repository at this point in the history
  • Loading branch information
@howbazaar
howbazaar committed Dec 12, 2018
1 parent 06a06a5 commit f58acb9
Show file tree
Hide file tree
Showing 288 changed files with 419 additions and 304 deletions.
2 changes: 1 addition & 1 deletion agent/agentbootstrap/bootstrap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/juju/juju/cloud"
"github.com/juju/juju/cloudconfig/instancecfg"
"github.com/juju/juju/controller/modelmanager"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/environs"
"github.com/juju/juju/environs/config"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/mongo"
"github.com/juju/juju/network"
"github.com/juju/juju/state"
Expand Down
2 changes: 1 addition & 1 deletion agent/agentbootstrap/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"github.com/juju/juju/cloudconfig/instancecfg"
"github.com/juju/juju/constraints"
"github.com/juju/juju/controller"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/environs"
"github.com/juju/juju/environs/config"
"github.com/juju/juju/environs/context"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/mongo"
"github.com/juju/juju/mongo/mongotest"
"github.com/juju/juju/network"
Expand Down
7 changes: 4 additions & 3 deletions api/base/mocks/caller_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/base/mocks/clientfacade_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/base/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/juju/version"

"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/model"
"github.com/juju/juju/core/status"
"github.com/juju/juju/core/instance"
)

// UserModel holds information about a model and the last
Expand Down
2 changes: 1 addition & 1 deletion api/firewaller/machine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

apiwatcher "github.com/juju/juju/api/watcher"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/core/watcher"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/watcher"
"github.com/juju/juju/network"
)

Expand Down
2 changes: 1 addition & 1 deletion api/firewaller/machine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/juju/juju/api/firewaller"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/core/watcher/watchertest"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/watcher/watchertest"
"github.com/juju/juju/network"
"github.com/juju/juju/state"
)
Expand Down
2 changes: 1 addition & 1 deletion api/firewaller/state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
gc "gopkg.in/check.v1"

apitesting "github.com/juju/juju/api/testing"
"github.com/juju/juju/core/watcher/watchertest"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/watcher/watchertest"
"github.com/juju/juju/state"
)

Expand Down
2 changes: 1 addition & 1 deletion api/instancepoller/machine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/juju/juju/api/base"
"github.com/juju/juju/api/common"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/core/status"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/status"
"github.com/juju/juju/network"
)

Expand Down
2 changes: 1 addition & 1 deletion api/instancepoller/machine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/juju/juju/api/instancepoller"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/core/status"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/status"
"github.com/juju/juju/network"
coretesting "github.com/juju/juju/testing"
)
Expand Down
2 changes: 1 addition & 1 deletion api/modelmanager/modelmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/juju/juju/api/base"
"github.com/juju/juju/api/common"
"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/instance"
"github.com/juju/juju/permission"
)

Expand Down
2 changes: 1 addition & 1 deletion api/provisioner/machine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (

apiwatcher "github.com/juju/juju/api/watcher"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/status"
"github.com/juju/juju/core/watcher"
"github.com/juju/juju/core/instance"
)

//go:generate mockgen -package mocks -destination mocks/machine_mock.go github.com/juju/juju/api/provisioner MachineProvisioner
Expand Down
5 changes: 3 additions & 2 deletions api/provisioner/mocks/machine_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/provisioner/provisioner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/constraints"
"github.com/juju/juju/container"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/status"
"github.com/juju/juju/core/watcher/watchertest"
"github.com/juju/juju/environs/config"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/juju/testing"
"github.com/juju/juju/network"
"github.com/juju/juju/state"
Expand Down
3 changes: 2 additions & 1 deletion apiserver/common/credentialcommon/backend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import (
"gopkg.in/juju/names.v2"

"github.com/juju/juju/cloud"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/environs/config"
"github.com/juju/juju/environs/context"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/environs/instances"
"github.com/juju/juju/state"
)

Expand Down
3 changes: 2 additions & 1 deletion apiserver/common/credentialcommon/modelcredential_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ import (
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/caas"
"github.com/juju/juju/cloud"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/environs"
"github.com/juju/juju/environs/config"
"github.com/juju/juju/environs/context"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/environs/instances"
"github.com/juju/juju/state"
statetesting "github.com/juju/juju/state/testing"
)
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/machine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/juju/errors"

"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/core/status"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/status"
"github.com/juju/juju/state"
"github.com/juju/juju/state/multiwatcher"
)
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/machine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/core/status"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/status"
"github.com/juju/juju/state"
"github.com/juju/juju/state/multiwatcher"
)
Expand Down
3 changes: 2 additions & 1 deletion apiserver/common/mocks/leadership.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion apiserver/common/mocks/upgradeseries.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apiserver/common/modelstatus_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/constraints"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/environs"
"github.com/juju/juju/environs/config"
"github.com/juju/juju/environs/context"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/provider/dummy"
"github.com/juju/juju/state"
statetesting "github.com/juju/juju/state/testing"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/networkingcommon/subnets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/environs"
"github.com/juju/juju/environs/context"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/network"
providercommon "github.com/juju/juju/provider/common"
)
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/networkingcommon/subnets_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/juju/juju/apiserver/common/networkingcommon"
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/environs/context"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/environs/context"
"github.com/juju/juju/network"
providercommon "github.com/juju/juju/provider/common"
coretesting "github.com/juju/juju/testing"
Expand Down
3 changes: 2 additions & 1 deletion apiserver/facades/agent/meterstatus/mocks/facade_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion apiserver/facades/agent/meterstatus/mocks/meterstatus_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion apiserver/facades/agent/provisioner/mocks/containerizer_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion apiserver/facades/agent/provisioner/mocks/machine_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion apiserver/facades/agent/provisioner/mocks/profile_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apiserver/facades/agent/provisioner/provisioner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import (
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/constraints"
"github.com/juju/juju/container"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/lxdprofile"
"github.com/juju/juju/core/status"
"github.com/juju/juju/environs"
"github.com/juju/juju/environs/config"
"github.com/juju/juju/environs/context"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/network"
"github.com/juju/juju/network/containerizer"
"github.com/juju/juju/state"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/provisioner/provisioner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/constraints"
"github.com/juju/juju/container"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/core/status"
"github.com/juju/juju/environs/config"
environtesting "github.com/juju/juju/environs/testing"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/juju/testing"
"github.com/juju/juju/network"
"github.com/juju/juju/network/containerizer"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/storageprovisioner/shim.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/juju/juju/apiserver/facade"
"github.com/juju/juju/caas"
"github.com/juju/juju/controller"
"github.com/juju/juju/environs"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/environs"
"github.com/juju/juju/state"
"github.com/juju/juju/state/stateenvirons"
"github.com/juju/juju/storage/poolmanager"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/storageprovisioner/storageprovisioner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"github.com/juju/juju/apiserver/params"
apiservertesting "github.com/juju/juju/apiserver/testing"
"github.com/juju/juju/caas"
"github.com/juju/juju/core/instance"
"github.com/juju/juju/environs"
"github.com/juju/juju/environs/tags"
"github.com/juju/juju/core/instance"
jujutesting "github.com/juju/juju/juju/testing"
"github.com/juju/juju/state"
"github.com/juju/juju/state/stateenvirons"
Expand Down
Loading

0 comments on commit f58acb9

Please sign in to comment.