Merge lp:~pwlars/charms/precise/uci-engine-key-secret-subordinate/key-secret-lpkey into lp:~canonical-ci-engineering/charms/precise/uci-engine-key-secret-subordinate/trunk

[Paul Larson]

Add optional launchpad credentials

Add optional launchpad credentials

[Celso Providelo (cprov)]

Thanks for working on this Paul,

I personally would not lay the lp creds as a hidden file (.launchpad.credentials), it will just make it hard to notice this file in production. What about simply 'launchpad.credentials' ?

Also, from what I've looked it seems pretty simple to adjust the charm unittests to cover this new option. Can you do that, please ?

review: Needs Fixing

[lp:~pwlars/charms/precise/uci-engine-key-secret-subordinate/key-secret-lpkey]

4. By Paul Larson on 2014-12-04

use unhidden version of launchpad.credentials file

[Paul Larson (pwlars)]

done

review: Needs Resubmitting

[Celso Providelo (cprov)]

Missing tests, as discussed on IRC.

review: Needs Fixing

[lp:~pwlars/charms/precise/uci-engine-key-secret-subordinate/key-secret-lpkey]

5. By Paul Larson on 2014-12-04

Add launchpad.credentials to the testcase

[Celso Providelo (cprov)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-11-25 16:46:29 +0000
+++ config.yaml	2014-12-04 19:04:34 +0000
@@ -15,3 +15,6 @@
   gpg-public-keyring:
     type: string
     description: Public GPG keyring (gpg.pub)
+  launchpad-credentials:
+    type: string
+    description: Launchpad credentials

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-11-25 16:46:29 +0000
+++ hooks/hooks.py	2014-12-04 19:04:34 +0000
@@ -63,6 +63,8 @@
         _install_key(config['gpg-secret-keyring'], keys_dir, 'gpg.sec')
         _install_key(config['ssh-public-key'], keys_dir, 'id_rsa.pub')
         _install_key(config['ssh-private-key'], keys_dir, 'id_rsa')
+        _install_key(config['launchpad-credentials'], keys_dir,
+                     'launchpad.credentials')
     except IOError as exc:
         juju_info('Cannot install keys: {}'.format(exc))
         if os.path.exists(keys_dir):

=== modified file 'unit_tests/test_hooks.py'
--- unit_tests/test_hooks.py	2014-11-25 16:46:29 +0000
+++ unit_tests/test_hooks.py	2014-12-04 19:04:34 +0000
@@ -101,6 +101,7 @@
             'ssh-public-key': base64.b64encode('public?'),
             'gpg-secret-keyring': base64.b64encode('secret!'),
             'gpg-public-keyring': base64.b64encode('public?'),
+            'launchpad-credentials': base64.b64encode('launchpad!'),
         }
         self.config.return_value.update(config)
 
@@ -108,12 +109,13 @@
         self.assertEqual(['keys'], os.listdir(self.service_dir))
         keys = sorted(os.listdir(self.keys_dir))
         self.assertEqual(
-            ['gpg.pub', 'gpg.sec', 'id_rsa', 'id_rsa.pub'], keys)
+            ['gpg.pub', 'gpg.sec', 'id_rsa', 'id_rsa.pub',
+             'launchpad.credentials'], keys)
 
     def test_juju_info_joined(self):
-        # Keys are placed immediatelly when the subordinate charm is bound.
+        # Keys are placed immediately when the subordinate charm is bound.
         os.makedirs(self.service_dir)
-        self.config.return_value['ssh-private-key'] =  base64.b64encode(
+        self.config.return_value['ssh-private-key'] = base64.b64encode(
             'secret!')
 
         hooks.hooks.execute(['hooks/juju-info-relation-joined'])