Merge main

wildjames · wildjames · commit 61a9a8d2a351 · 2025-05-09T09:57:36.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,27 +32,27 @@
     "@semantic-release/release-notes-generator": "^14.0.3",
     "@types/aws-lambda": "^8.10.148",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.15.2",
+    "@types/node": "^22.15.16",
     "@typescript-eslint/eslint-plugin": "^8.31.1",
     "@typescript-eslint/parser": "^8.31.1",
     "aws-lambda": "^1.0.7",
     "eslint": "^9.26.0",
-    "eslint-config-prettier": "^10.1.1",
+    "eslint-config-prettier": "^10.1.3",
     "eslint-plugin-import-newlines": "^1.3.4",
-    "eslint-plugin-prettier": "^5.3.1",
+    "eslint-plugin-prettier": "^5.4.0",
     "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
     "license-checker": "^25.0.1",
     "semantic-release": "^24.2.3",
     "ts-jest": "^29.3.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.31.1"
+    "typescript-eslint": "^8.32.0"
   },
   "dependencies": {
     "@PrescriptionStatusUpdate_common/middyErrorHandler": "^1.0.0",
     "@PrescriptionStatusUpdate_common/commonTypes": "^1.0.0",
     "conventional-changelog-eslint": "^6.0.0",
-    "esbuild": "^0.25.3"
+    "esbuild": "^0.25.4"
   }
 }
diff --git a/packages/capabilityStatement/package.json b/packages/capabilityStatement/package.json
@@ -16,9 +16,9 @@
   "dependencies": {
     "@aws-lambda-powertools/commons": "^2.19.0",
     "@aws-lambda-powertools/logger": "^2.19.0",
-    "@middy/core": "^6.2.2",
-    "@middy/input-output-logger": "^6.2.2",
-    "@nhs/fhir-middy-error-handler": "^2.1.29"
+    "@middy/core": "^6.2.3",
+    "@middy/input-output-logger": "^6.2.3",
+    "@nhs/fhir-middy-error-handler": "^2.1.30"
   },
   "devDependencies": {
     "@PrescriptionStatusUpdate_common/testing": "^1.0.0"
diff --git a/packages/checkPrescriptionStatusUpdates/package.json b/packages/checkPrescriptionStatusUpdates/package.json
@@ -15,12 +15,12 @@
   "dependencies": {
     "@aws-lambda-powertools/commons": "^2.19.0",
     "@aws-lambda-powertools/logger": "^2.19.0",
-    "@aws-lambda-powertools/parameters": "^2.19.0",
-    "@aws-sdk/client-dynamodb": "^3.799.0",
-    "@aws-sdk/lib-dynamodb": "^3.799.0",
-    "@middy/core": "^6.2.2",
-    "@middy/http-header-normalizer": "^6.2.2",
-    "@middy/input-output-logger": "^6.2.2",
+    "@aws-lambda-powertools/parameters": "^2.19.1",
+    "@aws-sdk/client-dynamodb": "^3.804.0",
+    "@aws-sdk/lib-dynamodb": "^3.804.0",
+    "@middy/core": "^6.2.3",
+    "@middy/http-header-normalizer": "^6.2.3",
+    "@middy/input-output-logger": "^6.2.3",
     "@PrescriptionStatusUpdate_common/middyErrorHandler": "^1.0.0"
   },
   "devDependencies": {
diff --git a/packages/common/middyErrorHandler/package.json b/packages/common/middyErrorHandler/package.json
@@ -17,7 +17,7 @@
     "@aws-lambda-powertools/logger": "^2.19.0"
   },
   "devDependencies": {
-    "@middy/core": "^6.2.2",
+    "@middy/core": "^6.2.3",
     "@PrescriptionStatusUpdate_common/testing": "^1.0.0"
   }
 }
diff --git a/packages/cpsuLambda/package.json b/packages/cpsuLambda/package.json
@@ -16,12 +16,12 @@
   "dependencies": {
     "@aws-lambda-powertools/commons": "^2.19.0",
     "@aws-lambda-powertools/logger": "^2.19.0",
-    "@aws-sdk/client-dynamodb": "^3.799.0",
-    "@aws-sdk/util-dynamodb": "^3.799.0",
-    "@middy/core": "^6.2.2",
-    "@middy/http-header-normalizer": "^6.2.2",
-    "@middy/input-output-logger": "^6.2.2",
-    "@middy/validator": "^6.2.2",
+    "@aws-sdk/client-dynamodb": "^3.804.0",
+    "@aws-sdk/util-dynamodb": "^3.804.0",
+    "@middy/core": "^6.2.3",
+    "@middy/http-header-normalizer": "^6.2.3",
+    "@middy/input-output-logger": "^6.2.3",
+    "@middy/validator": "^6.2.3",
     "json-schema-to-ts": "^3.1.1",
     "pratica": "^2.3.0",
     "ts-md5": "^1.3.1",
diff --git a/packages/gsul/package.json b/packages/gsul/package.json
@@ -16,12 +16,12 @@
   "dependencies": {
     "@aws-lambda-powertools/commons": "^2.19.0",
     "@aws-lambda-powertools/logger": "^2.19.0",
-    "@aws-sdk/client-dynamodb": "^3.799.0",
-    "@aws-sdk/lib-dynamodb": "^3.799.0",
-    "@aws-sdk/util-dynamodb": "^3.799.0",
-    "@middy/core": "^6.2.2",
-    "@middy/input-output-logger": "^6.2.2",
-    "@middy/validator": "^6.2.2",
+    "@aws-sdk/client-dynamodb": "^3.804.0",
+    "@aws-sdk/lib-dynamodb": "^3.804.0",
+    "@aws-sdk/util-dynamodb": "^3.804.0",
+    "@middy/core": "^6.2.3",
+    "@middy/input-output-logger": "^6.2.3",
+    "@middy/validator": "^6.2.3",
     "@PrescriptionStatusUpdate_common/middyErrorHandler": "^1.0.0",
     "json-schema-to-ts": "^3.1.1"
   }
diff --git a/packages/nhsNotifyLambda/package.json b/packages/nhsNotifyLambda/package.json
@@ -16,10 +16,10 @@
   "dependencies": {
     "@aws-lambda-powertools/commons": "^2.17.0",
     "@aws-lambda-powertools/logger": "^2.18.0",
-    "@aws-lambda-powertools/parameters": "^2.18.0",
-    "@middy/core": "^6.2.2",
-    "@middy/input-output-logger": "^6.2.2",
-    "@nhs/fhir-middy-error-handler": "^2.1.29",
+    "@aws-lambda-powertools/parameters": "^2.19.1",
+    "@middy/core": "^6.2.3",
+    "@middy/input-output-logger": "^6.2.3",
+    "@nhs/fhir-middy-error-handler": "^2.1.30",
     "axios": "^1.8.4"
   },
   "devDependencies": {
diff --git a/packages/nhsNotifyLambda/src/utils.ts b/packages/nhsNotifyLambda/src/utils.ts
@@ -64,8 +64,7 @@ export async function drainQueue(logger: Logger, maxTotal = 100): Promise<Array<
       WaitTimeSeconds: 20, // Use long polling to avoid getting empty responses when the queue is small
       MessageAttributeNames: [
         "MessageDeduplicationId",
-        "MessageGroupId",
-        "SequenceNumber"
+        "MessageGroupId"
       ]
     })
 
diff --git a/packages/nhsNotifyLambda/tests/testUtils.test.ts b/packages/nhsNotifyLambda/tests/testUtils.test.ts
@@ -416,5 +416,12 @@ describe("NHS notify lambda helper functions", () => {
         expect.objectContaining({error: awsErr})
       )
     })
+
+    it("does nothing when passed an empty array", async () => {
+      await addPrescriptionMessagesToNotificationStateStore(logger, [])
+      expect(infoSpy).toHaveBeenCalledTimes(1)
+      expect(infoSpy).toHaveBeenCalledWith("No data to push into DynamoDB.")
+      expect(sendSpy).not.toHaveBeenCalled()
+    })
   })
 })
diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -14,8 +14,8 @@
   },
   "dependencies": {
     "@aws-lambda-powertools/logger": "^2.19.0",
-    "@middy/core": "^6.2.2",
-    "@middy/input-output-logger": "^6.2.2",
-    "@nhs/fhir-middy-error-handler": "^2.1.29"
+    "@middy/core": "^6.2.3",
+    "@middy/input-output-logger": "^6.2.3",
+    "@nhs/fhir-middy-error-handler": "^2.1.30"
   }
 }
diff --git a/packages/specification/package.json b/packages/specification/package.json
@@ -18,6 +18,6 @@
   },
   "homepage": "https://github.com/NHSDigital/eps-prescription-status-update-api",
   "devDependencies": {
-    "@redocly/cli": "^1.34.2"
+    "@redocly/cli": "^1.34.3"
   }
 }
diff --git a/packages/statusLambda/package.json b/packages/statusLambda/package.json
@@ -15,10 +15,10 @@
   "dependencies": {
     "@aws-lambda-powertools/commons": "^2.19.0",
     "@aws-lambda-powertools/logger": "^2.19.0",
-    "@aws-lambda-powertools/parameters": "^2.19.0",
-    "@middy/core": "^6.2.2",
-    "@middy/input-output-logger": "^6.2.2",
-    "@nhs/fhir-middy-error-handler": "^2.1.29",
+    "@aws-lambda-powertools/parameters": "^2.19.1",
+    "@middy/core": "^6.2.3",
+    "@middy/input-output-logger": "^6.2.3",
+    "@nhs/fhir-middy-error-handler": "^2.1.30",
     "axios": "^1.9.0"
   },
   "devDependencies": {
diff --git a/packages/updatePrescriptionStatus/package.json b/packages/updatePrescriptionStatus/package.json
@@ -16,13 +16,13 @@
   "dependencies": {
     "@aws-lambda-powertools/commons": "^2.19.0",
     "@aws-lambda-powertools/logger": "^2.19.0",
-    "@aws-sdk/client-dynamodb": "^3.799.0",
-    "@aws-sdk/client-sqs": "^3.799.0",
-    "@aws-sdk/util-dynamodb": "^3.799.0",
-    "@middy/core": "^6.2.2",
-    "@middy/http-header-normalizer": "^6.2.2",
-    "@middy/input-output-logger": "^6.2.2",
-    "@nhs/fhir-middy-error-handler": "^2.1.29"
+    "@aws-sdk/client-dynamodb": "^3.804.0",
+    "@aws-sdk/client-sqs": "^3.804.0",
+    "@aws-sdk/util-dynamodb": "^3.804.0",
+    "@middy/core": "^6.2.3",
+    "@middy/http-header-normalizer": "^6.2.3",
+    "@middy/input-output-logger": "^6.2.3",
+    "@nhs/fhir-middy-error-handler": "^2.1.30"
   },
   "devDependencies": {
     "@faker-js/faker": "^9.6.0",
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -34,18 +34,18 @@ jsonpath-rw = "^1.4.0"
 semver = "^3.0.4"
 gitpython = "^3.1.44"
 requests = "^2.32.3"
-boto3 = "^1.38.10"
+boto3 = "^1.38.11"
 argparse = "^1.4.0"
 pre-commit = "^4.1.0"
 pytest = "^8.3.5"
-cfn-lint = "^1.34.2"
+cfn-lint = "^1.35.0"
 pyjwt = {extras = ["crypto"], version = "^2.10.1"}
 
 [tool.poetry.scripts]
 
 [tool.poetry.group.dev.dependencies]
 pre-commit = "^4.1.0"
-cfn-lint = "^1.34.2"
+cfn-lint = "^1.35.0"
 black = "^25.1.0"
 flake8 = "^7.2.0"
 jinja2 = "^3.1.5"

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"@aws-lambda-powertools/logger": "^2.19.0"`
`18`	`18`	`},`
`19`	`19`	`"devDependencies": {`
`20`		`- "@middy/core": "^6.2.2",`
	`20`	`+ "@middy/core": "^6.2.3",`
`21`	`21`	`"@PrescriptionStatusUpdate_common/testing": "^1.0.0"`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,7 @@ export async function drainQueue(logger: Logger, maxTotal = 100): Promise<Array<`
`64`	`64`	`WaitTimeSeconds: 20, // Use long polling to avoid getting empty responses when the queue is small`
`65`	`65`	`MessageAttributeNames: [`
`66`	`66`	`"MessageDeduplicationId",`
`67`		`- "MessageGroupId",`
`68`		`- "SequenceNumber"`
	`67`	`+ "MessageGroupId"`
`69`	`68`	`]`
`70`	`69`	`})`
`71`	`70`