Merge branch 'main' into fix/internal-event-datastore-dep

Author: masl2

.github/workflows/stage-3-build.yaml

@@ -182,6 +182,5 @@ jobs:
           environment: ${{ needs.pr-create-dynamic-environment.outputs.environment_name }}
           apimEnv: "internal-dev-sandbox"
           runId: "${{ github.run_id }}"
-          # TODO: CCM-15527: Do not deploy sandbox - new certs do not appear to auth for docker correctly
-          buildSandbox: false
+          buildSandbox: true
           releaseVersion: ${{ github.head_ref || github.ref_name }}

VERSION

@@ -1 +1 @@
-1.1.5-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}
+1.1.6-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}

infrastructure/terraform/components/api/ddb_table_supplier_configuration.tf

@@ -0,0 +1,59 @@
+resource "aws_dynamodb_table" "supplier-configuration" {
+  name         = "${local.csi}-supplier-config"
+  billing_mode = "PAY_PER_REQUEST"
+
+  hash_key  = "PK"
+  range_key = "SK"
+
+  ttl {
+    attribute_name = "ttl"
+    enabled        = true
+  }
+
+  attribute {
+    name = "PK"
+    type = "S"
+  }
+
+  attribute {
+    name = "SK"
+    type = "S"
+  }
+
+  attribute {
+    name = "entityType"
+    type = "S"
+  }
+
+  attribute {
+    name = "volumeGroup"
+    type = "S"
+  }
+
+  // The type-index GSI allows us to query for all supplier configurations of a given type (e.g. all letter supplier configurations)
+  global_secondary_index {
+    name            = "EntityTypeIndex"
+    hash_key        = "entityType"
+    range_key       = "SK"
+    projection_type = "ALL"
+  }
+
+  global_secondary_index {
+    name            = "volumeGroup-index"
+    hash_key        = "PK"
+    range_key       = "volumeGroup"
+    projection_type = "ALL"
+  }
+
+  point_in_time_recovery {
+    enabled = true
+  }
+
+  tags = merge(
+    local.default_tags,
+    {
+      NHSE-Enable-Dynamo-Backup-Acct = "True"
+    }
+  )
+
+}

infrastructure/terraform/components/api/locals.tf

@@ -20,15 +20,16 @@ locals {
   destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-firehose-logs"
 
   common_lambda_env_vars = {
-    LETTERS_TABLE_NAME       = aws_dynamodb_table.letters.name,
-    MI_TABLE_NAME            = aws_dynamodb_table.mi.name,
-    LETTER_TTL_HOURS         = 12960, # 18 months * 30 days * 24 hours
-    MI_TTL_HOURS             = 2160   # 90 days * 24 hours
-    SUPPLIER_ID_HEADER       = "nhsd-supplier-id",
-    APIM_CORRELATION_HEADER  = "nhsd-correlation-id",
-    DOWNLOAD_URL_TTL_SECONDS = 60
-    SNS_TOPIC_ARN            = "${module.eventsub.sns_topic.arn}",
-    EVENT_SOURCE             = "/data-plane/supplier-api/${var.group}/${var.environment}/letters"
+    APIM_CORRELATION_HEADER    = "nhsd-correlation-id",
+    DOWNLOAD_URL_TTL_SECONDS   = 60
+    EVENT_SOURCE               = "/data-plane/supplier-api/${var.group}/${var.environment}/letters"
+    LETTER_TTL_HOURS           = 12960, # 18 months * 30 days * 24 hours
+    LETTERS_TABLE_NAME         = aws_dynamodb_table.letters.name,
+    MI_TABLE_NAME              = aws_dynamodb_table.mi.name,
+    MI_TTL_HOURS               = 2160 # 90 days * 24 hours
+    SNS_TOPIC_ARN              = "${module.eventsub.sns_topic.arn}",
+    SUPPLIER_CONFIG_TABLE_NAME = aws_dynamodb_table.supplier-configuration.name
+    SUPPLIER_ID_HEADER         = "nhsd-supplier-id",
   }
 
   core_pdf_bucket_arn        = "arn:aws:s3:::comms-${var.core_account_id}-eu-west-2-${var.core_environment}-api-stg-pdf-pipeline"

infrastructure/terraform/components/api/module_lambda_supplier_allocator.tf

@@ -82,4 +82,20 @@ data "aws_iam_policy_document" "supplier_allocator_lambda" {
       module.sqs_letter_updates.sqs_queue_arn
     ]
   }
+
+  statement {
+    sid    = "AllowDynamoDBAccess"
+    effect = "Allow"
+
+    actions = [
+      "dynamodb:GetItem",
+      "dynamodb:Query"
+    ]
+
+    resources = [
+      aws_dynamodb_table.supplier-configuration.arn,
+      "${aws_dynamodb_table.supplier-configuration.arn}/index/volumeGroup-index"
+
+    ]
+  }
 }

internal/datastore/jest.config.ts

@@ -31,6 +31,9 @@ export const baseJestConfig: Config = {
 
   coveragePathIgnorePatterns: ["/__tests__/"],
   transform: { "^.+\\.ts$": "ts-jest" },
+  transformIgnorePatterns: [
+    "node_modules/(?!(@nhsdigital/nhs-notify-event-schemas-supplier-config)/)",
+  ],
   testPathIgnorePatterns: [".build"],
   testMatch: ["**/?(*.)+(spec|test).[jt]s?(x)"],
 

internal/datastore/package.json

@@ -3,6 +3,7 @@
     "@aws-sdk/client-dynamodb": "^3.984.0",
     "@aws-sdk/lib-dynamodb": "^3.1008.0",
     "@internal/helpers": "*",
+    "@nhsdigital/nhs-notify-event-schemas-supplier-config": "^1.0.1",
     "pino": "^10.3.0",
     "zod": "^4.1.11",
     "zod-mermaid": "^1.0.9"

internal/datastore/src/__test__/db.ts

@@ -37,6 +37,7 @@ export async function setupDynamoDBContainer() {
     lettersTtlHours: 1,
     letterQueueTtlHours: 1,
     miTtlHours: 1,
+    supplierConfigTableName: "supplier-config",
   };
 
   return {
@@ -146,6 +147,31 @@ const createLetterQueueTableCommand = new CreateTableCommand({
     { AttributeName: "queueSortOrderSk", AttributeType: "S" },
   ],
 });
+const createSupplierConfigTableCommand = new CreateTableCommand({
+  TableName: "supplier-config",
+  BillingMode: "PAY_PER_REQUEST",
+  KeySchema: [
+    { AttributeName: "PK", KeyType: "HASH" }, // Partition key
+    { AttributeName: "SK", KeyType: "RANGE" }, // Sort key
+  ],
+  GlobalSecondaryIndexes: [
+    {
+      IndexName: "volumeGroup-index",
+      KeySchema: [
+        { AttributeName: "PK", KeyType: "HASH" }, // Partition key for GSI
+        { AttributeName: "volumeGroup", KeyType: "RANGE" }, // Sort key for GSI
+      ],
+      Projection: {
+        ProjectionType: "ALL",
+      },
+    },
+  ],
+  AttributeDefinitions: [
+    { AttributeName: "PK", AttributeType: "S" },
+    { AttributeName: "SK", AttributeType: "S" },
+    { AttributeName: "volumeGroup", AttributeType: "S" },
+  ],
+});
 
 export async function createTables(context: DBContext) {
   const { ddbClient } = context;
@@ -156,6 +182,7 @@ export async function createTables(context: DBContext) {
   await ddbClient.send(createMITableCommand);
   await ddbClient.send(createSupplierTableCommand);
   await ddbClient.send(createLetterQueueTableCommand);
+  await ddbClient.send(createSupplierConfigTableCommand);
 }
 
 export async function deleteTables(context: DBContext) {
@@ -166,6 +193,7 @@ export async function deleteTables(context: DBContext) {
     "management-info",
     "suppliers",
     "letter-queue",
+    "supplier-config",
   ]) {
     await ddbClient.send(
       new DeleteTableCommand({