use centralized log group

pymonger · pymonger · commit cff27d63ef00 · 2024-08-30T12:47:22.000-07:00
- set invoke settings to 0 retries and 6 hour max event age
- fixed misspellings
- removed deployment_name variable
diff --git a/terraform-unity/centralized_log_group/README.md b/terraform-unity/centralized_log_group/README.md
@@ -36,5 +36,5 @@ No modules.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_centralized_log_group_arn"></a> [centralized\_log\_group\_arn](#output\_centralized\_log\_group\_arn) | The ARN of the centralized log group |
+| <a name="output_centralized_log_group_name"></a> [centralized\_log\_group\_name](#output\_centralized\_log\_group\_name) | The name of the centralized log group |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/terraform-unity/centralized_log_group/locals.tf b/terraform-unity/centralized_log_group/locals.tf
@@ -1,5 +1,5 @@
 locals {
-  log_group_name = "${var.project}-${var.venue}-inititator-centralized-log-group"
+  log_group_name = "${var.project}-${var.venue}-initiator-centralized-log-group"
   tags = {
     Venue       = "dev"
     ServiceArea = "cs"
diff --git a/terraform-unity/centralized_log_group/main.tf b/terraform-unity/centralized_log_group/main.tf
@@ -1,5 +1,5 @@
 resource "aws_cloudwatch_log_group" "centralized_log_group" {
-  name              = "/aws/lambda/${local.log_group_name}"
+  name              = "/unity/log/${local.log_group_name}"
   retention_in_days = 14
   tags              = local.tags
 }
diff --git a/terraform-unity/centralized_log_group/output.tf b/terraform-unity/centralized_log_group/output.tf
@@ -1,4 +1,4 @@
-output "centralized_log_group_arn" {
-  description = "The ARN of the centralized log group"
-  value       = aws_cloudwatch_log_group.centralized_log_group.arn
+output "centralized_log_group_name" {
+  description = "The name of the centralized log group"
+  value       = aws_cloudwatch_log_group.centralized_log_group.name
 }
diff --git a/terraform-unity/evaluators/sns-sqs-lambda/README.md b/terraform-unity/evaluators/sns-sqs-lambda/README.md
@@ -27,14 +27,14 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [aws_cloudwatch_log_group.evaluator_lambda_log_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
 | [aws_iam_policy.evaluator_lambda_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
 | [aws_iam_role.evaluator_lambda_iam_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
 | [aws_iam_role_policy_attachment.aws_xray_write_only_access](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_iam_role_policy_attachment.lambda_base_policy_attachment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_iam_role_policy_attachment.lambda_policy_attachment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_lambda_event_source_mapping.evaluator_queue_event_source_mapping](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_event_source_mapping) | resource |
 | [aws_lambda_function.evaluator_lambda](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function) | resource |
+| [aws_lambda_function_event_invoke_config.invoke_config](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function_event_invoke_config) | resource |
 | [aws_s3_object.lambda_package](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_object) | resource |
 | [aws_sns_topic.evaluator_topic](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/sns_topic) | resource |
 | [aws_sns_topic_policy.evaluator_topic_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/sns_topic_policy) | resource |
diff --git a/terraform-unity/evaluators/sns-sqs-lambda/main.tf b/terraform-unity/evaluators/sns-sqs-lambda/main.tf
@@ -18,7 +18,7 @@ resource "aws_s3_object" "lambda_package" {
 }
 
 resource "aws_lambda_function" "evaluator_lambda" {
-  depends_on    = [aws_s3_object.lambda_package, aws_cloudwatch_log_group.evaluator_lambda_log_group]
+  depends_on    = [aws_s3_object.lambda_package]
   function_name = local.function_name
   s3_bucket     = var.code_bucket
   s3_key        = "${var.evaluator_name}-${jsondecode(data.local_file.version.content).version}-lambda.zip"
@@ -31,11 +31,17 @@ resource "aws_lambda_function" "evaluator_lambda" {
   tracing_config {
     mode = "Active"
   }
+
+  logging_config {
+    log_format = "Text"
+    log_group  = "/unity/log/${var.project}-${var.venue}-initiator-centralized-log-group"
+  }
 }
 
-resource "aws_cloudwatch_log_group" "evaluator_lambda_log_group" {
-  name              = "/aws/lambda/${local.function_name}"
-  retention_in_days = 14
+resource "aws_lambda_function_event_invoke_config" "invoke_config" {
+  function_name                = aws_lambda_function.evaluator_lambda.function_name
+  maximum_event_age_in_seconds = 21600
+  maximum_retry_attempts       = 0
 }
 
 resource "aws_iam_role" "evaluator_lambda_iam_role" {
diff --git a/terraform-unity/initiator/README.md b/terraform-unity/initiator/README.md
@@ -26,7 +26,6 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [aws_cloudwatch_log_group.initiator_lambda](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
 | [aws_iam_policy.initiator_lambda_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
 | [aws_iam_role.initiator_lambda_iam_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
 | [aws_iam_role_policy_attachment.aws_xray_write_only_access](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
@@ -35,6 +34,7 @@ No modules.
 | [aws_iam_role_policy_attachment.lambda_sns_policy_attachment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_lambda_event_source_mapping.initiator_queue_event_source_mapping](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_event_source_mapping) | resource |
 | [aws_lambda_function.initiator_lambda](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function) | resource |
+| [aws_lambda_function_event_invoke_config.invoke_config](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function_event_invoke_config) | resource |
 | [aws_s3_object.lambda_package](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_object) | resource |
 | [aws_sns_topic.initiator_topic](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/sns_topic) | resource |
 | [aws_sns_topic_subscription.initiator_subscription](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/sns_topic_subscription) | resource |
diff --git a/terraform-unity/initiator/locals.tf b/terraform-unity/initiator/locals.tf
@@ -1,5 +1,5 @@
 locals {
-  function_name = "${var.project}-${var.venue}-inititator"
+  function_name = "${var.project}-${var.venue}-initiator"
   tags = {
     Venue       = "dev"
     ServiceArea = "cs"
diff --git a/terraform-unity/initiator/main.tf b/terraform-unity/initiator/main.tf
@@ -18,8 +18,8 @@ resource "aws_s3_object" "lambda_package" {
 }
 
 resource "aws_lambda_function" "initiator_lambda" {
-  depends_on    = [aws_s3_object.lambda_package, aws_cloudwatch_log_group.initiator_lambda]
-  function_name = "${var.project}-${var.venue}-inititator"
+  depends_on    = [aws_s3_object.lambda_package]
+  function_name = "${var.project}-${var.venue}-initiator"
   s3_bucket     = var.code_bucket
   s3_key        = "unity_initiator-${jsondecode(data.local_file.version.content).version}-lambda.zip"
   handler       = "unity_initiator.cloud.lambda_handler.lambda_handler_initiator"
@@ -37,13 +37,18 @@ resource "aws_lambda_function" "initiator_lambda" {
     mode = "Active"
   }
 
+  logging_config {
+    log_format = "Text"
+    log_group  = "/unity/log/${var.project}-${var.venue}-initiator-centralized-log-group"
+  }
+
   tags = local.tags
 }
 
-resource "aws_cloudwatch_log_group" "initiator_lambda" {
-  name              = "/aws/lambda/${var.project}-${var.venue}-inititator"
-  retention_in_days = 14
-  tags              = local.tags
+resource "aws_lambda_function_event_invoke_config" "invoke_config" {
+  function_name                = aws_lambda_function.initiator_lambda.function_name
+  maximum_event_age_in_seconds = 21600
+  maximum_retry_attempts       = 0
 }
 
 resource "aws_iam_role" "initiator_lambda_iam_role" {
diff --git a/terraform-unity/triggers/cmr-query/README.md b/terraform-unity/triggers/cmr-query/README.md
@@ -27,7 +27,6 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [aws_cloudwatch_log_group.cmr_query_lambda_log_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
 | [aws_dynamodb_table.cmr_table](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/dynamodb_table) | resource |
 | [aws_iam_policy.dynamodb_crud_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
 | [aws_iam_policy.scheduler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
@@ -39,6 +38,7 @@ No modules.
 | [aws_iam_role_policy_attachment.lambda_sns_policy_attachment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_iam_role_policy_attachment.scheduler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_lambda_function.cmr_query_lambda](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function) | resource |
+| [aws_lambda_function_event_invoke_config.invoke_config](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function_event_invoke_config) | resource |
 | [aws_s3_object.lambda_package](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_object) | resource |
 | [aws_scheduler_schedule.run_cmr_query](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/scheduler_schedule) | resource |
 | [null_resource.build_lambda_package](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
diff --git a/terraform-unity/triggers/cmr-query/main.tf b/terraform-unity/triggers/cmr-query/main.tf
@@ -113,7 +113,7 @@ resource "aws_iam_role_policy_attachment" "aws_xray_write_only_access" {
 }
 
 resource "aws_lambda_function" "cmr_query_lambda" {
-  depends_on    = [aws_s3_object.lambda_package, aws_cloudwatch_log_group.cmr_query_lambda_log_group]
+  depends_on    = [aws_s3_object.lambda_package]
   function_name = local.function_name
   s3_bucket     = var.code_bucket
   s3_key        = "cmr_query-${jsondecode(data.local_file.version.content).version}-lambda.zip"
@@ -133,12 +133,18 @@ resource "aws_lambda_function" "cmr_query_lambda" {
     mode = "Active"
   }
 
+  logging_config {
+    log_format = "Text"
+    log_group  = "/unity/log/${var.project}-${var.venue}-initiator-centralized-log-group"
+  }
+
   tags = local.tags
 }
 
-resource "aws_cloudwatch_log_group" "cmr_query_lambda_log_group" {
-  name              = "/aws/lambda/${local.function_name}"
-  retention_in_days = 14
+resource "aws_lambda_function_event_invoke_config" "invoke_config" {
+  function_name                = aws_lambda_function.cmr_query_lambda.function_name
+  maximum_event_age_in_seconds = 21600
+  maximum_retry_attempts       = 0
 }
 
 resource "aws_iam_role" "scheduler" {
diff --git a/terraform-unity/triggers/scheduled-task-instrumented/README.md b/terraform-unity/triggers/scheduled-task-instrumented/README.md
@@ -27,7 +27,6 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [aws_cloudwatch_log_group.scheduled_task_lambda_log_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
 | [aws_iam_policy.scheduler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
 | [aws_iam_role.scheduled_task_lambda_iam_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
 | [aws_iam_role.scheduler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
@@ -36,6 +35,7 @@ No modules.
 | [aws_iam_role_policy_attachment.lambda_sns_policy_attachment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_iam_role_policy_attachment.scheduler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_lambda_function.scheduled_task_lambda](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function) | resource |
+| [aws_lambda_function_event_invoke_config.invoke_config](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function_event_invoke_config) | resource |
 | [aws_s3_object.lambda_package](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_object) | resource |
 | [aws_scheduler_schedule.run_scheduled_task](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/scheduler_schedule) | resource |
 | [null_resource.build_lambda_package](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
@@ -47,7 +47,6 @@ No modules.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_code_bucket"></a> [code\_bucket](#input\_code\_bucket) | The S3 bucket where lambda zip files will be stored and accessed | `string` | n/a | yes |
-| <a name="input_deployment_name"></a> [deployment\_name](#input\_deployment\_name) | The deployment name | `string` | n/a | yes |
 | <a name="input_initiator_topic_arn"></a> [initiator\_topic\_arn](#input\_initiator\_topic\_arn) | The ARN of the initiator SNS topic to publish S3 events to | `string` | n/a | yes |
 | <a name="input_project"></a> [project](#input\_project) | The unity project its installed into | `string` | `"uod"` | no |
 | <a name="input_venue"></a> [venue](#input\_venue) | The unity venue its installed into | `string` | `"dev"` | no |
diff --git a/terraform-unity/triggers/scheduled-task-instrumented/lambda_handler.py b/terraform-unity/triggers/scheduled-task-instrumented/lambda_handler.py
@@ -21,7 +21,7 @@ def lambda_handler(event, context):
     # is an example of a single payload.
     # Finally return True if it successful. False otherwise.
 
-    with xray_recorder.capture("publish_url_to_inititator_topic"):
+    with xray_recorder.capture("publish_url_to_initiator_topic"):
         client = boto3.client("sns")
         res = client.publish(
             TopicArn=INITIATOR_TOPIC_ARN,
diff --git a/terraform-unity/triggers/scheduled-task-instrumented/locals.tf b/terraform-unity/triggers/scheduled-task-instrumented/locals.tf
@@ -1,5 +1,5 @@
 locals {
-  function_name = "${var.project}-${var.venue}-${var.deployment_name}-scheduled_task"
+  function_name = "${var.project}-${var.venue}-scheduled_task"
   tags = {
     Venue       = "dev"
     ServiceArea = "cs"
diff --git a/terraform-unity/triggers/scheduled-task-instrumented/main.tf b/terraform-unity/triggers/scheduled-task-instrumented/main.tf
@@ -52,7 +52,7 @@ resource "aws_iam_role_policy_attachment" "aws_xray_write_only_access" {
 }
 
 resource "aws_lambda_function" "scheduled_task_lambda" {
-  depends_on    = [aws_s3_object.lambda_package, aws_cloudwatch_log_group.scheduled_task_lambda_log_group]
+  depends_on    = [aws_s3_object.lambda_package]
   function_name = local.function_name
   s3_bucket     = var.code_bucket
   s3_key        = "scheduled_task-${jsondecode(data.local_file.version.content).version}-lambda.zip"
@@ -71,16 +71,22 @@ resource "aws_lambda_function" "scheduled_task_lambda" {
     mode = "Active"
   }
 
+  logging_config {
+    log_format = "Text"
+    log_group  = "/unity/log/${var.project}-${var.venue}-initiator-centralized-log-group"
+  }
+
   tags = local.tags
 }
 
-resource "aws_cloudwatch_log_group" "scheduled_task_lambda_log_group" {
-  name              = "/aws/lambda/${local.function_name}"
-  retention_in_days = 14
+resource "aws_lambda_function_event_invoke_config" "invoke_config" {
+  function_name                = aws_lambda_function.scheduled_task_lambda.function_name
+  maximum_event_age_in_seconds = 21600
+  maximum_retry_attempts       = 0
 }
 
 resource "aws_iam_role" "scheduler" {
-  name = "${var.project}-${var.venue}-${var.deployment_name}-cron-scheduler-role"
+  name = "${var.project}-${var.venue}-cron-scheduler-role"
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
     Statement = [
@@ -98,7 +104,7 @@ resource "aws_iam_role" "scheduler" {
 }
 
 resource "aws_iam_policy" "scheduler" {
-  name = "${var.project}-${var.venue}-${var.deployment_name}-cron-scheduler-policy"
+  name = "${var.project}-${var.venue}-cron-scheduler-policy"
   policy = jsonencode({
     Version = "2012-10-17"
     Statement = [
@@ -120,7 +126,7 @@ resource "aws_iam_role_policy_attachment" "scheduler" {
 }
 
 resource "aws_scheduler_schedule" "run_scheduled_task" {
-  name                = "${var.project}-${var.venue}-${var.deployment_name}-run_scheduled_task"
+  name                = "${var.project}-${var.venue}-run_scheduled_task"
   schedule_expression = "rate(1 minute)"
   flexible_time_window {
     mode = "OFF"
diff --git a/terraform-unity/triggers/scheduled-task-instrumented/variables.tf b/terraform-unity/triggers/scheduled-task-instrumented/variables.tf
@@ -1,8 +1,3 @@
-variable "deployment_name" {
-  description = "The deployment name"
-  type        = string
-}
-
 variable "project" {
   description = "The unity project its installed into"
   type        = string
diff --git a/terraform-unity/triggers/scheduled-task/README.md b/terraform-unity/triggers/scheduled-task/README.md
@@ -26,14 +26,14 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [aws_cloudwatch_log_group.scheduled_task_lambda_log_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
 | [aws_iam_policy.scheduler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
 | [aws_iam_role.scheduled_task_lambda_iam_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
 | [aws_iam_role.scheduler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
 | [aws_iam_role_policy_attachment.lambda_base_policy_attachment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_iam_role_policy_attachment.lambda_sns_policy_attachment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_iam_role_policy_attachment.scheduler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_lambda_function.scheduled_task_lambda](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function) | resource |
+| [aws_lambda_function_event_invoke_config.invoke_config](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function_event_invoke_config) | resource |
 | [aws_scheduler_schedule.run_scheduled_task](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/scheduler_schedule) | resource |
 | [archive_file.lambda_zip_inline](https://registry.terraform.io/providers/hashicorp/archive/latest/docs/data-sources/file) | data source |
 | [aws_iam_policy.mcp_operator_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy) | data source |
diff --git a/terraform-unity/triggers/scheduled-task/main.tf b/terraform-unity/triggers/scheduled-task/main.tf
@@ -41,12 +41,19 @@ resource "aws_lambda_function" "scheduled_task_lambda" {
       INITIATOR_TOPIC_ARN = var.initiator_topic_arn
     }
   }
+
+  logging_config {
+    log_format = "Text"
+    log_group  = "/unity/log/${var.project}-${var.venue}-initiator-centralized-log-group"
+  }
+
   tags = local.tags
 }
 
-resource "aws_cloudwatch_log_group" "scheduled_task_lambda_log_group" {
-  name              = "/aws/lambda/${local.function_name}"
-  retention_in_days = 14
+resource "aws_lambda_function_event_invoke_config" "invoke_config" {
+  function_name                = aws_lambda_function.scheduled_task_lambda.function_name
+  maximum_event_age_in_seconds = 21600
+  maximum_retry_attempts       = 0
 }
 
 resource "aws_iam_role" "scheduler" {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`resource "aws_cloudwatch_log_group" "centralized_log_group" {`
`2`		`- name = "/aws/lambda/${local.log_group_name}"`
	`2`	`+ name = "/unity/log/${local.log_group_name}"`
`3`	`3`	`retention_in_days = 14`
`4`	`4`	`tags = local.tags`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-output "centralized_log_group_arn" {`
`2`		`- description = "The ARN of the centralized log group"`
`3`		`- value = aws_cloudwatch_log_group.centralized_log_group.arn`
	`1`	`+output "centralized_log_group_name" {`
	`2`	`+ description = "The name of the centralized log group"`
	`3`	`+ value = aws_cloudwatch_log_group.centralized_log_group.name`
`4`	`4`	`}`