Enable nl2br in expanded markdown and fold module into dojo.announcement

Single newlines in the expanded body now render as <br>, so authored
markdown lays out multi-line. Module folded into the existing
dojo/announcement/ app and test patch paths updated.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: Maffooch

dojo/announcements/os_message.py dojo/announcement/os_message.pydojo/announcements/os_message.py renamed to dojo/announcement/os_message.py

@@ -7,7 +7,7 @@
 
 logger = logging.getLogger(__name__)
 
-BUCKET_URL = "https://storage.googleapis.com/defectdojo-os-messages-prod/open_source_message.md"
+BUCKET_URL = "https://storage.googleapis.com/defectdojo-os-messages-dev/open_source_message.md"
 CACHE_SECONDS = 3600
 HTTP_TIMEOUT_SECONDS = 2
 CACHE_KEY = "os_message:v1"
@@ -96,7 +96,7 @@ def parse_os_message(text):
         if expanded_source:
             expanded_rendered = markdown.markdown(
                 expanded_source,
-                extensions=["extra", "fenced_code"],
+                extensions=["extra", "fenced_code", "nl2br"],
             )
             expanded_html = bleach.clean(
                 expanded_rendered,

dojo/announcements/__init__.py

@@ -5,7 +5,7 @@
 from django.conf import settings
 from django.contrib import messages
 
-from dojo.announcements.os_message import get_os_banner
+from dojo.announcement.os_message import get_os_banner
 from dojo.labels import get_labels
 from dojo.models import Alerts, System_Settings, UserAnnouncement
 
@@ -40,8 +40,8 @@ def globalize_vars(request):
         # V3 Feature Flags
         "V3_FEATURE_LOCATIONS": settings.V3_FEATURE_LOCATIONS,
     }
-    os_banner = get_os_banner()
-    if os_banner is not None:
+
+    if (os_banner := get_os_banner()) is not None:
         context["additional_banners"] = [{
             "message": os_banner["message"],
             "style": "info",

dojo/context_processors.py

@@ -6,7 +6,7 @@
 from django.test import RequestFactory, SimpleTestCase, override_settings
 
 from dojo import context_processors
-from dojo.announcements import os_message
+from dojo.announcement import os_message
 
 
 class _Resp:
@@ -105,44 +105,44 @@ def setUp(self):
 
     def test_200_with_body_caches_body(self):
         body = "# headline\n"
-        with patch("dojo.announcements.os_message.requests.get", return_value=_Resp(200, body)) as mock_get:
+        with patch("dojo.announcement.os_message.requests.get", return_value=_Resp(200, body)) as mock_get:
             result = os_message.fetch_os_message()
         self.assertEqual(result, body)
         self.assertEqual(cache.get(os_message.CACHE_KEY), body)
         mock_get.assert_called_once()
 
     def test_404_caches_none(self):
-        with patch("dojo.announcements.os_message.requests.get", return_value=_Resp(404, "not found")):
+        with patch("dojo.announcement.os_message.requests.get", return_value=_Resp(404, "not found")):
             result = os_message.fetch_os_message()
         self.assertIsNone(result)
         self.assertIsNone(cache.get(os_message.CACHE_KEY, default="sentinel"))
 
     def test_timeout_caches_none(self):
-        with patch("dojo.announcements.os_message.requests.get", side_effect=requests.exceptions.Timeout):
+        with patch("dojo.announcement.os_message.requests.get", side_effect=requests.exceptions.Timeout):
             result = os_message.fetch_os_message()
         self.assertIsNone(result)
         self.assertIsNone(cache.get(os_message.CACHE_KEY, default="sentinel"))
 
     def test_connection_error_caches_none(self):
-        with patch("dojo.announcements.os_message.requests.get", side_effect=requests.exceptions.ConnectionError):
+        with patch("dojo.announcement.os_message.requests.get", side_effect=requests.exceptions.ConnectionError):
             result = os_message.fetch_os_message()
         self.assertIsNone(result)
         self.assertIsNone(cache.get(os_message.CACHE_KEY, default="sentinel"))
 
     def test_empty_body_caches_none(self):
-        with patch("dojo.announcements.os_message.requests.get", return_value=_Resp(200, "   \n\n")):
+        with patch("dojo.announcement.os_message.requests.get", return_value=_Resp(200, "   \n\n")):
             result = os_message.fetch_os_message()
         self.assertIsNone(result)
         self.assertIsNone(cache.get(os_message.CACHE_KEY, default="sentinel"))
 
     def test_second_call_hits_cache(self):
-        with patch("dojo.announcements.os_message.requests.get", return_value=_Resp(200, "# h\n")) as mock_get:
+        with patch("dojo.announcement.os_message.requests.get", return_value=_Resp(200, "# h\n")) as mock_get:
             os_message.fetch_os_message()
             os_message.fetch_os_message()
         self.assertEqual(mock_get.call_count, 1)
 
     def test_second_call_after_failure_also_hits_cache(self):
-        with patch("dojo.announcements.os_message.requests.get", side_effect=requests.exceptions.Timeout) as mock_get:
+        with patch("dojo.announcement.os_message.requests.get", side_effect=requests.exceptions.Timeout) as mock_get:
             os_message.fetch_os_message()
             os_message.fetch_os_message()
         self.assertEqual(mock_get.call_count, 1)
@@ -155,12 +155,12 @@ def setUp(self):
         cache.clear()
 
     def test_returns_none_when_fetch_returns_none(self):
-        with patch("dojo.announcements.os_message.fetch_os_message", return_value=None):
+        with patch("dojo.announcement.os_message.fetch_os_message", return_value=None):
             self.assertIsNone(os_message.get_os_banner())
 
     def test_swallows_parse_exception(self):
-        with patch("dojo.announcements.os_message.fetch_os_message", return_value="# ok\n"), \
-             patch("dojo.announcements.os_message.parse_os_message", side_effect=RuntimeError("boom")):
+        with patch("dojo.announcement.os_message.fetch_os_message", return_value="# ok\n"), \
+             patch("dojo.announcement.os_message.parse_os_message", side_effect=RuntimeError("boom")):
             self.assertIsNone(os_message.get_os_banner())