Skip to content

Commit 8152f64

Browse files
jacklearyjackleary
committed
NRL-1187 Subscribe lambda to new firehose stream
1 parent 10c28e4 commit 8152f64

File tree

2 files changed

+45
-78
lines changed

2 files changed

+45
-78
lines changed

‎terraform/infrastructure/lambda.tf‎

Lines changed: 39 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,9 @@ module "consumer__readDocumentReference" {
2020
local.pointers_kms_read_write_arn,
2121
local.auth_store_read_policy_arn
2222
]
23-
firehose_subscriptions = compact([
24-
module.firehose__processor.firehose_subscription,
25-
module.firehose__processor.firehose_reporting_subscription
26-
])
27-
handler = "read_document_reference.handler"
28-
retention = var.log_retention_period
23+
firehose_subscriptions = local.firehose_lambda_subscriptions
24+
handler = "read_document_reference.handler"
25+
retention = var.log_retention_period
2926
}
3027

3128
module "consumer__countDocumentReference" {
@@ -50,12 +47,9 @@ module "consumer__countDocumentReference" {
5047
local.pointers_kms_read_write_arn,
5148
local.auth_store_read_policy_arn
5249
]
53-
firehose_subscriptions = compact([
54-
module.firehose__processor.firehose_subscription,
55-
module.firehose__processor.firehose_reporting_subscription
56-
])
57-
handler = "count_document_reference.handler"
58-
retention = var.log_retention_period
50+
firehose_subscriptions = local.firehose_lambda_subscriptions
51+
handler = "count_document_reference.handler"
52+
retention = var.log_retention_period
5953
}
6054

6155
module "consumer__searchDocumentReference" {
@@ -80,12 +74,9 @@ module "consumer__searchDocumentReference" {
8074
local.pointers_kms_read_write_arn,
8175
local.auth_store_read_policy_arn
8276
]
83-
firehose_subscriptions = compact([
84-
module.firehose__processor.firehose_subscription,
85-
module.firehose__processor.firehose_reporting_subscription
86-
])
87-
handler = "search_document_reference.handler"
88-
retention = var.log_retention_period
77+
firehose_subscriptions = local.firehose_lambda_subscriptions
78+
handler = "search_document_reference.handler"
79+
retention = var.log_retention_period
8980
}
9081

9182
module "consumer__searchPostDocumentReference" {
@@ -110,12 +101,9 @@ module "consumer__searchPostDocumentReference" {
110101
local.pointers_kms_read_write_arn,
111102
local.auth_store_read_policy_arn
112103
]
113-
firehose_subscriptions = compact([
114-
module.firehose__processor.firehose_subscription,
115-
module.firehose__processor.firehose_reporting_subscription
116-
])
117-
handler = "search_post_document_reference.handler"
118-
retention = var.log_retention_period
104+
firehose_subscriptions = local.firehose_lambda_subscriptions
105+
handler = "search_post_document_reference.handler"
106+
retention = var.log_retention_period
119107
}
120108

121109
module "producer__createDocumentReference" {
@@ -141,12 +129,9 @@ module "producer__createDocumentReference" {
141129
local.pointers_kms_read_write_arn,
142130
local.auth_store_read_policy_arn
143131
]
144-
firehose_subscriptions = compact([
145-
module.firehose__processor.firehose_subscription,
146-
module.firehose__processor.firehose_reporting_subscription
147-
])
148-
handler = "create_document_reference.handler"
149-
retention = var.log_retention_period
132+
firehose_subscriptions = local.firehose_lambda_subscriptions
133+
handler = "create_document_reference.handler"
134+
retention = var.log_retention_period
150135
}
151136

152137
module "producer__deleteDocumentReference" {
@@ -172,12 +157,9 @@ module "producer__deleteDocumentReference" {
172157
local.pointers_kms_read_write_arn,
173158
local.auth_store_read_policy_arn
174159
]
175-
firehose_subscriptions = compact([
176-
module.firehose__processor.firehose_subscription,
177-
module.firehose__processor.firehose_reporting_subscription
178-
])
179-
handler = "delete_document_reference.handler"
180-
retention = var.log_retention_period
160+
firehose_subscriptions = local.firehose_lambda_subscriptions
161+
handler = "delete_document_reference.handler"
162+
retention = var.log_retention_period
181163
}
182164

183165
module "producer__readDocumentReference" {
@@ -202,12 +184,9 @@ module "producer__readDocumentReference" {
202184
local.pointers_kms_read_write_arn,
203185
local.auth_store_read_policy_arn
204186
]
205-
firehose_subscriptions = compact([
206-
module.firehose__processor.firehose_subscription,
207-
module.firehose__processor.firehose_reporting_subscription
208-
])
209-
handler = "read_document_reference.handler"
210-
retention = var.log_retention_period
187+
firehose_subscriptions = local.firehose_lambda_subscriptions
188+
handler = "read_document_reference.handler"
189+
retention = var.log_retention_period
211190
}
212191

213192
module "producer__searchDocumentReference" {
@@ -232,12 +211,9 @@ module "producer__searchDocumentReference" {
232211
local.pointers_kms_read_write_arn,
233212
local.auth_store_read_policy_arn
234213
]
235-
firehose_subscriptions = compact([
236-
module.firehose__processor.firehose_subscription,
237-
module.firehose__processor.firehose_reporting_subscription
238-
])
239-
handler = "search_document_reference.handler"
240-
retention = var.log_retention_period
214+
firehose_subscriptions = local.firehose_lambda_subscriptions
215+
handler = "search_document_reference.handler"
216+
retention = var.log_retention_period
241217
}
242218

243219
module "producer__searchPostDocumentReference" {
@@ -262,12 +238,9 @@ module "producer__searchPostDocumentReference" {
262238
local.pointers_kms_read_write_arn,
263239
local.auth_store_read_policy_arn
264240
]
265-
firehose_subscriptions = compact([
266-
module.firehose__processor.firehose_subscription,
267-
module.firehose__processor.firehose_reporting_subscription
268-
])
269-
handler = "search_post_document_reference.handler"
270-
retention = var.log_retention_period
241+
firehose_subscriptions = local.firehose_lambda_subscriptions
242+
handler = "search_post_document_reference.handler"
243+
retention = var.log_retention_period
271244
}
272245

273246
module "producer__updateDocumentReference" {
@@ -293,12 +266,9 @@ module "producer__updateDocumentReference" {
293266
local.pointers_kms_read_write_arn,
294267
local.auth_store_read_policy_arn
295268
]
296-
firehose_subscriptions = compact([
297-
module.firehose__processor.firehose_subscription,
298-
module.firehose__processor.firehose_reporting_subscription
299-
])
300-
handler = "update_document_reference.handler"
301-
retention = var.log_retention_period
269+
firehose_subscriptions = local.firehose_lambda_subscriptions
270+
handler = "update_document_reference.handler"
271+
retention = var.log_retention_period
302272
}
303273

304274
module "producer__upsertDocumentReference" {
@@ -324,12 +294,9 @@ module "producer__upsertDocumentReference" {
324294
local.pointers_kms_read_write_arn,
325295
local.auth_store_read_policy_arn
326296
]
327-
firehose_subscriptions = compact([
328-
module.firehose__processor.firehose_subscription,
329-
module.firehose__processor.firehose_reporting_subscription
330-
])
331-
handler = "upsert_document_reference.handler"
332-
retention = var.log_retention_period
297+
firehose_subscriptions = local.firehose_lambda_subscriptions
298+
handler = "upsert_document_reference.handler"
299+
retention = var.log_retention_period
333300
}
334301

335302
module "consumer__status" {
@@ -355,12 +322,9 @@ module "consumer__status" {
355322
local.pointers_kms_read_write_arn,
356323
local.auth_store_read_policy_arn
357324
]
358-
firehose_subscriptions = compact([
359-
module.firehose__processor.firehose_subscription,
360-
module.firehose__processor.firehose_reporting_subscription
361-
])
362-
handler = "status.handler"
363-
retention = var.log_retention_period
325+
firehose_subscriptions = local.firehose_lambda_subscriptions
326+
handler = "status.handler"
327+
retention = var.log_retention_period
364328
}
365329

366330

@@ -387,10 +351,7 @@ module "producer__status" {
387351
local.pointers_kms_read_write_arn,
388352
local.auth_store_read_policy_arn
389353
]
390-
firehose_subscriptions = compact([
391-
module.firehose__processor.firehose_subscription,
392-
module.firehose__processor.firehose_reporting_subscription
393-
])
394-
handler = "status.handler"
395-
retention = var.log_retention_period
354+
firehose_subscriptions = local.firehose_lambda_subscriptions
355+
handler = "status.handler"
356+
retention = var.log_retention_period
396357
}

‎terraform/infrastructure/locals.tf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ 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+
firehose_lambda_subscriptions = local.is_dev_env ? [
34+
module.firehose__processor.firehose_subscription,
35+
module.firehose__processor.firehose_reporting_subscription
36+
] : [
37+
module.firehose__processor.firehose_subscription
38+
]
3339

3440
# Logic / vars for splunk environment
3541
splunk_environment = local.is_sandbox_env ? "${var.account_name}sandbox" : var.account_name

0 commit comments

Comments
 (0)