fix tests

Author: anthony-nhs

.tool-versions

@@ -1,4 +1,4 @@
-nodejs 20.18.0
+nodejs 22.12.0
 python 3.12.7
 poetry 1.8.3
 shellcheck 0.10.0

packages/cdk/resources/CognitoFunctions.ts

@@ -3,7 +3,6 @@ import {LambdaFunction} from "./LambdaFunction"
 import {ITableV2} from "aws-cdk-lib/aws-dynamodb"
 import {IManagedPolicy} from "aws-cdk-lib/aws-iam"
 import {Secret} from "aws-cdk-lib/aws-secretsmanager"
-import {Runtime} from "aws-cdk-lib/aws-lambda"
 import {NodejsFunction} from "aws-cdk-lib/aws-lambda-nodejs"
 import {SharedSecrets} from "./SharedSecrets"
 import {NagSuppressions} from "cdk-nag"
@@ -48,7 +47,6 @@ export class CognitoFunctions extends Construct {
 
     // Create the token Lambda function
     const tokenLambda = new LambdaFunction(this, "TokenResources", {
-      runtime: Runtime.NODEJS_20_X,
       serviceName: props.serviceName,
       stackName: props.stackName,
       lambdaName: `${props.stackName}-token`,
@@ -102,7 +100,6 @@ export class CognitoFunctions extends Construct {
       }
 
       mockTokenLambda = new LambdaFunction(this, "MockTokenResources", {
-        runtime: Runtime.NODEJS_20_X,
         serviceName: props.serviceName,
         stackName: props.stackName,
         lambdaName: `${props.stackName}-mock-token`,

packages/cdk/resources/LambdaFunction.ts

@@ -6,7 +6,7 @@ import {
   ServicePrincipal
 } from "aws-cdk-lib/aws-iam"
 import {NodejsFunction} from "aws-cdk-lib/aws-lambda-nodejs"
-import {CfnFunction, LayerVersion, Runtime} from "aws-cdk-lib/aws-lambda"
+import {CfnFunction, LayerVersion} from "aws-cdk-lib/aws-lambda"
 import {Fn, RemovalPolicy} from "aws-cdk-lib"
 import {Key} from "aws-cdk-lib/aws-kms"
 import {
@@ -27,7 +27,6 @@ export interface LambdaFunctionProps {
   readonly serviceName: string
   readonly stackName: string
   readonly lambdaName: string
-  readonly runtime: Runtime
   readonly additionalPolicies?: Array<IManagedPolicy>
   readonly packageBasePath: string
   readonly entryPoint: string
@@ -133,7 +132,6 @@ export class LambdaFunction extends Construct {
 
     const lambdaFunction = new NodejsFunction(this, props.lambdaName, {
       ...lambdaOptions,
-      runtime: props.runtime,
       role: lambdaRole,
       environment: props.lambdaEnvironmentVariables,
       logGroup: lambdaLogGroup,

packages/cdk/resources/LambdaFunction/helpers.ts

@@ -26,7 +26,7 @@ interface DefaultLambdaOptionsParams {
 function getDefaultLambdaOptions(options: DefaultLambdaOptionsParams): NodejsFunctionProps {
   const defaultOptions: NodejsFunctionProps = {
     functionName: options.functionName,
-    runtime: Runtime.NODEJS_20_X,
+    runtime: Runtime.NODEJS_22_X,
     entry: join(baseDir, options.packageBasePath, options.entryPoint),
     projectRoot: baseDir,
     memorySize: 256,

packages/cdk/resources/api/apiFunctions.ts

@@ -3,7 +3,6 @@ import {LambdaFunction} from "../LambdaFunction"
 import {SharedSecrets} from "../SharedSecrets"
 import {ITableV2} from "aws-cdk-lib/aws-dynamodb"
 import {IManagedPolicy} from "aws-cdk-lib/aws-iam"
-import {Runtime} from "aws-cdk-lib/aws-lambda"
 import {NodejsFunction} from "aws-cdk-lib/aws-lambda-nodejs"
 import {Secret} from "aws-cdk-lib/aws-secretsmanager"
 import {NagSuppressions} from "cdk-nag"
@@ -100,7 +99,6 @@ export class ApiFunctions extends Construct {
 
     // Single Lambda for both real and mock scenarios
     const trackerUserInfoLambda = new LambdaFunction(this, "TrackerUserInfo", {
-      runtime: Runtime.NODEJS_20_X,
       serviceName: props.serviceName,
       stackName: props.stackName,
       lambdaName: `${props.stackName}-TrkUsrNfoUnified`,
@@ -117,7 +115,6 @@ export class ApiFunctions extends Construct {
 
     // Prescription Search Lambda Function
     const prescriptionSearchLambda = new LambdaFunction(this, "PrescriptionSearch", {
-      runtime: Runtime.NODEJS_20_X,
       serviceName: props.serviceName,
       stackName: props.stackName,
       lambdaName: `${props.stackName}-prescSearch`,

packages/cdk/tests/functionConstruct.test.ts

@@ -7,7 +7,6 @@ import {Template, Match} from "aws-cdk-lib/assertions"
 import {describe, test, beforeAll} from "@jest/globals"
 
 import {LambdaFunction} from "../resources/LambdaFunction"
-import {Runtime} from "aws-cdk-lib/aws-lambda"
 
 describe("functionConstruct works correctly", () => {
   let stack: Stack
@@ -28,7 +27,6 @@ describe("functionConstruct works correctly", () => {
       serviceName: "testServiceName",
       stackName: "testServiceName-testStack",
       lambdaName: "testLambda",
-      runtime: Runtime.NODEJS_20_X,
       additionalPolicies: [
       ],
       packageBasePath: "packages/cdk",
@@ -111,7 +109,7 @@ describe("functionConstruct works correctly", () => {
   test("it has the correct lambda", () => {
     template.hasResourceProperties("AWS::Lambda::Function", {
       Handler: "index.handler",
-      Runtime: "nodejs20.x",
+      Runtime: "nodejs22.x",
       FunctionName: "testServiceName-testLambda",
       MemorySize: 256,
       Architectures: ["x86_64"],
@@ -150,7 +148,6 @@ describe("functionConstruct works correctly with environment variables", () => {
       serviceName: "testServiceName",
       stackName: "testServiceName-testStack",
       lambdaName: "testLambda",
-      runtime: Runtime.NODEJS_20_X,
       additionalPolicies: [],
       packageBasePath: "packages/cdk",
       entryPoint: "tests/src/dummyLambda.ts",
@@ -163,7 +160,7 @@ describe("functionConstruct works correctly with environment variables", () => {
 
   test("environment variables are added correctly", () => {
     template.hasResourceProperties("AWS::Lambda::Function", {
-      Runtime: "nodejs20.x",
+      Runtime: "nodejs22.x",
       FunctionName: "testServiceName-testLambda",
       Environment: {Variables: {foo: "bar"}}
     })
@@ -193,7 +190,6 @@ describe("functionConstruct works correctly with additional policies", () => {
       serviceName: "testServiceName",
       stackName: "testServiceName-testStack",
       lambdaName: "testLambda",
-      runtime: Runtime.NODEJS_20_X,
       additionalPolicies: [testPolicy],
       packageBasePath: "packages/cdk",
       entryPoint: "tests/src/dummyLambda.ts",