Skip to content

Commit 10c28e4

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

File tree

2 files changed

+67
-39
lines changed

2 files changed

+67
-39
lines changed

‎terraform/infrastructure/lambda.tf‎

Lines changed: 52 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ module "consumer__readDocumentReference" {
2020
local.pointers_kms_read_write_arn,
2121
local.auth_store_read_policy_arn
2222
]
23-
firehose_subscriptions = [
24-
module.firehose__processor.firehose_subscription
25-
]
23+
firehose_subscriptions = compact([
24+
module.firehose__processor.firehose_subscription,
25+
module.firehose__processor.firehose_reporting_subscription
26+
])
2627
handler = "read_document_reference.handler"
2728
retention = var.log_retention_period
2829
}
@@ -49,9 +50,10 @@ module "consumer__countDocumentReference" {
4950
local.pointers_kms_read_write_arn,
5051
local.auth_store_read_policy_arn
5152
]
52-
firehose_subscriptions = [
53-
module.firehose__processor.firehose_subscription
54-
]
53+
firehose_subscriptions = compact([
54+
module.firehose__processor.firehose_subscription,
55+
module.firehose__processor.firehose_reporting_subscription
56+
])
5557
handler = "count_document_reference.handler"
5658
retention = var.log_retention_period
5759
}
@@ -78,9 +80,10 @@ module "consumer__searchDocumentReference" {
7880
local.pointers_kms_read_write_arn,
7981
local.auth_store_read_policy_arn
8082
]
81-
firehose_subscriptions = [
82-
module.firehose__processor.firehose_subscription
83-
]
83+
firehose_subscriptions = compact([
84+
module.firehose__processor.firehose_subscription,
85+
module.firehose__processor.firehose_reporting_subscription
86+
])
8487
handler = "search_document_reference.handler"
8588
retention = var.log_retention_period
8689
}
@@ -107,9 +110,10 @@ module "consumer__searchPostDocumentReference" {
107110
local.pointers_kms_read_write_arn,
108111
local.auth_store_read_policy_arn
109112
]
110-
firehose_subscriptions = [
111-
module.firehose__processor.firehose_subscription
112-
]
113+
firehose_subscriptions = compact([
114+
module.firehose__processor.firehose_subscription,
115+
module.firehose__processor.firehose_reporting_subscription
116+
])
113117
handler = "search_post_document_reference.handler"
114118
retention = var.log_retention_period
115119
}
@@ -137,9 +141,10 @@ module "producer__createDocumentReference" {
137141
local.pointers_kms_read_write_arn,
138142
local.auth_store_read_policy_arn
139143
]
140-
firehose_subscriptions = [
141-
module.firehose__processor.firehose_subscription
142-
]
144+
firehose_subscriptions = compact([
145+
module.firehose__processor.firehose_subscription,
146+
module.firehose__processor.firehose_reporting_subscription
147+
])
143148
handler = "create_document_reference.handler"
144149
retention = var.log_retention_period
145150
}
@@ -167,9 +172,10 @@ module "producer__deleteDocumentReference" {
167172
local.pointers_kms_read_write_arn,
168173
local.auth_store_read_policy_arn
169174
]
170-
firehose_subscriptions = [
171-
module.firehose__processor.firehose_subscription
172-
]
175+
firehose_subscriptions = compact([
176+
module.firehose__processor.firehose_subscription,
177+
module.firehose__processor.firehose_reporting_subscription
178+
])
173179
handler = "delete_document_reference.handler"
174180
retention = var.log_retention_period
175181
}
@@ -196,9 +202,10 @@ module "producer__readDocumentReference" {
196202
local.pointers_kms_read_write_arn,
197203
local.auth_store_read_policy_arn
198204
]
199-
firehose_subscriptions = [
200-
module.firehose__processor.firehose_subscription
201-
]
205+
firehose_subscriptions = compact([
206+
module.firehose__processor.firehose_subscription,
207+
module.firehose__processor.firehose_reporting_subscription
208+
])
202209
handler = "read_document_reference.handler"
203210
retention = var.log_retention_period
204211
}
@@ -225,9 +232,10 @@ module "producer__searchDocumentReference" {
225232
local.pointers_kms_read_write_arn,
226233
local.auth_store_read_policy_arn
227234
]
228-
firehose_subscriptions = [
229-
module.firehose__processor.firehose_subscription
230-
]
235+
firehose_subscriptions = compact([
236+
module.firehose__processor.firehose_subscription,
237+
module.firehose__processor.firehose_reporting_subscription
238+
])
231239
handler = "search_document_reference.handler"
232240
retention = var.log_retention_period
233241
}
@@ -254,9 +262,10 @@ module "producer__searchPostDocumentReference" {
254262
local.pointers_kms_read_write_arn,
255263
local.auth_store_read_policy_arn
256264
]
257-
firehose_subscriptions = [
258-
module.firehose__processor.firehose_subscription
259-
]
265+
firehose_subscriptions = compact([
266+
module.firehose__processor.firehose_subscription,
267+
module.firehose__processor.firehose_reporting_subscription
268+
])
260269
handler = "search_post_document_reference.handler"
261270
retention = var.log_retention_period
262271
}
@@ -284,9 +293,10 @@ module "producer__updateDocumentReference" {
284293
local.pointers_kms_read_write_arn,
285294
local.auth_store_read_policy_arn
286295
]
287-
firehose_subscriptions = [
288-
module.firehose__processor.firehose_subscription
289-
]
296+
firehose_subscriptions = compact([
297+
module.firehose__processor.firehose_subscription,
298+
module.firehose__processor.firehose_reporting_subscription
299+
])
290300
handler = "update_document_reference.handler"
291301
retention = var.log_retention_period
292302
}
@@ -314,9 +324,10 @@ module "producer__upsertDocumentReference" {
314324
local.pointers_kms_read_write_arn,
315325
local.auth_store_read_policy_arn
316326
]
317-
firehose_subscriptions = [
318-
module.firehose__processor.firehose_subscription
319-
]
327+
firehose_subscriptions = compact([
328+
module.firehose__processor.firehose_subscription,
329+
module.firehose__processor.firehose_reporting_subscription
330+
])
320331
handler = "upsert_document_reference.handler"
321332
retention = var.log_retention_period
322333
}
@@ -344,9 +355,10 @@ module "consumer__status" {
344355
local.pointers_kms_read_write_arn,
345356
local.auth_store_read_policy_arn
346357
]
347-
firehose_subscriptions = [
348-
module.firehose__processor.firehose_subscription
349-
]
358+
firehose_subscriptions = compact([
359+
module.firehose__processor.firehose_subscription,
360+
module.firehose__processor.firehose_reporting_subscription
361+
])
350362
handler = "status.handler"
351363
retention = var.log_retention_period
352364
}
@@ -375,9 +387,10 @@ module "producer__status" {
375387
local.pointers_kms_read_write_arn,
376388
local.auth_store_read_policy_arn
377389
]
378-
firehose_subscriptions = [
379-
module.firehose__processor.firehose_subscription
380-
]
390+
firehose_subscriptions = compact([
391+
module.firehose__processor.firehose_subscription,
392+
module.firehose__processor.firehose_reporting_subscription
393+
])
381394
handler = "status.handler"
382395
retention = var.log_retention_period
383396
}

‎terraform/infrastructure/modules/firehose/output.tf‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,18 @@ output "firehose_subscription" {
3131
}
3232
}
3333
}
34+
35+
output "firehose_reporting_subscription" {
36+
value = var.reporting_infra_toggle ? {
37+
destination = {
38+
arn = local.iam_subscriptions.firehose_reporting_stream_arn
39+
}
40+
role = {
41+
arn = aws_iam_role.firehose_subscription.arn
42+
}
43+
filter = {
44+
# At least two items, and the first not any of INIT_START, START, END, REPORT
45+
pattern = "[first_item_on_this_log_line != \"INIT_START\" && first_item_on_this_log_line != \"START\" && first_item_on_this_log_line != \"END\" && first_item_on_this_log_line != \"REPORT\", everything_else_on_this_log_line]"
46+
}
47+
} : null
48+
}

0 commit comments

Comments
 (0)