Pass the bundle id when deploying.

Pass the bundle id when deploying.

If bundle: URL is used, pass the bundle id when deploying so Charmworld can
increment the counter.

https://code.launchpad.net/~bac/juju-quickstart/pass-bundleid/+merge/195686

(do not edit description out of merge proposal)

[bac, 2013-11-18 22:52:50]

Please take a look.

[bac, 2013-11-18 22:54:41]

To QA:
Observe http://staging.jujucharms.com/bundle/~jorge/wordpress/wordpress-simple
and note download count.

juju switch ec2
juju bootstrap
make deploy
juju set juju-gui "charmworld-url=http://staging.jujucharms.com"

<get a beverage>

juju quickstart bundle:~jorge/wordpress/wordpress-simple

When everything is deployed check the staging page again and see the counters
have incremented.

[matthew.scott, 2013-11-19 00:00:53]

Code LGTM, no QA

[frankban, 2013-11-19 10:29:58]

Nice branch Brad, thank you!
LGTM with minors/optional changes.
Will QA in a minute.

https://codereview.appspot.com/28520044/diff/1/quickstart/manage.py
File quickstart/manage.py (right):

https://codereview.appspot.com/28520044/diff/1/quickstart/manage.py#newcode156
quickstart/manage.py:156: - bundle_yaml: the YAML encoded contents of the
bundle.
Please document bundle_id here too. Maybe that's redundant, but I liked to have
a single point in the code where all the namespace keys are listed.

https://codereview.appspot.com/28520044/diff/1/quickstart/manage.py#newcode171
quickstart/manage.py:171: '2) a URL (starting with "http://" or "https://") to a
YAML/JSON '
'2) a URL ("http://" or "https://") to a YAML/JSON or' or comma?
otherwise
'2) a URL (starting with "http(s)://") to a YAML/JSON or'?
<shrug>

https://codereview.appspot.com/28520044/diff/1/quickstart/tests/test_juju.py
File quickstart/tests/test_juju.py (right):

https://codereview.appspot.com/28520044/diff/1/quickstart/tests/test_juju.py#...
quickstart/tests/test_juju.py:189: # The deploy bundle call is properly
generated when passing a name.
...when passing a bundle id.

https://codereview.appspot.com/28520044/diff/1/quickstart/tests/test_manage.py
File quickstart/tests/test_manage.py (right):

https://codereview.appspot.com/28520044/diff/1/quickstart/tests/test_manage.p...
quickstart/tests/test_manage.py:345: 'bundle_id': None,
It would be nice to have this list alphabetically ordered (and this means
charm_url was already in the wrong place). <shrug>

https://codereview.appspot.com/28520044/diff/1/quickstart/tests/test_manage.p...
quickstart/tests/test_manage.py:372: bundle='/my/bundle/file.yaml',
bundle_yaml='mybundle: contents',
Thank you! It's surprising how hard for me is to avoid that typo...

https://codereview.appspot.com/28520044/diff/1/quickstart/utils.py
File quickstart/utils.py (right):

https://codereview.appspot.com/28520044/diff/1/quickstart/utils.py#newcode69
quickstart/utils.py:69: return
('https://manage.jujucharms.com/bundle/{}/json'.format(bundle_id),
Nice.

[frankban, 2013-11-19 10:42:23]

On 2013/11/18 22:54:41, bac wrote:
> To QA:
> Observe
http://staging.jujucharms.com/bundle/%7Ejorge/wordpress/wordpress-simple
> and note download count.
> 
> juju switch ec2
> juju bootstrap
> make deploy

The goal of the three commands above can also be achieved
more quickly by running:

.venv/bin/python juju-quickstart -e ec2 --gui-charm-url
cs:~juju-gui/precise/juju-gui-126

> juju set juju-gui "charmworld-url=http://staging.jujucharms.com"
> 
> <get a beverage>
> 
> juju quickstart bundle:~jorge/wordpress/wordpress-simple

I run:
.venv/bin/python juju-quickstart -e ec2 bundle:~jorge/wordpress/wordpress-simple

> 
> When everything is deployed check the staging page again and see the counters
> have incremented.

It works! Thank you!
LGTM QA ok.

[bac, 2013-11-19 12:27:04]

*** Submitted:

Pass the bundle id when deploying.

If bundle: URL is used, pass the bundle id when deploying so Charmworld can
increment the counter.

R=matthew.scott, frankban
CC=
https://codereview.appspot.com/28520044

https://codereview.appspot.com/28520044/diff/1/quickstart/manage.py
File quickstart/manage.py (right):

https://codereview.appspot.com/28520044/diff/1/quickstart/manage.py#newcode156
quickstart/manage.py:156: - bundle_yaml: the YAML encoded contents of the
bundle.
I will.  I chose not to since bundle_id is derived and not part of the
command-line options.  But it won't hurt.

https://codereview.appspot.com/28520044/diff/1/quickstart/manage.py#newcode171
quickstart/manage.py:171: '2) a URL (starting with "http://" or "https://") to a
YAML/JSON '
I went with a variant of the first and removed the 'or' on all but the
penultimate, i.e.

1) a,
2) b,
3) c, or
4) d.

https://codereview.appspot.com/28520044/diff/1/quickstart/tests/test_juju.py
File quickstart/tests/test_juju.py (right):

https://codereview.appspot.com/28520044/diff/1/quickstart/tests/test_juju.py#...
quickstart/tests/test_juju.py:189: # The deploy bundle call is properly
generated when passing a name.
Good catch.

https://codereview.appspot.com/28520044/diff/1/quickstart/tests/test_manage.py
File quickstart/tests/test_manage.py (right):

https://codereview.appspot.com/28520044/diff/1/quickstart/tests/test_manage.p...
quickstart/tests/test_manage.py:345: 'bundle_id': None,
On 2013/11/19 10:29:59, frankban wrote:
> It would be nice to have this list alphabetically ordered (and this means
> charm_url was already in the wrong place). <shrug>

Done.

https://codereview.appspot.com/28520044/diff/1/quickstart/tests/test_manage.p...
quickstart/tests/test_manage.py:372: bundle='/my/bundle/file.yaml',
bundle_yaml='mybundle: contents',
Well you only did it once.

Any time I see a typo I grep the entire project to see if it snuck in elsewhere
but that was the only one.