CCM-12616: Force destroy s3 buckets

simonlabarere · simonlabarere · commit 37ad30faa762 · 2026-01-16T10:25:12.000Z
diff --git a/infrastructure/terraform/components/dl/module_s3bucket_letters.tf b/infrastructure/terraform/components/dl/module_s3bucket_letters.tf
@@ -12,6 +12,8 @@ module "s3bucket_letters" {
   kms_key_arn = module.kms.key_arn
 
   policy_documents = [data.aws_iam_policy_document.s3bucket_letters.json]
+
+  force_destroy = var.force_destroy
 }
 
 data "aws_iam_policy_document" "s3bucket_letters" {
diff --git a/infrastructure/terraform/components/dl/module_s3bucket_non_pii_data.tf b/infrastructure/terraform/components/dl/module_s3bucket_non_pii_data.tf
@@ -12,6 +12,8 @@ module "s3bucket_non_pii_data" {
   kms_key_arn = module.kms.key_arn
 
   policy_documents = [data.aws_iam_policy_document.s3bucket_non_pii_data.json]
+
+  force_destroy = var.force_destroy
 }
 
 data "aws_iam_policy_document" "s3bucket_non_pii_data" {
diff --git a/infrastructure/terraform/components/dl/module_s3bucket_pii_data.tf b/infrastructure/terraform/components/dl/module_s3bucket_pii_data.tf
@@ -12,6 +12,8 @@ module "s3bucket_pii_data" {
   kms_key_arn = module.kms.key_arn
 
   policy_documents = [data.aws_iam_policy_document.s3bucket_pii_data.json]
+
+  force_destroy = var.force_destroy
 }
 
 data "aws_iam_policy_document" "s3bucket_pii_data" {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ module "s3bucket_letters" {`
`12`	`12`	`kms_key_arn = module.kms.key_arn`
`13`	`13`
`14`	`14`	`policy_documents = [data.aws_iam_policy_document.s3bucket_letters.json]`
	`15`	`+`
	`16`	`+ force_destroy = var.force_destroy`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`data "aws_iam_policy_document" "s3bucket_letters" {`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ module "s3bucket_non_pii_data" {`
`12`	`12`	`kms_key_arn = module.kms.key_arn`
`13`	`13`
`14`	`14`	`policy_documents = [data.aws_iam_policy_document.s3bucket_non_pii_data.json]`
	`15`	`+`
	`16`	`+ force_destroy = var.force_destroy`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`data "aws_iam_policy_document" "s3bucket_non_pii_data" {`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ module "s3bucket_pii_data" {`
`12`	`12`	`kms_key_arn = module.kms.key_arn`
`13`	`13`
`14`	`14`	`policy_documents = [data.aws_iam_policy_document.s3bucket_pii_data.json]`
	`15`	`+`
	`16`	`+ force_destroy = var.force_destroy`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`data "aws_iam_policy_document" "s3bucket_pii_data" {`