Merge branch 'main' into aea-4540-secret-scanning

wildjames · web-flow · commit da2e53c13285 · 2024-11-06T10:36:15.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,17 +28,17 @@
     "@semantic-release/release-notes-generator": "^14.0.1",
     "@types/aws-lambda": "^8.10.145",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.7.9",
-    "@typescript-eslint/eslint-plugin": "^8.11.0",
-    "@typescript-eslint/parser": "^8.11.0",
+    "@types/node": "^22.9.0",
+    "@typescript-eslint/eslint-plugin": "^8.13.0",
+    "@typescript-eslint/parser": "^8.13.0",
     "aws-lambda": "^1.0.7",
     "conventional-changelog-eslint": "^6.0.0",
-    "eslint": "^9.13.0",
+    "eslint": "^9.14.0",
     "eslint-plugin-import-newlines": "^1.4.0",
     "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
     "license-checker": "^25.0.1",
-    "semantic-release": "^24.1.3",
+    "semantic-release": "^24.2.0",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.3"
diff --git a/packages/capabilityStatement/package.json b/packages/capabilityStatement/package.json
@@ -18,7 +18,7 @@
     "@aws-lambda-powertools/logger": "^2.10.0",
     "@middy/core": "^5.5.1",
     "@middy/input-output-logger": "^5.5.1",
-    "@nhs/fhir-middy-error-handler": "^2.1.9"
+    "@nhs/fhir-middy-error-handler": "^2.1.10"
   },
   "devDependencies": {
     "@prescriptionsforpatients_common/testing": "^1.0.0"
diff --git a/packages/distanceSelling/package.json b/packages/distanceSelling/package.json
@@ -20,6 +20,6 @@
   },
   "devDependencies": {
     "@prescriptionsforpatients_common/testing": "^1.0.0",
-    "axios-mock-adapter": "^2.0.0"
+    "axios-mock-adapter": "^2.1.0"
   }
 }
diff --git a/packages/enrichPrescriptions/package.json b/packages/enrichPrescriptions/package.json
@@ -16,7 +16,7 @@
     "@aws-lambda-powertools/commons": "^2.8.0",
     "@aws-lambda-powertools/logger": "^2.10.0",
     "@aws-lambda-powertools/parameters": "^2.10.0",
-    "@aws-sdk/client-secrets-manager": "^3.679.0",
+    "@aws-sdk/client-secrets-manager": "^3.682.0",
     "@middy/core": "^5.5.1",
     "@middy/input-output-logger": "^5.5.1",
     "@types/fhir": "^0.0.41",
diff --git a/packages/getMyPrescriptions/package.json b/packages/getMyPrescriptions/package.json
@@ -17,17 +17,17 @@
     "@aws-lambda-powertools/commons": "^2.8.0",
     "@aws-lambda-powertools/logger": "^2.10.0",
     "@aws-lambda-powertools/parameters": "^2.10.0",
-    "@aws-sdk/client-secrets-manager": "^3.679.0",
+    "@aws-sdk/client-secrets-manager": "^3.682.0",
     "@middy/core": "^5.5.1",
     "@middy/http-header-normalizer": "^5.5.1",
     "@middy/input-output-logger": "^5.5.1",
-    "@nhs/fhir-middy-error-handler": "^2.1.9",
-    "@NHSDigital/eps-spine-client": "^2.1.6",
+    "@nhs/fhir-middy-error-handler": "^2.1.10",
+    "@NHSDigital/eps-spine-client": "^2.1.7",
     "@prescriptionsforpatients/distanceSelling": "^1.0.0",
     "@types/fhir": "^0.0.41"
   },
   "devDependencies": {
     "@prescriptionsforpatients_common/testing": "^1.0.0",
-    "axios-mock-adapter": "^2.0.0"
+    "axios-mock-adapter": "^2.1.0"
   }
 }
diff --git a/packages/getMyPrescriptions/tests/test-handler.test.ts b/packages/getMyPrescriptions/tests/test-handler.test.ts
@@ -268,10 +268,10 @@ describe("Unit test for app handler", function () {
 
   it("times-out if spine call takes too long", async () => {
     const mockErrorLogger = jest.spyOn(Logger.prototype, "error")
-    const delayedResponse: Promise<Array<unknown>> = new Promise((resolve) => setTimeout(() => resolve([]), 15_000))
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    mock.onGet("https://live/mm/patientfacingprescriptions").reply((_config) => delayedResponse)
-
+    mock.onGet("https://live/mm/patientfacingprescriptions").reply(function (config) {
+      return new Promise((resolve) => setTimeout(() => resolve([200, {}]), 15_000))
+    })
     const event: GetMyPrescriptionsEvent = JSON.parse(exampleStateMachineEvent)
     const eventHandler: Promise<LambdaResult> = handler(event, dummyContext)
 
@@ -300,9 +300,11 @@ describe("Unit test for app handler", function () {
       params: handlerParams,
       middleware: []
     })
-    const delayedResponse: Promise<Array<unknown>> = new Promise((resolve) => setTimeout(() => resolve([]), 5_000))
+
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    mock.onGet("https://live/mm/patientfacingprescriptions").reply((_config) => delayedResponse)
+    mock.onGet("https://live/mm/patientfacingprescriptions").reply(function (config) {
+      return new Promise((resolve) => setTimeout(() => resolve([200, {}]), 5_000))
+    })
 
     const event: GetMyPrescriptionsEvent = JSON.parse(exampleStateMachineEvent)
     const eventHandler: Promise<LambdaResult> = handler(event, dummyContext)
@@ -429,9 +431,10 @@ describe("Unit tests for app handler including service search", function () {
     const exampleResponse = {resourceType: "Bundle"}
     mock.onGet("https://spine/mm/patientfacingprescriptions").reply(200, exampleResponse)
 
-    const delayedResponse: Promise<Array<unknown>> = new Promise((resolve) => setTimeout(() => resolve([]), 15_000))
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    mock.onGet("https://service-search/service-search").reply((_config) => delayedResponse)
+    mock.onGet("https://service-search/service-search").reply(function (config) {
+      return new Promise((resolve) => setTimeout(() => resolve([200, {}]), 15_000))
+    })
 
     const event: GetMyPrescriptionsEvent = JSON.parse(exampleStateMachineEvent)
     const eventHandler: Promise<LambdaResult> = handler(event, dummyContext)
diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -17,7 +17,7 @@
     "@aws-lambda-powertools/logger": "^2.10.0",
     "@middy/core": "^5.5.1",
     "@middy/input-output-logger": "^5.5.1",
-    "@nhs/fhir-middy-error-handler": "^2.1.9"
+    "@nhs/fhir-middy-error-handler": "^2.1.10"
   },
   "devDependencies": {
     "@prescriptionsforpatients_common/testing": "^1.0.0"
diff --git a/packages/serviceSearchClient/package.json b/packages/serviceSearchClient/package.json
@@ -21,6 +21,6 @@
   },
   "devDependencies": {
     "@prescriptionsforpatients_common/testing": "^1.0.0",
-    "axios-mock-adapter": "^2.0.0"
+    "axios-mock-adapter": "^2.1.0"
   }
 }
diff --git a/packages/statusLambda/package.json b/packages/statusLambda/package.json
@@ -18,7 +18,7 @@
     "@aws-lambda-powertools/parameters": "^2.10.0",
     "@middy/core": "^5.5.1",
     "@middy/input-output-logger": "^5.5.1",
-    "@nhs/fhir-middy-error-handler": "^2.1.9",
-    "@NHSDigital/eps-spine-client": "^2.1.6"
+    "@nhs/fhir-middy-error-handler": "^2.1.10",
+    "@NHSDigital/eps-spine-client": "^2.1.7"
   }
 }
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -30,11 +30,11 @@ jsonpath-rw = "^1.4.0"
 semver = "^3.0.2"
 gitpython = "^3.1.43"
 requests = "^2.32.3"
-boto3 = "^1.35.48"
+boto3 = "^1.35.54"
 argparse = "^1.4.0"
 pre-commit = "^3.5.0"
 pytest = "^8.3.3"
-cfn-lint = "^1.18.1"
+cfn-lint = "^1.18.4"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^5.0.4"

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@`
`20`	`20`	`},`
`21`	`21`	`"devDependencies": {`
`22`	`22`	`"@prescriptionsforpatients_common/testing": "^1.0.0",`
`23`		`- "axios-mock-adapter": "^2.0.0"`
	`23`	`+ "axios-mock-adapter": "^2.1.0"`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@`
`21`	`21`	`},`
`22`	`22`	`"devDependencies": {`
`23`	`23`	`"@prescriptionsforpatients_common/testing": "^1.0.0",`
`24`		`- "axios-mock-adapter": "^2.0.0"`
	`24`	`+ "axios-mock-adapter": "^2.1.0"`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"@aws-lambda-powertools/parameters": "^2.10.0",`
`19`	`19`	`"@middy/core": "^5.5.1",`
`20`	`20`	`"@middy/input-output-logger": "^5.5.1",`
`21`		`- "@nhs/fhir-middy-error-handler": "^2.1.9",`
`22`		`- "@NHSDigital/eps-spine-client": "^2.1.6"`
	`21`	`+ "@nhs/fhir-middy-error-handler": "^2.1.10",`
	`22`	`+ "@NHSDigital/eps-spine-client": "^2.1.7"`
`23`	`23`	`}`
`24`	`24`	`}`