Merge lp:~hatch/charms/trusty/juju-gui/add-uuid-configjs into lp:~juju-gui/charms/trusty/juju-gui/trunk

[Jeff Pihach]

Supply the config.js file with the value from the JUJU_ENV_UUID value in supported versions of Juju.

To QA:
Deploy this charm and check that the config.js file sent to the gui has a key juju_env_uuid with a populated uuid value.

[Francesco Banconi (frankban)]

This branch looks good Jeff, thank you!
I have some minor comments, and I'd add a test for write_gui_config in test_utils.py:TestStartImprovAgentGui,
similar to test_write_gui_config_with_version_from_jujud, but exercising the juju_env_uuid value.

QA ok.

review: Approve

[lp:~hatch/charms/trusty/juju-gui/add-uuid-configjs]

233. By Jeff Pihach on 2015-02-09

Added additional test for the write_gui_config method around the uuid support

[Madison Scott-Clary (makyo)]

This LGTM, thanks Jeff! No QA.

review: Approve

[Jeff Pihach (hatch)]

Thanks for the reviews!

=== modified file 'Makefile'
--- Makefile	2015-01-05 16:23:48 +0000
+++ Makefile	2015-02-09 15:38:10 +0000
@@ -28,7 +28,7 @@
 setup:
 	tests/00-setup
 	# Ensure the correct version of pip has been installed
-	tests/.venv/bin/pip --version | grep "pip 1.[4-9]" || exit 1
+	tests/.venv/bin/pip --version | grep -E '1\.[4-9]\.|6\.[0-9]\.[0-9]' || exit 1
 
 sysdeps:
 	sudo apt-get install --yes $(SYSDEPS)
 
=== modified file 'config/config.js.template'
--- config/config.js.template	2014-12-18 16:43:04 +0000
+++ config/config.js.template	2015-02-09 15:38:10 +0000
@@ -28,5 +28,6 @@
   GA_key: {{ga_key}},
   login_help: {{login_help}},
   hideLoginButton: {{hide_login_button}},
-  jujuCoreVersion: {{juju_core_version}}
+  jujuCoreVersion: {{juju_core_version}},
+  jujuEnvUUID: {{juju_env_uuid}}
 };
 
=== modified file 'hooks/backend.py'
--- hooks/backend.py	2014-12-18 16:43:04 +0000
+++ hooks/backend.py	2015-02-09 15:38:10 +0000
@@ -133,7 +133,8 @@
             ga_key=config['ga-key'],
             hide_login_button=config['hide-login-button'],
             juju_core_version=config.get('juju-core-version'),
-            password=config.get('password'))
+            password=config.get('password'),
+            juju_env_uuid=os.getenv('JUJU_ENV_UUID', None))
         # Set up TCP ports.
         previous_port = backend.prev_config.get('port')
         current_port = backend.config.get('port')
 
=== modified file 'hooks/utils.py'
--- hooks/utils.py	2014-12-18 16:43:04 +0000
+++ hooks/utils.py	2015-02-09 15:38:10 +0000
@@ -348,7 +348,7 @@
         console_enabled, login_help, readonly, charmworld_url, charmstore_url,
         build_dir, secure=True, sandbox=False, cached_fonts=False,
         hide_login_button=False, config_js_path=None, ga_key='',
-        juju_core_version=None, password=None):
+        juju_core_version=None, password=None, juju_env_uuid=None):
     """Generate the GUI configuration file."""
     log('Generating the Juju GUI configuration file.')
     user = 'user-admin'
@@ -414,6 +414,7 @@
         'ga_key': json.dumps(ga_key),
         'hide_login_button': json.dumps(hide_login_button),
         'juju_core_version': json.dumps(juju_core_version),
+        'juju_env_uuid': json.dumps(juju_env_uuid),
     }
     if config_js_path is None:
         config_js_path = os.path.join(
 
=== modified file 'tests/test_backends.py'
--- tests/test_backends.py	2014-12-18 16:43:04 +0000
+++ tests/test_backends.py	2015-02-09 15:38:10 +0000
@@ -203,7 +203,8 @@
             secure=config['secure'], sandbox=config['sandbox'],
             cached_fonts=config['cached-fonts'], ga_key=config['ga-key'],
             juju_core_version=config['juju-core-version'],
-            hide_login_button=config['hide-login-button'], password=None)
+            hide_login_button=config['hide-login-button'],
+            juju_env_uuid=None, password=None)
 
     def test_base_dir_created(self):
         # The base Juju GUI directory is correctly created.
 
=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2014-12-18 16:43:04 +0000
+++ tests/test_utils.py	2015-02-09 15:38:10 +0000
@@ -976,6 +976,16 @@
             'charmstoreURL: "http://charmstore.example.com/"', js_conf)
         self.assertIn('GA_key: "UA-123456"', js_conf)
 
+    def test_write_gui_config_uuid(self):
+        # If the environment has the JUJU_ENV_UUID argument then it should
+        # populate the config with the value.
+        with mock.patch('os.environ', {'JUJU_ENV_UUID': 'long-uuid'}):
+            write_gui_config(
+                False, None, True, True, self.charmworld_url,
+                self.charmstore_url, self.build_dir, config_js_path='config',
+                juju_env_uuid=os.getenv('JUJU_ENV_UUID', None))
+        self.assertIn('jujuEnvUUID: "long-uuid"', self.files['config'])
+
     def test_write_gui_config_insecure(self):
         write_gui_config(
             False, 'This is login help.', True, self.charmworld_url,