Merge pull request #954 from NHSDigital/feature/jale13-nrl-1386-unsubscribe-status-lambdas

jackleary · web-flow · commit e1f053a3fce6 · 2025-07-01T09:33:26.000+01:00
NRL-1386 Status lambdas only send logs to splunk
diff --git a/terraform/account-wide-infrastructure/dev/vars.tf b/terraform/account-wide-infrastructure/dev/vars.tf
@@ -59,7 +59,7 @@ variable "enable_powerbi_auto_push" {
 variable "powerbi_gw_instance_type" {
   type        = string
   description = "Type for PowerBI GW EC2 Instance"
-  default     = "t2.micro"
+  default     = "t2.medium"
 }
 
 variable "use_powerbi_gw_custom_ami" {
diff --git a/terraform/account-wide-infrastructure/prod/vars.tf b/terraform/account-wide-infrastructure/prod/vars.tf
@@ -60,7 +60,7 @@ variable "enable_powerbi_auto_push" {
 variable "powerbi_gw_instance_type" {
   type        = string
   description = "Type for PowerBI GW EC2 Instance"
-  default     = "t2.micro"
+  default     = "t2.medium"
 }
 
 variable "use_powerbi_gw_custom_ami" {
diff --git a/terraform/account-wide-infrastructure/test/vars.tf b/terraform/account-wide-infrastructure/test/vars.tf
@@ -74,7 +74,7 @@ variable "enable_powerbi_auto_push" {
 variable "powerbi_gw_instance_type" {
   type        = string
   description = "Type for PowerBI GW EC2 Instance"
-  default     = "t2.micro"
+  default     = "t2.medium"
 }
 
 variable "use_powerbi_gw_custom_ami" {
diff --git a/terraform/infrastructure/lambda.tf b/terraform/infrastructure/lambda.tf
@@ -322,7 +322,7 @@ module "consumer__status" {
     local.pointers_kms_read_write_arn,
     local.auth_store_read_policy_arn
   ]
-  firehose_subscriptions = local.firehose_lambda_subscriptions
+  firehose_subscriptions = local.firehost_lambda_splunk_only_subscription
   handler                = "status.handler"
   retention              = var.log_retention_period
 }
@@ -351,7 +351,7 @@ module "producer__status" {
     local.pointers_kms_read_write_arn,
     local.auth_store_read_policy_arn
   ]
-  firehose_subscriptions = local.firehose_lambda_subscriptions
+  firehose_subscriptions = local.firehost_lambda_splunk_only_subscription
   handler                = "status.handler"
   retention              = var.log_retention_period
 }
diff --git a/terraform/infrastructure/locals.tf b/terraform/infrastructure/locals.tf
@@ -32,9 +32,16 @@ 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 ? {
-    "splunk_subscription" : module.firehose__processor[0].firehose_subscription,
-    "reports_subscription" : module.firehose__processor[0].firehose_reporting_subscription
+  firehose_lambda_subscriptions = var.use_shared_resources ? (
+    var.enable_reporting ? {
+      "splunk_subscription"  = module.firehose__processor[0].firehose_subscription,
+      "reports_subscription" = module.firehose__processor[0].firehose_reporting_subscription
+      } : {
+      "splunk_subscription" = module.firehose__processor[0].firehose_subscription
+    }
+  ) : {}
+  firehost_lambda_splunk_only_subscription = var.use_shared_resources ? {
+    "splunk_subscription" : module.firehose__processor[0].firehose_subscription
   } : {}
   splunk_environment = local.is_sandbox_env ? "${var.account_name}sandbox" : var.account_name
   splunk_index       = "aws_recordlocator_${local.splunk_environment}"

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ variable "enable_powerbi_auto_push" {`
`59`	`59`	`variable "powerbi_gw_instance_type" {`
`60`	`60`	`type = string`
`61`	`61`	`description = "Type for PowerBI GW EC2 Instance"`
`62`		`- default = "t2.micro"`
	`62`	`+ default = "t2.medium"`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`variable "use_powerbi_gw_custom_ami" {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ variable "enable_powerbi_auto_push" {`
`60`	`60`	`variable "powerbi_gw_instance_type" {`
`61`	`61`	`type = string`
`62`	`62`	`description = "Type for PowerBI GW EC2 Instance"`
`63`		`- default = "t2.micro"`
	`63`	`+ default = "t2.medium"`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`variable "use_powerbi_gw_custom_ami" {`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ variable "enable_powerbi_auto_push" {`
`74`	`74`	`variable "powerbi_gw_instance_type" {`
`75`	`75`	`type = string`
`76`	`76`	`description = "Type for PowerBI GW EC2 Instance"`
`77`		`- default = "t2.micro"`
	`77`	`+ default = "t2.medium"`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`variable "use_powerbi_gw_custom_ami" {`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ module "consumer__status" {`
`322`	`322`	`local.pointers_kms_read_write_arn,`
`323`	`323`	`local.auth_store_read_policy_arn`
`324`	`324`	`]`
`325`		`- firehose_subscriptions = local.firehose_lambda_subscriptions`
	`325`	`+ firehose_subscriptions = local.firehost_lambda_splunk_only_subscription`
`326`	`326`	`handler = "status.handler"`
`327`	`327`	`retention = var.log_retention_period`
`328`	`328`	`}`
`@@ -351,7 +351,7 @@ module "producer__status" {`
`351`	`351`	`local.pointers_kms_read_write_arn,`
`352`	`352`	`local.auth_store_read_policy_arn`
`353`	`353`	`]`
`354`		`- firehose_subscriptions = local.firehose_lambda_subscriptions`
	`354`	`+ firehose_subscriptions = local.firehost_lambda_splunk_only_subscription`
`355`	`355`	`handler = "status.handler"`
`356`	`356`	`retention = var.log_retention_period`
`357`	`357`	`}`