CCM-12616: Split MESH/Senders config

Author: simonlabarere

infrastructure/terraform/components/dl/locals.tf

@@ -6,6 +6,7 @@ locals {
   apim_private_key_ssm_parameter_name  = "/${var.component}/${var.environment}/apim/private_key"
   apim_keystore_s3_bucket              = "nhs-${var.aws_account_id}-${var.region}-${var.environment}-${var.component}-static-assets"
   ssm_mesh_prefix                      = "/${var.component}/${var.environment}/mesh"
+  ssm_senders_prefix                   = "/${var.component}/${var.environment}/senders"
   mock_mesh_endpoint                   = "s3://${module.s3bucket_non_pii_data.bucket}/mock-mesh"
   root_domain_name                     = "${var.environment}.${local.acct.route53_zone_names["digital-letters"]}"
   root_domain_id                       = local.acct.route53_zone_ids["digital-letters"]

infrastructure/terraform/components/dl/module_lambda_mesh_download.tf

@@ -45,7 +45,8 @@ module "mesh_download" {
     EVENT_PUBLISHER_DLQ_URL             = module.sqs_event_publisher_errors.sqs_queue_url
     EVENT_PUBLISHER_EVENT_BUS_ARN       = aws_cloudwatch_event_bus.main.arn
     PII_BUCKET                          = module.s3bucket_pii_data.bucket
-    SSM_PREFIX                          = "${local.ssm_mesh_prefix}"
+    SSM_MESH_PREFIX                     = "${local.ssm_mesh_prefix}"
+    SSM_SENDERS_PREFIX                  = "${local.ssm_senders_prefix}"
     USE_MESH_MOCK                       = var.enable_mock_mesh ? "true" : "false"
   }
 

infrastructure/terraform/components/dl/module_lambda_mesh_poll.tf

@@ -45,7 +45,8 @@ module "mesh_poll" {
     MAXIMUM_RUNTIME_MILLISECONDS        = "240000"  # 4 minutes (Lambda has 5 min timeout)
     POLLING_METRIC_NAME                 = "mesh-poll-successful-polls"
     POLLING_METRIC_NAMESPACE            = "dl-mesh-poll"
-    SSM_PREFIX                          = "${local.ssm_mesh_prefix}"
+    SSM_MESH_PREFIX                     = "${local.ssm_mesh_prefix}"
+    SSM_SENDERS_PREFIX                  = "${local.ssm_senders_prefix}"
     USE_MESH_MOCK                       = var.enable_mock_mesh ? "true" : "false"
   }
 

lambdas/mesh-download/mesh_download/config.py

@@ -6,7 +6,8 @@
 
 
 _REQUIRED_ENV_VAR_MAP = {
-    "ssm_prefix": "SSM_PREFIX",
+    "ssm_senders_prefix": "SSM_SENDERS_PREFIX",
+    "ssm_mesh_prefix": "SSM_MESH_PREFIX",
     "environment": "ENVIRONMENT",
     "certificate_expiry_metric_name": "CERTIFICATE_EXPIRY_METRIC_NAME",
     "certificate_expiry_metric_namespace": "CERTIFICATE_EXPIRY_METRIC_NAMESPACE",

lambdas/mesh-poll/mesh_poll/config.py

@@ -6,7 +6,8 @@
 
 
 _REQUIRED_ENV_VAR_MAP = {
-    "ssm_prefix": "SSM_PREFIX",
+    "ssm_senders_prefix": "SSM_SENDERS_PREFIX",
+    "ssm_mesh_prefix": "SSM_MESH_PREFIX",
     "maximum_runtime_milliseconds": "MAXIMUM_RUNTIME_MILLISECONDS",
     "environment": "ENVIRONMENT",
     "event_bus_arn": "EVENT_PUBLISHER_EVENT_BUS_ARN",

lambdas/mesh-poll/mesh_poll/sender_lookup.py

@@ -58,7 +58,7 @@ def __get_page(self, next_token=""):
         """
         Loads a page of sender data and extracts mailbox IDs and sender IDs
         """
-        senders_path = f"{self.__config.ssm_prefix.rstrip('/')}/senders/"
+        senders_path = f"{self.__config.ssm_senders_prefix.rstrip('/')}/"
 
         if len(next_token) == 0:
             response = self.__ssm.get_parameters_by_path(

utils/event-publisher-py/event_publisher/mesh_config.py

@@ -62,7 +62,7 @@ def __init__(self, ssm=None, s3_client=None):
         self.mesh_client = None
 
         # Common configuration attributes
-        self.ssm_prefix = None
+        self.ssm_mesh_prefix = None
         self.environment = None
         self.certificate_expiry_metric_name = None
         self.certificate_expiry_metric_namespace = None
@@ -108,7 +108,7 @@ def _load_optional_env_vars(self):
     def __enter__(self):
         # Load MESH configuration from SSM
         ssm_response = self.ssm.get_parameter(
-            Name=self.ssm_prefix + '/config',
+            Name=self.ssm_mesh_prefix + '/config',
             WithDecryption=True
         )
         mesh_config = json.loads(ssm_response['Parameter']['Value'])
@@ -120,11 +120,11 @@ def __enter__(self):
 
         # Load client certificates from SSM
         client_cert_parameter = self.ssm.get_parameter(
-            Name=self.ssm_prefix + '/client-cert',
+            Name=self.ssm_mesh_prefix + '/client-cert',
             WithDecryption=True
         )
         client_key_parameter = self.ssm.get_parameter(
-            Name=self.ssm_prefix + '/client-key',
+            Name=self.ssm_mesh_prefix + '/client-key',
             WithDecryption=True
         )