tidy up few changes

Author: Akol125

infrastructure/instance/.terraform.lock.hcl

@@ -15,8 +15,8 @@ module "get_status" {
   function_name                     = "get_status"
   image_uri                         = module.docker_image.image_uri
   policy_json                       = data.aws_iam_policy_document.logs_policy_document.json
-  aws_sns_topic                     = data.aws_sns_topic.fhir_api_errors.arn
   error_alarm_notifications_enabled = var.error_alarm_notifications_enabled
+  environment                       = var.environment
 }
 
 locals {
@@ -59,10 +59,6 @@ data "aws_iam_policy_document" "imms_policy_document" {
   ]
 }
 
-data "aws_sns_topic" "fhir_api_errors" {
-  name = "${var.environment}-fhir-api-errors"
-}
-
 data "aws_iam_policy_document" "imms_data_quality_s3_doc" {
   source_policy_documents = [
     templatefile("${local.policy_path}/s3_data_quality_access.json", {
@@ -89,8 +85,8 @@ module "imms_event_endpoint_lambdas" {
   environment_variables             = local.imms_lambda_env_vars
   vpc_subnet_ids                    = local.private_subnet_ids
   vpc_security_group_ids            = [data.aws_security_group.existing_securitygroup.id]
-  aws_sns_topic                     = data.aws_sns_topic.fhir_api_errors.arn
   error_alarm_notifications_enabled = var.error_alarm_notifications_enabled
+  environment                       = var.environment
 }
 
 

infrastructure/instance/endpoints.tf

@@ -403,4 +403,4 @@ resource "aws_cloudwatch_metric_alarm" "file_name_processor_error_alarm" {
   alarm_description   = "This sets off an alarm for any error logs found in the file name processor Lambda function"
   alarm_actions       = [data.aws_sns_topic.batch_processor_errors.arn]
   treat_missing_data  = "notBreaching"
-}
+}

infrastructure/instance/file_name_processor.tf

@@ -46,7 +46,7 @@ resource "aws_cloudwatch_log_metric_filter" "max_memory_used_metric" {
 
   metric_transformation {
     name      = "max-memory-used"
-    namespace = var.short_prefix
+    namespace = "${var.short_prefix}_${var.function_name}"
     value     = "$18"
   }
 }
@@ -65,18 +65,22 @@ resource "aws_cloudwatch_log_metric_filter" "fhir_api_error_logs" {
   }
 }
 
+data "aws_sns_topic" "fhir_api_errors" {
+  name = "${var.environment}-fhir-api-errors"
+}
+
 resource "aws_cloudwatch_metric_alarm" "fhir_api_error_alarm" {
   count = var.error_alarm_notifications_enabled ? 1 : 0
 
   alarm_name          = "${var.short_prefix}_${var.function_name}-lambda-error"
   comparison_operator = "GreaterThanOrEqualToThreshold"
   evaluation_periods  = 1
-  metric_name         = "${var.short_prefix}_${var.function_name}-ErrorLogs"
+  metric_name         = "${var.short_prefix}_${var.function_name}-ApiErrorLogs"
   namespace           = "${var.short_prefix}_${var.function_name}-Lambda"
   period              = 120
   statistic           = "Sum"
   threshold           = 1
   alarm_description   = "This sets off an alarm for any error logs found in fhir api Lambda function"
-  alarm_actions       = var.aws_sns_topic != null ? [var.aws_sns_topic] : []
+  alarm_actions       = [data.aws_sns_topic.fhir_api_errors.arn]
   treat_missing_data  = "notBreaching"
 }

infrastructure/instance/modules/lambda/lambda.tf

@@ -10,13 +10,8 @@ variable "function_name" {
   type = string
 }
 
-variable "aws_sns_topic" {
-  description = "SNS topic ARN for CloudWatch alarm notifications"
-  type        = string
-  default     = null
-}
 variable "error_alarm_notifications_enabled" {
-  description = "useful switching error alerting between environment"
+  description = "Switch to enable error alarm notifications to Slack"
   type        = string
 }
 
@@ -42,3 +37,8 @@ variable "vpc_subnet_ids" {
   type    = list(string)
   default = null
 }
+
+variable "environment" {
+  description = "The deployment environment (e.g., dev, int, internal-qa, prod)"
+  type        = string
+}