feat: upgrade lambda runtimes to node 22 (#3232)

Dane Pilcher · web-flow · commit ea4a75a995b7 · 2025-04-03T08:15:05.000-07:00
This reverts commit 9c5feee.
diff --git a/packages/amplify-category-api/resources/awscloudformation/container-templates/dockercompose-rest-express/express/Dockerfile b/packages/amplify-category-api/resources/awscloudformation/container-templates/dockercompose-rest-express/express/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/bitnami/node:18-debian-10
+FROM public.ecr.aws/bitnami/node:22
 
 ENV PORT=8080
 EXPOSE 8080
diff --git a/packages/amplify-category-api/resources/awscloudformation/container-templates/dockerfile-rest-express/Dockerfile b/packages/amplify-category-api/resources/awscloudformation/container-templates/dockerfile-rest-express/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/bitnami/node:18-debian-10
+FROM public.ecr.aws/bitnami/node:22
 
 ENV PORT=8080
 EXPOSE 8080
diff --git a/packages/amplify-category-api/resources/awscloudformation/container-templates/graphql-express/Dockerfile b/packages/amplify-category-api/resources/awscloudformation/container-templates/graphql-express/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/bitnami/node:18-debian-10
+FROM public.ecr.aws/bitnami/node:22
 
 WORKDIR /usr/src/app
 COPY package*.json ./
diff --git a/packages/amplify-category-api/resources/awscloudformation/sync-conflict-handler/sync-conflict-handler-template.json.ejs b/packages/amplify-category-api/resources/awscloudformation/sync-conflict-handler/sync-conflict-handler-template.json.ejs
@@ -66,7 +66,7 @@
                 }
             },
             "Role": { "Fn::GetAtt" : ["LambdaExecutionRole", "Arn"] },
-            "Runtime": "nodejs18.x",
+            "Runtime": "nodejs22.x",
             "Timeout": 25
           }
         },
diff --git a/packages/amplify-category-api/src/__tests__/graphql-transformer/override/__snapshots__/amplify-graphql-predictions-transformer-override.test.ts.snap b/packages/amplify-category-api/src/__tests__/graphql-transformer/override/__snapshots__/amplify-graphql-predictions-transformer-override.test.ts.snap
@@ -704,7 +704,7 @@ $utils.error($ctx.result.body)
               "Arn",
             ],
           },
-          "Runtime": "nodejs18.x",
+          "Runtime": "nodejs22.x",
           "Timeout": 60,
         },
         "Type": "AWS::Lambda::Function",
@@ -1609,7 +1609,7 @@ $utils.error($ctx.result.body)
               "Arn",
             ],
           },
-          "Runtime": "nodejs18.x",
+          "Runtime": "nodejs22.x",
           "Timeout": 60,
         },
         "Type": "AWS::Lambda::Function",
diff --git a/packages/amplify-category-api/src/__tests__/provider-utils/awscloudformation/__snapshots__/ecs-apigw-stack.test.ts.snap b/packages/amplify-category-api/src/__tests__/provider-utils/awscloudformation/__snapshots__/ecs-apigw-stack.test.ts.snap
@@ -1260,7 +1260,7 @@ exports.handler = async function({ RequestType, ResourceProperties, StackId }) {
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs22.x",
         "Timeout": 15,
       },
       "Type": "AWS::Lambda::Function",
@@ -1379,7 +1379,7 @@ exports.handler = async function({ RequestType, ResourceProperties, StackId }) {
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs22.x",
         "Timeout": 15,
       },
       "Type": "AWS::Lambda::Function",
@@ -2241,7 +2241,7 @@ exports.handler = async function({ 'CodePipeline.job': { id: jobId } }) {
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs22.x",
         "Timeout": 15,
       },
       "Type": "AWS::Lambda::Function",
diff --git a/packages/amplify-category-api/src/provider-utils/awscloudformation/pipeline-with-awaiter.ts b/packages/amplify-category-api/src/provider-utils/awscloudformation/pipeline-with-awaiter.ts
@@ -26,7 +26,7 @@ export type GitHubSourceActionInfo = {
   tokenSecretArn: string;
 };
 
-const lambdaRuntimeNodeVersion = lambda.Runtime.NODEJS_18_X;
+const lambdaRuntimeNodeVersion = new lambda.Runtime('nodejs22.x', lambda.RuntimeFamily.NODEJS, { supportsInlineCode: true });
 
 const lambdasDir = path.resolve(__dirname, '../../../resources/awscloudformation/lambdas');
 
diff --git a/packages/amplify-graphql-model-transformer/src/resolvers/rds/resolver.ts b/packages/amplify-graphql-model-transformer/src/resolvers/rds/resolver.ts
@@ -42,7 +42,7 @@ import {
   RDSSNSTopicMapping,
 } from '@aws-amplify/graphql-transformer-interfaces';
 import { Effect, IRole, Policy, PolicyStatement, Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
-import { IFunction, LayerVersion, Runtime, Alias, Function as LambdaFunction } from 'aws-cdk-lib/aws-lambda';
+import { IFunction, LayerVersion, Runtime, RuntimeFamily, Alias, Function as LambdaFunction } from 'aws-cdk-lib/aws-lambda';
 import { Construct } from 'constructs';
 import { CfnVPCEndpoint } from 'aws-cdk-lib/aws-ec2';
 import { AwsCustomResource, AwsCustomResourcePolicy, PhysicalResourceId } from 'aws-cdk-lib/custom-resources';
@@ -159,7 +159,7 @@ export const createRdsLambda = (
     `functions/${resourceNames.sqlLambdaFunction}.zip`,
     'handler.run',
     path.resolve(__dirname, '..', '..', '..', 'lib', 'rds-lambda.zip'),
-    Runtime.NODEJS_18_X,
+    new Runtime('nodejs22.x', RuntimeFamily.NODEJS, { supportsInlineCode: true }),
     [LayerVersion.fromLayerVersionArn(scope, resourceNames.sqlLambdaLayerVersion, layerVersionArn)],
     lambdaRole,
     lambdaEnvironment,
@@ -334,7 +334,7 @@ export const createRdsPatchingLambda = (
     `functions/${resourceNames.sqlPatchingLambdaFunction}.zip`,
     'index.handler',
     path.resolve(__dirname, '..', '..', '..', 'lib', 'rds-patching-lambda.zip'),
-    Runtime.NODEJS_18_X,
+    new Runtime('nodejs22.x', RuntimeFamily.NODEJS, { supportsInlineCode: true }),
     [],
     lambdaRole,
     environment,
diff --git a/packages/amplify-graphql-model-transformer/src/resources/amplify-dynamodb-table/provider.ts b/packages/amplify-graphql-model-transformer/src/resources/amplify-dynamodb-table/provider.ts
@@ -29,7 +29,7 @@ export class Provider extends Construct {
     const fn = new aws_lambda.Function(this, `framework-${entrypoint}`, {
       code: code,
       description: `AmplifyManagedTable - ${entrypoint} (${this.node.path})`.slice(0, 256),
-      runtime: aws_lambda.Runtime.NODEJS_18_X,
+      runtime: new aws_lambda.Runtime('nodejs22.x', aws_lambda.RuntimeFamily.NODEJS, { supportsInlineCode: true }),
       handler,
       timeout: Duration.minutes(14),
       role,
diff --git a/packages/amplify-graphql-name-mapping-transformer/src/field-mapping-lambda.ts b/packages/amplify-graphql-name-mapping-transformer/src/field-mapping-lambda.ts
@@ -33,7 +33,7 @@ export const createMappingLambda = (host: TransformHostProvider, stackManager: S
     `functions/${funcLogicalId}.zip`, // function key
     'index.handler', // function handler
     path.join(__dirname, 'assets', 'mapping-lambda.zip'),
-    lambda.Runtime.NODEJS_18_X,
+    new lambda.Runtime('nodejs22.x', lambda.RuntimeFamily.NODEJS, { supportsInlineCode: true }),
     undefined, // layers
     role, // execution role,
     undefined, // env vars
diff --git a/packages/amplify-graphql-predictions-transformer/src/__tests__/__snapshots__/amplify-graphql-predictions-transformer.test.ts.snap b/packages/amplify-graphql-predictions-transformer/src/__tests__/__snapshots__/amplify-graphql-predictions-transformer.test.ts.snap
@@ -1302,7 +1302,7 @@ $utils.error($ctx.result.body)
             "Arn",
           ],
         },
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs22.x",
         "Timeout": 60,
       },
       "Type": "AWS::Lambda::Function",
diff --git a/packages/amplify-graphql-predictions-transformer/src/graphql-predictions-transformer.ts b/packages/amplify-graphql-predictions-transformer/src/graphql-predictions-transformer.ts
@@ -396,7 +396,7 @@ function createPredictionsLambda(context: TransformerContextProvider, stack: cdk
     `functions/${functionId}.zip`,
     PredictionsResourceIDs.lambdaHandlerName,
     path.join(__dirname, '..', 'lib', 'predictionsLambdaFunction.zip'),
-    lambda.Runtime.NODEJS_18_X,
+    new lambda.Runtime('nodejs22.x', lambda.RuntimeFamily.NODEJS, { supportsInlineCode: true }),
     [],
     role,
     {},
diff --git a/packages/graphql-transformer-common/src/PredictionsResourceIDs.ts b/packages/graphql-transformer-common/src/PredictionsResourceIDs.ts
@@ -11,7 +11,7 @@ export class PredictionsResourceIDs {
 
   static lambdaHandlerName = 'predictionsLambda.handler';
 
-  static lambdaRuntime = 'nodejs18.x';
+  static lambdaRuntime = 'nodejs22.x';
 
   static lambdaTimeout = 60;
 
diff --git a/packages/graphql-transformers-e2e-tests/resources/jsonServer/src/index.ts b/packages/graphql-transformers-e2e-tests/resources/jsonServer/src/index.ts
@@ -9,7 +9,7 @@ export class JsonMockStack extends cdk.Stack {
     const jsonLambda = new lambda.Function(this, 'jsonServerFunction', {
       code: new lambda.AssetCode('src-server'),
       handler: 'index.handler',
-      runtime: lambda.Runtime.NODEJS_18_X,
+      runtime: new lambda.Runtime('nodejs22.x', lambda.RuntimeFamily.NODEJS, { supportsInlineCode: true }),
     });
 
     const api = new apigateway.LambdaRestApi(this, 'jsonMockApi', {
diff --git a/packages/graphql-transformers-e2e-tests/src/LambdaHelper.ts b/packages/graphql-transformers-e2e-tests/src/LambdaHelper.ts
@@ -24,7 +24,7 @@ export class LambdaHelper {
         Code: {
           ZipFile: zipContents,
         },
-        Runtime: 'nodejs18.x',
+        Runtime: 'nodejs22.x',
         Handler: `${filePrefix}.handler`,
         Role: roleArn,
       })

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM public.ecr.aws/bitnami/node:18-debian-10`
	`1`	`+FROM public.ecr.aws/bitnami/node:22`
`2`	`2`
`3`	`3`	`ENV PORT=8080`
`4`	`4`	`EXPOSE 8080`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`}`
`67`	`67`	`},`
`68`	`68`	`"Role": { "Fn::GetAtt" : ["LambdaExecutionRole", "Arn"] },`
`69`		`- "Runtime": "nodejs18.x",`
	`69`	`+ "Runtime": "nodejs22.x",`
`70`	`70`	`"Timeout": 25`
`71`	`71`	`}`
`72`	`72`	`},`