CCM-8237 sqs resource policy overlaod

aidenvaines-cgi · aidenvaines-cgi · commit ab15f515f345 · 2025-01-16T13:24:26.000Z
CCM-8237 sqs resource policy overlaod CCM-8237 sqs resource policy overlaod CCM-8237 sqs resource policy overlaod CCM-8237 sqs resource policy overlaod CCM-8237 sqs resource policy overlaod CCM-8237 sqs resource policy overlaod CCM-8237 sqs resource policy overlaod
diff --git a/infrastructure/modules/sqs/data_iam_policy_document_sqs_queue.tf b/infrastructure/modules/sqs/data_iam_policy_document_sqs_queue.tf
@@ -19,4 +19,6 @@ data "aws_iam_policy_document" "sqs_queue" {
       identifiers = [var.aws_account_id]
     }
   }
+
+  override_policy_documents = [var.sqs_policy_overload]
 }
diff --git a/infrastructure/modules/sqs/sqs_queue_policy.tf b/infrastructure/modules/sqs/sqs_queue_policy.tf
@@ -1,7 +1,5 @@
 resource "aws_sqs_queue_policy" "sqs_queue_policy" {
   queue_url = aws_sqs_queue.sqs_queue.id
-  policy    = jsonencode([
-    data.aws_iam_policy_document.sqs_queue.json,
-    var.sqs_policy_overload,
-  ])
+  policy    = data.aws_iam_policy_document.sqs_queue.json
 }
+
diff --git a/infrastructure/modules/sqs/variables.tf b/infrastructure/modules/sqs/variables.tf
@@ -60,11 +60,7 @@ variable "sqs_kms_key_arn" {
 variable "sqs_policy_overload" {
   type        = string
   description = "Optional additional policy to extend the SQS Resource Policy"
-  default     = null
-  validation {
-    condition     = can(jsondecode(var.sqs_policy_overload))
-    error_message = "sqs_policy_overload must be a valid JSON."
-  }
+  default     = ""
 }
 
 variable "allowed_arns" {

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,6 @@ data "aws_iam_policy_document" "sqs_queue" {`
`19`	`19`	`identifiers = [var.aws_account_id]`
`20`	`20`	`}`
`21`	`21`	`}`
	`22`	`+`
	`23`	`+ override_policy_documents = [var.sqs_policy_overload]`
`22`	`24`	`}`