Merge branch 'mozilla:main' into main

Author: ddurst

Dockerfile

@@ -1,5 +1,5 @@
 # Creating a python base with shared environment variables
-FROM python:3.13.7 AS base
+FROM python:3.14.0 AS base
 ENV PIP_NO_CACHE_DIR=off \
     PIP_DEFAULT_TIMEOUT=100 \
     PIP_DISABLE_PIP_VERSION_CHECK=on \
@@ -22,7 +22,7 @@ COPY ./poetry.lock ./pyproject.toml ./
 RUN $POETRY_HOME/bin/poetry install --without dev --no-root
 
 # `production` stage uses the dependencies downloaded in the `base` stage
-FROM python:3.13.7-slim AS production
+FROM python:3.14.0-slim AS production
 
 # Install pandoc for markdown to Jira conversions.
 RUN apt-get -y update && \

config/config.prod.yaml

@@ -164,6 +164,7 @@
         - maybe_update_components
         - maybe_update_issue_status
         - maybe_update_issue_resolution
+        - maybe_add_phabricator_link
         - sync_whiteboard_labels
         - sync_keywords_labels
       existing:
@@ -172,6 +173,7 @@
         - maybe_assign_jira_user
         - maybe_update_issue_status
         - maybe_update_issue_resolution
+        - maybe_add_phabricator_link
         - sync_whiteboard_labels
         - sync_keywords_labels
         - add_jira_comments_for_changes
@@ -364,20 +366,33 @@
         - maybe_assign_jira_user
         - maybe_update_issue_status
         - maybe_update_issue_resolution
+        - maybe_update_issue_priority
+        - maybe_update_issue_severity
+        - maybe_add_phabricator_link
         - sync_whiteboard_labels
         - sync_keywords_labels
       existing:
         - update_issue_summary
         - maybe_assign_jira_user
         - maybe_update_issue_status
         - maybe_update_issue_resolution
+        - maybe_update_issue_priority
+        - maybe_update_issue_severity
+        - maybe_add_phabricator_link
         - sync_whiteboard_labels
         - sync_keywords_labels
         - add_jira_comments_for_changes
       comment:
         - create_comment
     status_map: *basic-status-map
     resolution_map: *basic-resolution-map
+    priority_map:
+      "": (none)
+      P1: P1
+      P2: P2
+      P3: P3
+      P4: P4
+      P5: P5
 
 - whiteboard_tag: proton
   bugzilla_user_id: tbd

docs/actions.md

@@ -161,3 +161,4 @@ linked Jira issue status to "Closed". If the bug changes to a status not listed
 - `sync_whiteboard_labels`:
   Syncs the Bugzilla whitboard tags field to the Jira labels field.
 - `maybe_update_components`: looks at the component that's set on the bug (if any) and any components added to the project configuration with the `jira_components` parameter (see above). If those components are available on the Jira side as well, they're added to the Jira issue
+- `maybe_add_phabricator_link`: looks at an attachment and if it is a phabricator attachment, it gets added as a link or updated if the attachment was previously added.

jbi/bugzilla/models.py

@@ -1,5 +1,6 @@
 import datetime
 import logging
+import re
 from typing import Any, Optional, TypedDict
 from urllib.parse import ParseResult, urlparse
 
@@ -102,6 +103,36 @@ class WebhookAttachment(BaseModel, frozen=True):
     is_patch: bool
     is_private: bool
 
+    def is_phabricator_patch(self) -> bool:
+        """
+        Returns True if this attachment is a phabricator patch attachment.
+
+        We identify an attachment as a patch if the content type contains "phabricator-request"
+        """
+        return "phabricator-request" in self.content_type
+
+    def phabricator_url(self, base_url: str) -> str | None:
+        """
+        Returns the Phabricator patch URL from the file name if the attachment is a patch, otherwise, it returns None.
+        """
+        if not self.is_phabricator_patch():
+            return None
+
+        match = re.search(r'D\d+', self.file_name)
+        if not match:
+            logger.info(
+                "Expected that attachment with name %s is a patch, but we couldn't extract the phabricator id (e.g D1234)",
+                self.file_name,
+                extra={
+                    "bug": {
+                        "id": self.id,
+                    }
+                },
+            )
+            return None
+
+        revision_id = match.group(0)
+        return f"{base_url}/{revision_id}"
 
 class Bug(BaseModel, frozen=True):
     """Bugzilla Bug Object"""

jbi/environment.py

@@ -40,6 +40,9 @@ class Settings(BaseSettings):
     bugzilla_base_url: str = "https://bugzilla-dev.allizom.org"
     bugzilla_api_key: str
 
+    # Phabricator
+    phabricator_base_url: str = "https://phabricator.services.mozilla.com"
+
     # Logging
     log_level: str = "info"
     log_format: str = "json"  # set to "text" for human-readable logs

jbi/jira/service.py

@@ -132,6 +132,8 @@ def add_jira_comment(self, context: ActionContext):
                 formatted_comment += (
                     f"\n*Filename*: {att.file_name} ({att.content_type})"
                 )
+                if phabricator_url := att.phabricator_url(base_url=settings.phabricator_base_url):
+                    formatted_comment += f"\n*Phabricator URL*: {phabricator_url}"
 
         else:
             comment = context.bug.comment

jbi/models.py

@@ -45,6 +45,7 @@ class ActionSteps(BaseModel, frozen=True):
     ]
     attachment: list[str] = [
         "create_comment",
+        "maybe_add_phabricator_link",
     ]
 
     @field_validator("*")

jbi/steps.py

@@ -118,6 +118,51 @@ def add_link_to_bugzilla(
     context = context.append_responses(jira_response)
     return (StepStatus.SUCCESS, context)
 
+def maybe_add_phabricator_link(
+        context: ActionContext,
+        *,
+        jira_service: JiraService,
+) -> StepResult:
+    """Add a phabricator link to the Jira issue if an attachment is a phabricator attachment"""
+    if context.event.target != "attachment" or not context.bug.attachment:
+        return (StepStatus.NOOP, context)
+
+    attachment = context.bug.attachment
+
+    settings = get_settings()
+    phabricator_url = attachment.phabricator_url(base_url=settings.phabricator_base_url)
+
+    if not phabricator_url:
+        return (StepStatus.NOOP, context)
+
+    description = attachment.description
+    if attachment.is_obsolete:
+        description = f"{0} - {1}".format("Abandoned", attachment.description)
+
+    issue_key = context.jira.issue
+
+    jira_response = jira_service.client.create_or_update_issue_remote_links(
+        issue_key=issue_key,
+        global_id=f"{context.bug.id}-{attachment.id}",
+        link_url=phabricator_url,
+        title=description,
+    )
+
+    if jira_response:
+        logger.info(
+            "Phabricator patch added or updated in Jira issue %s",
+            issue_key,
+            extra=context.update(operation=Operation.LINK).model_dump(),
+        )
+        context = context.append_responses(jira_response)
+        return (StepStatus.SUCCESS, context)
+    else:
+        logger.info(
+            "Failed to add or update phabricator url in Jira issue %s",
+            issue_key,
+        )
+
+    return (StepStatus.NOOP, context)
 
 def maybe_delete_duplicate(
     context: ActionContext,