Skip to content

CCM-23223: Odin destination config #718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sidnhs merged 2 commits into from
Oct 7, 2026
+52 −18
Merged

CCM-23223: Odin destination config #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
680a589
CCM-23223: Odin destination config
sidnhs Oct 6, 2026
34fb7a4
Merge branch 'main' into feature/CCM-23223_odin
sidnhs Oct 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions infrastructure/terraform/components/api/cloudwatch_log_group_api_gateway_access.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,11 @@ resource "aws_cloudwatch_log_subscription_filter" "api_gateway" {
filter_pattern = ""
destination_arn = local.csoc_api_gw_log_destination_arn
}

resource "aws_cloudwatch_log_subscription_filter" "api_gateway_odin" {
name = "${replace(aws_cloudwatch_log_group.api_gateway_access.name, "/", "-")}-odin"
role_arn = local.acct.log_subscription_role_arn
log_group_name = aws_cloudwatch_log_group.api_gateway_access.name
filter_pattern = ""
destination_arn = local.odin_destination_arn
}
8 changes: 8 additions & 0 deletions infrastructure/terraform/components/api/cloudwatch_log_group_api_gateway_execution.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,11 @@ resource "aws_cloudwatch_log_subscription_filter" "api_gateway_execution" {
filter_pattern = ""
destination_arn = local.destination_arn
}

resource "aws_cloudwatch_log_subscription_filter" "api_gateway_execution_odin" {
name = "${replace(aws_cloudwatch_log_group.api_gateway_execution.name, "/", "-")}-odin"
role_arn = local.acct.log_subscription_role_arn
log_group_name = aws_cloudwatch_log_group.api_gateway_execution.name
filter_pattern = ""
destination_arn = local.odin_destination_arn
}
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ locals {
GET_MI_LAMBDA_ARN = module.get_mi.function_arn
})

destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-firehose-logs"
destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-firehose-logs"
odin_destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-odin-firehose-logs"

common_lambda_env_vars = {
APIM_CORRELATION_HEADER = "nhsd-correlation-id",
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_authorizer_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "authorizer_lambda" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

aws_account_id = var.aws_account_id
component = var.component
Expand Down Expand Up @@ -32,6 +32,7 @@ module "authorizer_lambda" {
force_lambda_code_deploy = var.force_lambda_code_deploy

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = {
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_amendment_event_transformer.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "amendment_event_transformer" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "amendment_event_transformer"
description = "Processes letter status updates"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "amendment_event_transformer" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {})
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_get_letter.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "get_letter" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "get_letter"
description = "Get letter status"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "get_letter" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {})
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_get_letter_data.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "get_letter_data" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "get_letter_data"
description = "Get the letter data"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "get_letter_data" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {})
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_get_letters.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "get_letters" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "get_letters"
description = "Get paginated letter ids"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "get_letters" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_get_mi.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "get_mi" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "get_mi"
description = "Retrieve management information"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "get_mi" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {})
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_get_status.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "get_status" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "get_status"
description = "Healthcheck for service"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "get_status" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {})
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_letter_updates_transformer.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "letter_updates_transformer" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "letter-updates-transformer"
description = "Letter Update Filter/Producer"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "letter_updates_transformer" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_mi_updates_transformer.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "mi_updates_transformer" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "mi-updates-transformer"
description = "MI Update Filter/Producer"
Expand Down Expand Up @@ -33,6 +33,7 @@ module "mi_updates_transformer" {

send_to_firehose = true
log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_patch_letter.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "patch_letter" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "patch_letter"
description = "Update the status of a letter"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "patch_letter" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_post_letters.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "post_letters" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "post_letters"
description = "Receives and accepts collection of letters to update"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "post_letters" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_post_mi.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "post_mi" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "post_mi"
description = "Add management information"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "post_mi" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {})
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_supplier_allocator.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "supplier_allocator" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "supplier-allocator"
description = "Allocate a letter to a supplier"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "supplier_allocator" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_supplier_config_ingress.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "supplier_config_ingress" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "supplier-config-ingress"
description = "Persist supplier config changes"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "supplier_config_ingress" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {})
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_supplier_mock.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "supplier_mock" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.5/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"
count = var.deploy_supplier_mock_scheduler ? 1 : 0

function_name = "supplier_mock"
Expand Down Expand Up @@ -33,6 +33,7 @@ module "supplier_mock" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_update_letter_queue.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "update_letter_queue" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "update_letter_queue"
description = "Populates the letter queue table with new pending letters from the letter change stream"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "update_letter_queue" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {})
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/terraform/components/api/module_lambda_upsert_letter.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "upsert_letter" {
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/4.0.2/terraform-lambda.zip"
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/6.0.5/terraform-lambda.zip"

function_name = "upsert_letter"
description = "Update or Insert the letter data in the letters table"
Expand Down Expand Up @@ -32,6 +32,7 @@ module "upsert_letter" {
enable_lambda_insights = false

log_destination_arn = local.destination_arn
odin_log_destination_arn = local.odin_destination_arn
log_subscription_role_arn = local.acct.log_subscription_role_arn

lambda_env_vars = merge(local.common_lambda_env_vars, {
Expand Down
Loading