From 97005a077be6cf4ed4c6c2c947b70a58bb58ef6f Mon Sep 17 00:00:00 2001 From: kakakakakku Date: Sun, 27 Jul 2025 13:15:42 +0900 Subject: [PATCH 1/3] fifo-sns-sqs-lambda-firehose-s3: Update runtime to python3.13 and update AWS Provider --- .../assets/lambda/lambdaFirehoseLogger.zip | Bin 0 -> 601 bytes fifo-sns-sqs-lambda-firehose-s3/main.tf | 4 ++-- .../modules/terraform-aws-firehose/main.tf | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 fifo-sns-sqs-lambda-firehose-s3/assets/lambda/lambdaFirehoseLogger.zip diff --git a/fifo-sns-sqs-lambda-firehose-s3/assets/lambda/lambdaFirehoseLogger.zip b/fifo-sns-sqs-lambda-firehose-s3/assets/lambda/lambdaFirehoseLogger.zip new file mode 100644 index 0000000000000000000000000000000000000000..8939ef49fb7c313906d673b35b02aef9ac5795b3 GIT binary patch literal 601 zcmWIWW@Zs#-~d7f2E{HQ0SDqhR!(AWQc9v*W>IQJesQW#etLRpkzPS%&ZP5sw+(oX zy|3arH2sK!GS3a&2L6MOk{D-|6;$0wY*=`sWYt+A-mb#QthL_{{=Zbpt>1Z6{-nRW zsO!XEPG@JnedwC-^i2MzT?*yw((xGzY}$-Ip*L?y9bAwYdVNA^NdpgaQTNiY-TANI zce6(?;NNj$%8R36VwIe?&whS1`PDLw)L3Vo4eATeUuI_wHMBHXueiSV_H?!U7ow3J zuNaiSIJ7f=3Q@}8x-=xt%AnUhyL#lZhj^GdY__$|1Y~eO)odpbJR02F#P`?;LXkRN0tM{KMX8s1hH_Wh5&C?Hjp$U5V`{Ce?Y?-7yxNT_NV{= literal 0 HcmV?d00001 diff --git a/fifo-sns-sqs-lambda-firehose-s3/main.tf b/fifo-sns-sqs-lambda-firehose-s3/main.tf index 525033271..87587e1da 100644 --- a/fifo-sns-sqs-lambda-firehose-s3/main.tf +++ b/fifo-sns-sqs-lambda-firehose-s3/main.tf @@ -6,7 +6,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.0" + version = "~> 5.0" } } @@ -90,7 +90,7 @@ module "aws_lambda" { lambda_name = "${local.prefix}-lambda-${random_id.seed.hex}" lambda_handler = "lambdaFirehoseLogger.lambdaFirehoseLogger" lambda_file = "./assets/lambda/lambdaFirehoseLogger.py" - lambda_runtime = "python3.8" + lambda_runtime = "python3.13" env_variables = { "FIREHOSE_STREAM_NAME" : "${local.prefix}-stream-${random_id.seed.hex}" } diff --git a/fifo-sns-sqs-lambda-firehose-s3/modules/terraform-aws-firehose/main.tf b/fifo-sns-sqs-lambda-firehose-s3/modules/terraform-aws-firehose/main.tf index 3a11801f3..968df3b13 100644 --- a/fifo-sns-sqs-lambda-firehose-s3/modules/terraform-aws-firehose/main.tf +++ b/fifo-sns-sqs-lambda-firehose-s3/modules/terraform-aws-firehose/main.tf @@ -18,10 +18,10 @@ resource "aws_kinesis_firehose_delivery_stream" "stream" { extended_s3_configuration { - role_arn = aws_iam_role.firehose_role.arn - bucket_arn = var.bucket_arn - buffer_size = var.buffer_size != null ? var.buffer_size : 1 - buffer_interval = var.buffer_interval != null ? var.buffer_interval : 60 + role_arn = aws_iam_role.firehose_role.arn + bucket_arn = var.bucket_arn + buffering_size = var.buffer_size != null ? var.buffer_size : 1 + buffering_interval = var.buffer_interval != null ? var.buffer_interval : 60 } } From f6a4fa9dc6efa6b49c3d871a86e938acc162ed3c Mon Sep 17 00:00:00 2001 From: kakakakakku Date: Sun, 27 Jul 2025 14:02:32 +0900 Subject: [PATCH 2/3] fifo-sns-sqs-lambda-firehose-s3: Update README.md --- fifo-sns-sqs-lambda-firehose-s3/README.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/fifo-sns-sqs-lambda-firehose-s3/README.md b/fifo-sns-sqs-lambda-firehose-s3/README.md index f739f91db..698b831b5 100644 --- a/fifo-sns-sqs-lambda-firehose-s3/README.md +++ b/fifo-sns-sqs-lambda-firehose-s3/README.md @@ -12,7 +12,7 @@ The Terraform template in this pattern allows you to connect an SQS FIFO queue t * FIFO SQS queue * FIFO SNS Topic * Lambda function in python -* Cloudwatch log group for Lambda function +* CloudWatch log group for Lambda function * Required roles and policies Learn more about this pattern at Serverless Land Patterns: [serverlessland.com/patterns/sns-sqs-lambda-firehose-s3-terraform](https://serverlessland.com/patterns/sns-sqs-lambda-firehose-s3-terraform) @@ -83,7 +83,7 @@ aws s3 ls "s3://fifo-sns-sqs-lambda-firehose-s3-bucket-" --r 2022-03-29 19:17:01 1672 2022/03/29/17/fifo-sns-sqs-lambda-firehose-s3-stream--1-2022-03-29-17-15-58-4c161535-d7d7-4ae8-b6b9-11ee2f4cd446 ``` -4. You can check cloudwatch log group as well to see the lambda's event logs +4. You can check CloudWatch log group as well to see the lambda's event logs ```bash aws logs describe-log-streams --log-group-name '/aws/lambda/fifo-sns-sqs-lambda-firehose-s3-lambda-' { @@ -197,11 +197,3 @@ terraform show ---- Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. SPDX-License-Identifier: MIT-0 - - - - - - - - From 38478751c9662f8c0694b712f0ef4ba7ffa1b05e Mon Sep 17 00:00:00 2001 From: kakakakakku Date: Sat, 2 Aug 2025 09:24:17 +0900 Subject: [PATCH 3/3] fifo-sns-sqs-lambda-firehose-s3: Delete unnecessary aws_s3_bucket_acl --- .../modules/terraform-aws-s3/main.tf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fifo-sns-sqs-lambda-firehose-s3/modules/terraform-aws-s3/main.tf b/fifo-sns-sqs-lambda-firehose-s3/modules/terraform-aws-s3/main.tf index f5f4c94dd..16354cb5b 100644 --- a/fifo-sns-sqs-lambda-firehose-s3/modules/terraform-aws-s3/main.tf +++ b/fifo-sns-sqs-lambda-firehose-s3/modules/terraform-aws-s3/main.tf @@ -13,11 +13,6 @@ resource "aws_s3_bucket" "bucket" { } -resource "aws_s3_bucket_acl" "acl" { - bucket = aws_s3_bucket.bucket.id - acl = "private" -} - resource "aws_s3_bucket_public_access_block" "access" { bucket = aws_s3_bucket.bucket.id block_public_acls = true