cleanup

alexnuttall · alexnuttall · commit 73ba9c074687 · 2025-06-30T09:16:54.000+01:00
diff --git a/infrastructure/terraform/components/acct/module_sandbox_kms.tf b/infrastructure/terraform/components/acct/module_sandbox_kms.tf
@@ -104,8 +104,8 @@ data "aws_iam_policy_document" "kms" {
 
     condition {
       test     = "StringEquals"
-      variable = "kms:ViaService"
-      values   = ["sqs.${var.region}.amazonaws.com"]
+      variable = "kms:EncryptionContext:aws:sqs:arn"
+      values   = ["arn:aws:sqs:${var.region}:${var.aws_account_id}:*"]
     }
   }
 }
diff --git a/infrastructure/terraform/components/app/module_kms.tf b/infrastructure/terraform/components/app/module_kms.tf
@@ -108,7 +108,7 @@ data "aws_iam_policy_document" "kms" {
   }
 
   statement {
-    sid    = "AllowEventBridgeToEncryptSpecificQueue"
+    sid    = "AllowEventBridgeAccessToLetterValidationQueue"
     effect = "Allow"
 
     principals {
diff --git a/run-e2e.sh b/run-e2e.sh

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,8 @@ data "aws_iam_policy_document" "kms" {`
`104`	`104`
`105`	`105`	`condition {`
`106`	`106`	`test = "StringEquals"`
`107`		`- variable = "kms:ViaService"`
`108`		`- values = ["sqs.${var.region}.amazonaws.com"]`
	`107`	`+ variable = "kms:EncryptionContext:aws:sqs:arn"`
	`108`	`+ values = ["arn:aws:sqs:${var.region}:${var.aws_account_id}:*"]`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ data "aws_iam_policy_document" "kms" {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`statement {`
`111`		`- sid = "AllowEventBridgeToEncryptSpecificQueue"`
	`111`	`+ sid = "AllowEventBridgeAccessToLetterValidationQueue"`
`112`	`112`	`effect = "Allow"`
`113`	`113`
`114`	`114`	`principals {`