From f4559302183d97b49fc7cbed8669dc0fefb531e7 Mon Sep 17 00:00:00 2001 From: nmnielsen Date: Mon, 17 Nov 2025 00:46:41 +0100 Subject: [PATCH 1/3] use aws_s3_object --- main.tf | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/main.tf b/main.tf index fc0cc6a..9f26a74 100644 --- a/main.tf +++ b/main.tf @@ -51,15 +51,15 @@ resource "aws_iam_role_policy_attachment" "lambda_insights" { } # S3 object to hold the deployed artifact -resource "aws_s3_bucket_object" "lambda_deploy_object" { - count = var.image_uri == null ? 1 : 0 - bucket = local.deployment_bucket_id - key = "${var.name}/${local.deploy_artifact_key}" - source = var.path - source_hash = md5(local.source_hash) - tags = merge(var.tags, { - GitSHA = var.git_sha - }) +resource "aws_s3_object" "lambda_deploy_object" { + count = var.image_uri == null ? 1 : 0 + bucket = local.deployment_bucket_id + key = "${var.name}/${local.deploy_artifact_key}" + source = var.path + etag = md5(local.source_hash) + tags = merge(var.tags, { + GitSHA = var.git_sha + }) } # The Lambda function itself @@ -78,8 +78,8 @@ resource "aws_lambda_function" "lambda" { runtime = var.runtime package_type = var.image_uri == null ? "Zip" : "Image" s3_bucket = var.image_uri == null ? local.deployment_bucket_id : null - s3_key = var.image_uri == null ? aws_s3_bucket_object.lambda_deploy_object[0].key : null - s3_object_version = var.image_uri == null ? aws_s3_bucket_object.lambda_deploy_object[0].version_id : null + s3_key = var.image_uri == null ? aws_s3_object.lambda_deploy_object[0].key : null + s3_object_version = var.image_uri == null ? aws_s3_object.lambda_deploy_object[0].version_id : null image_uri = var.image_uri tags = var.tags timeout = var.timeout From 48f07eff28e33234861cf2114c13e9eed8d245bd Mon Sep 17 00:00:00 2001 From: nmnielsen Date: Mon, 17 Nov 2025 00:50:42 +0100 Subject: [PATCH 2/3] terraform 1.7.4 --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index cc105ab..a99cffa 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@master - uses: hashicorp/setup-terraform@v1 with: - terraform_version: 1.3.0 + terraform_version: 1.7.4 - id: Init run: terraform init -no-color - id: Fmt From ceb81175f9c88c5f626263aeebfc1d419f363611 Mon Sep 17 00:00:00 2001 From: nmnielsen Date: Mon, 17 Nov 2025 00:53:55 +0100 Subject: [PATCH 3/3] tf format --- main.tf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/main.tf b/main.tf index 9f26a74..7007eae 100644 --- a/main.tf +++ b/main.tf @@ -52,14 +52,14 @@ resource "aws_iam_role_policy_attachment" "lambda_insights" { # S3 object to hold the deployed artifact resource "aws_s3_object" "lambda_deploy_object" { - count = var.image_uri == null ? 1 : 0 - bucket = local.deployment_bucket_id - key = "${var.name}/${local.deploy_artifact_key}" - source = var.path - etag = md5(local.source_hash) - tags = merge(var.tags, { - GitSHA = var.git_sha - }) + count = var.image_uri == null ? 1 : 0 + bucket = local.deployment_bucket_id + key = "${var.name}/${local.deploy_artifact_key}" + source = var.path + etag = md5(local.source_hash) + tags = merge(var.tags, { + GitSHA = var.git_sha + }) } # The Lambda function itself