From c4d02b9c3f38b63cfb833c398d4ed2d3b65cfffb Mon Sep 17 00:00:00 2001 From: ana-sher Date: Fri, 28 Nov 2025 19:11:11 +0100 Subject: [PATCH 1/7] clean zip after docker image creation --- infra/main.tf | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/infra/main.tf b/infra/main.tf index 46bca79..0f23d33 100644 --- a/infra/main.tf +++ b/infra/main.tf @@ -115,16 +115,6 @@ locals { docker_tag = substr(data.archive_file.docker_context.output_base64sha256, 0, 12) } -resource "null_resource" "cleanup_zip" { - triggers = { - docker_tag = local.docker_tag - } - - provisioner "local-exec" { - command = "rm -f ${path.module}/context.zip" - } -} - module "docker_image" { source = "terraform-aws-modules/lambda/aws//modules/docker-build" @@ -154,6 +144,14 @@ module "docker_image" { }) } +resource "null_resource" "cleanup_zip" { + depends_on = [module.docker_image.image_id] + + provisioner "local-exec" { + command = "rm -f ${path.module}/context.zip" + } +} + resource "aws_iam_role" "app_role" { name = "climate_app_role" From 0612fb37c6f181611d77cbfd9e94ae48eca9f7ef Mon Sep 17 00:00:00 2001 From: ana-sher Date: Fri, 28 Nov 2025 19:14:07 +0100 Subject: [PATCH 2/7] temporary run apply on pr --- .github/workflows/terraform.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 37a9aae..db18838 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -88,7 +88,8 @@ jobs: run: exit 1 - name: Terraform Apply - if: github.event_name == 'release' + if: github.event_name == 'pull_request' +# if: github.event_name == 'release' working-directory: infra run: | terraform init From 0e4fbdd4035be34379188b2734a209afb170b31f Mon Sep 17 00:00:00 2001 From: ana-sher Date: Fri, 28 Nov 2025 19:23:42 +0100 Subject: [PATCH 3/7] change docker tag generation --- infra/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.tf b/infra/main.tf index 0f23d33..6e1256d 100644 --- a/infra/main.tf +++ b/infra/main.tf @@ -112,7 +112,7 @@ data "archive_file" "docker_context" { } locals { - docker_tag = substr(data.archive_file.docker_context.output_base64sha256, 0, 12) + docker_tag = substr(replace(data.archive_file.docker_context.output_base64sha256, "[^a-zA-Z0-9._-]", "-"), 0, 12) } module "docker_image" { From 1e7b01421cda89a6c56c92faf200cbd9560e3eca Mon Sep 17 00:00:00 2001 From: ana-sher Date: Fri, 28 Nov 2025 19:26:59 +0100 Subject: [PATCH 4/7] change docker tag generation regex --- infra/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.tf b/infra/main.tf index 6e1256d..15e024b 100644 --- a/infra/main.tf +++ b/infra/main.tf @@ -112,7 +112,7 @@ data "archive_file" "docker_context" { } locals { - docker_tag = substr(replace(data.archive_file.docker_context.output_base64sha256, "[^a-zA-Z0-9._-]", "-"), 0, 12) + docker_tag = substr(replace(data.archive_file.docker_context.output_base64sha256, "[+/=]", "-"), 0, 12) } module "docker_image" { From 6a6c8d2b9365e75ad34a4076af2d22d1548c9887 Mon Sep 17 00:00:00 2001 From: ana-sher Date: Fri, 28 Nov 2025 19:46:44 +0100 Subject: [PATCH 5/7] change docker tag generation regex --- infra/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.tf b/infra/main.tf index 15e024b..f1f88da 100644 --- a/infra/main.tf +++ b/infra/main.tf @@ -112,7 +112,7 @@ data "archive_file" "docker_context" { } locals { - docker_tag = substr(replace(data.archive_file.docker_context.output_base64sha256, "[+/=]", "-"), 0, 12) + docker_tag = replace(substr(data.archive_file.docker_context.output_base64sha256, 0, 12), "/[^a-zA-Z0-9._-]/", "-") } module "docker_image" { From 01a913f22d9ca4458c9fc96b84ade4b733813194 Mon Sep 17 00:00:00 2001 From: ana-sher Date: Fri, 28 Nov 2025 20:28:14 +0100 Subject: [PATCH 6/7] add permission to pipeline --- .github/workflows/terraform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index db18838..f26e00c 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -11,6 +11,7 @@ on: permissions: pull-requests: write + packages: write issues: write id-token: write contents: read From 5a1b0dc60cce5636858c4ba81c86ce66f2effaea Mon Sep 17 00:00:00 2001 From: ana-sher Date: Fri, 28 Nov 2025 20:32:01 +0100 Subject: [PATCH 7/7] change back apply on release --- .github/workflows/terraform.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index f26e00c..95072ba 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -89,8 +89,7 @@ jobs: run: exit 1 - name: Terraform Apply - if: github.event_name == 'pull_request' -# if: github.event_name == 'release' + if: github.event_name == 'release' working-directory: infra run: | terraform init