/juju

migrations: Pass charm URL user component #6642

Merged
merged 3 commits into from Dec 1, 2016

Conversation

Reviewers

@babbageclunk babbageclunk

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@mjs @jujubot @babbageclunk
@mjs
Contributor

mjs commented Nov 30, 2016 •
Edited 1 time

In order to ensure the cs:~/user/foo style charms migrate correctly, the user component needs to be passed when uploading.

Drive-by: In the upload endpoint, don't assume "cs" if not "local". Fail fast if the schema isn't "cs" or "local".

QA

Successfully migrated a model which used cs:~user/foo style charms. These failed to migrated before.

mjs added some commits Nov 30, 2016

@mjs
apiserver: Support charm user argument 
Allow a charm's user component to be specified when charms are uploaded
during migration. This is required to avoid broken charms that have a
~user component.
8b5c9a9
@mjs
apiserver: Safer charm schema handling 
Don't assume "cs" if not "local". Fail fast if the schema isn't "cs" or "local".
5d40381
@mjs
api/migrationtarget: Pass charm user 
In order to ensure the cs:~/user/foo style charms migrate correctly, the
user component needs to be passed when uploading.
10d1bd2
api/migrationtarget/client.go
args.Add("schema", curl.Schema)
+ args.Add("user", curl.User)
+ args.Add("series", curl.Series)
@mjs

mjs Nov 30, 2016

Contributor

Note: no test changes here because these HTTP endpoints don't have tests! I have further changes coming here so I'll close the testing gap in the next PR.

@babbageclunk

babbageclunk approved these changes Dec 1, 2016
View changes

Looks good!

@mjs
Contributor

mjs commented Dec 1, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Dec 1, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju
@jujubot
Contributor

jujubot commented Dec 1, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/9752
@babbageclunk
Member

babbageclunk commented Dec 1, 2016

Mongo died on Windows.
@babbageclunk
Member

babbageclunk commented Dec 1, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Dec 1, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit a210318 into juju:develop Dec 1, 2016
1 check failed

1 check failed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details

@mjs mjs deleted the mjs:MM-charm-url-fix branch Dec 2, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment