change walthamforest name

This commit is contained in:
Jun-te Kim 2025-09-11 14:15:35 +00:00
parent ae9b9fef85
commit 0503e857fd
2 changed files with 22 additions and 22 deletions

View file

@ -1,11 +1,11 @@
# ECR repo
resource "aws_ecr_repository" "walthamforest_etl_ecr" {
name = "walthamforest_etl_ecr"
resource "aws_ecr_repository" "walthamforest_etl_adhoc_ecr" {
name = "walthamforest_etl_adhoc_ecr"
}
# ECR policy to allow Lambda access
resource "aws_ecr_repository_policy" "walthamforest_etl_ecr_access" {
repository = aws_ecr_repository.walthamforest_etl_ecr.name
resource "aws_ecr_repository_policy" "walthamforest_etl_adhoc_ecr_access" {
repository = aws_ecr_repository.walthamforest_etl_adhoc_ecr.name
policy = jsonencode({
Version = "2008-10-17",
@ -27,8 +27,8 @@ resource "aws_ecr_repository_policy" "walthamforest_etl_ecr_access" {
# ECR lifecycle policy to delete tagged images older than 14 days
resource "aws_ecr_lifecycle_policy" "walthamforest_etl_loader_lifecycle" {
repository = aws_ecr_repository.walthamforest_etl_ecr.name
resource "aws_ecr_lifecycle_policy" "walthamforest_etl_adhoc_loader_lifecycle" {
repository = aws_ecr_repository.walthamforest_etl_adhoc_ecr.name
policy = jsonencode({
"rules": [

View file

@ -4,20 +4,20 @@ data "aws_iam_role" "lambda_exec_role" {
}
# Reference existing ECR repository
data "aws_ecr_repository" "walthamforest_etl_ecr" {
name = "walthamforest_etl_ecr"
data "aws_ecr_repository" "walthamforest_etl_adhoc_adhoc_adhoc_adhoc_adhoc_ecr" {
name = "walthamforest_etl_adhoc_ecr"
}
# SQS queue
resource "aws_sqs_queue" "walthamforest_etl_queue" {
name = "walthamforest_etl-queue"
resource "aws_sqs_queue" "walthamforest_etl_adhoc_queue" {
name = "walthamforest_etl_adhoc-queue"
visibility_timeout_seconds = 1800 # 30 minutes (>= 300s and ~6x Lambda timeout)
}
# IAM policy specific to this Lambda
resource "aws_iam_policy" "walthamforest_etl_policy" {
name = "walthamforest_etl-loader-policy"
resource "aws_iam_policy" "walthamforest_etl_adhoc_policy" {
name = "walthamforest_etl_adhoc-loader-policy"
policy = jsonencode({
Version = "2012-10-17",
@ -31,7 +31,7 @@ resource "aws_iam_policy" "walthamforest_etl_policy" {
"sqs:GetQueueUrl",
"sqs:ChangeMessageVisibility"
],
Resource = aws_sqs_queue.walthamforest_etl_queue.arn
Resource = aws_sqs_queue.walthamforest_etl_adhoc_queue.arn
},
{
Effect = "Allow",
@ -40,7 +40,7 @@ resource "aws_iam_policy" "walthamforest_etl_policy" {
"ecr:BatchGetImage",
"ecr:BatchCheckLayerAvailability"
],
Resource = data.aws_ecr_repository.walthamforest_etl_ecr.arn
Resource = data.aws_ecr_repository.walthamforest_etl_adhoc_ecr.arn
},
{
Effect = "Allow",
@ -51,17 +51,17 @@ resource "aws_iam_policy" "walthamforest_etl_policy" {
})
}
resource "aws_iam_role_policy_attachment" "walthamforest_etl_policy_attach" {
resource "aws_iam_role_policy_attachment" "walthamforest_etl_adhoc_policy_attach" {
role = data.aws_iam_role.lambda_exec_role.name
policy_arn = aws_iam_policy.walthamforest_etl_policy.arn
policy_arn = aws_iam_policy.walthamforest_etl_adhoc_policy.arn
}
# Lambda function
resource "aws_lambda_function" "walthamforest_etl" {
function_name = "walthamforest_etl"
resource "aws_lambda_function" "walthamforest_etl_adhoc" {
function_name = "walthamforest_etl_adhoc"
role = data.aws_iam_role.lambda_exec_role.arn
package_type = "Image"
image_uri = "${data.aws_ecr_repository.walthamforest_etl_ecr.repository_url}:${var.lambda_image_tag}"
image_uri = "${data.aws_ecr_repository.walthamforest_etl_adhoc_ecr.repository_url}:${var.lambda_image_tag}"
# Increase timeout (max 900 sec / 15 min)
# timeout = 300 # e.g. 5 minutes
@ -76,8 +76,8 @@ resource "aws_lambda_function" "walthamforest_etl" {
}
# SQS trigger
resource "aws_lambda_event_source_mapping" "walthamforest_etl_trigger" {
event_source_arn = aws_sqs_queue.walthamforest_etl_queue.arn
function_name = aws_lambda_function.walthamforest_etl.arn
resource "aws_lambda_event_source_mapping" "walthamforest_etl_adhoc_trigger" {
event_source_arn = aws_sqs_queue.walthamforest_etl_adhoc_queue.arn
function_name = aws_lambda_function.walthamforest_etl_adhoc.arn
batch_size = 1
}