Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:empty-cdimage into ubuntu-mirror-charm:master

[Paul Collins]

handle non-existent triggers

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 38b2b108002d328ad46dd59304e2309c723d4b76

diff --git a/hooks/hooks.py b/hooks/hooks.py
index 877fa43..e01f266 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -569,8 +569,8 @@ SSH_TRIGGER_TEMPLATE = 'no-port-forwarding,no-X11-forwarding,no-agent-forwarding
 def merge_shared_key_triggers(conf, triggers):
     """Merge (in place) triggers that use the same ssh key."""
 
-    cdimage_key = extract_ssh_public_key(triggers.get('cdimage'))
-    releases_key = extract_ssh_public_key(triggers.get('releases'))
+    cdimage_key = extract_ssh_public_key(triggers.get('cdimage', ''))
+    releases_key = extract_ssh_public_key(triggers.get('releases', ''))
     if cdimage_key and releases_key and cdimage_key == releases_key:
         releases = conf.mirror_map('releases')
         cdimage = conf.mirror_map('cdimage')
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index 41508f6..02fb4f2 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -25,6 +25,20 @@ BARE_RELEASES_SSH_KEY = "AAAAB3NzaC1yc2EAAAABIwAAAQEA7TIXsws/s48o4N1MA+TpaudHS8X
 RELEASES_SSH_KEY = 'from="91.189.90.151,91.189.89.127,10.22.96.61,10.22.96.161" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA7TIXsws/s48o4N1MA+TpaudHS8XVF79JujYQGTumroZZqbsr04lbg1FaJ9HyS9P31e8lP2bmB5rexJaMyfAxDTV+DtrHXmeLi/XcGSOXoliOa/j3eQmdZyYme9z+Tfp8s3S6nxuDP3BRKkOuIzOPgPO5fr8AH7y83v3fyHi+H0sbm6agX2b+xV9oP8+DEgSxPNfZEVTgpdJ7/ULwAl68mWQW0w6VTVx0CMYF+cvcorcZMGmy+THzk8WH2XRalA5HqeiBtS7vJ+yFHJ5WbQOEUeR6gHRcrogR4Yd10eFWUNAFyvt53zF7W91PEgnJWjcCUN/uctybAFSgDK1UB6TPkQ== cjwatson@little'  # noqa: E501
 
 
+RELEASES_TRIGGERS_CONFIG = {
+    'mirror_releases_trigger': b64encode(RELEASES_SSH_KEY),
+    'role_map': json.dumps({
+        'localhost': ['releases'],
+    })
+}
+
+RELEASES_TRIGGERS = {
+    'releases': SSH_TRIGGER_TEMPLATE.format(
+        command='/srv/ubuntu-mirror/bin/mirror-1stage.sh releases &',
+        trigger=RELEASES_SSH_KEY,
+    ),
+}
+
 MERGEABLE_TRIGGERS_CONFIG = {
     'mirror_cdimage_trigger': b64encode(RELEASES_SSH_KEY),
     'mirror_releases_trigger': b64encode(RELEASES_SSH_KEY),
@@ -82,6 +96,16 @@ class TestUbuntuMirrorCharm(unittest.TestCase):
         merge_shared_key_triggers(conf, triggers)
         self.assertEqual(triggers, MERGED_TRIGGERS)
 
+    @patch('Config.config')
+    def test_merge_shared_key_triggers_releases_only(self, _config):
+        config = CallableDict(self.default_config)
+        config.update(RELEASES_TRIGGERS_CONFIG)
+        _config.side_effect = config  # i.e. we want our CallableDict to supply the charm config
+        conf = Config.Config()
+        triggers = deepcopy(RELEASES_TRIGGERS)
+        merge_shared_key_triggers(conf, triggers)
+        self.assertEqual(triggers, RELEASES_TRIGGERS)
+
     @patch('hooks.os.path.isdir')
     @patch('hooks.get_ssh_keyfile')
     @patch('hooks.write_file')