Skip to content

Commit 4c8322b

Browse files
committed
NRL-1187 pull correct kms key
1 parent 12f5e13 commit 4c8322b

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

terraform/infrastructure/data.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,7 @@ data "aws_s3_bucket" "source-data-bucket" {
4646
count = local.is_dev_env ? 1 : 0
4747
bucket = "${local.shared_prefix}-source-data-bucket"
4848
}
49+
50+
data "aws_kms_key" "glue" {
51+
count = local.is_dev_env ? 1 : 0
52+
}

terraform/infrastructure/firehose.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ module "firehose__processor" {
99
splunk_index = local.splunk_index
1010
destination = "splunk"
1111
reporting_bucket_arn = local.reporting_bucket_arn
12+
reporting_kms_arn = local.reporting_kms_arn
1213
reporting_infra_toggle = local.is_dev_env
1314
}

terraform/infrastructure/locals.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ locals {
3030

3131
# Logic / vars for reporting
3232
reporting_bucket_arn = local.is_dev_env ? data.aws_s3_bucket.source-data-bucket[0].arn : null
33+
reporting_kms_arn = local.is_dev_env ? data.aws_kms_key.glue[0].arn : null
3334
firehose_lambda_subscriptions = local.is_dev_env ? [
3435
module.firehose__processor.firehose_subscription,
3536
module.firehose__processor.firehose_reporting_subscription

terraform/infrastructure/modules/firehose/locals.tf

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,9 @@ locals {
4040
firehose_reporting_stream_arn = var.reporting_infra_toggle ? aws_kinesis_firehose_delivery_stream.reporting_stream[0].arn : null
4141
}
4242

43-
iam_kms_resources = var.reporting_infra_toggle ? [
43+
iam_kms_resources = compact([
4444
aws_kms_key.firehose.arn,
45-
aws_kms_key.glue.arn,
46-
] : [
47-
aws_kms_key.firehose.arn,
48-
]
45+
data.aws_kms_key.glue.arn
46+
])
4947

5048
}

terraform/infrastructure/modules/firehose/vars.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ variable "reporting_bucket_arn" {
4040
default = null
4141
}
4242

43+
variable "reporting_kms_arn" {
44+
type = string
45+
default = null
46+
}
47+
4348
variable "reporting_infra_toggle" {
4449
type = bool
4550
}

0 commit comments

Comments
 (0)