Merge pull request #422 from NHSDigital/release/2024-11-22

Release/2024-11-22

Author: megan-bower4

.github/workflows/deploy-nonprod-workspace.yml

@@ -11,7 +11,7 @@ on:
         options:
           - dev
           - qa
-          - int
+          # - int
           - ref
       sandbox:
         description: Do you want to deploy the sandbox version?

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2024-11-22
+- [PI-528] Collapse versioning to v1
+- [PI-581] MHS Device with Device Reference Data
+
 ## 2024-11-19
 - [PI-601] Workspace destroy, use main branch as fallback
 

VERSION

@@ -1 +1 @@
-2024.11.19
+2024.11.22

changelog/2024-11-22.md

@@ -0,0 +1,2 @@
+- [PI-528] Collapse versioning to v1
+- [PI-581] MHS Device with Device Reference Data

infrastructure/terraform/per_workspace/main.tf

@@ -80,7 +80,8 @@ module "lambdas" {
   source         = "./modules/api_worker/api_lambda"
   python_version = var.python_version
   name           = each.key
-  lambda_name    = "${local.project}--${replace(terraform.workspace, "_", "-")}--${replace(replace(replace(each.key, "_", "-"), "DeviceReferenceData", "DeviceRefData"), "MessageHandlingSystem", "MHS")}"
+  lambda_name    = "${local.project}--${replace(terraform.workspace, "_", "-")}--${replace(replace(replace(replace(each.key, "_", "-"), "DeviceReferenceData", "DeviceRefData"), "MessageHandlingSystem", "MHS"), "MessageSet", "MsgSet")}"
+
   //Compact will remove all nulls from the list and create a new one - this is because TF throws an error if there is a null item in the list.
   layers = concat(
     compact([for instance in module.layers : contains(var.api_lambda_layers, instance.name) ? instance.layer_arn : null]),

infrastructure/terraform/per_workspace/modules/api_entrypoint/api_gateway/locals.tf

@@ -5,7 +5,7 @@ locals {
   }
   methods = [
     for lambda_alias in setsubtract(var.lambdas, ["authoriser"]) :
-    { "method_${lambda_alias}" = "${local.apigateway_lambda_arn_prefix}:${var.assume_account}:function:${var.project}--${replace(terraform.workspace, "_", "-")}--${replace(replace(replace(lambda_alias, "_", "-"), "DeviceReferenceData", "DeviceRefData"), "MessageHandlingSystem", "MHS")}/invocations" }
+    { "method_${lambda_alias}" = "${local.apigateway_lambda_arn_prefix}:${var.assume_account}:function:${var.project}--${replace(terraform.workspace, "_", "-")}--${replace(replace(replace(replace(lambda_alias, "_", "-"), "DeviceReferenceData", "DeviceRefData"), "MessageHandlingSystem", "MHS"), "MessageSet", "MsgSet")}/invocations" }
   ]
   swagger_file = templatefile("${path.root}/../../swagger/dist/aws/swagger.yaml", merge({
     lambda_invoke_arn   = var.authoriser_metadata.lambda_invoke_arn,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "connecting-party-manager"
-version = "2024.11.19"
+version = "2024.11.22"
 description = "Repository for the Connecting Party Manager API and related services"
 authors = ["NHS England"]
 license = "LICENSE.md"

src/api/createCpmProduct/tests/test_index.py

@@ -3,8 +3,8 @@
 from unittest import mock
 
 import pytest
-from domain.core.root.v3 import Root
-from domain.repository.product_team_repository.v2 import ProductTeamRepository
+from domain.core.root import Root
+from domain.repository.product_team_repository import ProductTeamRepository
 from event.json import json_loads
 
 from test_helpers.dynamodb import mock_table

src/api/createCpmProductForEpr/src/v1/steps.py

@@ -7,9 +7,9 @@
     read_product_team,
 )
 from domain.core.cpm_product import CpmProduct
-from domain.core.cpm_system_id.v1 import PartyKeyId
-from domain.core.product_key.v1 import ProductKeyType
-from domain.core.product_team.v3 import ProductTeam
+from domain.core.cpm_system_id import PartyKeyId
+from domain.core.product_key import ProductKeyType
+from domain.core.product_team import ProductTeam
 from domain.repository.cpm_system_id_repository import CpmSystemIdRepository
 
 

src/api/createCpmProductForEpr/tests/test_index.py

@@ -4,11 +4,11 @@
 from unittest import mock
 
 import pytest
-from domain.core.cpm_system_id.v1 import PartyKeyId, ProductId
+from domain.core.cpm_system_id import PartyKeyId, ProductId
 from domain.core.enum import Status
-from domain.core.root.v3 import Root
-from domain.repository.cpm_product_repository.v3 import CpmProductRepository
-from domain.repository.product_team_repository.v2 import ProductTeamRepository
+from domain.core.root import Root
+from domain.repository.cpm_product_repository import CpmProductRepository
+from domain.repository.product_team_repository import ProductTeamRepository
 from event.json import json_loads
 
 from test_helpers.dynamodb import mock_table