From f5538f570c0cc4bee54e8d661bf52b5381369ae7 Mon Sep 17 00:00:00 2001 From: damientobin1 Date: Mon, 4 May 2026 23:09:11 +0100 Subject: [PATCH 1/7] CCM-17688: Updated Lifecycle Policy --- .../terraform/components/reporting/s3_bucket_results.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/terraform/components/reporting/s3_bucket_results.tf b/infrastructure/terraform/components/reporting/s3_bucket_results.tf index 5568f5f2..85175091 100644 --- a/infrastructure/terraform/components/reporting/s3_bucket_results.tf +++ b/infrastructure/terraform/components/reporting/s3_bucket_results.tf @@ -58,7 +58,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "results" { expected_bucket_owner = local.this_account rule { - id = "delete_all_objects_after_30_days" + id = "expire_objects" status = "Enabled" filter { @@ -66,11 +66,11 @@ resource "aws_s3_bucket_lifecycle_configuration" "results" { } expiration { - days = "30" + days = 30 } noncurrent_version_expiration { - noncurrent_days = "30" + noncurrent_days = 7 } } } From 1fb3caf2fe42e8e5aec1fa28b0ec81870e298db4 Mon Sep 17 00:00:00 2001 From: Damien Tobin Date: Tue, 5 May 2026 08:29:52 +0100 Subject: [PATCH 2/7] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../terraform/components/reporting/s3_bucket_results.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/terraform/components/reporting/s3_bucket_results.tf b/infrastructure/terraform/components/reporting/s3_bucket_results.tf index 85175091..c8364c42 100644 --- a/infrastructure/terraform/components/reporting/s3_bucket_results.tf +++ b/infrastructure/terraform/components/reporting/s3_bucket_results.tf @@ -58,7 +58,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "results" { expected_bucket_owner = local.this_account rule { - id = "expire_objects" + id = "expire_current_30d_noncurrent_7d" status = "Enabled" filter { From 3b95c37484e422e13ab6b7734639865736306aac Mon Sep 17 00:00:00 2001 From: damientobin1 Date: Tue, 5 May 2026 09:16:45 +0100 Subject: [PATCH 3/7] CCM-17688: Updated Lifecycle Policy --- .gitleaksignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitleaksignore b/.gitleaksignore index 969beb5d..1e313730 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -19,3 +19,5 @@ e44436c05bb859820c89b241df2e589ab760595b:infrastructure/terraform/components/rep 056d713eefe2305444059e99d707bd902ed6f532:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 d38af4e4f6c36ca9c3d843193b434386a9bad5ee:infrastructure/terraform/etc/env_eu-west-2_int.tfvars:generic-api-key:29 d38af4e4f6c36ca9c3d843193b434386a9bad5ee:infrastructure/terraform/etc/env_eu-west-2_prod.tfvars:generic-api-key:43 +9469a5a10e20b5c3275ba055e65ba98e7d11e9d2:infrastructure/terraform/components/reporting/README.md:ipv4:16 +9469a5a10e20b5c3275ba055e65ba98e7d11e9d2:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 \ No newline at end of file From 4ce9ca1db524c441779d8d834bf21f393b768c38 Mon Sep 17 00:00:00 2001 From: damientobin1 Date: Tue, 5 May 2026 09:20:13 +0100 Subject: [PATCH 4/7] CCM-17688: keep gitleaksignore updates --- .gitleaksignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitleaksignore b/.gitleaksignore index 1e313730..720e851b 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -20,4 +20,4 @@ e44436c05bb859820c89b241df2e589ab760595b:infrastructure/terraform/components/rep d38af4e4f6c36ca9c3d843193b434386a9bad5ee:infrastructure/terraform/etc/env_eu-west-2_int.tfvars:generic-api-key:29 d38af4e4f6c36ca9c3d843193b434386a9bad5ee:infrastructure/terraform/etc/env_eu-west-2_prod.tfvars:generic-api-key:43 9469a5a10e20b5c3275ba055e65ba98e7d11e9d2:infrastructure/terraform/components/reporting/README.md:ipv4:16 -9469a5a10e20b5c3275ba055e65ba98e7d11e9d2:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 \ No newline at end of file +9469a5a10e20b5c3275ba055e65ba98e7d11e9d2:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 From e48aa75708a8265a811590f211fa4ad83fdad9ed Mon Sep 17 00:00:00 2001 From: damientobin1 Date: Tue, 5 May 2026 09:32:40 +0100 Subject: [PATCH 5/7] CCM-17688: Updated Lifecycle Policy --- .gitleaksignore | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.gitleaksignore b/.gitleaksignore index 720e851b..f9c1477d 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -1,23 +1,4 @@ # SEE: https://github.com/gitleaks/gitleaks/blob/master/README.md#gitleaksignore -cd9c0efec38c5d63053dd865e5d4e207c0760d91:docs/guides/Perform_static_analysis.md:generic-api-key:37 -96096685ab3d6876671e2bc9a6ff4d48fc56e521:src/helloworld/helloworld.sln:ipv4:4 -4f4e8c15629b2cb09356a7fed4d72953590227ce:docs/Gemfile.lock:ipv4:4 -e2fd9d99d561c274cfd11b85a99a0cb1ae00f97d:infrastructure/terraform/components/reporting/templates/cloudinit_config.ps1:ipv4:28 -8cd75c04961cd6ce8477b7dad9c6daa67f03cd19:infrastructure/terraform/components/reporting/templates/cloudinit_config.tmpl:ipv4:32 -9b7b5b4539e13109e15c474684911b5a349c1b6d:infrastructure/terraform/components/reporting/scripts/sql/views/request_item_status_summary_all_emailfilter.sql:generic-api-key:12 -ca243cb73d3804a14f3eeefa8073c96802420c52:infrastructure/terraform/etc/env_eu-west-2_int.tfvars:generic-api-key:29 -ca243cb73d3804a14f3eeefa8073c96802420c52:infrastructure/terraform/etc/env_eu-west-2_prod.tfvars:generic-api-key:43 -bb20e9d078e09d242ade5deaa6dcb84f1755b347:infrastructure/terraform/components/reporting/README.md:ipv4:16 -82e47104e889b81a3c5fb27355072229eb671181:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 -9ffd6b1c4e6a8723e4fbc84d33e797f14a0504c1:infrastructure/terraform/components/reporting/README.md:ipv4:16 -9ffd6b1c4e6a8723e4fbc84d33e797f14a0504c1:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 -e44436c05bb859820c89b241df2e589ab760595b:infrastructure/terraform/components/reporting/README.md:ipv4:16 -056d713eefe2305444059e99d707bd902ed6f532:infrastructure/terraform/components/reporting/README.md:ipv4:16 -66380f86140cd9c23e5a3e61044488872e632bf7:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 -056d713eefe2305444059e99d707bd902ed6f532:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 -056d713eefe2305444059e99d707bd902ed6f532:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 -d38af4e4f6c36ca9c3d843193b434386a9bad5ee:infrastructure/terraform/etc/env_eu-west-2_int.tfvars:generic-api-key:29 -d38af4e4f6c36ca9c3d843193b434386a9bad5ee:infrastructure/terraform/etc/env_eu-west-2_prod.tfvars:generic-api-key:43 9469a5a10e20b5c3275ba055e65ba98e7d11e9d2:infrastructure/terraform/components/reporting/README.md:ipv4:16 9469a5a10e20b5c3275ba055e65ba98e7d11e9d2:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 From a4d9b1edeff0e982bdecb04d0a332591b9d53e78 Mon Sep 17 00:00:00 2001 From: damientobin1 Date: Tue, 5 May 2026 09:34:57 +0100 Subject: [PATCH 6/7] CCM-17688: Updated Lifecycle Policy --- .gitleaksignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitleaksignore b/.gitleaksignore index f9c1477d..63b6632d 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -2,3 +2,4 @@ 9469a5a10e20b5c3275ba055e65ba98e7d11e9d2:infrastructure/terraform/components/reporting/README.md:ipv4:16 9469a5a10e20b5c3275ba055e65ba98e7d11e9d2:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 +ca243cb73d3804a14f3eeefa8073c96802420c52:infrastructure/terraform/etc/env_eu-west-2_int.tfvars:generic-api-key:29 From 25f583ad92bf34672f64759a944d11cfa9c0e1e5 Mon Sep 17 00:00:00 2001 From: damientobin1 Date: Tue, 5 May 2026 09:37:22 +0100 Subject: [PATCH 7/7] CCM-17688: Updated Lifecycle Policy --- .gitleaksignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitleaksignore b/.gitleaksignore index 63b6632d..374d0269 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -3,3 +3,4 @@ 9469a5a10e20b5c3275ba055e65ba98e7d11e9d2:infrastructure/terraform/components/reporting/README.md:ipv4:16 9469a5a10e20b5c3275ba055e65ba98e7d11e9d2:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 ca243cb73d3804a14f3eeefa8073c96802420c52:infrastructure/terraform/etc/env_eu-west-2_int.tfvars:generic-api-key:29 +ca243cb73d3804a14f3eeefa8073c96802420c52:infrastructure/terraform/etc/env_eu-west-2_prod.tfvars:generic-api-key:43