skip unsupported github events

Author: artcz

intbot/core/integrations/github.py

@@ -42,7 +42,7 @@ def parse_github_webhook(headers: dict, content: dict) -> tuple[str, str]:
         return "", ""
 
     else:
-        raise ValueError(f"Event {event} not supported")
+        raise ValueError(f"Event `{event}` not supported")
 
 
 @dataclasses.dataclass

intbot/core/tasks.py

@@ -1,9 +1,13 @@
-from core.models import DiscordMessage, Webhook
+import logging
+
 from core.integrations.github import parse_github_webhook
+from core.models import DiscordMessage, Webhook
 from django.conf import settings
 from django.utils import timezone
 from django_tasks import task
 
+logger = logging.getLogger()
+
 
 @task
 def process_webhook(wh_uuid: str):
@@ -38,7 +42,14 @@ def process_github_webhook(wh: Webhook):
     if wh.source != "github":
         raise ValueError("Incorrect wh.source = {wh.source}")
 
-    message, event_action = parse_github_webhook(headers=wh.meta, content=wh.content)
+    try:
+        message, event_action = parse_github_webhook(
+            headers=wh.meta, content=wh.content
+        )
+    except ValueError as e:
+        # Downgrading to info because it's most likely event not supported
+        logger.info(f"Not processing Github Webhook {wh.uuid}: {e}")
+        return
 
     # NOTE WHERE SHOULD WE GET THE CHANNEL ID FROM?
     DiscordMessage.objects.create(

intbot/tests/test_tasks.py

@@ -1,6 +1,8 @@
+import logging
+
 import pytest
 from core.models import DiscordMessage, Webhook
-from core.tasks import process_internal_webhook, process_webhook
+from core.tasks import process_github_webhook, process_internal_webhook, process_webhook
 from django_tasks.task import ResultStatus
 
 
@@ -31,7 +33,7 @@ def test_process_internal_webhook_fails_if_incorrect_source():
 
 
 @pytest.mark.django_db
-def test_process_webhook_fails_if_unsupported_source(caplog):
+def test_process_webhook_fails_if_unsupported_source():
     wh = Webhook.objects.create(source="asdf", event="test1", content={})
 
     # If the task is enqueued the errors are not emited.
@@ -41,3 +43,23 @@ def test_process_webhook_fails_if_unsupported_source(caplog):
     assert result.status == ResultStatus.FAILED
     assert result._exception_class == ValueError
     assert result.traceback.endswith("ValueError: Unsupported source asdf\n")
+
+
+@pytest.mark.django_db
+def test_process_github_webhook_logs_unsupported_event(caplog):
+    wh = Webhook.objects.create(
+        source="github",
+        event="",
+        meta={"X-Github-Event": "testrandom"},
+        content={},
+    )
+
+    with caplog.at_level(logging.INFO):
+        process_github_webhook(wh)
+
+    assert len(caplog.records) == 1
+    assert caplog.records[0].levelname == "INFO"
+    assert (
+        caplog.records[0].message
+        == f"Not processing Github Webhook {wh.uuid}: Event `testrandom` not supported"
+    )