Merge pull request #2811 from kakakakakku/fifo-sns-sqs-lambda-firehose-s3

fifo-sns-sqs-lambda-firehose-s3: Update runtime to python3.13

Author: julianwood

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-<YOUR-DEPLOYMENT-ID>" --r
 2022-03-29 19:17:01  1672 2022/03/29/17/fifo-sns-sqs-lambda-firehose-s3-stream-<YOUR-DEPLOYMENT-ID>-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-<YOUR-DEPLOYMENT-ID>'
 {
@@ -197,11 +197,3 @@ terraform show
 ----
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
-
-
-
-
-
-
-
-

fifo-sns-sqs-lambda-firehose-s3/assets/lambda/lambdaFirehoseLogger.zip

@@ -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}"
   }

fifo-sns-sqs-lambda-firehose-s3/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
   }
 }
 

fifo-sns-sqs-lambda-firehose-s3/modules/terraform-aws-firehose/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