Skip to content

Commit 2973d9c

Browse files
VeebersVeebers
committed
Update resource usage of docker to container image.
1 parent 0ba3b3a commit 2973d9c

File tree

7 files changed

+13
-12
lines changed

7 files changed

+13
-12
lines changed

‎apiserver/resources.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func (h *ResourcesHandler) readResource(backend ResourcesBackend, req *http.Requ
157157
if path.Ext(uReq.Filename) != ext {
158158
return nil, errors.Errorf("incorrect extension on resource upload %q, expected %q", uReq.Filename, ext)
159159
}
160-
case charmresource.TypeDocker:
160+
case charmresource.TypeContainerImage:
161161
// Mapping the uploaded 'filename' which is actually the RegistryPath. There is no 'Path', it'll be written to file as content.yaml
162162
err := resources.CheckDockerDetails(res.Name, uReq.Filename)
163163
if err != nil {

‎charmstore/client_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ func (s *ClientSuite) TestGetResourceDockerType(c *gc.C) {
218218
}
219219
apiRes := params.Resource{
220220
Name: "mysql_image",
221-
Type: "docker",
221+
Type: "oci-image",
222222
Description: "something",
223223
Revision: 2,
224224
Fingerprint: resource.Fingerprint{}.Bytes(),

‎cmd/juju/resource/deploy.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func (d deployUploader) upload(resourceValues map[string]string, revisions map[s
122122
switch d.resources[name].Type {
123123
case charmresource.TypeFile:
124124
id, err = d.uploadFile(name, resValue)
125-
case charmresource.TypeDocker:
125+
case charmresource.TypeContainerImage:
126126
id, err = d.uploadDockerDetails(name, resValue)
127127
default:
128128
err = errors.New("unknown resource type to upload")
@@ -143,7 +143,7 @@ func (d deployUploader) validateResourceDetails(res map[string]string) error {
143143
switch d.resources[name].Type {
144144
case charmresource.TypeFile:
145145
err = d.checkFile(name, value)
146-
case charmresource.TypeDocker:
146+
case charmresource.TypeContainerImage:
147147
err = resources.CheckDockerDetails(name, value)
148148
default:
149149
return fmt.Errorf("unknown resource: %s", name)

‎dependencies.tsv‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ github.com/mattn/go-colorable git ed8eb9e318d7a84ce5915b495b7d35e0cfe7b5a8 2016-
8989
github.com/mattn/go-isatty git 66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8 2016-08-06T12:27:52Z
9090
github.com/mattn/go-runewidth git d96d1bd051f2bd9e7e43d602782b37b93b1b5666 2015-11-18T07:21:59Z
9191
github.com/matttproud/golang_protobuf_extensions git c12348ce28de40eed0136aa2b644d0ee0650e56c 2016-04-24T11:30:07Z
92+
github.com/ncw/swift git b2a7479cf26fa841ff90dd932d0221cb5c50782d 2018-03-27T20:33:07Z
9293
github.com/nu7hatch/gouuid git 179d4d0c4d8d407a32af483c2354df1d2c91e6c3 2013-12-21T20:05:32Z
9394
github.com/oracle/oci-go-sdk git ad5c34ed0cf8169d6817e2a37ec3e4521f856368 2018-04-05T22:36:05Z
9495
github.com/pkg/errors git 839d9e913e063e28dfd0e6c7b7512793e0a48be9 2016-10-02T05:25:12Z
@@ -113,10 +114,10 @@ gopkg.in/goose.v2 git 9cc2ac8f3ac3904725fe9bef85d30b53713b3be9 2018-07-31T15:26:
113114
gopkg.in/httprequest.v1 git 1a21782420ea13c3c6fb1d03578f446b3248edb1 2018-03-08T16:26:44Z
114115
gopkg.in/ini.v1 git 776aa739ce9373377cd16f526cdf06cb4c89b40f 2016-02-22T23:24:41Z
115116
gopkg.in/juju/blobstore.v2 git 51fa6e26128d74e445c72d3a91af555151cc3654 2016-01-25T02:37:03Z
116-
gopkg.in/juju/charm.v6 git 52d8af8e45d911a36f072826d1229d83ecdb958d 2018-07-15T21:39:02Z
117+
gopkg.in/juju/charm.v6 git abaa717bc6ed4f694281737cb01f32f7de7ea357 2018-08-03T03:00:15Z
117118
gopkg.in/juju/charmrepo.v2 git 653bbd81990d2d7d48e0fb931a3b0f52c694572f 2017-11-14T18:40:45Z
118-
gopkg.in/juju/charmrepo.v3 git 8bb46aa94f3c679069e80fe35aac6d0581096d65 2018-06-29T07:07:28Z
119-
gopkg.in/juju/charmstore.v5 git d93d0fd2b81b8230bdf9b1be91b50538dd8782fa 2018-06-28T08:11:03Z
119+
gopkg.in/juju/charmrepo.v3 git 7778a447283bd71109671c20818544514e16e9d9 2018-08-03T04:37:37Z
120+
gopkg.in/juju/charmstore.v5 git 743b5ab3209d901b82aaa6594c405e017e0761a9 2018-08-03T04:08:00Z
120121
gopkg.in/juju/environschema.v1 git 7359fc7857abe2b11b5b3e23811a9c64cb6b01e0 2015-11-04T11:58:10Z
121122
gopkg.in/juju/jujusvg.v3 git 1ebf5c5481e815de683e57e0f46705ac567e4e58 2018-06-29T06:57:38Z
122123
gopkg.in/juju/names.v2 git fd59336b4621bc2a70bf96d9e2f49954115ad19b 2018-06-21T09:39:30Z

‎resource/context/internal/resource.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func OpenResource(name string, client OpenedResourceClient) (*OpenedResource, er
3535
if err != nil {
3636
return nil, errors.Trace(err)
3737
}
38-
if info.Type == charmresource.TypeDocker {
38+
if info.Type == charmresource.TypeContainerImage {
3939
info.Path = "content.yaml"
4040
}
4141
or := &OpenedResource{

‎resource/resourcetesting/resource.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func NewCharmDockerResource(c *gc.C, name, content string) charmresource.Resourc
7171
res := charmresource.Resource{
7272
Meta: charmresource.Meta{
7373
Name: name,
74-
Type: charmresource.TypeDocker,
74+
Type: charmresource.TypeContainerImage,
7575
Description: name + " description",
7676
},
7777
Origin: charmresource.OriginUpload,

‎state/resources_state_resource.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func (st resourceState) storeResource(res resource.Resource, r io.Reader) error
283283
switch res.Type {
284284
case charmresource.TypeFile:
285285
err = st.storage.PutAndCheckHash(storagePath, r, res.Size, hash)
286-
case charmresource.TypeDocker:
286+
case charmresource.TypeContainerImage:
287287
var dockerDetails resources.DockerImageDetails
288288
respBuf := new(bytes.Buffer)
289289
_, err := respBuf.ReadFrom(r)
@@ -336,7 +336,7 @@ func (st resourceState) OpenResource(applicationID, name string) (resource.Resou
336336
var resourceReader io.ReadCloser
337337
var resSize int64
338338
switch resourceInfo.Type {
339-
case charmresource.TypeDocker:
339+
case charmresource.TypeContainerImage:
340340
resourceReader, resSize, err = st.dockerMetadataStorage.Get(resourceInfo.ID)
341341
case charmresource.TypeFile:
342342
resourceReader, resSize, err = st.storage.Get(storagePath)
@@ -347,7 +347,7 @@ func (st resourceState) OpenResource(applicationID, name string) (resource.Resou
347347
return resource.Resource{}, nil, errors.Annotate(err, "while retrieving resource data")
348348
}
349349
switch resourceInfo.Type {
350-
case charmresource.TypeDocker:
350+
case charmresource.TypeContainerImage:
351351
// Resource size only found at this stage in time as it's a response from the charmstore, not a stored file.
352352
// Store it as it's used later for verification (in a separate call than this one)
353353
resourceInfo.Size = resSize

0 commit comments

Comments
 (0)