CCM-12616: Remove mesh cert expiry metric from MESH Download

Author: simonlabarere

infrastructure/terraform/components/dl/module_lambda_mesh_download.tf

@@ -37,8 +37,6 @@ module "mesh_download" {
   log_subscription_role_arn = local.acct.log_subscription_role_arn
 
   lambda_env_vars = {
-    CERTIFICATE_EXPIRY_METRIC_NAME      = "mesh-download-client-certificate-near-expiry"
-    CERTIFICATE_EXPIRY_METRIC_NAMESPACE = "dl-mesh-download"
     DOWNLOAD_METRIC_NAME                = "mesh-download-successful-downloads"
     DOWNLOAD_METRIC_NAMESPACE           = "dl-mesh-download"
     ENVIRONMENT                         = var.environment

lambdas/mesh-download/mesh_download/config.py

@@ -9,8 +9,6 @@
     "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",
     "download_metric_name": "DOWNLOAD_METRIC_NAME",
     "download_metric_namespace": "DOWNLOAD_METRIC_NAMESPACE",
     "event_publisher_event_bus_arn": "EVENT_PUBLISHER_EVENT_BUS_ARN",

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

@@ -169,12 +169,13 @@ def build_mesh_client(self):
             )
 
         # Use real MESH client
-        report_expiry_time(
-            self.client_cert,
-            self.certificate_expiry_metric_name,
-            self.certificate_expiry_metric_namespace,
-            self.environment
-        )
+        if self.certificate_expiry_metric_name and self.certificate_expiry_metric_namespace:
+            report_expiry_time(
+                self.client_cert,
+                self.certificate_expiry_metric_name,
+                self.certificate_expiry_metric_namespace,
+                self.environment
+            )
 
         return mesh_client.MeshClient(
             self.lookup_endpoint(self.mesh_endpoint),