Simplify Lando URL via string replace; show all patch links

Agent-Logs-Url: https://github.com/mozilla/bugbot/sessions/4d972f29-57cb-43ea-beec-05b7e74f8a71

Co-authored-by: suhaibmujahid <4151357+suhaibmujahid@users.noreply.github.com>

Author: Copilot

.gitignore

@@ -15,4 +15,3 @@ db/*
 cache/
 .coverage
 .tox/
-*.egg-info/

bugbot/rules/uplift_beta.py

@@ -3,15 +3,14 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import base64
-import re
 
 from libmozdata import utils as lmdutils
 from libmozdata.bugzilla import Bugzilla
 
 from bugbot import utils
 from bugbot.bzcleaner import BzCleaner
 
-PHAB_URL_PAT = re.compile(r"https://phabricator\.services\.mozilla\.com/D([0-9]+)")
+PHAB_BASE_URL = "https://phabricator.services.mozilla.com/"
 LANDO_BASE_URL = "https://lando.moz.tools/"
 
 
@@ -43,25 +42,18 @@ def columns(self):
         return ["id", "summary", "assignee"]
 
     @staticmethod
-    def get_lando_url(attachments):
-        """Get the Lando URL for the most recently created non-obsolete
-        Phabricator attachment, or None if no such attachment exists."""
-        phab_attachments = [
-            a
-            for a in attachments
-            if a["content_type"] == "text/x-phabricator-request"
-            and not a["is_obsolete"]
-        ]
-        if not phab_attachments:
-            return None
-
-        latest = max(phab_attachments, key=lambda a: a["creation_time"])
-        phab_url = base64.b64decode(latest["data"]).decode("utf-8")
-        m = PHAB_URL_PAT.search(phab_url)
-        if not m:
-            return None
-
-        return f"{LANDO_BASE_URL}D{m.group(1)}"
+    def get_lando_urls(attachments):
+        """Get Lando URLs for all non-obsolete Phabricator attachments."""
+        urls = []
+        for attachment in attachments:
+            if (
+                attachment["content_type"] == "text/x-phabricator-request"
+                and not attachment["is_obsolete"]
+            ):
+                phab_url = base64.b64decode(attachment["data"]).decode("utf-8").strip()
+                if phab_url.startswith(PHAB_BASE_URL):
+                    urls.append(phab_url.replace(PHAB_BASE_URL, LANDO_BASE_URL, 1))
+        return urls
 
     def handle_bug(self, bug, data):
         bugid = str(bug["id"])
@@ -82,7 +74,7 @@ def handle_bug(self, bug, data):
             "nickname": nickname,
             "summary": self.get_summary(bug),
             "regressions": bug["regressions"],
-            "lando_url": self.get_lando_url(bug.get("attachments", [])),
+            "lando_urls": self.get_lando_urls(bug.get("attachments", [])),
         }
 
         return bug
@@ -174,7 +166,7 @@ def get_bugs(self, date="today", bug_ids=[]):
             if data["mail"] and data["nickname"]:
                 self.extra_ni[bugid] = {
                     "regression": len(data["regressions"]),
-                    "lando_url": data["lando_url"],
+                    "lando_urls": data["lando_urls"],
                 }
                 self.add_auto_ni(
                     bugid, {"mail": data["mail"], "nickname": data["nickname"]}

templates/uplift_beta_needinfo.txt

@@ -1,8 +1,8 @@
 The patch landed in nightly and beta is affected.
 :{{ nickname }}, is this bug important enough to require an uplift?
 - If yes, please nominate the patch for beta approval.{% if extra[bugid]["regression"] %} Also, don't forget to request an uplift for the patches in the {{ plural('regression', extra[bugid]["regression"]) }} caused by this fix.{% endif %}
-  - See https://wiki.mozilla.org/Release_Management/Requesting_an_Uplift for documentation on how to request an uplift.{% if extra[bugid]["lando_url"] %}
-  - The patch is available at {{ extra[bugid]["lando_url"] }}.{% endif %}
+  - See https://wiki.mozilla.org/Release_Management/Requesting_an_Uplift for documentation on how to request an uplift.{% for url in extra[bugid]["lando_urls"] %}
+  - The patch is available at {{ url }}.{% endfor %}
 - If no, please set `{{ extra["status_beta"] }}` to `wontfix`.
 
 {{ documentation }}