CCM-12616: rename client to sender

Author: lapenna-bjss

infrastructure/terraform/components/dl/module_lambda_mesh_download.tf

@@ -37,15 +37,19 @@ module "mesh_download" {
 
   lambda_env_vars = {
     # Required by Config
-    EVENT_PUBLISHER_EVENT_BUS_ARN = aws_cloudwatch_event_bus.main.arn
-    EVENT_PUBLISHER_DLQ_URL       = module.sqs_event_publisher_dlq.queue_url
-    ENVIRONMENT                   = var.environment
-    DEPLOYMENT                    = var.deployment
-    PII_BUCKET                    = module.s3bucket_pii_data.bucket
+    SSM_PREFIX                          = "dl/${var.environment}/mesh"
+    EVENT_PUBLISHER_EVENT_BUS_ARN       = aws_cloudwatch_event_bus.main.arn
+    EVENT_PUBLISHER_DLQ_URL             = module.sqs_event_publisher_dlq.queue_url
+    ENVIRONMENT                         = var.environment
+    PII_BUCKET                          = module.s3bucket_pii_data.bucket
+    CERTIFICATE_EXPIRY_METRIC_NAME      = "mesh-download-client-certificate-near-expiry"
+    CERTIFICATE_EXPIRY_METRIC_NAMESPACE = "dl-mesh-download"
+    POLLING_METRIC_NAME                 = "mesh-download-successful-polls"
+    POLLING_METRIC_NAMESPACE            = "dl-mesh-download"
 
     # Optional
-    USE_MESH_MOCK                 = var.enable_mock_mesh ? "true" : "false"
-    MOCK_MESH_BUCKET              = module.s3bucket_non_pii_data.bucket
+    USE_MESH_MOCK                       = var.enable_mock_mesh ? "true" : "false"
+    MOCK_MESH_BUCKET                    = module.s3bucket_non_pii_data.bucket
   }
 
 }

infrastructure/terraform/components/dl/module_lambda_mesh_poll.tf

@@ -38,17 +38,16 @@ module "mesh_poll" {
 
   lambda_env_vars = {
     # Required by Config
-    SSM_PREFIX                          = var.ssm_prefix
-    SSM_CLIENTS_PARAMETER_PATH          = var.ssm_clients_parameter_path
-    INBOX_WORKFLOW_ID                   = var.inbox_workflow_id
-    OUTBOX_WORKFLOW_ID                  = var.outbox_workflow_id
-    MAXIMUM_RUNTIME_MILLISECONDS        = var.maximum_runtime_milliseconds
+    SSM_PREFIX                          = "dl/${var.environment}/mesh"
+    SSM_SENDERS_PARAMETER_PATH          = "dl/${var.environment}/mesh/senders"
+    MAXIMUM_RUNTIME_MILLISECONDS        = "240000"  # 4 minutes (Lambda has 5 min timeout)
     ENVIRONMENT                         = var.environment
     EVENT_PUBLISHER_EVENT_BUS_ARN       = aws_cloudwatch_event_bus.main.arn
-    CERTIFICATE_EXPIRY_METRIC_NAME      = var.certificate_expiry_metric_name
-    CERTIFICATE_EXPIRY_METRIC_NAMESPACE = var.certificate_expiry_metric_namespace
-    POLLING_METRIC_NAME                 = var.polling_metric_name
-    POLLING_METRIC_NAMESPACE            = var.polling_metric_namespace
+    EVENT_PUBLISHER_DLQ_URL             = module.sqs_event_publisher_dlq.queue_url
+    CERTIFICATE_EXPIRY_METRIC_NAME      = "mesh-poll-client-certificate-near-expiry"
+    CERTIFICATE_EXPIRY_METRIC_NAMESPACE = "dl-mesh-poll"
+    POLLING_METRIC_NAME                 = "mesh-poll-successful-polls"
+    POLLING_METRIC_NAMESPACE            = "dl-mesh-poll"
 
     # Optional
     USE_MESH_MOCK                       = var.enable_mock_mesh ? "true" : "false"
@@ -111,4 +110,17 @@ data "aws_iam_policy_document" "mesh_poll_lambda" {
       module.kms.key_arn,
     ]
   }
+
+  statement {
+    sid    = "EventBridgePermissions"
+    effect = "Allow"
+
+    actions = [
+      "events:PutEvents",
+    ]
+
+    resources = [
+      aws_cloudwatch_event_bus.main.arn,
+    ]
+  }
 }

lambdas/mesh-poll/src/__init__.py

@@ -8,5 +8,5 @@
 from .config import *
 from .handler import *
 from .processor import *
-from .client_lookup import *
+from .sender_lookup import *
 from .errors import *

lambdas/mesh-poll/src/__tests__/test_handler.py

@@ -18,7 +18,7 @@ def setup_mocks():
 
     mock_ssm = Mock()
 
-    mock_client_lookup = Mock()
+    mock_sender_lookup = Mock()
 
     mock_processor = Mock()
     mock_processor.process_messages = Mock()
@@ -27,7 +27,7 @@ def setup_mocks():
         mock_context,
         mock_config,
         mock_ssm,
-        mock_client_lookup,
+        mock_sender_lookup,
         mock_processor
     )
 
@@ -36,21 +36,21 @@ class TestHandler:
     """Test suite for Lambda handler"""
 
     @patch('src.handler.Config')
-    @patch('src.handler.ClientLookup')
+    @patch('src.handler.SenderLookup')
     @patch('src.handler.MeshMessageProcessor')
     @patch('src.handler.client')
-    def test_handler_success(self, mock_boto_client, mock_processor_class, mock_client_lookup_class, mock_config_class):
+    def test_handler_success(self, mock_boto_client, mock_processor_class, mock_sender_lookup_class, mock_config_class):
         """Test successful handler execution"""
         from src.handler import handler
 
         (mock_context, mock_config, mock_ssm,
-        mock_client_lookup, mock_processor) = setup_mocks()
+        mock_sender_lookup, mock_processor) = setup_mocks()
 
         # Wire up the mocks
         mock_config_class.return_value.__enter__.return_value = mock_config
         mock_config_class.return_value.__exit__ = Mock(return_value=None)
         mock_boto_client.return_value = mock_ssm
-        mock_client_lookup_class.return_value = mock_client_lookup
+        mock_sender_lookup_class.return_value = mock_sender_lookup
         mock_processor_class.return_value = mock_processor
 
         # Execute handler
@@ -63,17 +63,17 @@ def test_handler_success(self, mock_boto_client, mock_processor_class, mock_clie
         # Verify SSM client was created
         mock_boto_client.assert_called_once_with('ssm')
 
-        # Verify ClientLookup was created with correct parameters
-        mock_client_lookup_class.assert_called_once()
-        call_args = mock_client_lookup_class.call_args
+        # Verify SenderLookup was created with correct parameters
+        mock_sender_lookup_class.assert_called_once()
+        call_args = mock_sender_lookup_class.call_args
         assert call_args[0][0] == mock_ssm
         assert call_args[0][1] == mock_config
 
         # Verify MeshMessageProcessor was created with correct parameters
         mock_processor_class.assert_called_once()
         call_kwargs = mock_processor_class.call_args[1]
         assert call_kwargs['config'] == mock_config
-        assert call_kwargs['client_lookup'] == mock_client_lookup
+        assert call_kwargs['sender_lookup'] == mock_sender_lookup
         assert call_kwargs['mesh_client'] == mock_config.mesh_client
         assert call_kwargs['get_remaining_time_in_millis'] == mock_context.get_remaining_time_in_millis
         assert call_kwargs['polling_metric'] == mock_config.polling_metric
@@ -82,15 +82,15 @@ def test_handler_success(self, mock_boto_client, mock_processor_class, mock_clie
         mock_processor.process_messages.assert_called_once()
 
     @patch('src.handler.Config')
-    @patch('src.handler.ClientLookup')
+    @patch('src.handler.SenderLookup')
     @patch('src.handler.MeshMessageProcessor')
     @patch('src.handler.client')
-    def test_handler_config_cleanup_on_exception(self, mock_boto_client, mock_processor_class, mock_client_lookup_class, mock_config_class):
+    def test_handler_config_cleanup_on_exception(self, mock_boto_client, mock_processor_class, mock_sender_lookup_class, mock_config_class):
         """Test that Config context manager cleanup is called even on exception"""
         from src.handler import handler
 
         (mock_context, mock_config, mock_ssm,
-        mock_client_lookup, mock_processor) = setup_mocks()
+        mock_sender_lookup, mock_processor) = setup_mocks()
 
         # Make processor raise an exception
         test_exception = RuntimeError("Test error")
@@ -100,7 +100,7 @@ def test_handler_config_cleanup_on_exception(self, mock_boto_client, mock_proces
         mock_exit = Mock(return_value=None)
         mock_config_class.return_value.__exit__ = mock_exit
         mock_boto_client.return_value = mock_ssm
-        mock_client_lookup_class.return_value = mock_client_lookup
+        mock_sender_lookup_class.return_value = mock_sender_lookup
         mock_processor_class.return_value = mock_processor
 
         # Handler should raise the exception
@@ -115,15 +115,15 @@ def test_handler_config_cleanup_on_exception(self, mock_boto_client, mock_proces
         assert call_args[1] == test_exception
 
     @patch('src.handler.Config')
-    @patch('src.handler.ClientLookup')
+    @patch('src.handler.SenderLookup')
     @patch('src.handler.MeshMessageProcessor')
     @patch('src.handler.client')
-    def test_handler_passes_correct_parameters_to_processor(self, mock_boto_client, mock_processor_class, mock_client_lookup_class, mock_config_class):
+    def test_handler_passes_correct_parameters_to_processor(self, mock_boto_client, mock_processor_class, mock_sender_lookup_class, mock_config_class):
         """Test that handler passes all required parameters to MeshMessageProcessor"""
         from src.handler import handler
 
         (mock_context, mock_config, mock_ssm,
-        mock_client_lookup, mock_processor) = setup_mocks()
+        mock_sender_lookup, mock_processor) = setup_mocks()
 
         mock_remaining_time_func = Mock(return_value=250000)
         mock_context.get_remaining_time_in_millis = mock_remaining_time_func
@@ -135,7 +135,7 @@ def test_handler_passes_correct_parameters_to_processor(self, mock_boto_client,
         mock_config_class.return_value.__enter__.return_value = mock_config
         mock_config_class.return_value.__exit__ = Mock(return_value=None)
         mock_boto_client.return_value = mock_ssm
-        mock_client_lookup_class.return_value = mock_client_lookup
+        mock_sender_lookup_class.return_value = mock_sender_lookup
         mock_processor_class.return_value = mock_processor
 
         handler(None, mock_context)
@@ -144,7 +144,7 @@ def test_handler_passes_correct_parameters_to_processor(self, mock_boto_client,
         call_kwargs = mock_processor_class.call_args[1]
 
         assert call_kwargs['config'] == mock_config
-        assert call_kwargs['client_lookup'] == mock_client_lookup
+        assert call_kwargs['sender_lookup'] == mock_sender_lookup
         assert call_kwargs['mesh_client'] == mock_mesh_client
         assert call_kwargs['get_remaining_time_in_millis'] == mock_remaining_time_func
         assert call_kwargs['polling_metric'] == mock_polling_metric

lambdas/mesh-poll/src/__tests__/test_processor.py

@@ -16,8 +16,8 @@ def setup_mocks():
     config.maximum_runtime_milliseconds = "500"
     config.ssm_prefix = "/dl/test/mesh"
 
-    client_lookup = Mock()
-    client_lookup.is_valid_sender.return_value = True  # Default to valid sender
+    sender_lookup = Mock()
+    sender_lookup.is_valid_sender.return_value = True  # Default to valid sender
 
     mesh_client = Mock(spec=MeshClient)
 
@@ -27,7 +27,7 @@ def setup_mocks():
 
     return (
         config,
-        client_lookup,
+        sender_lookup,
         mesh_client,
         log,
         polling_metric
@@ -67,7 +67,7 @@ class TestMeshMessageProcessor:
 
     def test_process_messages_iterates_through_inbox(self, mock_event_publisher_class, mock_getenv):
         """Test that processor iterates through all messages in MESH inbox"""
-        (config, client_lookup, mesh_client, log, polling_metric) = setup_mocks()
+        (config, sender_lookup, mesh_client, log, polling_metric) = setup_mocks()
         message1 = setup_message_data("1")
         message2 = setup_message_data("2")
 
@@ -79,7 +79,7 @@ def test_process_messages_iterates_through_inbox(self, mock_event_publisher_clas
 
         processor = MeshMessageProcessor(
             config=config,
-            client_lookup=client_lookup,
+            sender_lookup=sender_lookup,
             mesh_client=mesh_client,
             get_remaining_time_in_millis=get_remaining_time_in_millis,
             log=log,
@@ -88,7 +88,7 @@ def test_process_messages_iterates_through_inbox(self, mock_event_publisher_clas
 
         mesh_client.iterate_all_messages.side_effect = [
             [message1, message2], []]
-        client_lookup.is_valid_sender.return_value = True
+        sender_lookup.is_valid_sender.return_value = True
 
         processor.process_messages()
 
@@ -98,7 +98,7 @@ def test_process_messages_iterates_through_inbox(self, mock_event_publisher_clas
 
     def test_process_messages_stops_near_timeout(self, mock_event_publisher_class, mock_getenv):
         """Test that processor stops processing when near timeout"""
-        (config, client_lookup, mesh_client, log, polling_metric) = setup_mocks()
+        (config, sender_lookup, mesh_client, log, polling_metric) = setup_mocks()
         message1 = setup_message_data("1")
 
         mock_getenv.side_effect = lambda key, default='': {
@@ -108,7 +108,7 @@ def test_process_messages_stops_near_timeout(self, mock_event_publisher_class, m
 
         processor = MeshMessageProcessor(
             config=config,
-            client_lookup=client_lookup,
+            sender_lookup=sender_lookup,
             mesh_client=mesh_client,
             get_remaining_time_in_millis=get_remaining_time_in_millis_near_timeout,
             log=log,
@@ -119,12 +119,12 @@ def test_process_messages_stops_near_timeout(self, mock_event_publisher_class, m
 
         processor.process_messages()
 
-        client_lookup.is_valid_sender.assert_not_called()
+        sender_lookup.is_valid_sender.assert_not_called()
         polling_metric.record.assert_called_once()
 
     def test_process_message_with_valid_sender(self, mock_event_publisher_class, mock_getenv):
         """Test processing a single message from valid sender"""
-        (config, client_lookup, mesh_client, log, polling_metric) = setup_mocks()
+        (config, sender_lookup, mesh_client, log, polling_metric) = setup_mocks()
         message = setup_message_data("1")
 
         mock_getenv.side_effect = lambda key, default='': {
@@ -138,25 +138,25 @@ def test_process_message_with_valid_sender(self, mock_event_publisher_class, moc
 
         processor = MeshMessageProcessor(
             config=config,
-            client_lookup=client_lookup,
+            sender_lookup=sender_lookup,
             mesh_client=mesh_client,
             get_remaining_time_in_millis=get_remaining_time_in_millis,
             log=log,
             polling_metric=polling_metric
         )
 
-        client_lookup.is_valid_sender.return_value = True
+        sender_lookup.is_valid_sender.return_value = True
 
         processor.process_message(message)
 
         mesh_client.handshake.assert_called_once()
-        client_lookup.is_valid_sender.assert_called_once_with(message.sender)
+        sender_lookup.is_valid_sender.assert_called_once_with(message.sender)
         mock_event_publisher.send_events.assert_called_once()
         message.acknowledge.assert_not_called()  # Only acknowledged on auth error
 
     def test_process_message_with_unknown_sender(self, mock_event_publisher_class, mock_getenv):
         """Test that messages from unknown senders are rejected silently"""
-        (config, client_lookup, mesh_client, log, polling_metric) = setup_mocks()
+        (config, sender_lookup, mesh_client, log, polling_metric) = setup_mocks()
         message = setup_message_data("1")
 
         mock_getenv.side_effect = lambda key, default='': {
@@ -166,24 +166,24 @@ def test_process_message_with_unknown_sender(self, mock_event_publisher_class, m
 
         processor = MeshMessageProcessor(
             config=config,
-            client_lookup=client_lookup,
+            sender_lookup=sender_lookup,
             mesh_client=mesh_client,
             get_remaining_time_in_millis=get_remaining_time_in_millis,
             log=log,
             polling_metric=polling_metric
         )
 
         # Invalid sender
-        client_lookup.is_valid_sender.return_value = False
+        sender_lookup.is_valid_sender.return_value = False
 
         processor.process_message(message)
 
-        client_lookup.is_valid_sender.assert_called_once_with(message.sender)
+        sender_lookup.is_valid_sender.assert_called_once_with(message.sender)
         message.acknowledge.assert_called_once()
 
     def test_process_messages_across_multiple_iterations(self, mock_event_publisher_class, mock_getenv):
         """Test that processor continues polling until no messages remain"""
-        (config, client_lookup, mesh_client, log, polling_metric) = setup_mocks()
+        (config, sender_lookup, mesh_client, log, polling_metric) = setup_mocks()
         message1 = setup_message_data("1")
         message2 = setup_message_data("2")
         message3 = setup_message_data("3")
@@ -195,7 +195,7 @@ def test_process_messages_across_multiple_iterations(self, mock_event_publisher_
 
         processor = MeshMessageProcessor(
             config=config,
-            client_lookup=client_lookup,
+            sender_lookup=sender_lookup,
             mesh_client=mesh_client,
             get_remaining_time_in_millis=get_remaining_time_in_millis,
             log=log,
@@ -207,11 +207,11 @@ def test_process_messages_across_multiple_iterations(self, mock_event_publisher_
             [message3],            # Second iteration
             []                     # Third iteration - empty, stops
         ]
-        client_lookup.is_valid_sender.return_value = True
+        sender_lookup.is_valid_sender.return_value = True
 
         processor.process_messages()
 
         mesh_client.handshake.assert_called_once()
         assert mesh_client.iterate_all_messages.call_count == 3
-        assert client_lookup.is_valid_sender.call_count == 3
+        assert sender_lookup.is_valid_sender.call_count == 3
         polling_metric.record.assert_called_once()