Skip to content

Commit 94f88f0

Browse files
stevebuxstevebux
committed
Renamed queue and lambda
1 parent 6e27c49 commit 94f88f0

11 files changed

+47
-35
lines changed

‎infrastructure/terraform/components/api/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ No requirements.
4242

4343
| Name | Source | Version |
4444
|------|--------|---------|
45+
| <a name="module_amendment_event_transformer"></a> [amendment\_event\_transformer](#module\_amendment\_event\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
46+
| <a name="module_amendments_queue"></a> [amendments\_queue](#module\_amendments\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
4547
| <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
4648
| <a name="module_domain_truststore"></a> [domain\_truststore](#module\_domain\_truststore) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
4749
| <a name="module_eventpub"></a> [eventpub](#module\_eventpub) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-eventpub.zip | n/a |
@@ -51,8 +53,6 @@ No requirements.
5153
| <a name="module_get_letters"></a> [get\_letters](#module\_get\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
5254
| <a name="module_get_status"></a> [get\_status](#module\_get\_status) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
5355
| <a name="module_kms"></a> [kms](#module\_kms) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-kms.zip | n/a |
54-
| <a name="module_letter_status_update"></a> [letter\_status\_update](#module\_letter\_status\_update) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
55-
| <a name="module_letter_status_updates_queue"></a> [letter\_status\_updates\_queue](#module\_letter\_status\_updates\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
5656
| <a name="module_letter_updates_transformer"></a> [letter\_updates\_transformer](#module\_letter\_updates\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
5757
| <a name="module_logging_bucket"></a> [logging\_bucket](#module\_logging\_bucket) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
5858
| <a name="module_mi_updates_transformer"></a> [mi\_updates\_transformer](#module\_mi\_updates\_transformer) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |

‎infrastructure/terraform/components/api/event_source_mapping_status_updates_to_handler.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
resource "aws_lambda_event_source_mapping" "status_updates_sqs_to_status_update_handler" {
2-
event_source_arn = module.letter_status_updates_queue.sqs_queue_arn
3-
function_name = module.letter_status_update.function_arn
2+
event_source_arn = module.amendments_queue.sqs_queue_arn
3+
function_name = module.amendment_event_transformer.function_arn
44
batch_size = 10
55
maximum_batching_window_in_seconds = 1
66
scaling_config { maximum_concurrency = 10 }
77

88
depends_on = [
9-
module.letter_status_updates_queue, # ensures queue exists
10-
module.letter_status_update # ensures update handler exists
9+
module.amendments_queue, # ensures queue exists
10+
module.amendment_event_transformer # ensures update handler exists
1111
]
1212
}

‎infrastructure/terraform/components/api/lambda_event_source_mapping_letter_status_update.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
resource "aws_lambda_event_source_mapping" "letter_status_update" {
2-
event_source_arn = module.letter_status_updates_queue.sqs_queue_arn
3-
function_name = module.letter_status_update.function_name
1+
resource "aws_lambda_event_source_mapping" "amendment_event_transformer" {
2+
event_source_arn = module.amendments_queue.sqs_queue_arn
3+
function_name = module.amendment_event_transformer.function_name
44
batch_size = 10
55
maximum_batching_window_in_seconds = 5
66
function_response_types = [

infrastructure/terraform/components/api/module_lambda_letter_status_update.tf renamed to infrastructure/terraform/components/api/module_lambda_amendment_event_transformer.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
module "letter_status_update" {
1+
module "amendment_event_transformer" {
22
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
33

4-
function_name = "letter_status_update"
4+
function_name = "amendment_event_transformer"
55
description = "Processes letter status updates"
66

77
aws_account_id = var.aws_account_id
@@ -15,14 +15,14 @@ module "letter_status_update" {
1515
kms_key_arn = module.kms.key_arn
1616

1717
iam_policy_document = {
18-
body = data.aws_iam_policy_document.letter_status_update.json
18+
body = data.aws_iam_policy_document.amendment_event_transformer.json
1919
}
2020

2121
function_s3_bucket = local.acct.s3_buckets["lambda_function_artefacts"]["id"]
2222
function_code_base_path = local.aws_lambda_functions_dir_path
2323
function_code_dir = "api-handler/dist"
2424
function_include_common = true
25-
handler_function_name = "letterStatusUpdate"
25+
handler_function_name = "transformAmendmentEvent"
2626
runtime = "nodejs22.x"
2727
memory = 512
2828
timeout = 29
@@ -37,7 +37,7 @@ module "letter_status_update" {
3737
lambda_env_vars = merge(local.common_lambda_env_vars, {})
3838
}
3939

40-
data "aws_iam_policy_document" "letter_status_update" {
40+
data "aws_iam_policy_document" "amendment_event_transformer" {
4141
statement {
4242
sid = "KMSPermissions"
4343
effect = "Allow"
@@ -78,7 +78,7 @@ data "aws_iam_policy_document" "letter_status_update" {
7878
]
7979

8080
resources = [
81-
module.letter_status_updates_queue.sqs_queue_arn
81+
module.amendments_queue.sqs_queue_arn
8282
]
8383
}
8484

‎infrastructure/terraform/components/api/module_lambda_patch_letter.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module "patch_letter" {
3535
log_subscription_role_arn = local.acct.log_subscription_role_arn
3636

3737
lambda_env_vars = merge(local.common_lambda_env_vars, {
38-
QUEUE_URL = module.letter_status_updates_queue.sqs_queue_url
38+
QUEUE_URL = module.amendments_queue.sqs_queue_url
3939
})
4040
}
4141

@@ -64,7 +64,7 @@ data "aws_iam_policy_document" "patch_letter_lambda" {
6464
]
6565

6666
resources = [
67-
module.letter_status_updates_queue.sqs_queue_arn
67+
module.amendments_queue.sqs_queue_arn
6868
]
6969
}
7070
}

‎infrastructure/terraform/components/api/module_lambda_post_letters.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module "post_letters" {
3535
log_subscription_role_arn = local.acct.log_subscription_role_arn
3636

3737
lambda_env_vars = merge(local.common_lambda_env_vars, {
38-
QUEUE_URL = module.letter_status_updates_queue.sqs_queue_url,
38+
QUEUE_URL = module.amendments_queue.sqs_queue_url,
3939
MAX_LIMIT = var.max_get_limit
4040
})
4141
}
@@ -65,7 +65,7 @@ data "aws_iam_policy_document" "post_letters" {
6565
]
6666

6767
resources = [
68-
module.letter_status_updates_queue.sqs_queue_arn
68+
module.amendments_queue.sqs_queue_arn
6969
]
7070
}
7171
}

infrastructure/terraform/components/api/module_sqs_letter_status_updates.tf renamed to infrastructure/terraform/components/api/module_sqs_amendments.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Queue to transport update letter status messages
2-
module "letter_status_updates_queue" {
1+
# Queue to transport letter status amendment messages
2+
module "amendments_queue" {
33
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip"
44

5-
name = "letter_status_updates_queue"
5+
name = "amendments_queue"
66

77
aws_account_id = var.aws_account_id
88
component = var.component

‎infrastructure/terraform/components/api/moved.tf‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Moved blocks to handle resource renames without destroy/recreate
2+
3+
moved {
4+
from = module.letter_status_updates_queue
5+
to = module.amendments_queue
6+
}
7+
8+
moved {
9+
from = module.letter_status_update
10+
to = module.amendment_event_transformer
11+
}

lambdas/api-handler/src/handlers/__tests__/letter-status-update.test.ts renamed to lambdas/api-handler/src/handlers/__tests__/amendment-event-transformer.test.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Letter, LetterRepository } from "@internal/datastore/src";
77
import { UpdateLetterCommand } from "../../contracts/letters";
88
import { EnvVars } from "../../config/env";
99
import { Deps } from "../../config/deps";
10-
import createLetterStatusUpdateHandler from "../letter-status-update";
10+
import createTransformAmendmentEventHandler from "../amendment-event-transformer";
1111

1212
// Make crypto return consistent values, since we"re calling it in both prod and test code and comparing the values
1313
const realCrypto = jest.requireActual("crypto");
@@ -104,9 +104,9 @@ describe("createLetterStatusUpdateHandler", () => {
104104
const context = mockDeep<Context>();
105105
const callback = jest.fn();
106106

107-
const letterStatusUpdateHandler =
108-
createLetterStatusUpdateHandler(mockedDeps);
109-
await letterStatusUpdateHandler(
107+
const transformAmendmentEventHandler =
108+
createTransformAmendmentEventHandler(mockedDeps);
109+
await transformAmendmentEventHandler(
110110
buildEvent(updateLetterCommands),
111111
context,
112112
callback,
@@ -140,9 +140,9 @@ describe("createLetterStatusUpdateHandler", () => {
140140
const context = mockDeep<Context>();
141141
const callback = jest.fn();
142142

143-
const letterStatusUpdateHandler =
144-
createLetterStatusUpdateHandler(mockedDeps);
145-
await letterStatusUpdateHandler(
143+
const transformAmendmentEventHandler =
144+
createTransformAmendmentEventHandler(mockedDeps);
145+
await transformAmendmentEventHandler(
146146
buildEvent([updateLetterCommands[1]]),
147147
context,
148148
callback,
@@ -168,9 +168,9 @@ describe("createLetterStatusUpdateHandler", () => {
168168
);
169169
(mockedDeps.snsClient.send as jest.Mock).mockResolvedValueOnce({});
170170

171-
const letterStatusUpdateHandler =
172-
createLetterStatusUpdateHandler(mockedDeps);
173-
const sqsBatchResponse = await letterStatusUpdateHandler(
171+
const transformAmendmentEventHandler =
172+
createTransformAmendmentEventHandler(mockedDeps);
173+
const sqsBatchResponse = await transformAmendmentEventHandler(
174174
buildEvent(updateLetterCommands),
175175
mockDeep<Context>(),
176176
jest.fn(),

lambdas/api-handler/src/handlers/letter-status-update.ts renamed to lambdas/api-handler/src/handlers/amendment-event-transformer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
} from "../contracts/letters";
99
import { Deps } from "../config/deps";
1010

11-
export default function createLetterStatusUpdateHandler(
11+
export default function createTransformAmendmentEventHandler(
1212
deps: Deps,
1313
): SQSHandler {
1414
return async (event: SQSEvent) => {

0 commit comments

Comments
 (0)