Merge pull request #9 from PostHog/tom/fix-early-revoker-message

Add logging to debug early revoke not posting message

Author: Piccirello

src/main.py

@@ -613,6 +613,13 @@ def handle_early_revoke_button_click(body: dict, client: WebClient, context: Bol
     channel_id = jp.search("channel.id", body)
     thread_ts = jp.search("message.thread_ts", body) or jp.search("message.ts", body)
 
+    logger.info(
+        "Early revoke button context",
+        extra={"thread_ts": thread_ts, "channel_id": channel_id, "clicker_slack_id": clicker_slack_id},
+    )
+    if not thread_ts:
+        logger.warning("Could not extract thread_ts from button click body")
+
     # Parse the button value
     button_value = jp.search("actions[0].value", body)
     try:

src/revoker.py

@@ -188,6 +188,10 @@ def handle_early_account_revocation(  # noqa: PLR0913
     )
 
     # 4. Update header and post confirmation to thread
+    logger.info(
+        "Posting early revoke Slack updates",
+        extra={"post_update_to_slack": cfg.post_update_to_slack, "thread_ts": thread_ts, "schedule_name": schedule_name},
+    )
     if cfg.post_update_to_slack and thread_ts:
         # Update the original message header to ACCESS ENDED
         message = slack_helpers.get_message_from_timestamp(
@@ -216,21 +220,31 @@ def handle_early_account_revocation(  # noqa: PLR0913
             thread_ts=thread_ts,
         )
     elif cfg.post_update_to_slack:
-        # Full message when not in a thread
-        account = organizations.describe_account(org_client, user_account_assignment.account_id)
-        mention = slack_helpers.create_slack_mention_by_principal_id(
-            sso_user_id=user_account_assignment.user_principal_id,
-            sso_client=sso_client,
-            cfg=cfg,
-            identitystore_client=identitystore_client,
-            slack_client=slack_client,
-        )
-        reason_text = f" Reason: {reason}" if reason else ""
-        text = f"<@{revoker_slack_id}> ended the session early for {mention} (role {permission_set.name} in {account.name}).{reason_text}"
-        return slack_client.chat_postMessage(
-            channel=cfg.slack_channel_id,
-            text=text,
-        )
+        # Full message when not in a thread (fallback)
+        logger.info("No thread_ts available, posting to channel instead")
+        try:
+            account = organizations.describe_account(org_client, user_account_assignment.account_id)
+            mention = slack_helpers.create_slack_mention_by_principal_id(
+                sso_user_id=user_account_assignment.user_principal_id,
+                sso_client=sso_client,
+                cfg=cfg,
+                identitystore_client=identitystore_client,
+                slack_client=slack_client,
+            )
+            reason_text = f" Reason: {reason}" if reason else ""
+            text = f"<@{revoker_slack_id}> ended the session early for {mention} (role {permission_set.name} in {account.name}).{reason_text}"
+            return slack_client.chat_postMessage(
+                channel=cfg.slack_channel_id,
+                text=text,
+            )
+        except Exception as e:
+            logger.error("Failed to post early revoke message to channel", extra={"error": str(e)})
+            return slack_client.chat_postMessage(
+                channel=cfg.slack_channel_id,
+                text=f"<@{revoker_slack_id}> ended a session early.",
+            )
+    else:
+        logger.info("Slack updates disabled (post_update_to_slack=False)")
 
 
 def handle_early_group_revocation(  # noqa: PLR0913
@@ -291,6 +305,10 @@ def handle_early_group_revocation(  # noqa: PLR0913
     )
 
     # 4. Update header and post confirmation to thread
+    logger.info(
+        "Posting early revoke Slack updates",
+        extra={"post_update_to_slack": cfg.post_update_to_slack, "thread_ts": thread_ts, "schedule_name": schedule_name},
+    )
     if cfg.post_update_to_slack and thread_ts:
         # Update the original message header to ACCESS ENDED
         message = slack_helpers.get_message_from_timestamp(
@@ -319,20 +337,30 @@ def handle_early_group_revocation(  # noqa: PLR0913
             thread_ts=thread_ts,
         )
     elif cfg.post_update_to_slack:
-        # Full message when not in a thread
-        mention = slack_helpers.create_slack_mention_by_principal_id(
-            sso_user_id=group_assignment.user_principal_id,
-            sso_client=sso_client,
-            cfg=cfg,
-            identitystore_client=identitystore_client,
-            slack_client=slack_client,
-        )
-        reason_text = f" Reason: {reason}" if reason else ""
-        text = f"<@{revoker_slack_id}> ended the session early for {mention} (group {group_assignment.group_name}).{reason_text}"
-        return slack_client.chat_postMessage(
-            channel=cfg.slack_channel_id,
-            text=text,
-        )
+        # Full message when not in a thread (fallback)
+        logger.info("No thread_ts available, posting to channel instead")
+        try:
+            mention = slack_helpers.create_slack_mention_by_principal_id(
+                sso_user_id=group_assignment.user_principal_id,
+                sso_client=sso_client,
+                cfg=cfg,
+                identitystore_client=identitystore_client,
+                slack_client=slack_client,
+            )
+            reason_text = f" Reason: {reason}" if reason else ""
+            text = f"<@{revoker_slack_id}> ended the session early for {mention} (group {group_assignment.group_name}).{reason_text}"
+            return slack_client.chat_postMessage(
+                channel=cfg.slack_channel_id,
+                text=text,
+            )
+        except Exception as e:
+            logger.error("Failed to post early revoke message to channel", extra={"error": str(e)})
+            return slack_client.chat_postMessage(
+                channel=cfg.slack_channel_id,
+                text=f"<@{revoker_slack_id}> ended a session early.",
+            )
+    else:
+        logger.info("Slack updates disabled (post_update_to_slack=False)")
 
 
 def handle_account_assignment_deletion(  # noqa: PLR0913

src/slack_helpers.py

@@ -672,7 +672,7 @@ def build(
                 InputBlock(
                     block_id=cls.REASON_BLOCK_ID,
                     optional=True,
-                    label=PlainTextObject(text="Reason (optional)"),
+                    label=PlainTextObject(text="Reason"),
                     element=PlainTextInputElement(
                         action_id=cls.REASON_ACTION_ID,
                         placeholder=PlainTextObject(text="e.g. Task completed, no longer needed"),