set stuff up for sync

Author: anthony-nhs

.github/scripts/fix_cdk_json.sh

@@ -36,8 +36,10 @@ fix_boolean_number_key() {
 }
 
 CFN_DRIFT_DETECTION_GROUP="epsam"
+IS_PULL_REQUEST="false"
 if [[ "$STACK_NAME" =~ -pr-[0-9]+$ ]]; then
   CFN_DRIFT_DETECTION_GROUP="epsam-pull-request"
+  IS_PULL_REQUEST="true"
 fi
 
 # go through all the key values we need to set
@@ -50,3 +52,4 @@ fix_string_key logLevel "${LOG_LEVEL}"
 fix_string_key slackBotToken "${SLACK_BOT_TOKEN}"
 fix_string_key slackSigningSecret "${SLACK_SIGNING_SECRET}"
 fix_string_key cfnDriftDetectionGroup "${CFN_DRIFT_DETECTION_GROUP}"
+fix_boolean_number_key isPullRequest "${IS_PULL_REQUEST}"

packages/cdk/stacks/EpsAssistMeStack.ts

@@ -35,6 +35,7 @@ export class EpsAssistMeStack extends Stack {
     const account = Stack.of(this).account
     const logRetentionInDays = Number(this.node.tryGetContext("logRetentionInDays"))
     const logLevel: string = this.node.tryGetContext("logLevel")
+    const isPullRequest: boolean = this.node.tryGetContext("isPullRequest")
 
     // Get secrets from context or fail if not provided
     const slackBotToken: string = this.node.tryGetContext("slackBotToken")
@@ -179,7 +180,24 @@ export class EpsAssistMeStack extends Stack {
       value: storage.kbDocsBucket.bucket.bucketName,
       exportName: `${props.stackName}:kbDocsBucket:Name`
     })
-
+    if (isPullRequest) {
+      new CfnOutput(this, "VERSION_NUMBER", {
+        value: props.version,
+        exportName: `${props.stackName}:local:VERSION-NUMBER`
+      })
+      new CfnOutput(this, "COMMIT_ID", {
+        value: props.commitId,
+        exportName: `${props.stackName}:local:COMMIT-ID`
+      })
+      new CfnOutput(this, "slackBotToken", {
+        value: slackBotToken,
+        exportName: `${props.stackName}:local:slackBotToken`
+      })
+      new CfnOutput(this, "slackSigningSecret", {
+        value: slackSigningSecret,
+        exportName: `${props.stackName}:local:slackSigningSecret`
+      })
+    }
     // Final CDK Nag Suppressions
     nagSuppressions(this)
   }

packages/slackBotFunction/app/handler.py

@@ -29,8 +29,6 @@ def handler(event: dict, context: LambdaContext) -> dict:
     # register event handlers with the app
     app = get_app()
 
-    logger.info("Lambda invoked", extra={"is_async": event.get("async_processing", False)})
-
     # handle async processing requests
     if event.get("async_processing"):
         slack_event_data = event.get("slack_event")

packages/slackBotFunction/app/slack/slack_handlers.py

@@ -88,6 +88,7 @@ def mention_handler(event, ack, body, client):
     - If text after the mention starts with 'feedback:', store it as additional feedback.
     - Otherwise, forward to the async processing pipeline (Q&A).
     """
+    logger.debug("Sending ack response")
     ack()
     event_id = _gate_common(event, body)
     if not event_id:
@@ -237,7 +238,10 @@ def thread_message_handler(event, event_id, client):
 
 def unified_message_handler(event, ack, body, client):
     """Handle all message events - DMs and channel messages"""
+    logger.debug("Sending ack response")
     ack()
+    bot_token = get_bot_token()
+    respond_with_eyes(bot_token, event)
     event_id = _gate_common(event, body)
     if not event_id:
         return
@@ -253,6 +257,7 @@ def unified_message_handler(event, ack, body, client):
 
 def feedback_handler(ack, body, client):
     """Handle feedback button clicks (both positive and negative)."""
+    logger.debug("Sending ack response")
     ack()
     try:
         action_id = body["actions"][0]["action_id"]

packages/slackBotFunction/tests/test_middleware.py

@@ -1,7 +1,7 @@
 import sys
 
 
-def test_app_mention_handler_registered(
+def test_correct_handlers_registered(
     mock_slack_app,
     mock_env,
     mock_get_parameter,
@@ -10,48 +10,25 @@ def test_app_mention_handler_registered(
     """Test app mention handler execution by simulating the handler registration process"""
     # set up mocks
     # Create a mock app that captures the registered handlers
-    registered_handlers = {}
+    registered_action_handlers = {}
+    registered_event_handlers = {}
 
     def mock_event_decorator(event_type):
         def decorator(func):
-            registered_handlers[event_type] = func
+            registered_event_handlers[event_type] = func
             return func
 
         return decorator
 
-    mock_slack_app.event = mock_event_decorator
-
-    # delete and import module to test
-    if "app.slack.slack_handlers" in sys.modules:
-        del sys.modules["app.slack.slack_handlers"]
-    from app.slack.slack_handlers import setup_handlers
-
-    # perform operation
-    setup_handlers(mock_slack_app)
-
-    # assertions
-    assert "app_mention" in registered_handlers
-
-
-def test_message_handler_registered(
-    mock_slack_app,
-    mock_env,
-    mock_get_parameter,
-    lambda_context,
-):
-    """Test direct message handler execution by simulating the handler registration process"""
-    # set up mocks
-    # Create a mock app that captures the registered handlers
-    registered_handlers = {}
-
-    def mock_event_decorator(event_type):
+    def mock_action_decorator(event_type):
         def decorator(func):
-            registered_handlers[event_type] = func
+            registered_action_handlers[event_type] = func
             return func
 
         return decorator
 
     mock_slack_app.event = mock_event_decorator
+    mock_slack_app.action = mock_action_decorator
 
     # delete and import module to test
     if "app.slack.slack_handlers" in sys.modules:
@@ -62,4 +39,7 @@ def decorator(func):
     setup_handlers(mock_slack_app)
 
     # assertions
-    assert "message" in registered_handlers
+    assert "app_mention" in registered_event_handlers
+    assert "message" in registered_event_handlers
+    assert "feedback_yes" in registered_action_handlers
+    assert "feedback_no" in registered_action_handlers

packages/slackBotFunction/tests/test_slack_handlers.py

@@ -3,29 +3,15 @@
 from botocore.exceptions import ClientError
 
 
-def test_setup_handlers_registers_correctly(mock_env):
-    """Test that setup_handlers registers all handlers correctly"""
-    # set up mocks
-    mock_app = Mock()
-
-    # delete and import module to test
-    if "app.slack.slack_handlers" in sys.modules:
-        del sys.modules["app.slack.slack_handlers"]
-    from app.slack.slack_handlers import setup_handlers
-
-    # perform operation
-    setup_handlers(mock_app)
-
-    # assertions
-    # Verify all handlers are registered
-    assert mock_app.event.call_count == 2  # app_mention and unified message handler
-
-
 @patch("app.utils.handler_utils.is_duplicate_event")
 @patch("app.utils.handler_utils.trigger_async_processing")
 @patch("app.utils.handler_utils.respond_with_eyes")
 def test_app_mention_handler(
-    mock_respond_with_eyes, mock_trigger_async_processing, mock_is_duplicate_event, mock_get_parameter, mock_env
+    mock_respond_with_eyes: Mock,
+    mock_trigger_async_processing: Mock,
+    mock_is_duplicate_event: Mock,
+    mock_get_parameter: Mock,
+    mock_env: Mock,
 ):
     """Test app mention handler execution"""
     # set up mocks
@@ -45,7 +31,13 @@ def decorator(func):
     mock_app.event = capture_event
     mock_app.action = Mock()
     mock_ack = Mock()
-    mock_event = {"user": "U123", "text": "<@U456> test", "channel": "C123"}
+    mock_event = {
+        "user": "U123",
+        "text": "<@U456> test",
+        "channel": "C123",
+        "thread_ts": "123",
+        "channel_type": "channel",
+    }
     mock_body = {"event_id": "evt123"}
     mock_client = Mock()
     mock_is_duplicate_event.return_value = False
@@ -61,19 +53,26 @@ def decorator(func):
 
     # assertions
     mock_ack.assert_called_once()
-    mock_trigger_async_processing.assert_called_once()
+    mock_trigger_async_processing.assert_called_once_with(
+        {"event": mock_event, "event_id": "evt123", "bot_token": "test-token"}
+    )
     mock_respond_with_eyes.assert_called_once()
 
 
 @patch("app.utils.handler_utils.is_duplicate_event")
 @patch("app.utils.handler_utils.trigger_async_processing")
 @patch("app.utils.handler_utils.respond_with_eyes")
 def test_message_handler_non_dm_skip(
-    mock_respond_with_eyes, mock_trigger_async_processing, mock_is_duplicate_event, mock_get_parameter, mock_env
+    mock_respond_with_eyes: Mock,
+    mock_trigger_async_processing: Mock,
+    mock_is_duplicate_event: Mock,
+    mock_get_parameter: Mock,
+    mock_env: Mock,
 ):
     """Test message handler skips non-DM messages"""
     # set up mocks
     mock_app = Mock()
+    mock_is_duplicate_event.return_value = False
 
     # Capture the message handler
     message_handler = None
@@ -107,19 +106,20 @@ def decorator(func):
     # assertions
     mock_ack.assert_called_once()
     mock_trigger_async_processing.assert_not_called()  # Should not trigger for non-DM
+    mock_respond_with_eyes.assert_called_once()
 
 
 @patch("app.utils.handler_utils.is_duplicate_event")
 @patch("app.utils.handler_utils.trigger_async_processing")
 @patch("app.utils.handler_utils.respond_with_eyes")
 @patch("app.slack.slack_events.store_feedback")
 def test_feedback_yes_action_handler(
-    mock_store_feedback,
-    mock_respond_with_eyes,
-    mock_trigger_async_processing,
-    mock_is_duplicate_event,
-    mock_get_parameter,
-    mock_env,
+    mock_store_feedback: Mock,
+    mock_respond_with_eyes: Mock,
+    mock_trigger_async_processing: Mock,
+    mock_is_duplicate_event: Mock,
+    mock_get_parameter: Mock,
+    mock_env: Mock,
 ):
     """Test feedback_yes action handler"""
     if "app.slack.slack_handlers" in sys.modules: