CCM-14187: SonarQube fixes (#223)

gareth-allan · web-flow · commit 9bf7fdbde9b4 · 2026-03-03T13:19:25.000Z
* CCM-14187: SonarQube fixes

* CCM-14187: NPM audit fixes

* CCM-14187: Remove unused aws-lambda dependency

* CCM-14187: Add new lambdas to Jest config for workspace

* CCM-14187: Update dependencies of eventcatalog

* CCM-14187: Ran npm dedupe

* CCM-14187: Updated docs dependencies

* CCM-14187: Update Trivy version
diff --git a/.tool-versions b/.tool-versions
@@ -6,7 +6,7 @@ pre-commit 3.6.0
 python 3.14.0
 terraform 1.10.1
 terraform-docs 0.19.0
-trivy 0.61.0
+trivy 0.69.2
 vale 3.6.0
 # ==============================================================================
 # The section below is reserved for Docker image versions.
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -4,14 +4,14 @@
     "@fontsource/source-sans-pro": "^5.0.8",
     "canvg": "^4.0.1",
     "jquery": "^3.7.0",
-    "mermaid": "11.12.0",
+    "mermaid": "^11.12.0",
     "nhsuk-frontend": "^8.1.1",
     "reveal.js": "^4.5.0",
     "reveal.js-menu": "^2.1.0"
   },
   "description": "",
   "devDependencies": {
-    "copy-webpack-plugin": "^11.0.0",
+    "copy-webpack-plugin": "^13.0.1",
     "css-loader": "^6.8.1",
     "mini-css-extract-plugin": "^2.7.6",
     "saas": "^1.0.0",
@@ -25,6 +25,9 @@
   "keywords": [],
   "license": "ISC",
   "name": "nhs-notify",
+  "overrides": {
+    "serialize-javascript": "^7.0.3"
+  },
   "private": true,
   "scripts": {
     "build": "webpack && bundle config set --local path 'vendor/bundle' && bundle install && bundle exec just-the-docs rake search:init && JEKYLL_ENV=production bundle exec jekyll build --trace --config _config.yml,_config.version.yml",
diff --git a/lambdas/core-notifier-lambda/package.json b/lambdas/core-notifier-lambda/package.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "aws-lambda": "^1.0.7",
     "axios": "^1.13.5",
     "digital-letters-events": "^0.0.1",
     "sender-management": "^0.0.1",
diff --git a/lambdas/core-notifier-lambda/src/__tests__/app/parse-sqs-message.test.ts b/lambdas/core-notifier-lambda/src/__tests__/app/parse-sqs-message.test.ts
@@ -1,4 +1,4 @@
-import { SQSRecord } from 'aws-lambda';
+import type { SQSRecord } from 'aws-lambda';
 import { mock } from 'jest-mock-extended';
 import { Logger } from 'utils';
 import { parseSqsRecord } from 'app/parse-sqs-message';
diff --git a/lambdas/core-notifier-lambda/src/app/parse-sqs-message.ts b/lambdas/core-notifier-lambda/src/app/parse-sqs-message.ts
@@ -1,4 +1,4 @@
-import { SQSRecord } from 'aws-lambda';
+import type { SQSRecord } from 'aws-lambda';
 import { Logger } from 'utils';
 import { PDMResourceAvailable } from 'digital-letters-events';
 import { InvalidPdmResourceAvailableEvent } from 'domain/invalid-pdm-resource-available-event';
diff --git a/lambdas/file-scanner-lambda/package.json b/lambdas/file-scanner-lambda/package.json
@@ -1,7 +1,6 @@
 {
   "dependencies": {
     "@aws-sdk/client-s3": "^3.908.0",
-    "aws-lambda": "^1.0.7",
     "digital-letters-events": "^0.0.1",
     "utils": "^0.0.1"
   },
diff --git a/lambdas/key-generation/package.json b/lambdas/key-generation/package.json
@@ -1,10 +1,9 @@
 {
   "dependencies": {
-    "aws-lambda": "^1.0.7",
     "date-fns": "^4.1.0",
     "esbuild": "^0.25.9",
-    "utils": "*",
-    "node-jose": "^2.2.0"
+    "node-jose": "^2.2.0",
+    "utils": "*"
   },
   "devDependencies": {
     "@tsconfig/node22": "^22.0.2",
diff --git a/lambdas/move-scanned-files-lambda/package.json b/lambdas/move-scanned-files-lambda/package.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "aws-lambda": "^1.0.7",
     "axios": "^1.13.5",
     "digital-letters-events": "^0.0.1",
     "utils": "^0.0.1"
diff --git a/lambdas/move-scanned-files-lambda/src/__tests__/constants.ts b/lambdas/move-scanned-files-lambda/src/__tests__/constants.ts
@@ -1,4 +1,4 @@
-import { GuardDutyScanResultNotificationEvent } from 'aws-lambda';
+import type { GuardDutyScanResultNotificationEvent } from 'aws-lambda';
 
 const baseEvent: GuardDutyScanResultNotificationEvent = {
   id: '72c7d362-737a-6dce-fc78-9e27a0171419',
diff --git a/lambdas/move-scanned-files-lambda/src/app/move-file-handler.ts b/lambdas/move-scanned-files-lambda/src/app/move-file-handler.ts
@@ -1,7 +1,7 @@
 import { Logger } from 'utils/logger';
 import { S3Location, copyAndDeleteObjectS3, getS3ObjectMetadata } from 'utils';
 import { MoveScannedFilesConfig } from 'infra/config';
-import { GuardDutyScanResultNotificationEventDetail } from 'aws-lambda';
+import type { GuardDutyScanResultNotificationEventDetail } from 'aws-lambda';
 import { FileQuarantined, FileSafe } from 'digital-letters-events';
 import { createFileQuarantinedEvent, createFileSafeEvent } from 'domain/mapper';
 
@@ -208,7 +208,7 @@ export class MoveFileHandler {
       subkey: getLastCharactersOfKey(objectDetails.objectKey),
     });
 
-    if (!(await this.isEventForDigitalLetters(scanDetail))) {
+    if (!this.isEventForDigitalLetters(scanDetail)) {
       this.logger.warn({
         description: 'Scan result event is not valid, skipping processing.',
         sourceBucket: objectDetails.bucketName,
diff --git a/lambdas/move-scanned-files-lambda/src/app/parse-sqs-message.ts b/lambdas/move-scanned-files-lambda/src/app/parse-sqs-message.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   GuardDutyScanResultNotificationEventDetail,
   SQSRecord,
 } from 'aws-lambda';
diff --git a/lambdas/pdm-mock-lambda/package.json b/lambdas/pdm-mock-lambda/package.json
@@ -1,7 +1,6 @@
 {
   "dependencies": {
     "@aws-sdk/client-ssm": "^3.908.0",
-    "aws-lambda": "^1.0.7",
     "utils": "^0.0.1"
   },
   "description": "Lambda function to mock PDM (Patient Data Manager) API endpoints",
diff --git a/lambdas/pdm-poll-lambda/package.json b/lambdas/pdm-poll-lambda/package.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "aws-lambda": "^1.0.7",
     "digital-letters-events": "^0.0.1",
     "utils": "^0.0.1"
   },
diff --git a/lambdas/pdm-poll-lambda/src/__tests__/test-data.ts b/lambdas/pdm-poll-lambda/src/__tests__/test-data.ts
@@ -1,4 +1,4 @@
-import { SQSEvent, SQSRecord } from 'aws-lambda';
+import type { SQSEvent, SQSRecord } from 'aws-lambda';
 import {
   PDMResourceSubmitted,
   PDMResourceUnavailable,
diff --git a/lambdas/print-analyser/package.json b/lambdas/print-analyser/package.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "aws-lambda": "^1.0.7",
     "digital-letters-events": "^0.0.1",
     "pdf-lib": "^1.17.1",
     "utils": "^0.0.1"
diff --git a/lambdas/print-analyser/src/__tests__/test-data.ts b/lambdas/print-analyser/src/__tests__/test-data.ts
@@ -1,4 +1,4 @@
-import { SQSEvent, SQSRecord } from 'aws-lambda';
+import type { SQSEvent, SQSRecord } from 'aws-lambda';
 import { readFileSync } from 'node:fs';
 import path from 'node:path';
 import { FileSafe } from 'digital-letters-events';
diff --git a/lambdas/print-status-handler/package.json b/lambdas/print-status-handler/package.json
@@ -1,7 +1,6 @@
 {
   "dependencies": {
     "@nhsdigital/nhs-notify-event-schemas-supplier-api": "1.0.11",
-    "aws-lambda": "^1.0.7",
     "digital-letters-events": "^0.0.1",
     "utils": "^0.0.1",
     "zod": "^4.1.12"
diff --git a/lambdas/print-status-handler/src/__tests__/test-data.ts b/lambdas/print-status-handler/src/__tests__/test-data.ts
@@ -1,4 +1,4 @@
-import { SQSEvent, SQSRecord } from 'aws-lambda';
+import type { SQSEvent, SQSRecord } from 'aws-lambda';
 import { LetterEvent } from '@nhsdigital/nhs-notify-event-schemas-supplier-api/src/events/letter-events';
 
 export const acceptedLetterEvent = {
diff --git a/lambdas/refresh-apim-access-token/package.json b/lambdas/refresh-apim-access-token/package.json
@@ -1,7 +1,6 @@
 {
   "dependencies": {
     "@aws-sdk/client-ssm": "^3.840.0",
-    "aws-lambda": "^1.0.7",
     "axios": "^1.13.5",
     "esbuild": "^0.25.9",
     "jsonwebtoken": "^9.0.2",
@@ -10,7 +9,6 @@
   },
   "devDependencies": {
     "@tsconfig/node22": "^22.0.2",
-    "@types/aws-lambda": "^8.10.148",
     "@types/jest": "^29.5.14",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/node": "^24.0.10",
diff --git a/lambdas/report-event-transformer/package.json b/lambdas/report-event-transformer/package.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "aws-lambda": "^1.0.7",
     "utils": "^0.0.1",
     "zod": "^4.1.12"
   },
diff --git a/lambdas/report-event-transformer/src/__tests__/test-data.ts b/lambdas/report-event-transformer/src/__tests__/test-data.ts
@@ -1,4 +1,4 @@
-import { FirehoseTransformationEvent } from 'aws-lambda';
+import type { FirehoseTransformationEvent } from 'aws-lambda';
 import { DigitalLettersEvent } from 'types/events';
 
 export const digitalLettersEvent = {
diff --git a/lambdas/ttl-handle-expiry-lambda/package.json b/lambdas/ttl-handle-expiry-lambda/package.json
@@ -2,7 +2,6 @@
   "dependencies": {
     "@aws-sdk/client-sqs": "^3.914.0",
     "@aws-sdk/util-dynamodb": "^3.928.0",
-    "aws-lambda": "^1.0.7",
     "digital-letters-events": "^0.0.1",
     "utils": "^0.0.1"
   },
diff --git a/lambdas/ttl-handle-expiry-lambda/src/__tests__/app/dlq.test.ts b/lambdas/ttl-handle-expiry-lambda/src/__tests__/app/dlq.test.ts
@@ -1,5 +1,5 @@
 import { SendMessageBatchCommand } from '@aws-sdk/client-sqs';
-import { DynamoDBRecord } from 'aws-lambda';
+import type { DynamoDBRecord } from 'aws-lambda';
 import { randomUUID } from 'node:crypto';
 import { Dlq, DlqDependencies } from 'app/dlq';
 
diff --git a/lambdas/ttl-handle-expiry-lambda/src/app/dlq.ts b/lambdas/ttl-handle-expiry-lambda/src/app/dlq.ts
@@ -1,5 +1,5 @@
 import { SQSClient, SendMessageBatchCommand } from '@aws-sdk/client-sqs';
-import { DynamoDBRecord } from 'aws-lambda';
+import type { DynamoDBRecord } from 'aws-lambda';
 import { randomUUID } from 'node:crypto';
 import { Logger } from 'utils';
 
diff --git a/lambdas/ttl-poll-lambda/package.json b/lambdas/ttl-poll-lambda/package.json
@@ -2,7 +2,6 @@
   "dependencies": {
     "@aws-sdk/lib-dynamodb": "^3.908.0",
     "@aws-sdk/util-dynamodb": "^3.910.0",
-    "aws-lambda": "^1.0.7",
     "lodash": "^4.17.21",
     "p-limit": "^3.1.0",
     "utils": "^0.0.1"
diff --git a/lambdas/ttl-poll-lambda/src/__tests__/apis/scheduled-event-handler.test.ts b/lambdas/ttl-poll-lambda/src/__tests__/apis/scheduled-event-handler.test.ts
@@ -1,4 +1,4 @@
-import { ScheduledEvent } from 'aws-lambda';
+import type { ScheduledEvent } from 'aws-lambda';
 import { Logger } from 'utils';
 import { mock } from 'jest-mock-extended';
 import { EventDetail, createHandler } from 'apis/scheduled-event-handler';
diff --git a/package-lock.json b/package-lock.json
diff --git a/project.code-workspace b/project.code-workspace
diff --git a/src/cloudevents/.tool-versions b/src/cloudevents/.tool-versions
diff --git a/src/cloudevents/package.json b/src/cloudevents/package.json
diff --git a/src/cloudevents/tools/discovery/__tests__/schema-discoverer-cli.test.ts b/src/cloudevents/tools/discovery/__tests__/schema-discoverer-cli.test.ts
diff --git a/src/cloudevents/tools/discovery/schema-discoverer-cli.ts b/src/cloudevents/tools/discovery/schema-discoverer-cli.ts
diff --git a/src/cloudevents/tools/generator/__tests__/docs-generator.test.ts b/src/cloudevents/tools/generator/__tests__/docs-generator.test.ts
diff --git a/src/cloudevents/tools/generator/docs-generator/docs-generator.ts b/src/cloudevents/tools/generator/docs-generator/docs-generator.ts
diff --git a/src/eventcatalog/package-lock.json b/src/eventcatalog/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`		`- "aws-lambda": "^1.0.7",`
`4`	`3`	`"axios": "^1.13.5",`
`5`	`4`	`"digital-letters-events": "^0.0.1",`
`6`	`5`	`"sender-management": "^0.0.1",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { SQSRecord } from 'aws-lambda';`
	`1`	`+import type { SQSRecord } from 'aws-lambda';`
`2`	`2`	`import { mock } from 'jest-mock-extended';`
`3`	`3`	`import { Logger } from 'utils';`
`4`	`4`	`import { parseSqsRecord } from 'app/parse-sqs-message';`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`	`3`	`"@aws-sdk/client-s3": "^3.908.0",`
`4`		`- "aws-lambda": "^1.0.7",`
`5`	`4`	`"digital-letters-events": "^0.0.1",`
`6`	`5`	`"utils": "^0.0.1"`
`7`	`6`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { GuardDutyScanResultNotificationEvent } from 'aws-lambda';`
	`1`	`+import type { GuardDutyScanResultNotificationEvent } from 'aws-lambda';`
`2`	`2`
`3`	`3`	`const baseEvent: GuardDutyScanResultNotificationEvent = {`
`4`	`4`	`id: '72c7d362-737a-6dce-fc78-9e27a0171419',`