diff --git a/service_status/monitor_service.py b/service_status/monitor_service.py index 9c027cbbe..69c010078 100644 --- a/service_status/monitor_service.py +++ b/service_status/monitor_service.py @@ -23,9 +23,7 @@ "Team

" CERT_EXP_EMAIL_NOTIFICATION_SUBJ = "Certificates are about to expire for service %s for %s network." CERT_EXP_SLACK_NOTIFICATION_MSG = \ - "```Alert!\n\nCertificates for service %s under organization %s for the %s network are about to expire in %s days.\n" \ - "Endpoint: %s \n\nFor any queries please email at cs-marketplace@singularitynet.io. \n\nWarmest regards, " \ - "\nSingularityNET Marketplace Team```" + "Certificates for service %s under organization %s for the %s network are about to expire in %s days." NO_OF_ENDPOINT_TO_TEST_LIMIT = 5 @@ -160,7 +158,7 @@ def _get_certificate_expiration_email_notification_message(org_id, service_id, e @staticmethod def _get_certificate_expiration_slack_notification_message(org_id, service_id, endpoint, days_left_for_expiration): - return CERT_EXP_SLACK_NOTIFICATION_MSG % (service_id, org_id, NETWORK_NAME, days_left_for_expiration, endpoint) + return CERT_EXP_SLACK_NOTIFICATION_MSG % (service_id, org_id, NETWORK_NAME, days_left_for_expiration) class MonitorServiceHealth(MonitorService): diff --git a/service_status/testcases/unit_testcases/test_monitor_service_certificates_expiry.py b/service_status/testcases/unit_testcases/test_monitor_service_certificates_expiry.py index a5ca05d18..46056617a 100644 --- a/service_status/testcases/unit_testcases/test_monitor_service_certificates_expiry.py +++ b/service_status/testcases/unit_testcases/test_monitor_service_certificates_expiry.py @@ -22,10 +22,8 @@ def test_get_certificate_expiration_slack_notification_message(self): days_left_for_expiration = 10 response = self.monitor_service_certificate._get_certificate_expiration_slack_notification_message( org_id=org_id, service_id=service_id, endpoint=endpoint, days_left_for_expiration=days_left_for_expiration) - assert (response == "```Alert!\n\nCertificates for service test_service_id under organization test_org_id for " - "the TEST network are about to expire in 10 days.\nEndpoint: https://dummyendpoint.com \n\n" - "For any queries please email at cs-marketplace@singularitynet.io. \n\nWarmest regards, \n" - "SingularityNET Marketplace Team```") + assert (response == "Certificates for service test_service_id under organization test_org_id for " + "the TEST network are about to expire in 10 days.") def test_get_certificate_expiration_email_notification_message(self): org_id = "test_org_id"