[NRL-1386] Switch lambda subscriptions to a named map

Author: mattdean3-nhs

terraform/infrastructure/locals.tf

@@ -32,10 +32,10 @@ locals {
 
   reporting_bucket_arn = data.aws_s3_bucket.source-data-bucket.arn
   reporting_kms_arn    = data.aws_kms_key.glue.arn
-  firehose_lambda_subscriptions = var.use_shared_resources ? [
-    module.firehose__processor[0].firehose_subscription,
-    module.firehose__processor[0].firehose_reporting_subscription
-  ] : []
+  firehose_lambda_subscriptions = var.use_shared_resources ? {
+    "splunk_subscription" : module.firehose__processor[0].firehose_subscription,
+    "reports_subscription" : module.firehose__processor[0].firehose_reporting_subscription
+  } : {}
   splunk_environment = local.is_sandbox_env ? "${var.account_name}sandbox" : var.account_name
   splunk_index       = "aws_recordlocator_${local.splunk_environment}"
 

terraform/infrastructure/modules/lambda/cloudwatch.tf

@@ -5,11 +5,11 @@ resource "aws_cloudwatch_log_group" "lambda_cloudwatch_log_group" {
 }
 
 resource "aws_cloudwatch_log_subscription_filter" "lambda_log_filter" {
-  name           = "${aws_lambda_function.lambda_function.function_name}_filter"
-  log_group_name = aws_cloudwatch_log_group.lambda_cloudwatch_log_group.name
+  for_each = var.firehose_subscriptions
 
-  count           = length(var.firehose_subscriptions)
-  role_arn        = var.firehose_subscriptions[count.index].role.arn
-  destination_arn = var.firehose_subscriptions[count.index].destination.arn
-  filter_pattern  = var.firehose_subscriptions[count.index].filter.pattern
+  name            = "${aws_lambda_function.lambda_function.function_name}_filter"
+  log_group_name  = aws_cloudwatch_log_group.lambda_cloudwatch_log_group.name
+  role_arn        = each.value.role.arn
+  destination_arn = each.value.destination.arn
+  filter_pattern  = each.value.filter.pattern
 }

terraform/infrastructure/modules/lambda/vars.tf

@@ -23,7 +23,9 @@ variable "additional_policies" {
 variable "handler" {}
 
 variable "firehose_subscriptions" {
-  default = []
+  description = "The firehose subscriptions to attach to the lambda logs"
+  type        = map(any)
+  default     = {}
 }
 
 variable "vpc" {