Skip to content

Commit da763f6

Browse files
committed
Revert all terraform changes
1 parent fb79d22 commit da763f6

23 files changed

Lines changed: 47 additions & 395 deletions

infrastructure/terraform/components/api/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,14 @@ No requirements.
5050
| <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 |
5151
| <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 |
5252
| <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 |
53+
| <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 |
5354
| <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 |
5455
| <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 |
5556
| <a name="module_patch_letter"></a> [patch\_letter](#module\_patch\_letter) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
5657
| <a name="module_post_letters"></a> [post\_letters](#module\_post\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
5758
| <a name="module_post_mi"></a> [post\_mi](#module\_post\_mi) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
5859
| <a name="module_s3bucket_test_letters"></a> [s3bucket\_test\_letters](#module\_s3bucket\_test\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-s3bucket.zip | n/a |
60+
| <a name="module_sqs_letter_updates"></a> [sqs\_letter\_updates](#module\_sqs\_letter\_updates) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-sqs.zip | n/a |
5961
| <a name="module_supplier_events_forwarder_lambda"></a> [supplier\_events\_forwarder\_lambda](#module\_supplier\_events\_forwarder\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-lambda.zip | n/a |
6062
| <a name="module_supplier_events_queue"></a> [supplier\_events\_queue](#module\_supplier\_events\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-sqs.zip | n/a |
6163
| <a name="module_supplier_requests_queue"></a> [supplier\_requests\_queue](#module\_supplier\_requests\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
resource "aws_lambda_event_source_mapping" "status_updates_sqs_to_status_update_handler" {
2-
event_source_arn = module.supplier_requests_queue.sqs_queue_arn
2+
event_source_arn = module.letter_status_updates_queue.sqs_queue_arn
33
function_name = module.letter_status_update.function_arn
44
batch_size = 10
5+
maximum_batching_window_in_seconds = 1
56
scaling_config { maximum_concurrency = 10 }
67

78
depends_on = [
8-
module.supplier_requests_queue, # ensures queue exists
9-
module.letter_status_update # ensures update handler exists
9+
module.letter_status_updates_queue, # ensures queue exists
10+
module.letter_status_update # ensures update handler exists
1011
]
1112
}

infrastructure/terraform/components/api/lambda_event_source_mapping_upsert_letter.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
resource "aws_lambda_event_source_mapping" "upsert_letter" {
2-
event_source_arn = module.amendments_queue.sqs_queue_arn
2+
event_source_arn = module.sqs_letter_updates.sqs_queue_arn
33
function_name = module.upsert_letter.function_name
44
batch_size = 10
5+
maximum_batching_window_in_seconds = 5
56
function_response_types = [
67
"ReportBatchItemFailures"
78
]

infrastructure/terraform/components/api/module_authorizer_lambda.tf

Lines changed: 0 additions & 72 deletions
This file was deleted.

infrastructure/terraform/components/api/module_lambda_letter_status_update.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ data "aws_iam_policy_document" "letter_status_update" {
7979
]
8080

8181
resources = [
82-
module.supplier_requests_queue.sqs_queue_arn
82+
module.letter_status_updates_queue.sqs_queue_arn
8383
]
8484
}
8585
}

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.supplier_requests_queue.sqs_queue_url
38+
QUEUE_URL = module.letter_status_updates_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.supplier_requests_queue.sqs_queue_arn
67+
module.letter_status_updates_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.supplier_requests_queue.sqs_queue_url,
38+
QUEUE_URL = module.letter_status_updates_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.supplier_requests_queue.sqs_queue_arn
68+
module.letter_status_updates_queue.sqs_queue_arn
6969
]
7070
}
7171
}

infrastructure/terraform/components/api/module_lambda_supplier_events_forwarder.tf

Lines changed: 0 additions & 86 deletions
This file was deleted.

infrastructure/terraform/components/api/module_lambda_upsert_letter.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ data "aws_iam_policy_document" "upsert_letter_lambda" {
7777
]
7878

7979
resources = [
80-
module.amendments_queue.sqs_queue_arn
80+
module.sqs_letter_updates.sqs_queue_arn
8181
]
8282
}
8383
}

infrastructure/terraform/components/api/module_sqs_amendments_queue.tf

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)