Skip to content

Commit 8edef57

Browse files
MatthewPopat-NHSMatthewPopat-NHS
authored
Merge branch 'main' into AEA-6028
2 parents b4f58b8 + 18db8c4 commit 8edef57

13 files changed

Lines changed: 50 additions & 65 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
tag_release:
5757
needs: [quality_checks, get_commit_id, get_asdf_version]
58-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
58+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
5959
with:
6060
dry_run: true
6161
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/pull_request.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
jobs:
1111
dependabot-auto-approve-and-merge:
1212
needs: quality_checks
13-
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@27a44fb54f4023136d2c14058e3256e73af9901e
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
1414
secrets:
1515
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1616
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -32,7 +32,7 @@ jobs:
3232
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
3333
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
3434
pr_title_format_check:
35-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@27a44fb54f4023136d2c14058e3256e73af9901e
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
3636
quality_checks:
3737
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
3838
needs: [get_asdf_version, get_commit_id]
@@ -112,7 +112,7 @@ jobs:
112112

113113
tag_release:
114114
needs: [get_commit_id, get_asdf_version]
115-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
115+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
116116
with:
117117
dry_run: true
118118
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
tag_release:
5858
needs: [quality_checks, get_commit_id, get_asdf_version]
59-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
59+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
6060
with:
6161
dry_run: false
6262
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.trivyignore.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,12 @@ vulnerabilities:
2323
- id: CVE-2025-61729
2424
statement: downstream dependency for asdf/go - waiting for new asdf release
2525
expired_at: 2026-06-01
26+
- id: CVE-2025-61726
27+
statement: downstream dependency for asdf/go - waiting for new asdf release
28+
expired_at: 2026-06-01
29+
- id: CVE-2025-61728
30+
statement: downstream dependency for asdf/go - waiting for new asdf release
31+
expired_at: 2026-06-01
32+
- id: CVE-2026-25128
33+
statement: downstream dependency for fast-xml-parser - waiting for aws-sdk release
34+
expired_at: 2026-06-01

‎package-lock.json‎

Lines changed: 9 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"keywords": [],
1212
"license": "MIT",
1313
"devDependencies": {
14-
"@types/node": "^25.0.10",
14+
"@types/node": "^25.1.0",
1515
"@typescript-eslint/eslint-plugin": "^8.54.0",
1616
"@typescript-eslint/parser": "^8.54.0",
1717
"@vitest/coverage-v8": "^4.0.18",
@@ -26,7 +26,7 @@
2626
"vitest": "^4.0.13"
2727
},
2828
"dependencies": {
29-
"aws-cdk": "^2.1102.0",
29+
"aws-cdk": "^2.1104.0",
3030
"aws-cdk-lib": "^2.236.0",
3131
"cdk-nag": "^2.37.52",
3232
"constructs": "^10.4.5",

‎packages/cdkConstructs/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"private": false,
2121
"type": "module",
2222
"dependencies": {
23-
"@aws-sdk/client-cloudformation": "^3.975.0",
23+
"@aws-sdk/client-cloudformation": "^3.978.0",
2424
"@aws-sdk/client-route-53": "^3.975.0",
25-
"@aws-sdk/client-s3": "^3.975.0",
26-
"aws-cdk": "^2.1102.0",
25+
"@aws-sdk/client-s3": "^3.978.0",
26+
"aws-cdk": "^2.1104.0",
2727
"aws-cdk-lib": "^2.236.0",
2828
"cdk-nag": "^2.37.52",
2929
"constructs": "^10.4.5"
@@ -38,6 +38,6 @@
3838
"main": "lib/src/index.js",
3939
"types": "lib/src/index.d.ts",
4040
"devDependencies": {
41-
"@types/node": "^25.0.10"
41+
"@types/node": "^25.1.0"
4242
}
4343
}

‎packages/cdkConstructs/src/constructs/PythonLambdaFunction.ts‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
} from "aws-cdk-lib/aws-lambda"
1818
import {join} from "node:path"
1919
import {createSharedLambdaResources} from "./lambdaSharedResources"
20+
import {addSuppressions} from "../utils/helpers"
2021

2122
export interface PythonLambdaFunctionProps {
2223
/**
@@ -207,15 +208,11 @@ export class PythonLambdaFunction extends Construct {
207208

208209
// Suppress CFN guard rules for Lambda function
209210
const cfnLambda = lambdaFunction.node.defaultChild as CfnFunction
210-
cfnLambda.cfnOptions.metadata = {
211-
guard: {
212-
SuppressedRules: [
213-
"LAMBDA_DLQ_CHECK",
214-
"LAMBDA_INSIDE_VPC",
215-
"LAMBDA_CONCURRENCY_CHECK"
216-
]
217-
}
218-
}
211+
addSuppressions([cfnLambda], [
212+
"LAMBDA_DLQ_CHECK",
213+
"LAMBDA_INSIDE_VPC",
214+
"LAMBDA_CONCURRENCY_CHECK"
215+
])
219216

220217
// Create policy for external services to invoke this Lambda
221218
const executionManagedPolicy = new ManagedPolicy(this, "ExecuteLambdaManagedPolicy", {

‎packages/cdkConstructs/src/constructs/TypescriptLambdaFunction.ts‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {NodejsFunction, NodejsFunctionProps} from "aws-cdk-lib/aws-lambda-nodejs
1515
import {Construct} from "constructs"
1616
import {join} from "node:path"
1717
import {createSharedLambdaResources} from "./lambdaSharedResources"
18+
import {addSuppressions} from "../utils/helpers"
1819

1920
export interface TypescriptLambdaFunctionProps {
2021
/**
@@ -231,15 +232,11 @@ export class TypescriptLambdaFunction extends Construct {
231232
})
232233

233234
const cfnLambda = lambdaFunction.node.defaultChild as CfnFunction
234-
cfnLambda.cfnOptions.metadata = {
235-
guard: {
236-
SuppressedRules: [
237-
"LAMBDA_DLQ_CHECK",
238-
"LAMBDA_INSIDE_VPC",
239-
"LAMBDA_CONCURRENCY_CHECK"
240-
]
241-
}
242-
}
235+
addSuppressions([cfnLambda], [
236+
"LAMBDA_DLQ_CHECK",
237+
"LAMBDA_INSIDE_VPC",
238+
"LAMBDA_CONCURRENCY_CHECK"
239+
])
243240

244241
const executionManagedPolicy = new ManagedPolicy(this, "ExecuteLambdaManagedPolicy", {
245242
description: `execute lambda ${functionName}`,

‎packages/cdkConstructs/src/constructs/lambdaSharedResources.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
} from "aws-cdk-lib/aws-iam"
1414
import {NagSuppressions} from "cdk-nag"
1515
import {LAMBDA_INSIGHTS_LAYER_ARNS} from "../config"
16+
import {addSuppressions} from "../utils/helpers"
1617

1718
export interface SharedLambdaResourceProps {
1819
readonly functionName: string
@@ -65,13 +66,7 @@ export const createSharedLambdaResources = (
6566
})
6667

6768
const cfnlogGroup = logGroup.node.defaultChild as CfnLogGroup
68-
cfnlogGroup.cfnOptions.metadata = {
69-
guard: {
70-
SuppressedRules: [
71-
"CW_LOGGROUP_RETENTION_PERIOD_CHECK"
72-
]
73-
}
74-
}
69+
addSuppressions([cfnlogGroup], ["CW_LOGGROUP_RETENTION_PERIOD_CHECK"])
7570

7671
new CfnSubscriptionFilter(scope, "LambdaLogsSplunkSubscriptionFilter", {
7772
destinationArn: splunkDeliveryStream.streamArn,

0 commit comments

Comments
 (0)