Merge branch 'main' into feature/CCM-17208_Supplier_api_pact_tests

Author: simonlabarere

infrastructure/terraform/components/dl/module_lambda_mesh_poll.tf

@@ -42,7 +42,7 @@ module "mesh_poll" {
     ENVIRONMENT                         = var.environment
     EVENT_PUBLISHER_DLQ_URL             = module.sqs_event_publisher_errors.sqs_queue_url
     EVENT_PUBLISHER_EVENT_BUS_ARN       = aws_cloudwatch_event_bus.main.arn
-    MAXIMUM_RUNTIME_MILLISECONDS        = "240000" # 4 minutes (Lambda has 5 min timeout)
+    LAMBDA_TIMEOUT_BUFFER_MILLISECONDS  = "60000" # 1 minute, to leave time for mesh-download to acknowledge the message before we run again.
     POLLING_METRIC_NAME                 = "mesh-poll-successful-polls"
     POLLING_METRIC_NAMESPACE            = "dl-mesh-poll"
     SSM_MESH_PREFIX                     = local.ssm_mesh_prefix

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

@@ -13,7 +13,7 @@ def setup_mocks():
     Create all mock objects needed for processor testing
     """
     config = Mock()
-    config.maximum_runtime_milliseconds = "500"
+    config.lambda_timeout_buffer_milliseconds = "500"
     config.ssm_prefix = "/dl/test"
     config.environment = "development"
 

lambdas/mesh-poll/mesh_poll/config.py

@@ -8,7 +8,7 @@
 _REQUIRED_ENV_VAR_MAP = {
     "ssm_senders_prefix": "SSM_SENDERS_PREFIX",
     "ssm_mesh_prefix": "SSM_MESH_PREFIX",
-    "maximum_runtime_milliseconds": "MAXIMUM_RUNTIME_MILLISECONDS",
+    "lambda_timeout_buffer_milliseconds": "LAMBDA_TIMEOUT_BUFFER_MILLISECONDS",
     "environment": "ENVIRONMENT",
     "event_bus_arn": "EVENT_PUBLISHER_EVENT_BUS_ARN",
     "event_publisher_dlq_url": "EVENT_PUBLISHER_DLQ_URL",

lambdas/mesh-poll/mesh_poll/processor.py

@@ -44,11 +44,11 @@ def __init__(self, **kwargs):
 
     def is_enough_time_to_process_message(self):
         """
-        Determines whether the lambda should continue to process messages
+        Determines whether the lambda should continue to process messages.
         """
         remaining_time_in_millis = self.__get_remaining_time_in_millis()
 
-        return int(self.__config.maximum_runtime_milliseconds) \
+        return int(self.__config.lambda_timeout_buffer_milliseconds) \
             < remaining_time_in_millis
 
     def process_messages(self):