Skip to content

Commit 68847d3

Browse files
lapenna-bjsslapenna-bjss
committed
CCM-12616: Update ssm prefix path
1 parent 80e2506 commit 68847d3

8 files changed

Lines changed: 16 additions & 5733 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ No requirements.
4343
| <a name="module_kms"></a> [kms](#module\_kms) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-kms.zip | n/a |
4444
| <a name="module_lambda_apim_key_generation"></a> [lambda\_apim\_key\_generation](#module\_lambda\_apim\_key\_generation) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
4545
| <a name="module_lambda_lambda_apim_refresh_token"></a> [lambda\_lambda\_apim\_refresh\_token](#module\_lambda\_lambda\_apim\_refresh\_token) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
46-
| <a name="module_mesh_download"></a> [mesh\_download](#module\_mesh\_download) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
46+
| <a name="module_mesh_download"></a> [mesh\_download](#module\_mesh\_download) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
4747
| <a name="module_mesh_poll"></a> [mesh\_poll](#module\_mesh\_poll) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
4848
| <a name="module_pdm_mock"></a> [pdm\_mock](#module\_pdm\_mock) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
4949
| <a name="module_pdm_uploader"></a> [pdm\_uploader](#module\_pdm\_uploader) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |

‎infrastructure/terraform/components/dl/locals.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ locals {
55
apim_api_key_ssm_parameter_name = "/${var.component}/${var.environment}/apim/api_key"
66
apim_private_key_ssm_parameter_name = "/${var.component}/${var.environment}/apim/private_key"
77
apim_keystore_s3_bucket = "nhs-${var.aws_account_id}-${var.region}-${var.environment}-${var.component}-static-assets"
8-
ssm_mesh_prefix = "/${var.component}/${var.environment}/mesh"
8+
ssm_mesh_prefix = "/${var.component}/${var.environment}"
99
mock_mesh_endpoint = "s3://${module.s3bucket_non_pii_data.bucket}/mock-mesh"
1010
root_domain_name = "${var.environment}.${local.acct.route53_zone_names["digital-letters"]}"
1111
root_domain_id = local.acct.route53_zone_ids["digital-letters"]

‎infrastructure/terraform/components/dl/module_lambda_mesh_download.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "mesh_download" {
2-
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip"
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
33

44
function_name = "mesh-download"
55
description = "A lambda function for downloading MESH messages and storing in S3"

infrastructure/terraform/components/dl/ssm_parameter_mesh.tf renamed to infrastructure/terraform/components/dl/ssm_parameter_mesh_config.tf

File renamed without changes.

‎lambdas/mesh-poll/mesh_poll/__tests__/test_processor.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def setup_mocks():
1313
"""
1414
config = Mock()
1515
config.maximum_runtime_milliseconds = "500"
16-
config.ssm_prefix = "/dl/test/mesh"
16+
config.ssm_prefix = "/dl/test"
1717
config.environment = "development"
1818

1919
sender_lookup = Mock()

‎lambdas/mesh-poll/mesh_poll/__tests__/test_sender_lookup.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def setup_mocks():
1010
ssm = Mock()
1111

1212
config = Mock()
13-
config.ssm_prefix = "/dl/test/mesh"
13+
config.ssm_prefix = "/dl/test"
1414

1515
logger = Mock()
1616

@@ -19,7 +19,7 @@ def setup_mocks():
1919

2020
def create_sender_parameter(sender_id, mailbox_id):
2121
return {
22-
"Name": f"/dl/test/mesh/senders/{sender_id}",
22+
"Name": f"/dl/test/senders/{sender_id}",
2323
"Value": json.dumps({
2424
"senderId": sender_id,
2525
"meshMailboxSenderId": mailbox_id,
@@ -47,7 +47,7 @@ def test_load_valid_senders_single_page(self):
4747
sender_lookup = SenderLookup(ssm, config, logger)
4848

4949
ssm.get_parameters_by_path.assert_called_once_with(
50-
Path="/dl/test/mesh/senders/",
50+
Path="/dl/test/senders/",
5151
WithDecryption=True
5252
)
5353
assert sender_lookup.is_valid_sender("MAILBOX_001")
@@ -80,8 +80,8 @@ def test_load_valid_senders_multiple_pages(self):
8080

8181
assert ssm.get_parameters_by_path.call_count == 2
8282
ssm.get_parameters_by_path.assert_has_calls([
83-
call(Path="/dl/test/mesh/senders/", WithDecryption=True),
84-
call(Path="/dl/test/mesh/senders/", WithDecryption=True, NextToken="token123")
83+
call(Path="/dl/test/senders/", WithDecryption=True),
84+
call(Path="/dl/test/senders/", WithDecryption=True, NextToken="token123")
8585
], any_order=False)
8686
assert sender_lookup.is_valid_sender("MAILBOX_001")
8787
assert sender_lookup.is_valid_sender("MAILBOX_002")
@@ -127,7 +127,7 @@ def test_load_valid_senders_handles_malformed_json(self):
127127
"Parameters": [
128128
create_sender_parameter("sender1", "MAILBOX_001"),
129129
{
130-
"Name": "/dl/test/mesh/senders/bad_sender",
130+
"Name": "/dl/test/senders/bad_sender",
131131
"Value": "not valid json {{"
132132
},
133133
create_sender_parameter("sender3", "MAILBOX_003"),
@@ -148,7 +148,7 @@ def test_load_valid_senders_handles_missing_mailbox_id(self):
148148
"Parameters": [
149149
create_sender_parameter("sender1", "MAILBOX_001"),
150150
{
151-
"Name": "/dl/test/mesh/senders/incomplete_sender",
151+
"Name": "/dl/test/senders/incomplete_sender",
152152
"Value": json.dumps({
153153
"senderId": "incomplete",
154154
"name": "Incomplete Sender"
@@ -172,7 +172,7 @@ def test_load_valid_senders_handles_empty_mailbox_id(self):
172172
"Parameters": [
173173
create_sender_parameter("sender1", "MAILBOX_001"),
174174
{
175-
"Name": "/dl/test/mesh/senders/empty_mailbox",
175+
"Name": "/dl/test/senders/empty_mailbox",
176176
"Value": json.dumps({
177177
"senderId": "empty",
178178
"meshMailboxSenderId": "", # Empty string
@@ -192,7 +192,7 @@ def test_load_valid_senders_handles_empty_mailbox_id(self):
192192
def test_load_valid_senders_with_trailing_slash_in_path(self):
193193
"""Test that paths with trailing slashes are handled correctly"""
194194
ssm, config, logger = setup_mocks()
195-
config.ssm_prefix = "/dl/test/mesh/" # Trailing slash
195+
config.ssm_prefix = "/dl/test/" # Trailing slash
196196

197197
ssm.get_parameters_by_path.return_value = {
198198
"Parameters": [
@@ -203,7 +203,7 @@ def test_load_valid_senders_with_trailing_slash_in_path(self):
203203
sender_lookup = SenderLookup(ssm, config, logger)
204204

205205
ssm.get_parameters_by_path.assert_called_once_with(
206-
Path="/dl/test/mesh/senders/",
206+
Path="/dl/test/senders/",
207207
WithDecryption=True
208208
)
209209
assert sender_lookup.is_valid_sender("MAILBOX_001")
@@ -292,7 +292,7 @@ def test_load_valid_senders_skips_entries_with_missing_sender_id(self):
292292
"Parameters": [
293293
create_sender_parameter("sender1", "MAILBOX_001"),
294294
{
295-
"Name": "/dl/test/mesh/senders/incomplete",
295+
"Name": "/dl/test/senders/incomplete",
296296
"Value": json.dumps({
297297
"meshMailboxSenderId": "MAILBOX_BAD",
298298
"name": "Incomplete"

0 commit comments

Comments
 (0)