Removes extraneous Nones in get

Author: GabeVillalobos

src/sentry/integrations/slack/integration.py

@@ -115,9 +115,9 @@ def send_notification(
         try:
             client.chat_postMessage(
                 channel=target.resource_id,
-                blocks=payload["blocks"],
+                blocks=payload["blocks"] if len(payload["blocks"]) > 0 else None,
                 text=payload["text"],
-                attachments=payload.get("attachments", None),
+                attachments=payload.get("attachments"),
                 unfurl_links=False,
                 unfurl_media=False,
             )
@@ -137,9 +137,9 @@ def send_notification_with_threading(
         )
         kwargs: dict[str, Any] = dict(
             channel=target.resource_id,
-            blocks=payload["blocks"],
+            blocks=payload["blocks"] if len(payload["blocks"]) > 0 else None,
             text=payload["text"],
-            attachments=payload.get("attachments", None),
+            attachments=payload.get("attachments"),
             unfurl_links=False,
             unfurl_media=False,
         )

src/sentry/notifications/platform/api/endpoints/internal_registered_templates.py

@@ -99,7 +99,7 @@ def serialize_slack_preview[T: NotificationData](
     for block in message.get("blocks", []):
         serialized_blocks.append(block.to_dict())
 
-    return {"blocks": serialized_blocks, "attachments": message.get("attachments", None)}
+    return {"blocks": serialized_blocks, "attachments": message.get("attachments")}
 
 
 def serialize_discord_preview[T: NotificationData](

src/sentry/notifications/platform/slack/renderers/metric_alert.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import logging
+
 from sentry.incidents.models.incident import IncidentStatus
 from sentry.integrations.messaging.types import LEVEL_TO_COLOR
 from sentry.integrations.metric_alerts import get_status_text
@@ -16,6 +18,8 @@
     NotificationRenderedTemplate,
 )
 
+logger = logging.getLogger(__name__)
+
 
 class SlackMetricAlertRenderer(NotificationRenderer[SlackRenderable]):
     provider_key = NotificationProviderKey.SLACK
@@ -47,6 +51,8 @@ def render[DataT: NotificationData](
             {"blocks": slack_body.get("blocks", []), "color": slack_body.get("color", "")}
         ]
 
+        logger.info(f"attachment_blocks: {attachment_blocks}")
+
         renderable = SlackRenderable(
             blocks=[],
             attachments=attachment_blocks,

tests/sentry/notifications/platform/slack/renderers/test_metric_alert.py

@@ -96,7 +96,7 @@ def test_render_produces_blocks(self) -> None:
         )
 
         # Without a chart: exactly one section block
-        assert result.get("attachments", None) is not None
+        assert result.get("attachments") is not None
         attachments: list[Any] = result["attachments"]
         assert len(attachments) == 1
         blocks: list[Any] = attachments[0]["blocks"]
@@ -123,7 +123,7 @@ def test_render_includes_image_block_when_chart_url_set(self) -> None:
             rendered_template=self.rendered_template,
         )
 
-        assert result.get("attachments", None) is not None
+        assert result.get("attachments") is not None
 
         # With a chart: section block + image block
         blocks: list[Any] = result["attachments"][0]["blocks"]
@@ -140,7 +140,7 @@ def test_render_without_chart_url(self) -> None:
             rendered_template=self.rendered_template,
         )
 
-        assert result.get("attachments", None) is not None
+        assert result.get("attachments") is not None
         attachments: list[Any] = result["attachments"]
         assert len(attachments) == 1
         blocks: list[Any] = attachments[0]["blocks"]