Merge lp:~bac/juju-gui/send-bundle-id-to-deployer into lp:juju-gui/experimental

[Brad Crittenden]

Send the bundle ID when deploying.

By sending the bundle ID to the server, the deployment statistics can be
updated on Charmworld for that bundle.

QA:

In the latest charm trunk:
% juju switch ec2
% juju bootstrap
% make deploy
% juju set juju-gui "juju-gui-source=lp:~bac/juju-gui/send-bundle-id-to-deployer"
% juju set juju-gui "charmworld-url=http://staging.jujucharms.com"

Search for a simple bundle. Jorge's are good. In this example I'll use mediawiki-simple.

Look at the bundle on staging:
http://staging.jujucharms.com/bundle/~jorge/mediawiki-simple/mediawiki-simple

Note the Downloads statistics.

Go to your juju-gui instance on ec2.
Search for jorge.
Pick the bundle you want (mediawiki-simple in this case).
Deploy it.
Only when all service are successfully deployed, green, and relations built
will the deployment statistics get updated. At that time go back to staging
and see that the downloads have been incremented.

https://codereview.appspot.com/28440043/

[lp:~bac/juju-gui/send-bundle-id-to-deployer]

1204. By Brad Crittenden on 2013-11-18

Fix param doc for deployBundle.

[Brad Crittenden (bac)]

Reviewers: mp+195598_code.launchpad.net,

Message:
Please take a look.

Description:
Send the bundle ID when deploying.

By sending the bundle ID to the server, the deployment statistics can be
updated on Charmworld for that bundle.

QA:

In the latest charm trunk:
% juju switch ec2
% juju bootstrap
% make deploy
% juju set juju-gui
"juju-gui-source=lp:~bac/juju-gui/send-bundle-id-to-deployer"
% juju set juju-gui "charmworld-url=http://staging.jujucharms.com"

Search for a simple bundle. Jorge's are good. In this example I'll use
mediawiki-simple.

Look at the bundle on staging:
http://staging.jujucharms.com/bundle/~jorge/mediawiki-simple/mediawiki-simple

Note the Downloads statistics.

Go to your juju-gui instance on ec2.
Search for jorge.
Pick the bundle you want (mediawiki-simple in this case).
Deploy it.
Only when all service are successfully deployed, green, and relations
built
will the deployment statistics get updated. At that time go back to
staging
and see that the downloads have been incremented.

https://code.launchpad.net/~bac/juju-gui/send-bundle-id-to-deployer/+merge/195598

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/28440043/

Affected files (+26, -14 lines):
   A [revision details]
   M app/app.js
   M app/assets/javascripts/bundle-import-helpers.js
   M app/store/env/go.js
   M app/subapps/browser/views/bundle.js
   M test/test_bundle_import_helpers.js

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: app/app.js
=== modified file 'app/app.js'
--- app/app.js 2013-11-15 13:46:35 +0000
+++ app/app.js 2013-11-18 13:27:49 +0000
@@ -595,13 +595,14 @@
        // Grab a reference of these for the nested event calls below.
        var env = this.env;
        var db = this.db;
- cfg.deployBundle = function(bundle) {
+ cfg.deployBundle = function(bundle, bundleId) {
          // The other views will hand us an Object vs a YAML string. The
import
          // helpers want the yaml string instead.
          importHelpers.deployBundle(
              Y.JSON.stringify({
                bundle: bundle
              }),
+ bundleId,
              env,
              db
          );

Index: test/test_bundle_import_helpers.js
=== modified file 'test/test_bundle_import_helpers.js'
--- test/test_bundle_import_helpers.js 2013-11-15 13:46:35 +0000
+++ test/test_bundle_import_helpers.js 2013-11-18 13:57:40 +0000
@@ -55,7 +55,7 @@
        };

        // Start the process by deploying the bundle.
- ns.BundleHelpers.deployBundle('test bundle', env, db);
+ ns.BundleHelpers.deployBundle('test bundle', undefined, env, db);
      });

      it('errors when the bundle import fails from the env', function(done) {
@@ -65,14 +65,14 @@
          done();
        };

- env.deployerImport = function(bundle, name, callback) {
+ env.deployerImport = function(bundle, name, bundleid, callback) {...

[Jeff Pihach (hatch)]

LGTM Thanks for the discussion on this!

You can either do the comment below or make a ticket for someone else to
follow-up with at a later time.

https://codereview.appspot.com/28440043/diff/1/app/store/env/go.js
File app/store/env/go.js (right):

https://codereview.appspot.com/28440043/diff/1/app/store/env/go.js#newcode431
app/store/env/go.js:431: else if (Y.Lang.isFunction(bundleID) &&
callback === undefined) {
We should change this method to accept a configuration object instead of
relying on this munging.

https://codereview.appspot.com/28440043/

[lp:~bac/juju-gui/send-bundle-id-to-deployer]

1205. By Brad Crittenden on 2013-11-18

Pass an object with bundle name and id to deploy functions.

1206. By Brad Crittenden on 2013-11-18

lint

[Brad Crittenden (bac)]

*** Submitted:

Send the bundle ID when deploying.

By sending the bundle ID to the server, the deployment statistics can be
updated on Charmworld for that bundle.

QA:

In the latest charm trunk:
% juju switch ec2
% juju bootstrap
% make deploy
% juju set juju-gui
"juju-gui-source=lp:~bac/juju-gui/send-bundle-id-to-deployer"
% juju set juju-gui "charmworld-url=http://staging.jujucharms.com"

Search for a simple bundle. Jorge's are good. In this example I'll use
mediawiki-simple.

Look at the bundle on staging:
http://staging.jujucharms.com/bundle/~jorge/mediawiki-simple/mediawiki-simple

Note the Downloads statistics.

Go to your juju-gui instance on ec2.
Search for jorge.
Pick the bundle you want (mediawiki-simple in this case).
Deploy it.
Only when all service are successfully deployed, green, and relations
built
will the deployment statistics get updated. At that time go back to
staging
and see that the downloads have been incremented.

R=jeff.pihach
CC=
https://codereview.appspot.com/28440043

https://codereview.appspot.com/28440043/

[Benjamin Saller (bcsaller)]

I realize this is out of band but I'd like to change the API for deployer
to take a bundle archive similar to how charms work. We intend to have
bundles with custom hooks in the future and those should ship with the
deployer YAML. We can discuss this again as I get closer with some of the
other needed changes, but this is a heads up.

On Mon, Nov 18, 2013 at 10:33 AM, Brad Crittenden <email address hidden> wrote:

> *** Submitted:
>
> Send the bundle ID when deploying.
>
> By sending the bundle ID to the server, the deployment statistics can be
> updated on Charmworld for that bundle.
>
> QA:
>
> In the latest charm trunk:
> % juju switch ec2
> % juju bootstrap
> % make deploy
> % juju set juju-gui
> "juju-gui-source=lp:~bac/juju-gui/send-bundle-id-to-deployer"
> % juju set juju-gui "charmworld-url=http://staging.jujucharms.com"
>
> Search for a simple bundle. Jorge's are good. In this example I'll use
> mediawiki-simple.
>
> Look at the bundle on staging:
>
> http://staging.jujucharms.com/bundle/~jorge/mediawiki-simple/mediawiki-simple
>
> Note the Downloads statistics.
>
> Go to your juju-gui instance on ec2.
> Search for jorge.
> Pick the bundle you want (mediawiki-simple in this case).
> Deploy it.
> Only when all service are successfully deployed, green, and relations
> built
> will the deployment statistics get updated. At that time go back to
> staging
> and see that the downloads have been incremented.
>
> R=jeff.pihach
> CC=
> https://codereview.appspot.com/28440043
>
>
> https://codereview.appspot.com/28440043/
>
> --
>
> https://code.launchpad.net/~bac/juju-gui/send-bundle-id-to-deployer/+merge/195598
> Your team Juju GUI Hackers is requested to review the proposed merge of
> lp:~bac/juju-gui/send-bundle-id-to-deployer into lp:juju-gui.
>

=== modified file 'app/app.js'
--- app/app.js	2013-11-15 13:46:35 +0000
+++ app/app.js	2013-11-18 18:25:29 +0000
@@ -595,13 +595,14 @@
       // Grab a reference of these for the nested event calls below.
       var env = this.env;
       var db = this.db;
-      cfg.deployBundle = function(bundle) {
+      cfg.deployBundle = function(bundle, bundleId) {
         // The other views will hand us an Object vs a YAML string. The import
         // helpers want the yaml string instead.
         importHelpers.deployBundle(
             Y.JSON.stringify({
               bundle: bundle
             }),
+            bundleId,
             env,
             db
         );

=== modified file 'app/assets/javascripts/bundle-import-helpers.js'
--- app/assets/javascripts/bundle-import-helpers.js	2013-11-15 19:04:20 +0000
+++ app/assets/javascripts/bundle-import-helpers.js	2013-11-18 18:25:29 +0000
@@ -27,12 +27,13 @@
       to deploy the bundle to the environment.
 
       @method deployBundle
-      @param {Object} bundle Bundle data.
+      @param {String} bundle Bundle YAML data.
+      @param {String} bundleId Bundle ID for Charmworld.  May be null.
       @param {Environment} env Environment with access to the bundle back end.
       calls.
       @param {Database} db The app Database with access to the NotificationList.
     */
-    deployBundle: function(bundle, env, db, customCallback) {
+    deployBundle: function(bundle, bundleId, env, db, customCallback) {
       var notifications = db.notifications;
 
       var defaultCallback = function(result) {
@@ -57,9 +58,13 @@
       };
 
       if (Y.Lang.isFunction(env.deployerImport)) {
+        var bundleData = {
+          name: null,
+          id: bundleId
+        };
         env.deployerImport(
             bundle,
-            null,
+            bundleData,
             customCallback ? customCallback : defaultCallback
         );
       } else {
@@ -104,6 +109,7 @@
         reader.onload = function(e) {
           ns.BundleHelpers.deployBundle(
               e.target.result,
+              undefined,
               env,
               db,
               function(result) {

=== modified file 'app/store/env/go.js'
--- app/store/env/go.js	2013-11-15 13:46:35 +0000
+++ app/store/env/go.js	2013-11-18 18:25:29 +0000
@@ -416,27 +416,31 @@
      *
      * @method deployerImport
      * @param {String} yamlData to import.
-     * @param {String} [bundleName] Bundle name to import.
+     * @param {Object} bundleData Object describing the bundle.  Has name and
+     *     id.  May be null.
      * @param {Function} callback to trigger.
      * @return {Number} Request Id.
      */
-    deployerImport: function(yamlData, bundleName, callback) {
+    deployerImport: function(yamlData, bundleData, callback) {
       var intermediateCallback;
+      var name, id;
 
-      if (Y.Lang.isFunction(bundleName) && callback === undefined) {
-        callback = bundleName;
-        bundleName = undefined;
-      }
       if (callback) {
         intermediateCallback = Y.bind(this.handleDeployerImport,
                                       this, callback);
       }
+      if (Y.Lang.isValue(bundleData)) {
+        name = bundleData.name;
+        id = bundleData.id;
+      }
+
       this._send_rpc({
         Type: 'Deployer',
         Request: 'Import',
         Params: {
           YAML: yamlData,
-          Name: undefined
+          Name: name,
+          BundleID: id
         }
       }, intermediateCallback);
     },

=== modified file 'app/subapps/browser/views/bundle.js'
--- app/subapps/browser/views/bundle.js	2013-11-14 18:53:43 +0000
+++ app/subapps/browser/views/bundle.js	2013-11-18 18:25:29 +0000
@@ -93,7 +93,7 @@
       } else {
         this.fire('viewNavigate', {change: {charmID: null}});
       }
-      this.get('deployBundle')(bundle.get('data'));
+      this.get('deployBundle')(bundle.get('data'), bundle.get('id'));
     },
 
     /**

=== modified file 'test/test_bundle_import_helpers.js'
--- test/test_bundle_import_helpers.js	2013-11-15 13:46:35 +0000
+++ test/test_bundle_import_helpers.js	2013-11-18 18:25:29 +0000
@@ -55,7 +55,7 @@
       };
 
       // Start the process by deploying the bundle.
-      ns.BundleHelpers.deployBundle('test bundle', env, db);
+      ns.BundleHelpers.deployBundle('test bundle', undefined, env, db);
     });
 
     it('errors when the bundle import fails from the env', function(done) {
@@ -65,14 +65,14 @@
         done();
       };
 
-      env.deployerImport = function(bundle, name, callback) {
+      env.deployerImport = function(bundle, bundleData, callback) {
         callback({
           err: 'Abort abort!'
         });
       };
 
       // Start the process by deploying the bundle.
-      ns.BundleHelpers.deployBundle('test bundle', env, db);
+      ns.BundleHelpers.deployBundle('test bundle', '~jorge/wiki/wiki', env, db);
     });
 
     it('provides deployBundle helper for working through env', function(done) {
@@ -87,10 +87,12 @@
 
       // Stub out the env call to make sure we check the params and call the
       // provided callback.
-      env.deployerImport = function(bundle, name, callback) {
+      env.deployerImport = function(bundle, bundleData, callback) {
         assert.equal(bundle, 'test bundle');
+        assert.equal(bundleData.id, '~jorge/wiki/wiki');
         assert.equal(
-            name, null, 'The name is not currently supported or passed.');
+            bundleData.name, null,
+            'The name is not currently supported or passed.');
         // This is the default callback from the deployBundle method.
         callback({
           err: undefined,
@@ -108,12 +110,12 @@
         ns.BundleHelpers._watchDeployment = _watchDeployment;
 
         // Make sure we did in fact post our notification to the user.
-        assert.equal(hitNotifications, true);
+        assert.equal(true, hitNotifications);
         done();
       };
 
       // Start the process by deploying the bundle.
-      ns.BundleHelpers.deployBundle('test bundle', env, db);
+      ns.BundleHelpers.deployBundle('test bundle', '~jorge/wiki/wiki', env, db);
     });
 
     it('provides a notification when a deploy watch updates', function(done) {
@@ -223,7 +225,7 @@
 
       // Stub out the env call to make sure we check the params and call the
       // provided callback.
-      env.deployerImport = function(bundle, name, callback) {
+      env.deployerImport = function(bundle, bundleData, callback) {
         callback({
           err: undefined,
           DeploymentId: 10
@@ -295,7 +297,7 @@
       };
 
       // Start the process by deploying the bundle.
-      ns.BundleHelpers.deployBundle('test bundle', env, db);
+      ns.BundleHelpers.deployBundle('test bundle', undefined, env, db);
 
     });