NRL-1188 use compact to ignore nulls

Author: jackleary

terraform/infrastructure/locals.tf

@@ -29,7 +29,7 @@ locals {
   public_domain = local.is_sandbox_env ? var.public_sandbox_domain : var.public_domain
 
   # Logic / vars for reporting
-  reporting_bucket_arn = local.is_dev_env ? data.aws_s3_bucket.source-data-bucket[0].arn : data.aws_s3_bucket.source-data-bucket.arn
+  reporting_bucket_arn = local.is_dev_env ? data.aws_s3_bucket.source-data-bucket[0].arn : null
 
   # Logic / vars for splunk environment
   splunk_environment = local.is_sandbox_env ? "${var.account_name}sandbox" : var.account_name

terraform/infrastructure/modules/firehose/iam_firehose.tf

@@ -27,12 +27,12 @@ data "aws_iam_policy_document" "firehose" {
       "s3:PutObject",
     ]
 
-    resources = [
+    resources = compact([
       aws_s3_bucket.firehose.arn,
       "${aws_s3_bucket.firehose.arn}/*",
       var.reporting_bucket_arn,
       "${var.reporting_bucket_arn}/*",
-    ]
+    ])
     effect = "Allow"
   }
 
@@ -72,12 +72,12 @@ data "aws_iam_policy_document" "firehose" {
     actions = [
       "logs:PutLogEvents",
     ]
-    resources = [
+    resources = compact([
       aws_cloudwatch_log_group.firehose.arn,
       aws_cloudwatch_log_stream.firehose.arn,
       local.iam_firehose.cloudwatch_reporting_log_group_arn,
       local.iam_firehose.cloudwatch_reporting_log_stream_arn,
-    ]
+    ])
     effect = "Allow"
   }
 }

terraform/infrastructure/modules/firehose/iam_subscriptions.tf

@@ -20,10 +20,10 @@ data "aws_iam_policy_document" "firehose_subscription" {
       "firehose:*",
     ]
     effect = "Allow"
-    resources = [
+    resources = compact([
       aws_kinesis_firehose_delivery_stream.firehose.arn,
       local.iam_subscriptions.firehose_reporting_stream_arn,
-    ]
+    ])
   }
   statement {
     actions = [

terraform/infrastructure/modules/firehose/locals.tf

@@ -32,12 +32,12 @@ locals {
   }
 
   iam_firehose = {
-    cloudwatch_reporting_log_group_arn  = var.reporting_infra_toggle ? aws_cloudwatch_log_group.firehose_reporting[0].arn : aws_cloudwatch_log_group.firehose_reporting.arn
-    cloudwatch_reporting_log_stream_arn = var.reporting_infra_toggle ? aws_cloudwatch_log_stream.firehose_reporting[0].arn : aws_cloudwatch_log_stream.firehose_reporting.arn
+    cloudwatch_reporting_log_group_arn  = var.reporting_infra_toggle ? aws_cloudwatch_log_group.firehose_reporting[0].arn : null
+    cloudwatch_reporting_log_stream_arn = var.reporting_infra_toggle ? aws_cloudwatch_log_stream.firehose_reporting[0].arn : null
   }
 
   iam_subscriptions = {
-    firehose_reporting_stream_arn = var.reporting_infra_toggle ? aws_kinesis_firehose_delivery_stream.reporting_stream[0].arn : aws_kinesis_firehose_delivery_stream.reporting_stream.arn
+    firehose_reporting_stream_arn = var.reporting_infra_toggle ? aws_kinesis_firehose_delivery_stream.reporting_stream[0].arn : null
   }
 
 }