Skip to content

Commit 337f0e1

Browse files
jack-w-shawjack-w-shaw
committed
Fix import ordering
1 parent 9b52d2b commit 337f0e1

File tree

406 files changed

+531
-531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

406 files changed

+531
-531
lines changed

‎api/agent/uniter/relation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"context"
88

99
"github.com/juju/errors"
10-
"github.com/juju/juju/internal/charm"
1110
"github.com/juju/names/v5"
1211

1312
"github.com/juju/juju/core/life"
1413
"github.com/juju/juju/core/relation"
14+
"github.com/juju/juju/internal/charm"
1515
"github.com/juju/juju/rpc/params"
1616
)
1717

‎api/agent/uniter/relation_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package uniter_test
66
import (
77
"context"
88

9-
"github.com/juju/juju/internal/charm"
109
"github.com/juju/names/v5"
1110
jc "github.com/juju/testing/checkers"
1211
gc "gopkg.in/check.v1"
@@ -15,6 +14,7 @@ import (
1514
basetesting "github.com/juju/juju/api/base/testing"
1615
"github.com/juju/juju/core/life"
1716
"github.com/juju/juju/core/relation"
17+
"github.com/juju/juju/internal/charm"
1818
"github.com/juju/juju/rpc/params"
1919
"github.com/juju/juju/testing"
2020
)

‎api/agent/uniter/relationunit_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package uniter_test
66
import (
77
"context"
88

9-
"github.com/juju/juju/internal/charm"
109
"github.com/juju/names/v5"
1110
jc "github.com/juju/testing/checkers"
1211
gc "gopkg.in/check.v1"
@@ -15,6 +14,7 @@ import (
1514
basetesting "github.com/juju/juju/api/base/testing"
1615
"github.com/juju/juju/core/life"
1716
"github.com/juju/juju/core/watcher/watchertest"
17+
"github.com/juju/juju/internal/charm"
1818
"github.com/juju/juju/rpc/params"
1919
"github.com/juju/juju/testing"
2020
)

‎api/agent/uniter/unit.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"time"
99

1010
"github.com/juju/errors"
11-
"github.com/juju/juju/internal/charm"
1211
"github.com/juju/names/v5"
1312

1413
"github.com/juju/juju/api/common"
@@ -20,6 +19,7 @@ import (
2019
"github.com/juju/juju/core/secrets"
2120
"github.com/juju/juju/core/status"
2221
"github.com/juju/juju/core/watcher"
22+
"github.com/juju/juju/internal/charm"
2323
"github.com/juju/juju/rpc/params"
2424
)
2525

‎api/agent/uniter/unit_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"context"
88
"time"
99

10-
"github.com/juju/juju/internal/charm"
1110
"github.com/juju/names/v5"
1211
"github.com/juju/testing"
1312
jc "github.com/juju/testing/checkers"
@@ -19,6 +18,7 @@ import (
1918
"github.com/juju/juju/core/model"
2019
"github.com/juju/juju/core/status"
2120
"github.com/juju/juju/core/watcher/watchertest"
21+
"github.com/juju/juju/internal/charm"
2222
"github.com/juju/juju/rpc/params"
2323
coretesting "github.com/juju/juju/testing"
2424
)

‎api/client/application/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
"github.com/juju/collections/set"
1414
"github.com/juju/errors"
15-
"github.com/juju/juju/internal/charm"
1615
"github.com/juju/names/v5"
1716

1817
"github.com/juju/juju/api/base"
@@ -22,6 +21,7 @@ import (
2221
"github.com/juju/juju/core/crossmodel"
2322
"github.com/juju/juju/core/devices"
2423
"github.com/juju/juju/core/instance"
24+
"github.com/juju/juju/internal/charm"
2525
internallogger "github.com/juju/juju/internal/logger"
2626
"github.com/juju/juju/internal/storage"
2727
"github.com/juju/juju/rpc/params"

‎api/client/application/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"time"
99

1010
"github.com/juju/errors"
11-
"github.com/juju/juju/internal/charm"
1211
"github.com/juju/names/v5"
1312
jc "github.com/juju/testing/checkers"
1413
"go.uber.org/mock/gomock"
@@ -21,6 +20,7 @@ import (
2120
"github.com/juju/juju/core/constraints"
2221
"github.com/juju/juju/core/crossmodel"
2322
"github.com/juju/juju/core/instance"
23+
"github.com/juju/juju/internal/charm"
2424
"github.com/juju/juju/internal/storage"
2525
jujutesting "github.com/juju/juju/juju/testing"
2626
"github.com/juju/juju/rpc/params"

‎api/client/applicationoffers/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery"
1010
"github.com/juju/errors"
11-
"github.com/juju/juju/internal/charm"
1211
"github.com/juju/names/v5"
1312

1413
"github.com/juju/juju/api/base"
1514
"github.com/juju/juju/core/crossmodel"
1615
"github.com/juju/juju/core/permission"
1716
"github.com/juju/juju/core/relation"
17+
"github.com/juju/juju/internal/charm"
1818
internallogger "github.com/juju/juju/internal/logger"
1919
"github.com/juju/juju/rpc/params"
2020
)

‎api/client/applicationoffers/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery"
1111
"github.com/juju/errors"
12-
"github.com/juju/juju/internal/charm"
1312
"github.com/juju/names/v5"
1413
jc "github.com/juju/testing/checkers"
1514
"go.uber.org/mock/gomock"
@@ -19,6 +18,7 @@ import (
1918
"github.com/juju/juju/api/client/applicationoffers"
2019
apiservererrors "github.com/juju/juju/apiserver/errors"
2120
jujucrossmodel "github.com/juju/juju/core/crossmodel"
21+
"github.com/juju/juju/internal/charm"
2222
jujutesting "github.com/juju/juju/juju/testing"
2323
"github.com/juju/juju/rpc/params"
2424
"github.com/juju/juju/testing"

‎api/client/charms/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import (
88

99
"github.com/juju/collections/transform"
1010
"github.com/juju/errors"
11-
"github.com/juju/juju/internal/charm"
12-
charmresource "github.com/juju/juju/internal/charm/resource"
1311

1412
"github.com/juju/juju/api/base"
1513
api "github.com/juju/juju/api/client/resources"
1614
apicharm "github.com/juju/juju/api/common/charm"
1715
commoncharms "github.com/juju/juju/api/common/charms"
1816
apiservererrors "github.com/juju/juju/apiserver/errors"
1917
corebase "github.com/juju/juju/core/base"
18+
"github.com/juju/juju/internal/charm"
19+
charmresource "github.com/juju/juju/internal/charm/resource"
2020
"github.com/juju/juju/rpc/params"
2121
)
2222

‎api/client/charms/client_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import (
77
"os"
88

99
"github.com/juju/errors"
10-
"github.com/juju/juju/internal/charm"
11-
charmresource "github.com/juju/juju/internal/charm/resource"
1210
jc "github.com/juju/testing/checkers"
1311
"go.uber.org/mock/gomock"
1412
gc "gopkg.in/check.v1"
@@ -18,6 +16,8 @@ import (
1816
apicharm "github.com/juju/juju/api/common/charm"
1917
"github.com/juju/juju/core/arch"
2018
corebase "github.com/juju/juju/core/base"
19+
"github.com/juju/juju/internal/charm"
20+
charmresource "github.com/juju/juju/internal/charm/resource"
2121
"github.com/juju/juju/rpc/params"
2222
"github.com/juju/juju/testcharms"
2323
coretesting "github.com/juju/juju/testing"

‎api/client/charms/downloader_s3.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"io"
1010

1111
"github.com/juju/errors"
12-
"github.com/juju/juju/internal/charm"
1312

1413
"github.com/juju/juju/api/base"
14+
"github.com/juju/juju/internal/charm"
1515
"github.com/juju/juju/internal/downloader"
1616
)
1717

‎api/client/charms/localcharmclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
"strings"
1515

1616
"github.com/juju/errors"
17-
"github.com/juju/juju/internal/charm"
1817
"github.com/juju/version/v2"
1918

2019
"github.com/juju/juju/api/base"
2120
"github.com/juju/juju/core/lxdprofile"
21+
"github.com/juju/juju/internal/charm"
2222
jujuversion "github.com/juju/juju/version"
2323
)
2424

‎api/client/charms/localcharmclient_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"regexp"
1010

1111
"github.com/juju/errors"
12-
"github.com/juju/juju/internal/charm"
1312
jc "github.com/juju/testing/checkers"
1413
"github.com/juju/version/v2"
1514
"go.uber.org/mock/gomock"
@@ -19,6 +18,7 @@ import (
1918
basemocks "github.com/juju/juju/api/base/mocks"
2019
"github.com/juju/juju/api/client/charms"
2120
"github.com/juju/juju/api/http/mocks"
21+
"github.com/juju/juju/internal/charm"
2222
"github.com/juju/juju/testcharms"
2323
"github.com/juju/juju/testing"
2424
coretesting "github.com/juju/juju/testing"

‎api/client/payloads/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package payloads_test
55

66
import (
7-
"github.com/juju/juju/internal/charm"
87
"github.com/juju/names/v5"
98
jc "github.com/juju/testing/checkers"
109
"go.uber.org/mock/gomock"
@@ -13,6 +12,7 @@ import (
1312
"github.com/juju/juju/api/base/mocks"
1413
"github.com/juju/juju/api/client/payloads"
1514
corepayloads "github.com/juju/juju/core/payloads"
15+
"github.com/juju/juju/internal/charm"
1616
"github.com/juju/juju/rpc/params"
1717
)
1818

‎api/client/payloads/helpers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ package payloads
55

66
import (
77
"github.com/juju/errors"
8-
"github.com/juju/juju/internal/charm"
98
"github.com/juju/names/v5"
109

1110
"github.com/juju/juju/core/payloads"
11+
"github.com/juju/juju/internal/charm"
1212
"github.com/juju/juju/rpc/params"
1313
)
1414

‎api/client/payloads/helpers_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
package payloads
55

66
import (
7-
"github.com/juju/juju/internal/charm"
87
"github.com/juju/names/v5"
98
jc "github.com/juju/testing/checkers"
109
gc "gopkg.in/check.v1"
1110

1211
"github.com/juju/juju/core/payloads"
12+
"github.com/juju/juju/internal/charm"
1313
"github.com/juju/juju/rpc/params"
1414
)
1515

‎api/client/resources/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import (
99
"strings"
1010

1111
"github.com/juju/errors"
12-
charmresource "github.com/juju/juju/internal/charm/resource"
1312
"github.com/juju/names/v5"
1413

1514
"github.com/juju/juju/api/base"
1615
apicharm "github.com/juju/juju/api/common/charm"
1716
"github.com/juju/juju/api/http"
1817
apiservererrors "github.com/juju/juju/apiserver/errors"
1918
"github.com/juju/juju/core/resources"
19+
charmresource "github.com/juju/juju/internal/charm/resource"
2020
"github.com/juju/juju/rpc/params"
2121
)
2222

‎api/client/resources/client_upload_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"time"
1414

1515
"github.com/juju/errors"
16-
charmresource "github.com/juju/juju/internal/charm/resource"
1716
jc "github.com/juju/testing/checkers"
1817
"github.com/kr/pretty"
1918
"go.uber.org/mock/gomock"
@@ -26,6 +25,7 @@ import (
2625
corebase "github.com/juju/juju/core/base"
2726
coreresources "github.com/juju/juju/core/resources"
2827
resourcetesting "github.com/juju/juju/core/resources/testing"
28+
charmresource "github.com/juju/juju/internal/charm/resource"
2929
"github.com/juju/juju/internal/uuid"
3030
"github.com/juju/juju/rpc/params"
3131
)

‎api/client/resources/helpers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ package resources
55

66
import (
77
"github.com/juju/errors"
8-
charmresource "github.com/juju/juju/internal/charm/resource"
98
"github.com/juju/names/v5"
109

1110
apiservererrors "github.com/juju/juju/apiserver/errors"
1211
"github.com/juju/juju/core/resources"
12+
charmresource "github.com/juju/juju/internal/charm/resource"
1313
"github.com/juju/juju/rpc/params"
1414
)
1515

‎api/client/resources/helpers_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import (
88
"time"
99

1010
"github.com/juju/errors"
11-
charmresource "github.com/juju/juju/internal/charm/resource"
1211
"github.com/juju/names/v5"
1312
"github.com/juju/testing"
1413
jc "github.com/juju/testing/checkers"
1514
gc "gopkg.in/check.v1"
1615

1716
"github.com/juju/juju/core/resources"
1817
resourcetesting "github.com/juju/juju/core/resources/testing"
18+
charmresource "github.com/juju/juju/internal/charm/resource"
1919
"github.com/juju/juju/rpc/params"
2020
)
2121

‎api/client/resources/upload.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"net/http"
1111

1212
"github.com/juju/errors"
13-
charmresource "github.com/juju/juju/internal/charm/resource"
1413
"github.com/juju/names/v5"
1514

1615
"github.com/juju/juju/core/resources"
16+
charmresource "github.com/juju/juju/internal/charm/resource"
1717
)
1818

1919
// UploadRequest defines a single upload request.

‎api/common/charm/charmorigin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ package charm
55

66
import (
77
"github.com/juju/errors"
8-
"github.com/juju/juju/internal/charm"
98

109
corebase "github.com/juju/juju/core/base"
1110
corecharm "github.com/juju/juju/core/charm"
11+
"github.com/juju/juju/internal/charm"
1212
"github.com/juju/juju/rpc/params"
1313
)
1414

‎api/common/charm/charmorigin_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
package charm_test
55

66
import (
7-
"github.com/juju/juju/internal/charm"
87
gc "gopkg.in/check.v1"
98

109
commoncharm "github.com/juju/juju/api/common/charm"
1110
corebase "github.com/juju/juju/core/base"
1211
corecharm "github.com/juju/juju/core/charm"
12+
"github.com/juju/juju/internal/charm"
1313
)
1414

1515
type originSuite struct{}

‎api/common/charms/common.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"fmt"
99

1010
"github.com/juju/errors"
11-
"github.com/juju/juju/internal/charm"
12-
"github.com/juju/juju/internal/charm/resource"
1311
"github.com/juju/names/v5"
1412
"github.com/juju/version/v2"
1513

1614
"github.com/juju/juju/api/base"
15+
"github.com/juju/juju/internal/charm"
16+
"github.com/juju/juju/internal/charm/resource"
1717
"github.com/juju/juju/rpc/params"
1818
)
1919

‎api/common/charms/common_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
package charms_test
55

66
import (
7-
"github.com/juju/juju/internal/charm"
8-
"github.com/juju/juju/internal/charm/resource"
97
"github.com/juju/version/v2"
108
"go.uber.org/mock/gomock"
119
gc "gopkg.in/check.v1"
1210

1311
basemocks "github.com/juju/juju/api/base/mocks"
1412
apicommoncharms "github.com/juju/juju/api/common/charms"
13+
"github.com/juju/juju/internal/charm"
14+
"github.com/juju/juju/internal/charm/resource"
1515
"github.com/juju/juju/rpc/params"
1616
coretesting "github.com/juju/juju/testing"
1717
)

0 commit comments

Comments
 (0)