Merge lp:~cprov/charms/precise/uci-engine-key-secret-subordinate/warn-principal into lp:~canonical-ci-engineering/charms/precise/uci-engine-key-secret-subordinate/trunk

[Celso Providelo]

Implements a 'secrets' relation which is only established once the keys (secrets, really) are available.

This way additionally to the internal/container scoped relation the principals using k-s-s can be aware of secret content availability for completing its installation (see jenkins charm example).

[Paul Larson (pwlars)]

This seemed to work fine when I tried it on Friday. +1

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-12-04 18:45:32 +0000
+++ hooks/hooks.py	2014-12-08 10:51:58 +0000
@@ -88,6 +88,15 @@
     juju_info('Container joined: {}'.format(unit))
     _install_keys(unit)
 
+    # Signal units (normally principal) that secrets are available.
+    local_unit = charmhelpers.core.hookenv.local_unit()
+    relids = charmhelpers.core.hookenv.relation_ids('secrets')
+    for rid in relids:
+        relation = charmhelpers.core.hookenv.relation_get(
+            rid=rid, unit=local_unit)
+        if relation:
+            charmhelpers.core.hookenv.relation_set(
+                rid, {'location': _service_dir(unit)})
 
 if __name__ == "__main__":
     hooks.execute(sys.argv)

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-11-25 16:46:29 +0000
+++ metadata.yaml	2014-12-08 10:51:58 +0000
@@ -7,6 +7,11 @@
 categories:
   - misc
 subordinate: true
+provides:
+  secrets:
+    interface: secrets
+    scope: container
+    optional: true
 requires:
   juju-info:
     interface: juju-info

=== modified file 'unit_tests/test_hooks.py'
--- unit_tests/test_hooks.py	2014-12-04 19:04:24 +0000
+++ unit_tests/test_hooks.py	2014-12-08 10:51:58 +0000
@@ -26,9 +26,15 @@
 
 PATCHES = [
     'charmhelpers.core.hookenv.config',
+    'charmhelpers.core.hookenv.local_unit',
     'charmhelpers.core.hookenv.log',
+    'charmhelpers.core.hookenv.relation_get',
+    'charmhelpers.core.hookenv.relation_id',
+    'charmhelpers.core.hookenv.relation_ids',
+    'charmhelpers.core.hookenv.relation_set',
     'charmhelpers.core.hookenv.relations_of_type',
     'charmhelpers.core.hookenv.remote_unit',
+    'charmhelpers.core.hookenv.unit_get',
     'charmhelpers.core.host.mkdir',
 ]
 
@@ -50,13 +56,19 @@
             setattr(self, attr_name, _m.start())
             self.addCleanup(_m.stop)
 
+        self.local_unit.return_value = 'bazinga'
         self.unit_name = 'bazinga/0'
         self.service_dir = os.path.join(self.tmpdir, 'bazinga')
         self.keys_dir = os.path.join(self.service_dir, 'keys')
-        self.remote_unit.return_value = self.unit_name
+        self.relation_get.side_effect = lambda rid, unit=None: 'something'
+        self.relation_id.return_value = '1'
+        self.relation_ids.side_effect = (
+            lambda rel_id: ["{}:{}".format(rel_id, self.relation_id())])
         self.relations_of_type.side_effect = (
             lambda rel_type: [{'__unit__': self.unit_name}])
+        self.remote_unit.return_value = self.unit_name
         self.mkdir.side_effect = lambda d, perms=None: os.mkdir(d)
+        self.unit_get.return_value = '127.0.0.1'
 
         self._set_default_config()
 
@@ -121,3 +133,7 @@
         hooks.hooks.execute(['hooks/juju-info-relation-joined'])
         self.assertEqual(['keys'], os.listdir(self.service_dir))
         self.assertEqual(['id_rsa'], os.listdir(self.keys_dir))
+        # Once the keys are in place the subordinate updates the 'secrets'
+        # relations established.
+        self.relation_set.assert_called_once_with(
+            'secrets:1', {'location': self.service_dir})