Skip to content

Commit 4ee3bdd

Browse files
committed
add cloudwatch logs config for lambdas
1 parent 9510109 commit 4ee3bdd

File tree

6 files changed

+22
-8
lines changed

6 files changed

+22
-8
lines changed

terraform-unity/evaluators/sns_sqs_lambda/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ No modules.
2626

2727
| Name | Type |
2828
|------|------|
29+
| [aws_cloudwatch_log_group.evaluator_lambda_log_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
2930
| [aws_iam_policy.evaluator_lambda_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
3031
| [aws_iam_role.evaluator_lambda_iam_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
3132
| [aws_iam_role_policy_attachment.lambda_base_policy_attachment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |

terraform-unity/evaluators/sns_sqs_lambda/locals.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
locals {
2+
function_name = "${var.project}-${var.venue}-${var.evaluator_name}-evaluator"
23
tags = {
34
Venue = "dev"
45
ServiceArea = "cs"

terraform-unity/evaluators/sns_sqs_lambda/main.tf

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ resource "aws_lambda_function" "evaluator_lambda" {
88
]
99
}
1010

11-
function_name = "${var.project}-${var.venue}-${var.evaluator_name}-evaluator"
11+
function_name = local.function_name
1212
role = aws_iam_role.evaluator_lambda_iam_role.arn
1313
handler = "lambda_function.lambda_handler"
1414
runtime = "python3.11"
@@ -18,8 +18,13 @@ resource "aws_lambda_function" "evaluator_lambda" {
1818
tags = local.tags
1919
}
2020

21+
resource "aws_cloudwatch_log_group" "evaluator_lambda_log_group" {
22+
name = "/aws/lambda/${local.function_name}"
23+
retention_in_days = 14
24+
}
25+
2126
resource "aws_iam_role" "evaluator_lambda_iam_role" {
22-
name = "${var.project}-${var.venue}-${var.evaluator_name}-evaluator_lambda_iam_role"
27+
name = "${local.function_name}_lambda_iam_role"
2328

2429
assume_role_policy = jsonencode({
2530
Version = "2012-10-17",
@@ -38,7 +43,7 @@ resource "aws_iam_role" "evaluator_lambda_iam_role" {
3843
}
3944

4045
resource "aws_iam_policy" "evaluator_lambda_policy" {
41-
name = "${var.project}-${var.venue}-${var.evaluator_name}-evaluator_lambda_policy"
46+
name = "${local.function_name}_lambda_policy"
4247
description = "A policy for the evaluator lambda function to access S3 and SQS"
4348

4449
policy = jsonencode({
@@ -89,7 +94,7 @@ resource "aws_ssm_parameter" "evaluator_lambda_function_name" {
8994

9095

9196
resource "aws_sqs_queue" "evaluator_dead_letter_queue" {
92-
name = "${var.project}-${var.venue}-${var.evaluator_name}-evaluator_dead_letter_queue"
97+
name = "${local.function_name}_dead_letter_queue"
9398
delay_seconds = 0
9499
max_message_size = 2048
95100
message_retention_seconds = 1209600
@@ -99,7 +104,7 @@ resource "aws_sqs_queue" "evaluator_dead_letter_queue" {
99104
}
100105

101106
resource "aws_sqs_queue" "evaluator_queue" {
102-
name = "${var.project}-${var.venue}-${var.evaluator_name}-evaluator_queue"
107+
name = "${local.function_name}_queue"
103108
delay_seconds = 0
104109
max_message_size = 2048
105110
message_retention_seconds = 1209600
@@ -113,7 +118,7 @@ resource "aws_sqs_queue" "evaluator_queue" {
113118
}
114119

115120
resource "aws_sns_topic" "evaluator_topic" {
116-
name = "${var.project}-${var.venue}-${var.evaluator_name}-evaluator_topic"
121+
name = "${local.function_name}_topic"
117122
}
118123

119124
resource "aws_sns_topic_policy" "evaluator_topic_policy" {

terraform-unity/triggers/scheduled_task/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ No modules.
2626

2727
| Name | Type |
2828
|------|------|
29+
| [aws_cloudwatch_log_group.scheduled_task_lambda_log_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
2930
| [aws_iam_policy.scheduler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
3031
| [aws_iam_role.scheduled_task_lambda_iam_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
3132
| [aws_iam_role.scheduler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |

terraform-unity/triggers/scheduled_task/locals.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
locals {
2+
function_name = "${var.project}-${var.venue}-${var.deployment_name}-scheduled_task"
23
tags = {
34
Venue = "dev"
45
ServiceArea = "cs"

terraform-unity/triggers/scheduled_task/main.tf

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "aws_iam_role" "scheduled_task_lambda_iam_role" {
2-
name = "${var.project}-${var.venue}-${var.deployment_name}-scheduled_task_lambda_iam_role"
2+
name = "${local.function_name}_lambda_iam_role"
33

44
assume_role_policy = jsonencode({
55
Version = "2012-10-17",
@@ -30,7 +30,7 @@ resource "aws_iam_role_policy_attachment" "lambda_base_policy_attachment" {
3030
resource "aws_lambda_function" "scheduled_task_lambda" {
3131
filename = data.archive_file.lambda_zip_inline.output_path
3232
source_code_hash = data.archive_file.lambda_zip_inline.output_base64sha256
33-
function_name = "${var.project}-${var.venue}-${var.deployment_name}-scheduled_task"
33+
function_name = local.function_name
3434
handler = "lambda_function.lambda_handler"
3535
runtime = "python3.11"
3636
role = aws_iam_role.scheduled_task_lambda_iam_role.arn
@@ -44,6 +44,11 @@ resource "aws_lambda_function" "scheduled_task_lambda" {
4444
tags = local.tags
4545
}
4646

47+
resource "aws_cloudwatch_log_group" "scheduled_task_lambda_log_group" {
48+
name = "/aws/lambda/${local.function_name}"
49+
retention_in_days = 14
50+
}
51+
4752
resource "aws_iam_role" "scheduler" {
4853
name = "${var.project}-${var.venue}-${var.deployment_name}-cron-scheduler-role"
4954
assume_role_policy = jsonencode({

0 commit comments

Comments
 (0)