cleanup

Author: devksingh4

terraform/envs/prod/main.tf

@@ -34,10 +34,6 @@ locals {
   bucket_prefix = "${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}"
 }
 
-resource "aws_cloudwatch_log_group" "main_app_logs" {
-  name              = "/aws/lambda/${var.ProjectId}-lambda"
-  retention_in_days = var.LogRetentionDays
-}
 module "sqs_queues" {
   source                        = "../../modules/sqs"
   resource_prefix               = var.ProjectId
@@ -78,6 +74,7 @@ module "alarms" {
   resource_prefix                 = var.ProjectId
   main_cloudfront_distribution_id = module.frontend.main_cloudfront_distribution_id
   standard_sns_arn                = var.GeneralSNSAlertArn
+  main_lambda_function_name       = module.lambdas.core_api_lambda_name
 }
 
 module "lambdas" {

terraform/envs/qa/main.tf

@@ -34,11 +34,8 @@ locals {
   bucket_prefix = "${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}"
 }
 
-resource "aws_cloudwatch_log_group" "main_app_logs" {
-  name              = "/aws/lambda/${var.ProjectId}-lambda"
-  retention_in_days = var.LogRetentionDays
-}
 module "sqs_queues" {
+  depends_on                    = [module.lambdas]
   source                        = "../../modules/sqs"
   resource_prefix               = var.ProjectId
   core_sqs_consumer_lambda_name = module.lambdas.core_sqs_consumer_lambda_name

terraform/modules/alarms/main.tf

@@ -38,7 +38,7 @@ resource "aws_cloudwatch_metric_alarm" "app_latency_alarm" {
     var.standard_sns_arn
   ]
   dimensions = {
-    FunctionName = "${var.resource_prefix}-lambda"
+    FunctionName = var.main_lambda_function_name
   }
 }
 
@@ -56,7 +56,7 @@ resource "aws_cloudwatch_metric_alarm" "app_no_requests_alarm" {
     var.priority_sns_arn
   ]
   dimensions = {
-    FunctionName = "${var.resource_prefix}-lambda"
+    FunctionName = var.main_lambda_function_name
   }
 }
 
@@ -74,7 +74,7 @@ resource "aws_cloudwatch_metric_alarm" "app_invocation_error_alarm" {
     var.priority_sns_arn
   ]
   dimensions = {
-    FunctionName = "${var.resource_prefix}-lambda"
+    FunctionName = var.main_lambda_function_name
   }
 }
 

terraform/modules/alarms/variables.tf

@@ -17,3 +17,7 @@ variable "main_cloudfront_distribution_id" {
   type        = string
   description = "ID for the cloudfront distribution that serves the main application"
 }
+
+variable "main_lambda_function_name" {
+  type = string
+}

terraform/modules/lambdas/main.tf

@@ -11,7 +11,7 @@ data "archive_file" "sqs_lambda_code" {
 }
 
 locals {
-  core_api_lambda_name          = "${var.ProjectId}-lambda"
+  core_api_lambda_name          = "${var.ProjectId}-main-server"
   core_sqs_consumer_lambda_name = "${var.ProjectId}-sqs-consumer"
 }
 data "aws_caller_identity" "current" {}