Skip to content

Commit efc88bb

Browse files
howbazaarhowbazaar
committed
Update imports.
1 parent b4eda94 commit efc88bb

File tree

130 files changed

+127
-127
lines changed

Some content is hidden

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

130 files changed

+127
-127
lines changed

‎api/applicationoffers/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/juju/juju/api/base"
1313
"github.com/juju/juju/apiserver/params"
1414
"github.com/juju/juju/core/crossmodel"
15+
"github.com/juju/juju/core/permission"
1516
"github.com/juju/juju/core/relation"
16-
"github.com/juju/juju/permission"
1717
)
1818

1919
var logger = loggo.GetLogger("juju.api.applicationoffers")

‎api/client_macaroon_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/juju/juju/api"
1515
apitesting "github.com/juju/juju/api/testing"
16-
"github.com/juju/juju/permission"
16+
"github.com/juju/juju/core/permission"
1717
"github.com/juju/juju/testcharms"
1818
)
1919

‎api/cloud/cloud.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/juju/juju/apiserver/common"
1313
"github.com/juju/juju/apiserver/params"
1414
jujucloud "github.com/juju/juju/cloud"
15-
"github.com/juju/juju/permission"
15+
"github.com/juju/juju/core/permission"
1616
)
1717

1818
var logger = loggo.GetLogger("juju.api.cloud")

‎api/controller/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/juju/juju/api/common/cloudspec"
1717
"github.com/juju/juju/apiserver/params"
1818
"github.com/juju/juju/core/model"
19+
"github.com/juju/juju/core/permission"
1920
"github.com/juju/juju/environs"
20-
"github.com/juju/juju/permission"
2121
)
2222

2323
// Client provides methods that the Juju client command uses to interact

‎api/controller/legacy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
"github.com/juju/juju/apiserver/params"
1818
"github.com/juju/juju/core/life"
1919
"github.com/juju/juju/core/model"
20+
"github.com/juju/juju/core/permission"
2021
"github.com/juju/juju/environs/config"
2122
jujutesting "github.com/juju/juju/juju/testing"
22-
"github.com/juju/juju/permission"
2323
"github.com/juju/juju/provider/dummy"
2424
"github.com/juju/juju/state"
2525
"github.com/juju/juju/testing"

‎api/modelmanager/modelmanager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/juju/juju/core/instance"
1818
"github.com/juju/juju/core/model"
1919
"github.com/juju/juju/environs/config"
20-
"github.com/juju/juju/permission"
20+
"github.com/juju/juju/core/permission"
2121
"github.com/juju/juju/rpc"
2222
)
2323

‎api/state_macaroon_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
"github.com/juju/juju/api"
1717
apitesting "github.com/juju/juju/api/testing"
18-
"github.com/juju/juju/permission"
18+
"github.com/juju/juju/core/permission"
1919
"github.com/juju/juju/rpc"
2020
)
2121

‎api/testing/macaroonsuite.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919

2020
"github.com/juju/juju/api"
2121
"github.com/juju/juju/controller"
22+
"github.com/juju/juju/core/permission"
2223
jujutesting "github.com/juju/juju/juju/testing"
23-
"github.com/juju/juju/permission"
2424
"github.com/juju/juju/state"
2525
"github.com/juju/juju/testing/factory"
2626
)

‎api/watcher/watcher_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
corewatcher "github.com/juju/juju/core/watcher"
2929
"github.com/juju/juju/core/watcher/watchertest"
3030
"github.com/juju/juju/juju/testing"
31-
"github.com/juju/juju/permission"
31+
"github.com/juju/juju/core/permission"
3232
"github.com/juju/juju/state"
3333
coretesting "github.com/juju/juju/testing"
3434
"github.com/juju/juju/testing/factory"

‎apiserver/admin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/juju/juju/core/auditlog"
2323
"github.com/juju/juju/core/network"
2424
"github.com/juju/juju/feature"
25-
"github.com/juju/juju/permission"
25+
"github.com/juju/juju/core/permission"
2626
"github.com/juju/juju/rpc"
2727
"github.com/juju/juju/state"
2828
statepresence "github.com/juju/juju/state/presence"

‎apiserver/admin_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"github.com/juju/juju/core/model"
4040
"github.com/juju/juju/core/network"
4141
jujutesting "github.com/juju/juju/juju/testing"
42-
"github.com/juju/juju/permission"
42+
"github.com/juju/juju/core/permission"
4343
"github.com/juju/juju/rpc"
4444
"github.com/juju/juju/state"
4545
"github.com/juju/juju/testing"

‎apiserver/common/crossmodel/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/juju/juju/apiserver/common"
2121
"github.com/juju/juju/apiserver/params"
2222
"github.com/juju/juju/charmstore"
23-
"github.com/juju/juju/permission"
23+
"github.com/juju/juju/core/permission"
2424
)
2525

2626
const (

‎apiserver/common/crossmodel/auth_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/juju/juju/apiserver/common"
2323
"github.com/juju/juju/apiserver/common/crossmodel"
2424
"github.com/juju/juju/apiserver/params"
25-
"github.com/juju/juju/permission"
25+
"github.com/juju/juju/core/permission"
2626
coretesting "github.com/juju/juju/testing"
2727
)
2828

‎apiserver/common/crossmodel/interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/juju/juju/core/crossmodel"
1212
"github.com/juju/juju/core/firewall"
1313
"github.com/juju/juju/core/status"
14-
"github.com/juju/juju/permission"
14+
"github.com/juju/juju/core/permission"
1515
"github.com/juju/juju/state"
1616
)
1717

‎apiserver/common/crossmodel/mock_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/juju/juju/apiserver/authentication"
1414
"github.com/juju/juju/apiserver/common/crossmodel"
1515
jujucrossmodel "github.com/juju/juju/core/crossmodel"
16-
"github.com/juju/juju/permission"
16+
"github.com/juju/juju/core/permission"
1717
coretesting "github.com/juju/juju/testing"
1818
)
1919

‎apiserver/common/leadership.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/juju/juju/apiserver/facade"
1111
"github.com/juju/juju/apiserver/params"
1212
"github.com/juju/juju/core/leadership"
13-
"github.com/juju/juju/permission"
13+
"github.com/juju/juju/core/permission"
1414
"github.com/juju/juju/state"
1515
)
1616

‎apiserver/common/modelmanagerinterface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/juju/juju/core/status"
1616
"github.com/juju/juju/environs"
1717
"github.com/juju/juju/environs/config"
18-
"github.com/juju/juju/permission"
18+
"github.com/juju/juju/core/permission"
1919
"github.com/juju/juju/state"
2020
)
2121

‎apiserver/common/modeluser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"gopkg.in/juju/names.v3"
1111

1212
"github.com/juju/juju/apiserver/params"
13-
"github.com/juju/juju/permission"
13+
"github.com/juju/juju/core/permission"
1414
"github.com/juju/juju/state"
1515
)
1616

‎apiserver/common/permissions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"gopkg.in/juju/names.v3"
99

1010
"github.com/juju/juju/apiserver/facade"
11-
"github.com/juju/juju/permission"
11+
"github.com/juju/juju/core/permission"
1212
)
1313

1414
// EveryoneTagName represents a special group that encompasses

‎apiserver/common/permissions_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"gopkg.in/juju/names.v3"
1111

1212
"github.com/juju/juju/apiserver/common"
13-
"github.com/juju/juju/permission"
13+
"github.com/juju/juju/core/permission"
1414
"github.com/juju/juju/testing"
1515
)
1616

‎apiserver/export_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/juju/juju/apiserver/common"
1313
"github.com/juju/juju/apiserver/facade"
1414
"github.com/juju/juju/apiserver/stateauthenticator"
15-
"github.com/juju/juju/permission"
15+
"github.com/juju/juju/core/permission"
1616
"github.com/juju/juju/rpc"
1717
"github.com/juju/juju/state"
1818
)

‎apiserver/facade/interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/juju/juju/core/lease"
1212
"github.com/juju/juju/core/multiwatcher"
1313
"github.com/juju/juju/core/presence"
14-
"github.com/juju/juju/permission"
14+
"github.com/juju/juju/core/permission"
1515
"github.com/juju/juju/state"
1616
)
1717

‎apiserver/facade/mocks/facade_mock.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apiserver/facades/client/action/action.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/juju/juju/apiserver/common"
1414
"github.com/juju/juju/apiserver/facade"
1515
"github.com/juju/juju/apiserver/params"
16-
"github.com/juju/juju/permission"
16+
"github.com/juju/juju/core/permission"
1717
"github.com/juju/juju/state"
1818
"github.com/juju/juju/state/watcher"
1919
)

‎apiserver/facades/client/annotations/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/juju/juju/apiserver/common"
1111
"github.com/juju/juju/apiserver/facade"
1212
"github.com/juju/juju/apiserver/params"
13-
"github.com/juju/juju/permission"
13+
"github.com/juju/juju/core/permission"
1414
"github.com/juju/juju/state"
1515
)
1616

‎apiserver/facades/client/application/application.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"github.com/juju/juju/core/network"
3939
"github.com/juju/juju/core/status"
4040
"github.com/juju/juju/environs"
41-
"github.com/juju/juju/permission"
41+
"github.com/juju/juju/core/permission"
4242
"github.com/juju/juju/state"
4343
"github.com/juju/juju/state/stateenvirons"
4444
"github.com/juju/juju/storage"

‎apiserver/facades/client/applicationoffers/access_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/juju/juju/apiserver/facades/client/applicationoffers"
1717
"github.com/juju/juju/apiserver/params"
1818
jujucrossmodel "github.com/juju/juju/core/crossmodel"
19-
"github.com/juju/juju/permission"
19+
"github.com/juju/juju/core/permission"
2020
"github.com/juju/juju/state"
2121
)
2222

‎apiserver/facades/client/applicationoffers/applicationoffers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/juju/juju/apiserver/params"
1818
jujucrossmodel "github.com/juju/juju/core/crossmodel"
1919
"github.com/juju/juju/environs"
20-
"github.com/juju/juju/permission"
20+
"github.com/juju/juju/core/permission"
2121
"github.com/juju/juju/state/stateenvirons"
2222
)
2323

‎apiserver/facades/client/applicationoffers/applicationoffers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
jujucrossmodel "github.com/juju/juju/core/crossmodel"
2222
"github.com/juju/juju/core/network"
2323
"github.com/juju/juju/environs"
24-
"github.com/juju/juju/permission"
24+
"github.com/juju/juju/core/permission"
2525
"github.com/juju/juju/state"
2626
"github.com/juju/juju/testing"
2727
)

‎apiserver/facades/client/applicationoffers/base.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/juju/juju/apiserver/params"
1919
jujucrossmodel "github.com/juju/juju/core/crossmodel"
2020
"github.com/juju/juju/environs"
21-
"github.com/juju/juju/permission"
21+
"github.com/juju/juju/core/permission"
2222
"github.com/juju/juju/state"
2323
)
2424

‎apiserver/facades/client/applicationoffers/base_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
jujucrossmodel "github.com/juju/juju/core/crossmodel"
1818
"github.com/juju/juju/core/network"
1919
"github.com/juju/juju/environs"
20-
"github.com/juju/juju/permission"
20+
"github.com/juju/juju/core/permission"
2121
"github.com/juju/juju/state"
2222
coretesting "github.com/juju/juju/testing"
2323
)

‎apiserver/facades/client/applicationoffers/mock_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/juju/juju/core/status"
2525
"github.com/juju/juju/environs"
2626
"github.com/juju/juju/environs/context"
27-
"github.com/juju/juju/permission"
27+
"github.com/juju/juju/core/permission"
2828
"github.com/juju/juju/state"
2929
"github.com/juju/juju/testing"
3030
)

‎apiserver/facades/client/applicationoffers/state.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/juju/juju/core/crossmodel"
1313
"github.com/juju/juju/core/network"
1414
"github.com/juju/juju/environs/context"
15-
"github.com/juju/juju/permission"
15+
"github.com/juju/juju/core/permission"
1616
"github.com/juju/juju/state"
1717
)
1818

‎apiserver/facades/client/backups/backups.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/juju/juju/apiserver/params"
1717
"github.com/juju/juju/controller"
1818
"github.com/juju/juju/environs/config"
19-
"github.com/juju/juju/permission"
19+
"github.com/juju/juju/core/permission"
2020
"github.com/juju/juju/state"
2121
"github.com/juju/juju/state/backups"
2222
)

‎apiserver/facades/client/block/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/juju/juju/apiserver/common"
1010
"github.com/juju/juju/apiserver/facade"
1111
"github.com/juju/juju/apiserver/params"
12-
"github.com/juju/juju/permission"
12+
"github.com/juju/juju/core/permission"
1313
"github.com/juju/juju/state"
1414
)
1515

‎apiserver/facades/client/bundle/bundle.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/juju/juju/apiserver/params"
2828
"github.com/juju/juju/core/constraints"
2929
"github.com/juju/juju/core/devices"
30-
"github.com/juju/juju/permission"
30+
"github.com/juju/juju/core/permission"
3131
"github.com/juju/juju/state"
3232
"github.com/juju/juju/storage"
3333
)

‎apiserver/facades/client/charms/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/juju/juju/apiserver/common"
1414
"github.com/juju/juju/apiserver/facade"
1515
"github.com/juju/juju/apiserver/params"
16-
"github.com/juju/juju/permission"
16+
"github.com/juju/juju/core/permission"
1717
"github.com/juju/juju/state"
1818
)
1919

‎apiserver/facades/client/client/backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/juju/juju/core/network"
2121
"github.com/juju/juju/core/status"
2222
"github.com/juju/juju/environs/config"
23-
"github.com/juju/juju/permission"
23+
"github.com/juju/juju/core/permission"
2424
"github.com/juju/juju/state"
2525
)
2626

‎apiserver/facades/client/client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"github.com/juju/juju/environs/context"
3333
"github.com/juju/juju/environs/manual/sshprovisioner"
3434
"github.com/juju/juju/environs/manual/winrmprovisioner"
35-
"github.com/juju/juju/permission"
35+
"github.com/juju/juju/core/permission"
3636
"github.com/juju/juju/state"
3737
"github.com/juju/juju/state/stateenvirons"
3838
jujuversion "github.com/juju/juju/version"

‎apiserver/facades/client/client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import (
4545
"github.com/juju/juju/environs/instances"
4646
"github.com/juju/juju/environs/manual/sshprovisioner"
4747
toolstesting "github.com/juju/juju/environs/tools/testing"
48-
"github.com/juju/juju/permission"
48+
"github.com/juju/juju/core/permission"
4949
"github.com/juju/juju/rpc"
5050
"github.com/juju/juju/state"
5151
"github.com/juju/juju/state/stateenvirons"

‎apiserver/facades/client/cloud/backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/juju/juju/controller"
1212
"github.com/juju/juju/environs/config"
1313
"github.com/juju/juju/environs/context"
14-
"github.com/juju/juju/permission"
14+
"github.com/juju/juju/core/permission"
1515
"github.com/juju/juju/state"
1616
)
1717

‎apiserver/facades/client/cloud/cloud.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/juju/juju/caas/kubernetes/provider"
2323
"github.com/juju/juju/cloud"
2424
"github.com/juju/juju/environs"
25-
"github.com/juju/juju/permission"
25+
"github.com/juju/juju/core/permission"
2626
"github.com/juju/juju/state"
2727
)
2828

‎apiserver/facades/client/cloud/cloudV2_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/juju/juju/controller"
1919
"github.com/juju/juju/environs/config"
2020
"github.com/juju/juju/environs/context"
21-
"github.com/juju/juju/permission"
21+
"github.com/juju/juju/core/permission"
2222
_ "github.com/juju/juju/provider/dummy"
2323
_ "github.com/juju/juju/provider/ec2"
2424
_ "github.com/juju/juju/provider/maas"

0 commit comments

Comments
 (0)