Skip to content

Commit

Permalink
Fix Go import order
Browse files Browse the repository at this point in the history
  • Loading branch information
@barrettj12
barrettj12 committed Jul 19, 2023
1 parent e77a404 commit 1c34542
Show file tree
Hide file tree
Showing 231 changed files with 336 additions and 294 deletions.
3 changes: 2 additions & 1 deletion api/agent/deployer/deployer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
package deployer

import (
"github.com/juju/names/v4"

"github.com/juju/juju/api/base"
"github.com/juju/juju/api/common"
"github.com/juju/juju/core/life"
"github.com/juju/juju/rpc/params"
"github.com/juju/names/v4"
)

const deployerFacade = "Deployer"
Expand Down
3 changes: 2 additions & 1 deletion api/agent/deployer/machine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ package deployer
import (
"fmt"

"github.com/juju/names/v4"

apiwatcher "github.com/juju/juju/api/watcher"
"github.com/juju/juju/core/watcher"
"github.com/juju/juju/rpc/params"
"github.com/juju/names/v4"
)

// Machine represents a juju machine as seen by the deployer worker.
Expand Down
3 changes: 2 additions & 1 deletion api/agent/deployer/unit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
package deployer

import (
"github.com/juju/names/v4"

"github.com/juju/juju/api/common"
"github.com/juju/juju/core/life"
"github.com/juju/juju/core/status"
"github.com/juju/juju/rpc/params"
"github.com/juju/names/v4"
)

// Unit represents a juju unit as seen by the deployer worker.
Expand Down
3 changes: 2 additions & 1 deletion api/agent/diskmanager/diskmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
package diskmanager

import (
"github.com/juju/names/v4"

"github.com/juju/juju/api/base"
"github.com/juju/juju/rpc/params"
"github.com/juju/juju/storage"
"github.com/juju/names/v4"
)

const diskManagerFacade = "DiskManager"
Expand Down
3 changes: 2 additions & 1 deletion api/agent/hostkeyreporter/facade.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
package hostkeyreporter

import (
"github.com/juju/names/v4"

"github.com/juju/juju/api/base"
"github.com/juju/juju/rpc/params"
"github.com/juju/names/v4"
)

// Facade provides access to the HostKeyReporter API facade.
Expand Down
3 changes: 2 additions & 1 deletion api/agent/instancemutater/export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
package instancemutater

import (
"github.com/juju/names/v4"

"github.com/juju/juju/api/base"
"github.com/juju/juju/core/life"
"github.com/juju/names/v4"
)

func NewMachine(facadeCaller base.FacadeCaller, tag names.MachineTag, life life.Value) *Machine {
Expand Down
3 changes: 2 additions & 1 deletion api/agent/logger/logger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ package logger
import (
"fmt"

"github.com/juju/names/v4"

"github.com/juju/juju/api/base"
apiwatcher "github.com/juju/juju/api/watcher"
"github.com/juju/juju/core/watcher"
"github.com/juju/juju/rpc/params"
"github.com/juju/names/v4"
)

// State provides access to an logger worker's view of the state.
Expand Down
2 changes: 1 addition & 1 deletion api/agent/uniter/goal-state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package uniter_test
import (
"time"

coretesting "github.com/juju/juju/testing"
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
Expand All @@ -15,6 +14,7 @@ import (
"github.com/juju/juju/api/base/testing"
"github.com/juju/juju/core/application"
"github.com/juju/juju/rpc/params"
coretesting "github.com/juju/juju/testing"
)

type goalStateSuite struct {
Expand Down
3 changes: 2 additions & 1 deletion api/agent/upgradeseries/export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
package upgradeseries

import (
"github.com/juju/names/v4"

"github.com/juju/juju/api/base"
"github.com/juju/juju/api/common"
"github.com/juju/names/v4"
)

func NewStateFromCaller(caller base.FacadeCaller, authTag names.Tag) *Client {
Expand Down
3 changes: 1 addition & 2 deletions api/apiclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,11 @@ import (

"github.com/juju/juju/api/base"
"github.com/juju/juju/charmstore"
"github.com/juju/juju/rpc/params"

"github.com/juju/juju/core/network"
jujuproxy "github.com/juju/juju/proxy"
"github.com/juju/juju/rpc"
"github.com/juju/juju/rpc/jsoncodec"
"github.com/juju/juju/rpc/params"
"github.com/juju/juju/utils/proxy"
jujuversion "github.com/juju/juju/version"
)
Expand Down
3 changes: 2 additions & 1 deletion api/common/watch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ package common
import (
"fmt"

"github.com/juju/names/v4"

"github.com/juju/juju/api/base"
apiwatcher "github.com/juju/juju/api/watcher"
"github.com/juju/juju/core/watcher"
"github.com/juju/juju/rpc/params"
"github.com/juju/names/v4"
)

// Watch starts a NotifyWatcher for the entity with the specified tag.
Expand Down
1 change: 1 addition & 0 deletions api/connector/clientstoreconnector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"errors"

"github.com/go-macaroon-bakery/macaroon-bakery/v3/httpbakery"

"github.com/juju/juju/api"
"github.com/juju/juju/juju"
"github.com/juju/juju/jujuclient"
Expand Down
3 changes: 2 additions & 1 deletion api/connector/simpleconnector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
package connector

import (
"github.com/juju/juju/api"
"github.com/juju/names/v4"
"gopkg.in/macaroon.v2"

"github.com/juju/juju/api"
)

// SimpleConfig aims to provide the same API surface as pilot juju for
Expand Down
1 change: 1 addition & 0 deletions api/controller/controller/identity_url.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package controller

import (
"github.com/juju/errors"

"github.com/juju/juju/rpc/params"
)

Expand Down
1 change: 1 addition & 0 deletions api/controller/controller/mongo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package controller

import (
"github.com/juju/errors"

"github.com/juju/juju/rpc/params"
)

Expand Down
2 changes: 1 addition & 1 deletion api/controller/crossmodelrelations/macarooncache_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ package crossmodelrelations_test
import (
"time"

"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery/checkers"
"github.com/juju/clock/testclock"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/macaroon.v2"

"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery/checkers"
"github.com/juju/juju/api/controller/crossmodelrelations"
apitesting "github.com/juju/juju/api/testing"
coretesting "github.com/juju/juju/testing"
Expand Down
3 changes: 2 additions & 1 deletion api/controller/firewaller/relation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
package firewaller

import (
"github.com/juju/juju/core/life"
"github.com/juju/names/v4"

"github.com/juju/juju/core/life"
)

// Relation represents a juju relation as seen by the firewaller worker.
Expand Down
3 changes: 2 additions & 1 deletion api/controller/instancepoller/export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
package instancepoller

import (
"github.com/juju/names/v4"

"github.com/juju/juju/api/base"
"github.com/juju/juju/core/life"
"github.com/juju/names/v4"
)

func NewMachine(caller base.APICaller, tag names.MachineTag, life life.Value) *Machine {
Expand Down
2 changes: 1 addition & 1 deletion api/controller/pubsub/pubsub_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"net/url"
"time"

"github.com/juju/testing"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/base"
apipubsub "github.com/juju/juju/api/controller/pubsub"
"github.com/juju/juju/rpc/params"
"github.com/juju/testing"
)

type PubSubSuite struct {
Expand Down
1 change: 1 addition & 0 deletions api/controller/raftlease/raftlease.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package raftlease

import (
"github.com/juju/errors"

"github.com/juju/juju/api/base"
apiservererrors "github.com/juju/juju/apiserver/errors"
"github.com/juju/juju/rpc/params"
Expand Down
3 changes: 1 addition & 2 deletions api/controller/raftlease/raftlease_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
package raftlease

import (
"go.uber.org/mock/gomock"

"github.com/juju/errors"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"go.uber.org/mock/gomock"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/base/mocks"
Expand Down
2 changes: 1 addition & 1 deletion api/export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"github.com/go-macaroon-bakery/macaroon-bakery/v3/httpbakery"
"github.com/juju/clock"
"github.com/juju/errors"
jujuproxy "github.com/juju/juju/proxy"
"github.com/juju/names/v4"
"gopkg.in/macaroon.v2"

"github.com/juju/juju/core/network"
jujuproxy "github.com/juju/juju/proxy"
"github.com/juju/juju/rpc/jsoncodec"
)

Expand Down
3 changes: 1 addition & 2 deletions apiserver/allfacades.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ import (
"github.com/juju/juju/apiserver/facades/client/action"
"github.com/juju/juju/apiserver/facades/client/annotations" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/application"
"github.com/juju/juju/apiserver/facades/client/modelupgrader"

// ModelUser Write
"github.com/juju/juju/apiserver/facades/client/applicationoffers"
"github.com/juju/juju/apiserver/facades/client/backups" // ModelUser Write
Expand All @@ -67,6 +65,7 @@ import (
"github.com/juju/juju/apiserver/facades/client/modelconfig" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/modelgeneration"
"github.com/juju/juju/apiserver/facades/client/modelmanager" // ModelUser Write
"github.com/juju/juju/apiserver/facades/client/modelupgrader"
"github.com/juju/juju/apiserver/facades/client/payloads"
"github.com/juju/juju/apiserver/facades/client/resources"
"github.com/juju/juju/apiserver/facades/client/spaces" // ModelUser Write
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/firewall/firewall.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
package firewall

import (
"github.com/juju/charm/v8"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/names/v4"

"github.com/juju/charm/v8"
apiservererrors "github.com/juju/juju/apiserver/errors"
"github.com/juju/juju/apiserver/facade"
"github.com/juju/juju/rpc/params"
Expand Down
1 change: 1 addition & 0 deletions apiserver/common/networkingcommon/shims.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package networkingcommon

import (
"github.com/juju/errors"

"github.com/juju/juju/state"
)

Expand Down
3 changes: 1 addition & 2 deletions apiserver/common/upgradeseries_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ import (
"github.com/juju/loggo"
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"go.uber.org/mock/gomock"
gc "gopkg.in/check.v1"
"gopkg.in/tomb.v2"

"go.uber.org/mock/gomock"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/common/mocks"
apiservertesting "github.com/juju/juju/apiserver/testing"
Expand Down
3 changes: 1 addition & 2 deletions apiserver/facades/agent/caasapplication/application_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ package caasapplication_test
import (
"time"

"gopkg.in/yaml.v2"

"github.com/juju/clock/testclock"
"github.com/juju/errors"
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/yaml.v2"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facades/agent/caasapplication"
Expand Down
1 change: 1 addition & 0 deletions apiserver/facades/agent/caasapplication/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"reflect"

"github.com/juju/errors"

"github.com/juju/juju/apiserver/facade"
"github.com/juju/juju/caas"
"github.com/juju/juju/state/stateenvirons"
Expand Down
1 change: 1 addition & 0 deletions apiserver/facades/agent/caasoperator/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"reflect"

"github.com/juju/errors"

"github.com/juju/juju/apiserver/common/unitcommon"
"github.com/juju/juju/apiserver/facade"
"github.com/juju/juju/caas"
Expand Down
1 change: 1 addition & 0 deletions apiserver/facades/agent/hostkeyreporter/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"reflect"

"github.com/juju/errors"

"github.com/juju/juju/apiserver/facade"
)

Expand Down
1 change: 1 addition & 0 deletions apiserver/facades/agent/leadership/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"reflect"

"github.com/juju/errors"

"github.com/juju/juju/apiserver/facade"
)

Expand Down
1 change: 1 addition & 0 deletions apiserver/facades/agent/machine/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"reflect"

"github.com/juju/errors"

"github.com/juju/juju/apiserver/facade"
)

Expand Down
1 change: 1 addition & 0 deletions apiserver/facades/agent/migrationflag/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"reflect"

"github.com/juju/errors"

"github.com/juju/juju/apiserver/facade"
)

Expand Down
1 change: 1 addition & 0 deletions apiserver/facades/agent/provisioner/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"reflect"

"github.com/juju/errors"

"github.com/juju/juju/apiserver/facade"
)

Expand Down
1 change: 1 addition & 0 deletions apiserver/facades/agent/proxyupdater/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"reflect"

"github.com/juju/errors"

"github.com/juju/juju/apiserver/facade"
)

Expand Down
Loading

0 comments on commit 1c34542

Please sign in to comment.