Skip to content

Chore: [AEA-0000] - fix adding cfn guard suppressions to not overwrite all of metadata #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MatthewPopat-NHS merged 2 commits into from
Feb 2, 2026
Merged

Chore: [AEA-0000] - fix adding cfn guard suppressions to not overwrite all of metadata #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d583ce8
fix adding supressions
anthony-nhs Feb 2, 2026
1afe077
more supressions
anthony-nhs Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .trivyignore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,12 @@ vulnerabilities:
- id: CVE-2025-61729
statement: downstream dependency for asdf/go - waiting for new asdf release
expired_at: 2026-06-01
- id: CVE-2025-61726
statement: downstream dependency for asdf/go - waiting for new asdf release
expired_at: 2026-06-01
- id: CVE-2025-61728
statement: downstream dependency for asdf/go - waiting for new asdf release
expired_at: 2026-06-01
- id: CVE-2026-25128
statement: downstream dependency for fast-xml-parser - waiting for aws-sdk release
expired_at: 2026-06-01
15 changes: 6 additions & 9 deletions packages/cdkConstructs/src/constructs/PythonLambdaFunction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
} from "aws-cdk-lib/aws-lambda"
import {join} from "node:path"
import {createSharedLambdaResources} from "./lambdaSharedResources"
import {addSuppressions} from "../utils/helpers"

export interface PythonLambdaFunctionProps {
/**
Expand Down Expand Up @@ -207,15 +208,11 @@ export class PythonLambdaFunction extends Construct {

// Suppress CFN guard rules for Lambda function
const cfnLambda = lambdaFunction.node.defaultChild as CfnFunction
cfnLambda.cfnOptions.metadata = {
guard: {
SuppressedRules: [
"LAMBDA_DLQ_CHECK",
"LAMBDA_INSIDE_VPC",
"LAMBDA_CONCURRENCY_CHECK"
]
}
}
addSuppressions([cfnLambda], [
"LAMBDA_DLQ_CHECK",
"LAMBDA_INSIDE_VPC",
"LAMBDA_CONCURRENCY_CHECK"
])

// Create policy for external services to invoke this Lambda
const executionManagedPolicy = new ManagedPolicy(this, "ExecuteLambdaManagedPolicy", {
Expand Down
15 changes: 6 additions & 9 deletions packages/cdkConstructs/src/constructs/TypescriptLambdaFunction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {NodejsFunction, NodejsFunctionProps} from "aws-cdk-lib/aws-lambda-nodejs
import {Construct} from "constructs"
import {join} from "node:path"
import {createSharedLambdaResources} from "./lambdaSharedResources"
import {addSuppressions} from "../utils/helpers"

export interface TypescriptLambdaFunctionProps {
/**
Expand Down Expand Up @@ -231,15 +232,11 @@ export class TypescriptLambdaFunction extends Construct {
})

const cfnLambda = lambdaFunction.node.defaultChild as CfnFunction
cfnLambda.cfnOptions.metadata = {
guard: {
SuppressedRules: [
"LAMBDA_DLQ_CHECK",
"LAMBDA_INSIDE_VPC",
"LAMBDA_CONCURRENCY_CHECK"
]
}
}
addSuppressions([cfnLambda], [
"LAMBDA_DLQ_CHECK",
"LAMBDA_INSIDE_VPC",
"LAMBDA_CONCURRENCY_CHECK"
])

const executionManagedPolicy = new ManagedPolicy(this, "ExecuteLambdaManagedPolicy", {
description: `execute lambda ${functionName}`,
Expand Down
9 changes: 2 additions & 7 deletions packages/cdkConstructs/src/constructs/lambdaSharedResources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
} from "aws-cdk-lib/aws-iam"
import {NagSuppressions} from "cdk-nag"
import {LAMBDA_INSIGHTS_LAYER_ARNS} from "../config"
import {addSuppressions} from "../utils/helpers"

export interface SharedLambdaResourceProps {
readonly functionName: string
Expand Down Expand Up @@ -65,13 +66,7 @@ export const createSharedLambdaResources = (
})

const cfnlogGroup = logGroup.node.defaultChild as CfnLogGroup
cfnlogGroup.cfnOptions.metadata = {
guard: {
SuppressedRules: [
"CW_LOGGROUP_RETENTION_PERIOD_CHECK"
]
}
}
addSuppressions([cfnlogGroup], ["CW_LOGGROUP_RETENTION_PERIOD_CHECK"])

new CfnSubscriptionFilter(scope, "LambdaLogsSplunkSubscriptionFilter", {
destinationArn: splunkDeliveryStream.streamArn,
Expand Down