Skip to content

Commit 87e76bc

Browse files
masl2masl2
committed
Merge remote-tracking branch 'origin/main' into dependabotCombined
2 parents 8e066ea + 31deef7 commit 87e76bc

14 files changed

Lines changed: 35 additions & 64 deletions

‎.github/workflows/cicd-4-pr-title-check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: "Check PR title format"
18-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-pr-title-format@3009a36549abae57bae8fe0119c2f3fed156a628 # 3.1.2
18+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-pr-title-format@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # 4.0.1
1919
with:
2020
title: ${{ github.event.pull_request.title }}

‎.github/workflows/scheduled-repository-template-sync.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Check out the repository
1919
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2020
- name: Sync repository template
21-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/sync-template-repo@3.1.2
21+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/sync-template-repo@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
2222
with:
2323
github_token: ${{ github.token }}
2424

‎.github/workflows/stage-1-commit.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
with:
5252
fetch-depth: 0 # Full history is needed to scan all commits
5353
- name: "Scan secrets"
54-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/scan-secrets@3.1.2
54+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/scan-secrets@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
5555
check-file-format:
5656
name: "Check file format"
5757
runs-on: ubuntu-latest
@@ -62,7 +62,7 @@ jobs:
6262
with:
6363
fetch-depth: 0 # Full history is needed to compare branches
6464
- name: "Check file format"
65-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-file-format@3.1.2
65+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-file-format@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
6666
check-markdown-format:
6767
name: "Check Markdown format"
6868
runs-on: ubuntu-latest
@@ -73,7 +73,7 @@ jobs:
7373
with:
7474
fetch-depth: 0 # Full history is needed to compare branches
7575
- name: "Check Markdown format"
76-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-markdown-format@3.1.2
76+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-markdown-format@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
7777
terraform-docs:
7878
name: "Run terraform-docs"
7979
runs-on: ubuntu-latest
@@ -108,7 +108,7 @@ jobs:
108108
with:
109109
fetch-depth: 0 # Full history is needed to compare branches
110110
- name: "Check English usage"
111-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-english-usage@3.1.2
111+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-english-usage@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
112112
check-todo-usage:
113113
name: "Check TODO usage"
114114
runs-on: ubuntu-latest
@@ -119,7 +119,7 @@ jobs:
119119
with:
120120
fetch-depth: 0 # Full history is needed to compare branches
121121
- name: "Check TODO usage"
122-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-todo-usage@3.1.2
122+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-todo-usage@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
123123
detect-terraform-changes:
124124
name: "Detect Terraform Changes"
125125
runs-on: ubuntu-latest
@@ -154,7 +154,7 @@ jobs:
154154
- name: "Setup ASDF"
155155
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
156156
- name: "Lint Terraform"
157-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/lint-terraform@3.1.2
157+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/lint-terraform@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
158158
# TODO - Re-visit Trivy usage https://nhsd-jira.digital.nhs.uk/browse/CCM-15549
159159
# trivy-iac:
160160
# name: "Trivy IaC Scan"
@@ -200,7 +200,7 @@ jobs:
200200
- name: "Checkout code"
201201
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
202202
- name: "Count lines of code"
203-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/create-lines-of-code-report@3.1.2
203+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/create-lines-of-code-report@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
204204
with:
205205
build_datetime: "${{ inputs.build_datetime }}"
206206
build_timestamp: "${{ inputs.build_timestamp }}"
@@ -219,7 +219,7 @@ jobs:
219219
- name: "Checkout code"
220220
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
221221
- name: "Scan dependencies"
222-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/scan-dependencies@3.1.2
222+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/scan-dependencies@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
223223
with:
224224
build_datetime: "${{ inputs.build_datetime }}"
225225
build_timestamp: "${{ inputs.build_timestamp }}"

‎.github/workflows/stage-2-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ jobs:
245245
with:
246246
name: code-coverage-report
247247
- name: "Perform static analysis"
248-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/perform-static-analysis@3.1.2
248+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/perform-static-analysis@4.0.0
249249
with:
250250
sonar_organisation_key: "${{ vars.SONAR_ORGANISATION_KEY }}"
251251
sonar_project_key: "${{ vars.SONAR_PROJECT_KEY }}"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ No requirements.
5151
| Name | Source | Version |
5252
|------|--------|---------|
5353
| <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 |
54-
| <a name="module_amendments_queue"></a> [amendments\_queue](#module\_amendments\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-sqs.zip | n/a |
54+
| <a name="module_amendments_queue"></a> [amendments\_queue](#module\_amendments\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip | n/a |
5555
| <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 |
5656
| <a name="module_ddb_alarms_idempotency"></a> [ddb\_alarms\_idempotency](#module\_ddb\_alarms\_idempotency) | ../../modules/alarms-ddb | n/a |
5757
| <a name="module_ddb_alarms_letter_queue"></a> [ddb\_alarms\_letter\_queue](#module\_ddb\_alarms\_letter\_queue) | ../../modules/alarms-ddb | n/a |
@@ -67,16 +67,16 @@ No requirements.
6767
| <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 |
6868
| <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 |
6969
| <a name="module_lambda_alarms"></a> [lambda\_alarms](#module\_lambda\_alarms) | ../../modules/alarms-lambda | n/a |
70-
| <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/3.0.6/terraform-sqs.zip | n/a |
70+
| <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/3.1.5/terraform-sqs.zip | n/a |
7171
| <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 |
7272
| <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 |
7373
| <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 |
7474
| <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 |
7575
| <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 |
7676
| <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 |
7777
| <a name="module_sqs_alarms"></a> [sqs\_alarms](#module\_sqs\_alarms) | ../../modules/alarms-sqs | n/a |
78-
| <a name="module_sqs_letter_updates"></a> [sqs\_letter\_updates](#module\_sqs\_letter\_updates) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-sqs.zip | n/a |
79-
| <a name="module_sqs_supplier_allocator"></a> [sqs\_supplier\_allocator](#module\_sqs\_supplier\_allocator) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-sqs.zip | n/a |
78+
| <a name="module_sqs_letter_updates"></a> [sqs\_letter\_updates](#module\_sqs\_letter\_updates) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip | n/a |
79+
| <a name="module_sqs_supplier_allocator"></a> [sqs\_supplier\_allocator](#module\_sqs\_supplier\_allocator) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip | n/a |
8080
| <a name="module_supplier_allocator"></a> [supplier\_allocator](#module\_supplier\_allocator) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
8181
| <a name="module_supplier_ssl"></a> [supplier\_ssl](#module\_supplier\_ssl) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.26/terraform-ssl.zip | n/a |
8282
| <a name="module_update_letter_queue"></a> [update\_letter\_queue](#module\_update\_letter\_queue) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ module "sqs_alarms" {
22
for_each = local.alarms_enabled ? local.sqs_alarm_targets : {}
33
source = "../../modules/alarms-sqs"
44

5-
alarm_prefix = local.csi
6-
queue_name = each.value
7-
dlq_queue_name = replace(each.value, "-queue", "-dlq")
8-
tags = local.default_tags
5+
alarm_prefix = local.csi
6+
queue_name = each.value
7+
tags = local.default_tags
98
}

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

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

55
name = "amendments_queue"
66

@@ -12,5 +12,6 @@ module "amendments_queue" {
1212

1313
sqs_kms_key_arn = module.kms.key_arn
1414

15-
create_dlq = true
15+
create_dlq = true
16+
enable_queue_oldest_message_alarm = false
1617
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Queue to transport update letter status messages. Now replaced by module.amendments_queue.
22
# This queue will not be removed just yet, to allow it to be drained following the release in which module.amendments_queue replaces it.
33
module "letter_status_updates_queue" {
4-
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-sqs.zip"
4+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip"
55

66
name = "letter_status_updates_queue"
77

@@ -13,5 +13,6 @@ module "letter_status_updates_queue" {
1313

1414
sqs_kms_key_arn = module.kms.key_arn
1515

16-
create_dlq = true
16+
create_dlq = true
17+
enable_queue_oldest_message_alarm = false
1718
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "sqs_letter_updates" {
2-
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-sqs.zip"
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip"
33

44
aws_account_id = var.aws_account_id
55
component = var.component
@@ -12,8 +12,9 @@ module "sqs_letter_updates" {
1212

1313
visibility_timeout_seconds = 60
1414

15-
create_dlq = true
16-
sqs_policy_overload = data.aws_iam_policy_document.letter_updates_queue_policy.json
15+
create_dlq = true
16+
enable_queue_oldest_message_alarm = false
17+
sqs_policy_overload = data.aws_iam_policy_document.letter_updates_queue_policy.json
1718
}
1819

1920
data "aws_iam_policy_document" "letter_updates_queue_policy" {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "sqs_supplier_allocator" {
2-
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.0.6/terraform-sqs.zip"
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/3.1.5/terraform-sqs.zip"
33

44
aws_account_id = var.aws_account_id
55
component = var.component
@@ -12,8 +12,9 @@ module "sqs_supplier_allocator" {
1212

1313
visibility_timeout_seconds = 60
1414

15-
create_dlq = true
16-
sqs_policy_overload = data.aws_iam_policy_document.supplier_allocator_queue_policy.json
15+
create_dlq = true
16+
enable_queue_oldest_message_alarm = false
17+
sqs_policy_overload = data.aws_iam_policy_document.supplier_allocator_queue_policy.json
1718
}
1819

1920
data "aws_iam_policy_document" "supplier_allocator_queue_policy" {

0 commit comments

Comments
 (0)