fix message group id

Author: alexnuttall

infrastructure/terraform/components/sandbox/module_eventpub.tf

@@ -17,7 +17,7 @@ module "eventpub" {
   enable_event_cache                   = true
   enable_sns_delivery_logging          = false
   enable_firehose_raw_message_delivery = true
-  event_cache_buffer_interval          = 60
+  event_cache_buffer_interval          = 0
   sns_success_logging_sample_percent   = 0
   force_destroy                        = true
 

infrastructure/terraform/modules/backend-api/pipes_pipe_routing_config_table_events.tf

@@ -24,10 +24,19 @@ resource "aws_pipes_pipe" "routing_config_table_events" {
   }
 
   target_parameters {
-    input_template = "{\"dynamodb\": <$.dynamodb>,\"eventID\": <$.eventID>,\"eventName\": <$.eventName>,\"eventSource\": <$.eventSource>,\"tableName\": \"${aws_dynamodb_table.routing_configuration.name}\"}"
+    input_template = <<-EOF
+      {
+        "dynamodb": <$.dynamodb>,
+        "eventID": <$.eventID>,
+        "eventName": <$.eventName>,
+        "eventSource": <$.eventSource>,
+        "tableName": "${aws_dynamodb_table.routing_configuration.name}",
+        "prefixedGroupId": "${local.db_entity_shortnames["routing_config"]}:<$.dynamodb.Keys.id.S>"
+      }
+    EOF
 
     sqs_queue_parameters {
-      message_group_id         = "${local.db_entity_shortnames["routing_config"]}:<$.dynamodb.Keys.id.S>"
+      message_group_id         = "$.prefixedGroupId"
       message_deduplication_id = "$.eventID"
     }
   }

infrastructure/terraform/modules/backend-api/pipes_pipe_template_table_events.tf

@@ -24,10 +24,19 @@ resource "aws_pipes_pipe" "template_table_events" {
   }
 
   target_parameters {
-    input_template = "{\"dynamodb\": <$.dynamodb>,\"eventID\": <$.eventID>,\"eventName\": <$.eventName>,\"eventSource\": <$.eventSource>,\"tableName\": \"${aws_dynamodb_table.templates.name}\"}"
+    input_template = <<-EOF
+      {
+        "dynamodb": <$.dynamodb>,
+        "eventID": <$.eventID>,
+        "eventName": <$.eventName>,
+        "eventSource": <$.eventSource>,
+        "tableName": "${aws_dynamodb_table.templates.name}",
+        "prefixedGroupId": "${local.db_entity_shortnames["template"]}:<$.dynamodb.Keys.id.S>"
+      }
+    EOF
 
     sqs_queue_parameters {
-      message_group_id         = "${local.db_entity_shortnames["template"]}:<$.dynamodb.Keys.id.S>"
+      message_group_id         = "$.prefixedGroupId"
       message_deduplication_id = "$.eventID"
     }
   }