Skip to content

Commit 41ba6e9

Browse files
wallyworldwallyworld
committed
Move resources files to a single top level package
1 parent 5d8c181 commit 41ba6e9

33 files changed

+148
-230
lines changed

‎apiserver/apiserver.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ import (
4545
"github.com/juju/juju/core/lease"
4646
"github.com/juju/juju/core/multiwatcher"
4747
"github.com/juju/juju/core/presence"
48-
"github.com/juju/juju/core/resource"
48+
coreresource "github.com/juju/juju/core/resource"
4949
"github.com/juju/juju/feature"
5050
"github.com/juju/juju/pubsub/apiserver"
5151
controllermsg "github.com/juju/juju/pubsub/controller"
52-
"github.com/juju/juju/resource/resourceadapters"
52+
"github.com/juju/juju/resource"
5353
"github.com/juju/juju/rpc"
5454
"github.com/juju/juju/rpc/jsoncodec"
5555
"github.com/juju/juju/state"
@@ -112,7 +112,7 @@ type Server struct {
112112

113113
// resourceLock is used to limit the number of
114114
// concurrent resource downloads to units.
115-
resourceLock resourceadapters.ResourceDownloadLock
115+
resourceLock resource.ResourceDownloadLock
116116

117117
// registerIntrospectionHandlers is a function that will
118118
// call a function with (path, http.Handler) tuples. This
@@ -503,10 +503,10 @@ func (srv *Server) updateResourceDownloadLimiters(cfg controller.Config) {
503503
defer srv.mu.Unlock()
504504
globalLimit := cfg.ControllerResourceDownloadLimit()
505505
appLimit := cfg.ApplicationResourceDownloadLimit()
506-
srv.resourceLock = resourceadapters.NewResourceDownloadLimiter(globalLimit, appLimit)
506+
srv.resourceLock = resource.NewResourceDownloadLimiter(globalLimit, appLimit)
507507
}
508508

509-
func (srv *Server) getResourceDownloadLimiter() resourceadapters.ResourceDownloadLock {
509+
func (srv *Server) getResourceDownloadLimiter() resource.ResourceDownloadLock {
510510
srv.mu.Lock()
511511
defer srv.mu.Unlock()
512512
return srv.resourceLock
@@ -743,7 +743,7 @@ func (srv *Server) endpoints() []apihttp.Endpoint {
743743
},
744744
}
745745
unitResourcesHandler := &UnitResourcesHandler{
746-
NewOpener: func(req *http.Request, tagKinds ...string) (resource.Opener, state.PoolHelper, error) {
746+
NewOpener: func(req *http.Request, tagKinds ...string) (coreresource.Opener, state.PoolHelper, error) {
747747
st, _, err := httpCtxt.stateForRequestAuthenticatedTag(req, tagKinds...)
748748
if err != nil {
749749
return nil, nil, errors.Trace(err)
@@ -753,8 +753,8 @@ func (srv *Server) endpoints() []apihttp.Endpoint {
753753
if err != nil {
754754
return nil, nil, errors.Trace(err)
755755
}
756-
opener, err := resourceadapters.NewResourceOpener(
757-
resourceadapters.NewResourceOpenerState(st.State), srv.getResourceDownloadLimiter, tag.Id())
756+
opener, err := resource.NewResourceOpener(
757+
resource.NewResourceOpenerState(st.State), srv.getResourceDownloadLimiter, tag.Id())
758758
if err != nil {
759759
return nil, nil, errors.Trace(err)
760760
}

‎apiserver/facades/controller/caasapplicationprovisioner/provisioner.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import (
3030
"github.com/juju/juju/cloudconfig/podcfg"
3131
"github.com/juju/juju/controller"
3232
"github.com/juju/juju/core/network"
33-
"github.com/juju/juju/core/resource"
33+
coreresource "github.com/juju/juju/core/resource"
3434
"github.com/juju/juju/core/status"
3535
"github.com/juju/juju/environs/config"
3636
"github.com/juju/juju/environs/tags"
37-
"github.com/juju/juju/resource/resourceadapters"
37+
"github.com/juju/juju/resource"
3838
"github.com/juju/juju/rpc/params"
3939
"github.com/juju/juju/state"
4040
stateerrors "github.com/juju/juju/state/errors"
@@ -56,7 +56,7 @@ type APIGroup struct {
5656
*API
5757
}
5858

59-
type NewResourceOpenerFunc func(appName string) (resource.Opener, error)
59+
type NewResourceOpenerFunc func(appName string) (coreresource.Opener, error)
6060

6161
type API struct {
6262
auth facade.Authorizer
@@ -103,8 +103,8 @@ func NewStateCAASApplicationProvisionerAPI(ctx facade.Context) (*APIGroup, error
103103
return nil, errors.Trace(err)
104104
}
105105

106-
newResourceOpener := func(appName string) (resource.Opener, error) {
107-
return resourceadapters.NewResourceOpenerForApplication(resourceadapters.NewResourceOpenerState(st), appName)
106+
newResourceOpener := func(appName string) (coreresource.Opener, error) {
107+
return resource.NewResourceOpenerForApplication(resource.NewResourceOpenerState(st), appName)
108108
}
109109

110110
api, err := NewCAASApplicationProvisionerAPI(
@@ -759,7 +759,7 @@ func (a *API) ApplicationOCIResources(args params.Entities) (params.CAASApplicat
759759
}
760760

761761
func readDockerImageResource(reader io.Reader) (params.DockerImageInfo, error) {
762-
var details resource.DockerImageDetails
762+
var details coreresource.DockerImageDetails
763763
contents, err := ioutil.ReadAll(reader)
764764
if err != nil {
765765
return params.DockerImageInfo{}, errors.Trace(err)
@@ -769,7 +769,7 @@ func readDockerImageResource(reader io.Reader) (params.DockerImageInfo, error) {
769769
return params.DockerImageInfo{}, errors.Annotate(err, "file neither valid json or yaml")
770770
}
771771
}
772-
if err := resource.ValidateDockerRegistryPath(details.RegistryPath); err != nil {
772+
if err := coreresource.ValidateDockerRegistryPath(details.RegistryPath); err != nil {
773773
return params.DockerImageInfo{}, err
774774
}
775775
return params.DockerImageInfo{

‎cmd/juju/application/deploy.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import (
3939
"github.com/juju/juju/core/model"
4040
"github.com/juju/juju/core/series"
4141
"github.com/juju/juju/environs/config"
42-
"github.com/juju/juju/resource/resourceadapters"
4342
apiparams "github.com/juju/juju/rpc/params"
4443
"github.com/juju/juju/storage"
4544
)
@@ -364,7 +363,7 @@ type DeployCommand struct {
364363
NewConsumeDetailsAPI func(url *charm.OfferURL) (deployer.ConsumeDetails, error)
365364

366365
// DeployResources stores a function which deploys charm resources.
367-
DeployResources resourceadapters.DeployResourcesFunc
366+
DeployResources deployer.DeployResourcesFunc
368367

369368
// When deploying a charm, Trust signifies that the charm should be
370369
// deployed with access to trusted credentials. That is, hooks run by

‎cmd/juju/application/deploy_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ import (
6767
jjtesting "github.com/juju/juju/juju/testing"
6868
"github.com/juju/juju/jujuclient"
6969
"github.com/juju/juju/jujuclient/jujuclienttesting"
70-
"github.com/juju/juju/resource/resourceadapters"
7170
"github.com/juju/juju/rpc/params"
7271
"github.com/juju/juju/state"
7372
"github.com/juju/juju/storage"
@@ -91,7 +90,7 @@ var defaultLocalOrigin = commoncharm.Origin{
9190
type DeploySuiteBase struct {
9291
testing.RepoSuite
9392
coretesting.CmdBlockHelper
94-
DeployResources resourceadapters.DeployResourcesFunc
93+
DeployResources deployer.DeployResourcesFunc
9594

9695
fakeAPI *fakeDeployAPI
9796
}
@@ -1000,7 +999,7 @@ type CAASDeploySuiteBase struct {
1000999
jujutesting.IsolationSuite
10011000
deployer.DeployerAPI
10021001
Store *jujuclient.MemStore
1003-
DeployResources resourceadapters.DeployResourcesFunc
1002+
DeployResources deployer.DeployResourcesFunc
10041003

10051004
CharmsPath string
10061005
factory *mocks.MockDeployerFactory

‎cmd/juju/application/deployer/bundle.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"github.com/juju/juju/cmd/juju/application/utils"
2020
"github.com/juju/juju/core/constraints"
2121
"github.com/juju/juju/core/devices"
22-
"github.com/juju/juju/resource/resourceadapters"
2322
"github.com/juju/juju/storage"
2423
)
2524

@@ -46,7 +45,7 @@ type deployBundle struct {
4645
resolver Resolver
4746
authorizer store.MacaroonGetter
4847
newConsumeDetailsAPI func(url *charm.OfferURL) (ConsumeDetails, error)
49-
deployResources resourceadapters.DeployResourcesFunc
48+
deployResources DeployResourcesFunc
5049
charmReader CharmReader
5150

5251
useExistingMachines bool

‎cmd/juju/application/deployer/bundlehandler.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"time"
1313

1414
"github.com/juju/charm/v8"
15-
"github.com/juju/charm/v8/resource"
15+
charmresource "github.com/juju/charm/v8/resource"
1616
jujuclock "github.com/juju/clock"
1717
"github.com/juju/cmd/v3"
1818
"github.com/juju/collections/set"
@@ -42,7 +42,6 @@ import (
4242
"github.com/juju/juju/core/model"
4343
"github.com/juju/juju/core/series"
4444
"github.com/juju/juju/environs/config"
45-
"github.com/juju/juju/resource/resourceadapters"
4645
"github.com/juju/juju/rpc/params"
4746
"github.com/juju/juju/state/watcher"
4847
"github.com/juju/juju/storage"
@@ -67,7 +66,7 @@ type bundleDeploySpec struct {
6766
bundleResolver Resolver
6867
authorizer store.MacaroonGetter
6968
getConsumeDetailsAPI func(*charm.OfferURL) (ConsumeDetails, error)
70-
deployResources resourceadapters.DeployResourcesFunc
69+
deployResources DeployResourcesFunc
7170

7271
useExistingMachines bool
7372
bundleMachines map[string]string
@@ -145,7 +144,7 @@ type bundleHandler struct {
145144
bundleResolver Resolver
146145
authorizer store.MacaroonGetter
147146
getConsumeDetailsAPI func(*charm.OfferURL) (ConsumeDetails, error)
148-
deployResources resourceadapters.DeployResourcesFunc
147+
deployResources DeployResourcesFunc
149148

150149
// bundleStorage contains a mapping of application-specific storage
151150
// constraints. For each application, the storage constraints in the
@@ -771,7 +770,7 @@ func (h *bundleHandler) addCharm(change *bundlechanges.AddCharmChange) error {
771770
return nil
772771
}
773772

774-
func (h *bundleHandler) makeResourceMap(meta map[string]resource.Meta, storeResources map[string]int, localResources map[string]string) map[string]string {
773+
func (h *bundleHandler) makeResourceMap(meta map[string]charmresource.Meta, storeResources map[string]int, localResources map[string]string) map[string]string {
775774
resources := make(map[string]string)
776775
for resName, path := range localResources {
777776
// The resource may be a relative path, convert to absolute path.
@@ -782,7 +781,7 @@ func (h *bundleHandler) makeResourceMap(meta map[string]resource.Meta, storeReso
782781
maybePath = filepath.Clean(filepath.Join(h.bundleDir, path))
783782
}
784783
_, err := h.filesystem.Stat(maybePath)
785-
if err == nil || meta[resName].Type == resource.TypeFile {
784+
if err == nil || meta[resName].Type == charmresource.TypeFile {
786785
path = maybePath
787786
}
788787
resources[resName] = path

‎cmd/juju/application/deployer/charm.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"github.com/juju/juju/core/constraints"
2929
"github.com/juju/juju/core/devices"
3030
"github.com/juju/juju/core/instance"
31-
"github.com/juju/juju/resource/resourceadapters"
3231
"github.com/juju/juju/storage"
3332
)
3433

@@ -42,7 +41,7 @@ type deployCharm struct {
4241
modelConstraints constraints.Value
4342
csMac *macaroon.Macaroon
4443
devices map[string]devices.Constraints
45-
deployResources resourceadapters.DeployResourcesFunc
44+
deployResources DeployResourcesFunc
4645
force bool
4746
id application.CharmID
4847
flagSet *gnuflag.FlagSet

‎cmd/juju/application/deployer/deployer.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"strings"
1414

1515
"github.com/juju/charm/v8"
16-
"github.com/juju/charm/v8/resource"
16+
charmresource "github.com/juju/charm/v8/resource"
1717
jujuclock "github.com/juju/clock"
1818
"github.com/juju/errors"
1919
"github.com/juju/gnuflag"
@@ -31,7 +31,6 @@ import (
3131
"github.com/juju/juju/core/instance"
3232
"github.com/juju/juju/core/model"
3333
"github.com/juju/juju/environs/config"
34-
"github.com/juju/juju/resource/resourceadapters"
3534
"github.com/juju/juju/storage"
3635
)
3736

@@ -49,7 +48,7 @@ func NewDeployerFactory(dep DeployerDependencies) DeployerFactory {
4948
steps: dep.Steps,
5049
}
5150
if dep.DeployResources == nil {
52-
d.deployResources = resourceadapters.DeployResources
51+
d.deployResources = DeployResources
5352
}
5453
return d
5554
}
@@ -106,7 +105,7 @@ func (d *factory) setConfig(cfg DeployerConfig) {
106105

107106
// DeployerDependencies are required for any deployer to be run.
108107
type DeployerDependencies struct {
109-
DeployResources resourceadapters.DeployResourcesFunc
108+
DeployResources DeployResourcesFunc
110109
Model ModelCommand
111110
FileSystem modelcmd.Filesystem
112111
CharmReader CharmReader
@@ -136,7 +135,7 @@ type DeployerConfig struct {
136135
Constraints constraints.Value
137136
ModelConstraints constraints.Value
138137
Devices map[string]devices.Constraints
139-
DeployResources resourceadapters.DeployResourcesFunc
138+
DeployResources DeployResourcesFunc
140139
DryRun bool
141140
FlagSet *gnuflag.FlagSet
142141
Force bool
@@ -155,7 +154,7 @@ type DeployerConfig struct {
155154
type factory struct {
156155
// DeployerDependencies
157156
model ModelCommand
158-
deployResources resourceadapters.DeployResourcesFunc
157+
deployResources DeployResourcesFunc
159158
newConsumeDetailsAPI func(url *charm.OfferURL) (ConsumeDetails, error)
160159
fileSystem modelcmd.Filesystem
161160
charmReader CharmReader
@@ -640,7 +639,7 @@ func (d *factory) validateResourcesNeededForLocalDeploy(charmMeta *charm.Meta) e
640639

641640
var missingImages []string
642641
for resName, resMeta := range charmMeta.Resources {
643-
if resMeta.Type == resource.TypeContainerImage {
642+
if resMeta.Type == charmresource.TypeContainerImage {
644643
if _, ok := d.resources[resName]; !ok {
645644
missingImages = append(missingImages, resName)
646645
}

‎resource/resourceadapters/deploy.go renamed to ‎cmd/juju/application/deployer/resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2016 Canonical Ltd.
22
// Licensed under the AGPLv3, see LICENCE file for details.
33

4-
package resourceadapters
4+
package deployer
55

66
import (
77
"strconv"

‎cmd/juju/application/export_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ import (
1313

1414
"github.com/juju/juju/api"
1515
"github.com/juju/juju/api/base"
16+
"github.com/juju/juju/cmd/juju/application/deployer"
1617
"github.com/juju/juju/cmd/juju/application/refresher"
1718
"github.com/juju/juju/cmd/juju/application/store"
1819
"github.com/juju/juju/cmd/juju/application/utils"
1920
"github.com/juju/juju/cmd/modelcmd"
2021
jujutesting "github.com/juju/juju/juju/testing"
2122
"github.com/juju/juju/jujuclient"
22-
"github.com/juju/juju/resource/resourceadapters"
2323
)
2424

2525
//go:generate go run github.com/golang/mock/mockgen -package mocks -destination mocks/deployer_mock.go github.com/juju/juju/cmd/juju/application/deployer Deployer,DeployerFactory
2626

2727
func NewRefreshCommandForTest(
2828
store jujuclient.ClientStore,
2929
apiOpen api.OpenFunc,
30-
deployResources resourceadapters.DeployResourcesFunc,
30+
deployResources deployer.DeployResourcesFunc,
3131
newCharmStore NewCharmStoreFunc,
3232
newCharmResolver NewCharmResolverFunc,
3333
newCharmAdder NewCharmAdderFunc,
@@ -63,7 +63,7 @@ func NewRefreshCommandForStateTest(
6363
newCharmStore NewCharmStoreFunc,
6464
newCharmAdder NewCharmAdderFunc,
6565
newCharmClient func(base.APICallCloser) utils.CharmClient,
66-
deployResources resourceadapters.DeployResourcesFunc,
66+
deployResources deployer.DeployResourcesFunc,
6767
newCharmAPIClient func(conn base.APICallCloser) CharmRefreshClient,
6868
) cmd.Command {
6969
cmd := newRefreshCommand()

‎cmd/juju/application/refresh.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"github.com/juju/juju/api/controller/controller"
3333
"github.com/juju/juju/charmhub"
3434
jujucmd "github.com/juju/juju/cmd"
35+
"github.com/juju/juju/cmd/juju/application/deployer"
3536
"github.com/juju/juju/cmd/juju/application/refresher"
3637
"github.com/juju/juju/cmd/juju/application/store"
3738
"github.com/juju/juju/cmd/juju/application/utils"
@@ -40,14 +41,13 @@ import (
4041
"github.com/juju/juju/cmd/modelcmd"
4142
corecharm "github.com/juju/juju/core/charm"
4243
"github.com/juju/juju/environs/config"
43-
"github.com/juju/juju/resource/resourceadapters"
4444
"github.com/juju/juju/rpc/params"
4545
"github.com/juju/juju/storage"
4646
)
4747

4848
func newRefreshCommand() *refreshCommand {
4949
return &refreshCommand{
50-
DeployResources: resourceadapters.DeployResources,
50+
DeployResources: deployer.DeployResources,
5151
NewCharmAdder: newCharmAdder,
5252
NewCharmClient: func(conn base.APICallCloser) utils.CharmClient {
5353
return apicharms.NewClient(conn)
@@ -136,7 +136,7 @@ type NewCharmResolverFunc func(base.APICallCloser, store.CharmrepoForDeploy, sto
136136
type refreshCommand struct {
137137
modelcmd.ModelCommandBase
138138

139-
DeployResources resourceadapters.DeployResourcesFunc
139+
DeployResources deployer.DeployResourcesFunc
140140
NewCharmAdder NewCharmAdderFunc
141141
NewCharmStore NewCharmStoreFunc
142142
NewCharmResolver NewCharmResolverFunc

0 commit comments

Comments
 (0)