[PRMP-1148] Remove lambda_name variable from lambda_alarms module and derive the value instead

chrisbloe · chrisbloe · commit 346f99e2f44f · 2025-12-19T12:48:31.000Z
diff --git a/infrastructure/lambda-access-audit.tf b/infrastructure/lambda-access-audit.tf
@@ -14,7 +14,6 @@ module "access-audit-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.access-audit-lambda.function_name
   lambda_timeout       = module.access-audit-lambda.timeout
-  lambda_name          = "access_audit_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.access-audit-alarm-topic.arn]
   ok_actions           = [module.access-audit-alarm-topic.arn]
diff --git a/infrastructure/lambda-authoriser.tf b/infrastructure/lambda-authoriser.tf
@@ -35,7 +35,6 @@ module "authoriser-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.authoriser-lambda.function_name
   lambda_timeout       = module.authoriser-lambda.timeout
-  lambda_name          = "authoriser_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.authoriser-alarm-topic.arn]
   ok_actions           = [module.authoriser-alarm-topic.arn]
diff --git a/infrastructure/lambda-back-channel-logout.tf b/infrastructure/lambda-back-channel-logout.tf
@@ -47,7 +47,6 @@ module "back_channel_logout_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.back_channel_logout_lambda.function_name
   lambda_timeout       = module.back_channel_logout_lambda.timeout
-  lambda_name          = "back_channel_logout_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.back_channel_logout_alarm_topic.arn]
   ok_actions           = [module.back_channel_logout_alarm_topic.arn]
diff --git a/infrastructure/lambda-bulk-upload-metadata-processor.tf b/infrastructure/lambda-bulk-upload-metadata-processor.tf
@@ -44,7 +44,6 @@ module "bulk-upload-metadata-processor-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.bulk-upload-metadata-processor-lambda.function_name
   lambda_timeout       = module.bulk-upload-metadata-processor-lambda.timeout
-  lambda_name          = "bulk_upload_metadata_processor_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.bulk-upload-metadata-processor-alarm-topic.arn]
   ok_actions           = [module.bulk-upload-metadata-processor-alarm-topic.arn]
diff --git a/infrastructure/lambda-bulk-upload-metadata.tf b/infrastructure/lambda-bulk-upload-metadata.tf
@@ -32,7 +32,6 @@ module "bulk-upload-metadata-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.bulk-upload-metadata-lambda.function_name
   lambda_timeout       = module.bulk-upload-metadata-lambda.timeout
-  lambda_name          = "bulk_upload_metadata_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.bulk-upload-metadata-alarm-topic.arn]
   ok_actions           = [module.bulk-upload-metadata-alarm-topic.arn]
diff --git a/infrastructure/lambda-bulk-upload-report.tf b/infrastructure/lambda-bulk-upload-report.tf
@@ -53,7 +53,6 @@ module "bulk-upload-report-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.bulk-upload-report-lambda.function_name
   lambda_timeout       = module.bulk-upload-report-lambda.timeout
-  lambda_name          = "bulk_upload_report_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.bulk-upload-report-alarm-topic.arn]
   ok_actions           = [module.bulk-upload-report-alarm-topic.arn]
diff --git a/infrastructure/lambda-bulk-upload.tf b/infrastructure/lambda-bulk-upload.tf
@@ -90,7 +90,6 @@ module "bulk-upload-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.bulk-upload-lambda.function_name
   lambda_timeout       = module.bulk-upload-lambda.timeout
-  lambda_name          = "bulk_upload_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.bulk-upload-alarm-topic.arn]
   ok_actions           = [module.bulk-upload-alarm-topic.arn]
diff --git a/infrastructure/lambda-create-doc-ref.tf b/infrastructure/lambda-create-doc-ref.tf
@@ -2,7 +2,6 @@ module "create_doc_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.create-doc-ref-lambda.function_name
   lambda_timeout       = module.create-doc-ref-lambda.timeout
-  lambda_name          = "create_document_reference_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.create_doc_alarm_topic.arn]
   ok_actions           = [module.create_doc_alarm_topic.arn]
diff --git a/infrastructure/lambda-data-collection.tf b/infrastructure/lambda-data-collection.tf
@@ -2,7 +2,6 @@ module "data-collection-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.data-collection-lambda.function_name
   lambda_timeout       = module.data-collection-lambda.timeout
-  lambda_name          = "data_collection_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.data-collection-alarm-topic.arn]
   ok_actions           = [module.data-collection-alarm-topic.arn]
diff --git a/infrastructure/lambda-delete-doc-object.tf b/infrastructure/lambda-delete-doc-object.tf
@@ -2,7 +2,6 @@ module "delete-document-object-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.delete-document-object-lambda.function_name
   lambda_timeout       = module.delete-document-object-lambda.timeout
-  lambda_name          = "delete_document_object_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.delete-document-object-alarm-topic.arn]
   ok_actions           = [module.delete-document-object-alarm-topic.arn]
diff --git a/infrastructure/lambda-delete-doc-ref.tf b/infrastructure/lambda-delete-doc-ref.tf
@@ -14,7 +14,6 @@ module "delete_doc_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.delete-doc-ref-lambda.function_name
   lambda_timeout       = module.delete-doc-ref-lambda.timeout
-  lambda_name          = "delete_document_reference_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.delete_doc_alarm_topic.arn]
   ok_actions           = [module.delete_doc_alarm_topic.arn]
diff --git a/infrastructure/lambda-document-manifest-job.tf b/infrastructure/lambda-document-manifest-job.tf
@@ -14,7 +14,6 @@ module "document_manifest_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.document-manifest-job-lambda.function_name
   lambda_timeout       = module.document-manifest-job-lambda.timeout
-  lambda_name          = "create_document_manifest_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.document_manifest_alarm_topic.arn]
   ok_actions           = [module.document_manifest_alarm_topic.arn]
diff --git a/infrastructure/lambda-document-status-check-result.tf b/infrastructure/lambda-document-status-check-result.tf
@@ -14,7 +14,6 @@ module "document-status-check-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.document-status-check-lambda.function_name
   lambda_timeout       = module.document-status-check-lambda.timeout
-  lambda_name          = "document_status_check_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.document-status-check-alarm-topic.arn]
   ok_actions           = [module.document-status-check-alarm-topic.arn]
diff --git a/infrastructure/lambda-edge-presign.tf b/infrastructure/lambda-edge-presign.tf
@@ -2,7 +2,6 @@ module "edge_presign_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.edge-presign-lambda.function_name
   lambda_timeout       = module.edge-presign-lambda.timeout
-  lambda_name          = "edge_presign_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.edge_presign_alarm_topic.arn]
   ok_actions           = [module.edge_presign_alarm_topic.arn]
diff --git a/infrastructure/lambda-feature-flags.tf b/infrastructure/lambda-feature-flags.tf
@@ -14,7 +14,6 @@ module "feature_flags_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.feature-flags-lambda.function_name
   lambda_timeout       = module.feature-flags-lambda.timeout
-  lambda_name          = "feature_flags_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.feature_flags_alarm_topic.arn]
   ok_actions           = [module.feature_flags_alarm_topic.arn]
diff --git a/infrastructure/lambda-generate-document-manifest.tf b/infrastructure/lambda-generate-document-manifest.tf
@@ -2,7 +2,6 @@ module "generate-document-manifest-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.generate-document-manifest-lambda.function_name
   lambda_timeout       = module.generate-document-manifest-lambda.timeout
-  lambda_name          = "generate_document_manifest_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.generate-document-manifest-alarm-topic.arn]
   ok_actions           = [module.generate-document-manifest-alarm-topic.arn]
diff --git a/infrastructure/lambda-generate-stitch-record.tf b/infrastructure/lambda-generate-stitch-record.tf
@@ -2,7 +2,6 @@ module "generate-lloyd-george-stitch-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.generate-lloyd-george-stitch-lambda.function_name
   lambda_timeout       = module.generate-lloyd-george-stitch-lambda.timeout
-  lambda_name          = "generate_lloyd_george_stitch_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.generate-lloyd-george-stitch-alarm-topic.arn]
   ok_actions           = [module.generate-lloyd-george-stitch-alarm-topic.arn]
diff --git a/infrastructure/lambda-get-doc-ref.tf b/infrastructure/lambda-get-doc-ref.tf
@@ -2,7 +2,6 @@ module "get-doc-ref-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.get-doc-ref-lambda.function_name
   lambda_timeout       = module.get-doc-ref-lambda.timeout
-  lambda_name          = "get_document_reference_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.get-doc-ref-alarm-topic.arn]
   ok_actions           = [module.get-doc-ref-alarm-topic.arn]
diff --git a/infrastructure/lambda-get-document-review.tf b/infrastructure/lambda-get-document-review.tf
@@ -39,7 +39,6 @@ module "get_document_review_lambda_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.get_document_review_lambda.function_name
   lambda_timeout       = module.get_document_review_lambda.timeout
-  lambda_name          = "get_document_review_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.get_document_review_lambda_alarm_topic.arn]
   ok_actions           = [module.get_document_review_lambda_alarm_topic.arn]
diff --git a/infrastructure/lambda-get-report-by-ods.tf b/infrastructure/lambda-get-report-by-ods.tf
@@ -14,7 +14,6 @@ module "get-report-by-ods-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.get-report-by-ods-lambda.function_name
   lambda_timeout       = module.get-report-by-ods-lambda.timeout
-  lambda_name          = "get_report_by_ods_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.get-report-by-ods-alarm-topic.arn]
   ok_actions           = [module.get-report-by-ods-alarm-topic.arn]
diff --git a/infrastructure/lambda-lloyd-george-record-stitch.tf b/infrastructure/lambda-lloyd-george-record-stitch.tf
@@ -14,7 +14,6 @@ module "lloyd-george-stitch_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.lloyd-george-stitch-lambda.function_name
   lambda_timeout       = module.lloyd-george-stitch-lambda.timeout
-  lambda_name          = "lloyd_george_record_stitch_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.lloyd-george-stitch_topic.arn]
   ok_actions           = [module.lloyd-george-stitch_topic.arn]
diff --git a/infrastructure/lambda-login-redirect.tf b/infrastructure/lambda-login-redirect.tf
@@ -51,7 +51,6 @@ module "login_redirect_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.login_redirect_lambda.function_name
   lambda_timeout       = module.login_redirect_lambda.timeout
-  lambda_name          = "login_redirect_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.login_redirect-alarm_topic.arn]
   ok_actions           = [module.login_redirect-alarm_topic.arn]
diff --git a/infrastructure/lambda-logout.tf b/infrastructure/lambda-logout.tf
@@ -45,7 +45,6 @@ module "logout_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.logout_lambda.function_name
   lambda_timeout       = module.logout_lambda.timeout
-  lambda_name          = "logout_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.logout_alarm_topic.arn]
   ok_actions           = [module.logout_alarm_topic.arn]
diff --git a/infrastructure/lambda-manage-nrl-pointer.tf b/infrastructure/lambda-manage-nrl-pointer.tf
@@ -32,7 +32,6 @@ module "manage-nrl-pointer-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.manage-nrl-pointer-lambda.function_name
   lambda_timeout       = module.manage-nrl-pointer-lambda.timeout
-  lambda_name          = "manage_nrl_pointer_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.manage-nrl-pointer-alarm-topic.arn]
   ok_actions           = [module.manage-nrl-pointer-alarm-topic.arn]
diff --git a/infrastructure/lambda-mns-notification.tf b/infrastructure/lambda-mns-notification.tf
@@ -41,7 +41,6 @@ module "mns-notification-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.mns-notification-lambda[0].function_name
   lambda_timeout       = module.mns-notification-lambda[0].timeout
-  lambda_name          = "mns_notification_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.mns-notification-alarm-topic[0].arn]
   ok_actions           = [module.mns-notification-alarm-topic[0].arn]
diff --git a/infrastructure/lambda-nhs-oauth-token-generator.tf b/infrastructure/lambda-nhs-oauth-token-generator.tf
@@ -23,7 +23,6 @@ module "nhs-oauth-token-generator-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.nhs-oauth-token-generator-lambda.function_name
   lambda_timeout       = module.nhs-oauth-token-generator-lambda.timeout
-  lambda_name          = "nhs_oauth_token_generator_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.nhs-oauth-token-generator-alarm-topic.arn]
   ok_actions           = [module.nhs-oauth-token-generator-alarm-topic.arn]
diff --git a/infrastructure/lambda-patch-document-review.tf b/infrastructure/lambda-patch-document-review.tf
@@ -35,7 +35,6 @@ module "patch_document_review_lambda_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.patch_document_review_lambda.function_name
   lambda_timeout       = module.patch_document_review_lambda.timeout
-  lambda_name          = "patch_document_review_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.patch_document_review_lambda_alarm_topic.arn]
   ok_actions           = [module.patch_document_review_lambda_alarm_topic.arn]
diff --git a/infrastructure/lambda-pdf-stitching.tf b/infrastructure/lambda-pdf-stitching.tf
@@ -40,7 +40,6 @@ module "pdf-stitching-lambda-alarms" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.pdf-stitching-lambda.function_name
   lambda_timeout       = module.pdf-stitching-lambda.timeout
-  lambda_name          = "PdfStitchingLambda"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.pdf-stitching-alarm-topic.arn]
   ok_actions           = [module.pdf-stitching-alarm-topic.arn]
diff --git a/infrastructure/lambda-post-document-review.tf b/infrastructure/lambda-post-document-review.tf
@@ -40,7 +40,6 @@ module "post_document_review_lambda_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.post_document_review_lambda.function_name
   lambda_timeout       = module.post_document_review_lambda.timeout
-  lambda_name          = "post_document_review_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.post_document_review_lambda_alarm_topic.arn]
   ok_actions           = [module.post_document_review_lambda_alarm_topic.arn]
diff --git a/infrastructure/lambda-review-document-status.tf b/infrastructure/lambda-review-document-status.tf
@@ -30,7 +30,6 @@ module "review-document-status-check-lambda-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.review-document-status-check-lambda.function_name
   lambda_timeout       = module.review-document-status-check-lambda.timeout
-  lambda_name          = "search_document_review_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.review-document-status-check-alarm-topic.arn]
   ok_actions           = [module.review-document-status-check-alarm-topic.arn]
diff --git a/infrastructure/lambda-search-doc-references.tf b/infrastructure/lambda-search-doc-references.tf
@@ -14,7 +14,6 @@ module "search_doc_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.search-document-references-lambda.function_name
   lambda_timeout       = module.search-document-references-lambda.timeout
-  lambda_name          = "search_document_references_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.search_doc_alarm_topic.arn]
   ok_actions           = [module.search_doc_alarm_topic.arn]
diff --git a/infrastructure/lambda-search-document-review.tf b/infrastructure/lambda-search-document-review.tf
@@ -32,7 +32,6 @@ module "search_document_review_lambda_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.search_document_review_lambda.function_name
   lambda_timeout       = module.search_document_review_lambda.timeout
-  lambda_name          = "search_document_review_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.search_document_review_lambda_alarm_topic.arn]
   ok_actions           = [module.search_document_review_lambda_alarm_topic.arn]
diff --git a/infrastructure/lambda-search-patient.tf b/infrastructure/lambda-search-patient.tf
@@ -14,7 +14,6 @@ module "search_patient_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.search-patient-details-lambda.function_name
   lambda_timeout       = module.search-patient-details-lambda.timeout
-  lambda_name          = "search_patient_details_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.search_patient_alarm_topic.arn]
   ok_actions           = [module.search_patient_alarm_topic.arn]
diff --git a/infrastructure/lambda-send-feedback.tf b/infrastructure/lambda-send-feedback.tf
@@ -37,7 +37,6 @@ module "send-feedback-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.send-feedback-lambda.function_name
   lambda_timeout       = module.send-feedback-lambda.timeout
-  lambda_name          = "send_feedback_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.send-feedback-alarm-topic.arn]
   ok_actions           = [module.send-feedback-alarm-topic.arn]
diff --git a/infrastructure/lambda-statistical-report.tf b/infrastructure/lambda-statistical-report.tf
@@ -2,7 +2,6 @@ module "statistical-report-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.statistical-report-lambda.function_name
   lambda_timeout       = module.statistical-report-lambda.timeout
-  lambda_name          = "statistical_report_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.statistical-report-alarm-topic.arn]
   ok_actions           = [module.statistical-report-alarm-topic.arn]
diff --git a/infrastructure/lambda-token.tf b/infrastructure/lambda-token.tf
@@ -53,7 +53,6 @@ module "create_token-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.create-token-lambda.function_name
   lambda_timeout       = module.create-token-lambda.timeout
-  lambda_name          = "token_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.create_token-alarm_topic.arn]
   ok_actions           = [module.create_token-alarm_topic.arn]
diff --git a/infrastructure/lambda-transfer-key-manager.tf b/infrastructure/lambda-transfer-key-manager.tf
@@ -77,7 +77,6 @@ module "transfer-key-manager-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.transfer-key-manager-lambda.function_name
   lambda_timeout       = module.transfer-key-manager-lambda.timeout
-  lambda_name          = "transfer_key_manager_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.transfer-key-manager-alarm-topic.arn]
   ok_actions           = [module.transfer-key-manager-alarm-topic.arn]
diff --git a/infrastructure/lambda-update-doc-ref.tf b/infrastructure/lambda-update-doc-ref.tf
@@ -2,7 +2,6 @@ module "update-doc-ref-alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.update-doc-ref-lambda.function_name
   lambda_timeout       = module.update-doc-ref-lambda.timeout
-  lambda_name          = "update_document_reference_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.update-doc-ref-alarm-topic.arn]
   ok_actions           = [module.update-doc-ref-alarm-topic.arn]
diff --git a/infrastructure/lambda-update-upload-state.tf b/infrastructure/lambda-update-upload-state.tf
@@ -14,7 +14,6 @@ module "update_upload_state_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.update-upload-state-lambda.function_name
   lambda_timeout       = module.update-upload-state-lambda.timeout
-  lambda_name          = "update_upload_state_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.update_upload_state_alarm_topic.arn]
   ok_actions           = [module.update_upload_state_alarm_topic.arn]
diff --git a/infrastructure/lambda-virus-scan-result.tf b/infrastructure/lambda-virus-scan-result.tf
@@ -14,7 +14,6 @@ module "virus_scan_result_alarm" {
   source               = "./modules/lambda_alarms"
   lambda_function_name = module.virus_scan_result_lambda.function_name
   lambda_timeout       = module.virus_scan_result_lambda.timeout
-  lambda_name          = "virus_scan_result_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.virus_scan_result_alarm_topic.arn]
   ok_actions           = [module.virus_scan_result_alarm_topic.arn]
diff --git a/infrastructure/modules/lambda_alarms/main.tf b/infrastructure/modules/lambda_alarms/main.tf
diff --git a/infrastructure/modules/lambda_alarms/variable.tf b/infrastructure/modules/lambda_alarms/variable.tf
