Merge remote-tracking branch 'origin/main' into refactor-model-services

Author: leplatrem

jbi/actions/default.py

@@ -275,10 +275,13 @@ def create_and_link_issue(  # pylint: disable=too-many-locals
             jira_key_in_response,
             extra=log_context.update(operation=Operation.LINK).dict(),
         )
+        icon_url = f"{settings.bugzilla_base_url}/favicon.ico"
         jira_response = self.jira_client.create_or_update_issue_remote_links(
             issue_key=jira_key_in_response,
             link_url=bugzilla_url,
-            title=f"Bugzilla Bug {bug_obj.id}",
+            title=bugzilla_url,
+            icon_url=icon_url,
+            icon_title=icon_url,
         )
 
         self.update_issue(payload, bug_obj, jira_key_in_response, is_new=True)

jbi/models.py

@@ -325,7 +325,7 @@ class Config:
     webhook_id: int
     webhook_name: str
     event: BugzillaWebhookEvent
-    bug: Optional[BugzillaBug]
+    bug: BugzillaBug
 
     def map_as_jira_comment(self):
         """Extract comment from Webhook Event"""

jbi/runner.py

@@ -28,19 +28,15 @@ def execute_action(
     The value returned by the action call is returned.
     """
     log_context = RunnerLogContext(
-        bug={
-            "id": request.bug.id if request.bug else None,
-        },
-        request=request,
+        bug=request.bug.dict(),
+        request=request.dict(),
         operation=Operation.HANDLE,
     )
     try:
         logger.debug(
             "Handling incoming request",
             extra=log_context.dict(),
         )
-        if not request.bug:
-            raise IgnoreInvalidRequestError("no bug data received")
 
         try:
             request = request.copy(update={"bug": bugzilla_fetch_private(request.bug)})

pyproject.toml

@@ -11,7 +11,7 @@ fastapi = "^0.79.0"
 pydantic = {version = "^1.9.2", extras = ["dotenv", "email"]}
 uvicorn = {extras = ["standard"], version = "^0.18.2"}
 python-bugzilla = "^3.2.0"
-atlassian-python-api = { git = "https://github.com/atlassian-api/atlassian-python-api.git", rev = "82293a2ac9bfa" }
+atlassian-python-api = { git = "https://github.com/atlassian-api/atlassian-python-api.git", rev = "4e8698863e4d2" }
 dockerflow = "2022.7.0"
 Jinja2 = "^3.1.2"
 pydantic-yaml = {extras = ["pyyaml","ruamel"], version = "^0.8.0"}

tests/unit/test_router.py

@@ -111,6 +111,17 @@ def test_webhook_is_200_if_action_raises_IgnoreInvalidRequestError(
         )
 
 
+def test_webhook_is_422_if_bug_information_missing(webhook_create_example):
+    webhook_create_example.bug = None
+
+    with TestClient(app) as anon_client:
+        response = anon_client.post(
+            "/bugzilla_webhook", data=webhook_create_example.json()
+        )
+        assert response.status_code == 422
+        assert response.json()["detail"][0]["msg"] == "none is not an allowed value"
+
+
 def test_read_version(anon_client):
     """__version__ returns the contents of version.json."""
     here = os.path.dirname(__file__)

tests/unit/test_runner.py

@@ -56,22 +56,6 @@ def test_private_request_is_allowed(
     assert payload.bug.id == 654321
 
 
-def test_request_is_ignored_because_no_bug(
-    webhook_create_example: BugzillaWebhookRequest,
-    actions_example: Actions,
-    settings: Settings,
-):
-    webhook_create_example.bug = None
-
-    with pytest.raises(IgnoreInvalidRequestError) as exc_info:
-        execute_action(
-            request=webhook_create_example,
-            actions=actions_example,
-            settings=settings,
-        )
-    assert str(exc_info.value) == "no bug data received"
-
-
 def test_request_is_ignored_because_no_action(
     webhook_create_example: BugzillaWebhookRequest,
     actions_example: Actions,