Merge ~blake-rouse/maas:fix-1846141 into maas:master

[Blake Rouse]

Fixes LP: #1846141 - Add triggers for creating, updating, and deleting SSL keys.

[Alberto Donato (ack)]

+1

review: Approve

d1b4ed1... by Blake Rouse on 2019-10-09

Switch to str casting.

diff --git a/src/maasserver/triggers/testing.py b/src/maasserver/triggers/testing.py
index fd39916..9e31c36 100644
--- a/src/maasserver/triggers/testing.py
+++ b/src/maasserver/triggers/testing.py
@@ -648,6 +648,10 @@ class TransactionalHelpersMixin:
         return factory.make_SSLKey(**params)
 
     @transactional
+    def update_sslkey(self, id, params, **kwargs):
+        return apply_update_to_model(SSLKey, id, params, **kwargs)
+
+    @transactional
     def delete_sslkey(self, id):
         key = SSLKey.objects.get(id=id)
         key.delete()
diff --git a/src/maasserver/triggers/tests/test_init.py b/src/maasserver/triggers/tests/test_init.py
index 756cff3..140ed7d 100644
--- a/src/maasserver/triggers/tests/test_init.py
+++ b/src/maasserver/triggers/tests/test_init.py
@@ -244,6 +244,9 @@ class TestTriggersUsed(MAASServerTestCase):
         "sshkey_sshkey_update_notify",
         "sshkey_user_sshkey_link_notify",
         "sshkey_user_sshkey_unlink_notify",
+        "sslkey_sslkey_create_notify",
+        "sslkey_sslkey_delete_notify",
+        "sslkey_sslkey_update_notify",
         "sslkey_user_sslkey_link_notify",
         "sslkey_user_sslkey_unlink_notify",
         "staticipaddress_ipaddress_domain_delete_notify",
diff --git a/src/maasserver/triggers/tests/test_websocket_listener.py b/src/maasserver/triggers/tests/test_websocket_listener.py
index 3ee85f2..9ec10af 100644
--- a/src/maasserver/triggers/tests/test_websocket_listener.py
+++ b/src/maasserver/triggers/tests/test_websocket_listener.py
@@ -27,6 +27,7 @@ from maasserver.models.config import Config
 from maasserver.models.node import Node
 from maasserver.models.partition import MIN_PARTITION_SIZE
 from maasserver.models.switch import Switch
+from maasserver.testing import get_data
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASTransactionServerTestCase
 from maasserver.triggers.testing import TransactionalHelpersMixin
@@ -3626,6 +3627,75 @@ class TestUserSSLKeyListener(
             yield listener.stopService()
 
 
+class TestSSLKeyListener(
+        MAASTransactionServerTestCase, TransactionalHelpersMixin):
+    """End-to-end test of both the listeners code and the maasserver_sslkey
+    table."""
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_create(self):
+        yield deferToDatabase(register_websocket_triggers)
+        user = yield deferToDatabase(self.create_user)
+
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        listener.register("sslkey", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            obj = yield deferToDatabase(self.create_sslkey, {"user": user})
+            yield dv.get(timeout=2)
+            self.assertEqual(('create', str(obj.id)), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_update(self):
+        yield deferToDatabase(register_websocket_triggers)
+        user = yield deferToDatabase(self.create_user)
+        sslkey = yield deferToDatabase(self.create_sslkey, {"user": user})
+        other_sslkey = yield deferToDatabase(
+            self.create_sslkey, {
+                "user": user,
+                "key_string": get_data('data/test_x509_1.pem'),
+            })
+        contents = other_sslkey.key
+        yield deferToDatabase(self.delete_sslkey, other_sslkey.id)
+
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        listener.register("sslkey", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            # Force the update because the key contents could be the same.
+            yield deferToDatabase(
+                self.update_sslkey, sslkey.id, {'key': contents},
+                force_update=True)
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', str(sslkey.id)), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_delete(self):
+        yield deferToDatabase(register_websocket_triggers)
+        user = yield deferToDatabase(self.create_user)
+        sslkey = yield deferToDatabase(self.create_sslkey, {"user": user})
+
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        listener.register("sslkey", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(self.delete_sslkey, sslkey.id)
+            yield dv.get(timeout=2)
+            self.assertEqual(('delete', str(sslkey.id)), dv.value)
+        finally:
+            yield listener.stopService()
+
+
 class TestDHCPSnippetListener(
         MAASTransactionServerTestCase, TransactionalHelpersMixin):
     """End-to-end test of both the listeners code and the cluster
diff --git a/src/maasserver/triggers/websocket.py b/src/maasserver/triggers/websocket.py
index 47e393d..9b8ce17 100644
--- a/src/maasserver/triggers/websocket.py
+++ b/src/maasserver/triggers/websocket.py
@@ -2064,6 +2064,18 @@ def register_websocket_triggers():
     register_trigger(
         "maasserver_sslkey", "user_sslkey_unlink_notify", "delete")
 
+    # SSL key table.
+    register_procedure(
+        render_notification_procedure(
+            'sslkey_create_notify', 'sslkey_create', 'NEW.id'))
+    register_procedure(
+        render_notification_procedure(
+            'sslkey_update_notify', 'sslkey_update', 'NEW.id'))
+    register_procedure(
+        render_notification_procedure(
+            'sslkey_delete_notify', 'sslkey_delete', 'OLD.id'))
+    register_triggers("maasserver_sslkey", "sslkey")
+
     # DHCPSnippet table
     register_procedure(
         render_notification_procedure(