Merge pull request #4333 from opensafely-core/airlock-unknown-events

Handle unknown airlock event types

airlock/views.py

@@ -47,7 +47,11 @@ class AirlockEvent:
 
     @classmethod
     def from_payload(cls, data):
-        event_type = EventType[data.get("event_type").upper()]
+        event_type = data.get("event_type").upper()
+        try:
+            event_type = EventType[event_type]
+        except KeyError:
+            raise NotificationError(f"Unknown event type '{event_type}'")
         updates = data.get("updates") or []
         request_author = User.objects.get(username=data.get("request_author"))
         username = data.get("user")
@@ -147,6 +151,7 @@ def email_author(airlock_event: AirlockEvent):
 EVENT_NOTIFICATIONS = {
     EventType.REQUEST_SUBMITTED: [create_issue],
     EventType.REQUEST_WITHDRAWN: [close_issue],
+    EventType.REQUEST_APPROVED: [],
     EventType.REQUEST_RELEASED: [email_author, close_issue],
     EventType.REQUEST_REJECTED: [email_author, close_issue],
     EventType.REQUEST_UPDATED: [email_author, update_issue],
@@ -160,9 +165,8 @@ def airlock_event_view(request):
     # do token authentication
     get_backend_from_token(token)
 
-    airlock_event = AirlockEvent.from_payload(request.data)
-
     try:
+        airlock_event = AirlockEvent.from_payload(request.data)
         handle_notifications(airlock_event)
     except NotificationError as e:
         return Response({"status": "error", "message": str(e)}, status=201)

tests/unit/airlock/test_views.py

@@ -28,6 +28,8 @@ def close_issue(*args, **kwargs):
 @pytest.mark.parametrize(
     "event_type,author_is_user,updates,email_sent",
     [
+        # No action for request_approved
+        ("request_approved", True, None, False),
         # author and user are different; emails are sent for rejected/released
         ("request_submitted", True, None, False),
         ("request_rejected", True, None, True),
@@ -162,6 +164,7 @@ def test_api_post_release_request_custom_org_and_repo(mock_create_issue, api_rf)
             [{"update_type": "file_added", "group": "Group 1", "user": "user"}],
             "Error creating GitHub issue comment",
         ),
+        ("bad_event_type", None, "Unknown event type 'BAD_EVENT_TYPE'"),
     ],
 )
 @patch("airlock.views._get_github_api", FakeGithubApiWithError)