From bf829da9d757a1f46ff14e3976697247edfb39e2 Mon Sep 17 00:00:00 2001 From: robertd Date: Tue, 14 May 2019 16:46:45 -0600 Subject: [PATCH] feat(lambda): add nodejs10x runtime and update tests --- design/code-asset-metadata.md | 2 +- .../test/integ.restapi.books.expected.json | 2 +- .../test/integ.restapi.books.ts | 6 +- .../test/integ.restapi.expected.json | 2 +- .../aws-apigateway/test/integ.restapi.ts | 2 +- .../aws-apigateway/test/test.lambda-api.ts | 8 +-- .../aws-apigateway/test/test.lambda.ts | 6 +- ...ambda-deployed-through-codepipeline.lit.ts | 2 +- .../test/integ.lambda-pipeline.expected.json | 2 +- .../test/integ.lambda-pipeline.ts | 2 +- .../test/test.pipeline.ts | 2 +- .../aws-cognito/test/test.user-pool.ts | 6 +- .../test/integ.dynamodb.global.expected.json | 2 +- .../test/lambda/integ.events.expected.json | 2 +- .../test/lambda/integ.events.ts | 2 +- .../test/integ.dynamodb.expected.json | 2 +- .../test/integ.kinesis.expected.json | 2 +- .../test/integ.s3.expected.json | 4 +- .../test/integ.sns.expected.json | 2 +- .../test/integ.sqs.expected.json | 2 +- .../test/test-function.ts | 2 +- .../@aws-cdk/aws-lambda/lib/log-retention.ts | 2 +- packages/@aws-cdk/aws-lambda/lib/runtime.ts | 1 + .../integ.bucket-notifications.expected.json | 4 +- .../test/integ.bucket-notifications.ts | 2 +- .../test/integ.lambda.expected.json | 2 +- .../@aws-cdk/aws-lambda/test/integ.lambda.ts | 2 +- .../integ.layer-version.lit.expected.json | 4 +- .../test/integ.layer-version.lit.ts | 4 +- .../test/integ.log-retention.expected.json | 8 +-- .../aws-lambda/test/integ.log-retention.ts | 6 +- .../@aws-cdk/aws-lambda/test/test.alias.ts | 14 ++--- .../@aws-cdk/aws-lambda/test/test.code.ts | 14 ++--- .../@aws-cdk/aws-lambda/test/test.lambda.ts | 56 +++++++++---------- .../@aws-cdk/aws-lambda/test/test.layers.ts | 6 +- .../test/test.subscriptiondestination.ts | 2 +- .../aws-lambda/test/test.vpc-lambda.ts | 6 +- ...teg.sns-bucket-notifications.expected.json | 2 +- .../test/integ.sns-lambda.expected.json | 2 +- .../@aws-cdk/aws-sns/test/integ.sns-lambda.ts | 2 +- packages/@aws-cdk/aws-sns/test/test.sns.ts | 8 +-- .../integ.bucket-notifications.expected.json | 2 +- .../test/integ.ec2-task.expected.json | 2 +- .../test/integ.fargate-task.expected.json | 2 +- .../test/integ.rtv.lambda.expected.json | 2 +- .../runtime-values/test/integ.rtv.lambda.ts | 2 +- .../@aws-cdk/runtime-values/test/test.rtv.ts | 2 +- 47 files changed, 111 insertions(+), 110 deletions(-) diff --git a/design/code-asset-metadata.md b/design/code-asset-metadata.md index 7a367b7d6ccb6..1a6846bfa7924 100644 --- a/design/code-asset-metadata.md +++ b/design/code-asset-metadata.md @@ -75,7 +75,7 @@ const resource = new serverless.CfnFunction(this, 'Func', { bucket: asset.s3BucketName, key: asset.s3ObjectKey }, - runtime: 'nodejs8.10', + runtime: 'nodejs10.x', handler: 'index.handler' }); diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.expected.json index 0baf839a608ca..faa98dd37b4e5 100644 --- a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.expected.json +++ b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.expected.json @@ -54,7 +54,7 @@ "Arn" ] }, - "Runtime": "nodejs6.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "BooksHandlerServiceRole5B6A8847" diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.ts b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.ts index 783459ebb6009..7b830ec2f2c7f 100644 --- a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.ts +++ b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.ts @@ -7,19 +7,19 @@ class BookStack extends cdk.Stack { super(scope, id); const booksHandler = new apigw.LambdaIntegration(new lambda.Function(this, 'BooksHandler', { - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, handler: 'index.handler', code: lambda.Code.inline(`exports.handler = ${echoHandlerCode}`) })); const bookHandler = new apigw.LambdaIntegration(new lambda.Function(this, 'BookHandler', { - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, handler: 'index.handler', code: lambda.Code.inline(`exports.handler = ${echoHandlerCode}`) })); const hello = new apigw.LambdaIntegration(new lambda.Function(this, 'Hello', { - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, handler: 'index.handler', code: lambda.Code.inline(`exports.handler = ${helloCode}`) })); diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json index c46e8005d766f..c8f060b87989e 100644 --- a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json +++ b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json @@ -384,7 +384,7 @@ "Arn" ] }, - "Runtime": "nodejs6.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "MyHandlerServiceRoleFFA06653" diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.ts b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.ts index d81e9ac3ccea1..3dcf719565e28 100644 --- a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.ts +++ b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.ts @@ -23,7 +23,7 @@ class Test extends cdk.Stack { }); const handler = new lambda.Function(this, 'MyHandler', { - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, code: lambda.Code.inline(`exports.handler = ${handlerCode}`), handler: 'index.handler', }); diff --git a/packages/@aws-cdk/aws-apigateway/test/test.lambda-api.ts b/packages/@aws-cdk/aws-apigateway/test/test.lambda-api.ts index 5a16869d06149..97dd2778d73fc 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.lambda-api.ts +++ b/packages/@aws-cdk/aws-apigateway/test/test.lambda-api.ts @@ -14,7 +14,7 @@ export = { const handler = new lambda.Function(stack, 'handler', { handler: 'index.handler', code: lambda.Code.inline('boom'), - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); // WHEN @@ -78,7 +78,7 @@ export = { const handler = new lambda.Function(stack, 'handler', { handler: 'index.handler', code: lambda.Code.inline('boom'), - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); const alias = new lambda.Alias(stack, 'alias', { aliasName: 'my-alias', @@ -145,7 +145,7 @@ export = { const handler = new lambda.Function(stack, 'handler', { handler: 'index.handler', code: lambda.Code.inline('boom'), - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); // WHEN @@ -184,7 +184,7 @@ export = { const handler = new lambda.Function(stack, 'handler', { handler: 'index.handler', code: lambda.Code.inline('boom'), - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); test.throws(() => new apigw.LambdaRestApi(stack, 'lambda-rest-api', { diff --git a/packages/@aws-cdk/aws-apigateway/test/test.lambda.ts b/packages/@aws-cdk/aws-apigateway/test/test.lambda.ts index a2997316d50aa..6241296c5bf78 100644 --- a/packages/@aws-cdk/aws-apigateway/test/test.lambda.ts +++ b/packages/@aws-cdk/aws-apigateway/test/test.lambda.ts @@ -56,7 +56,7 @@ export = { // GIVEN const stack = new cdk.Stack(); const fn = new lambda.Function(stack, 'Handler', { - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, code: lambda.Code.inline('foo'), handler: 'index.handler' }); @@ -106,7 +106,7 @@ export = { // GIVEN const stack = new cdk.Stack(); const fn = new lambda.Function(stack, 'Handler', { - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, code: lambda.Code.inline('foo'), handler: 'index.handler' }); @@ -132,7 +132,7 @@ export = { const api = new apigateway.RestApi(stack, 'test-api'); const handler = new lambda.Function(stack, 'MyFunc', { - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, handler: 'index.handler', code: lambda.Code.inline(``) }); diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts index 2ba724c3fd045..c62887691655e 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts @@ -17,7 +17,7 @@ const lambdaCode = lambda.Code.cfnParameters(); new lambda.Function(lambdaStack, 'Lambda', { code: lambdaCode, handler: 'index.handler', - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, }); // other resources that your Lambda needs, added to the lambdaStack... diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.expected.json index 63f6c7e3817f2..423ce81429d09 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.expected.json +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.expected.json @@ -658,7 +658,7 @@ "Arn" ] }, - "Runtime": "nodejs6.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "LambdaFunServiceRoleDefaultPolicy217FED83", diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.ts index c98510d3c392f..6477904ee392f 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.ts @@ -34,7 +34,7 @@ const lambdaFun = new lambda.Function(stack, 'LambdaFun', { }; `), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); const lambdaStage = pipeline.addStage({ name: 'Lambda' }); lambdaStage.addAction(new cpactions.LambdaInvokeAction({ diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/test.pipeline.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/test.pipeline.ts index 1bba1fd738244..e5dbf8b7e839f 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/test/test.pipeline.ts +++ b/packages/@aws-cdk/aws-codepipeline-actions/test/test.pipeline.ts @@ -434,7 +434,7 @@ export = { const lambdaFun = new lambda.Function(stack, 'Function', { code: new lambda.InlineCode('bla'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS43, + runtime: lambda.Runtime.NodeJS10x, }); const pipeline = new codepipeline.Pipeline(stack, 'Pipeline'); diff --git a/packages/@aws-cdk/aws-cognito/test/test.user-pool.ts b/packages/@aws-cdk/aws-cognito/test/test.user-pool.ts index 11c92b4669180..a9ede6c4bb325 100644 --- a/packages/@aws-cdk/aws-cognito/test/test.user-pool.ts +++ b/packages/@aws-cdk/aws-cognito/test/test.user-pool.ts @@ -28,7 +28,7 @@ export = { const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); // WHEN @@ -56,7 +56,7 @@ export = { const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); // WHEN @@ -93,7 +93,7 @@ export = { const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); // WHEN diff --git a/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.expected.json b/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.expected.json index 68f0d210b3b7e..ce883fbb4cb22 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.expected.json +++ b/packages/@aws-cdk/aws-dynamodb-global/test/integ.dynamodb.global.expected.json @@ -207,7 +207,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10", + "Runtime": "nodejs10.x", "Description": "Lambda to make DynamoDB a global table", "Timeout": 300 }, diff --git a/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.expected.json b/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.expected.json index f71081e3ff084..958186fc577d3 100644 --- a/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.expected.json +++ b/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.expected.json @@ -54,7 +54,7 @@ "Arn" ] }, - "Runtime": "nodejs6.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "MyFuncServiceRole54065130" diff --git a/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.ts b/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.ts index c815efec9a00f..c428522db496b 100644 --- a/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.ts +++ b/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.ts @@ -8,7 +8,7 @@ const app = new cdk.App(); const stack = new cdk.Stack(app, 'lambda-events'); const fn = new lambda.Function(stack, 'MyFunc', { - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, handler: 'index.handler', code: lambda.Code.inline(`exports.handler = ${handler.toString()}`) }); diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.dynamodb.expected.json b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.dynamodb.expected.json index 49a5de5ac5898..f4da827cdbe6d 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.dynamodb.expected.json +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.dynamodb.expected.json @@ -89,7 +89,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "FServiceRoleDefaultPolicy17A19BFA", diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.kinesis.expected.json b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.kinesis.expected.json index d9e448f80376a..daf0e780f4405 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.kinesis.expected.json +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.kinesis.expected.json @@ -84,7 +84,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "FServiceRoleDefaultPolicy17A19BFA", diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.expected.json b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.expected.json index 615e8c3652d8a..98af2703dd0de 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.expected.json +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.s3.expected.json @@ -54,7 +54,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "FServiceRole3AC82EE1" @@ -203,7 +203,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10", + "Runtime": "nodejs10.x", "Timeout": 300 } } diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sns.expected.json b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sns.expected.json index 6a50e98575458..1822304a48a26 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sns.expected.json +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sns.expected.json @@ -54,7 +54,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "FServiceRole3AC82EE1" diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sqs.expected.json b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sqs.expected.json index 53cbc327dc4ad..7b849f60efad2 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sqs.expected.json +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sqs.expected.json @@ -88,7 +88,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "FServiceRoleDefaultPolicy17A19BFA", diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/test-function.ts b/packages/@aws-cdk/aws-lambda-event-sources/test/test-function.ts index b3ba0c456cfcd..0eb08304b7303 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/test/test-function.ts +++ b/packages/@aws-cdk/aws-lambda-event-sources/test/test-function.ts @@ -6,7 +6,7 @@ export class TestFunction extends lambda.Function { super(scope, id, { handler: 'index.handler', code: lambda.Code.inline(`exports.handler = ${handler.toString()}`), - runtime: lambda.Runtime.NodeJS810 + runtime: lambda.Runtime.NodeJS10x }); } } diff --git a/packages/@aws-cdk/aws-lambda/lib/log-retention.ts b/packages/@aws-cdk/aws-lambda/lib/log-retention.ts index 1196f04d38012..61e04a6c175cd 100644 --- a/packages/@aws-cdk/aws-lambda/lib/log-retention.ts +++ b/packages/@aws-cdk/aws-lambda/lib/log-retention.ts @@ -33,7 +33,7 @@ export class LogRetention extends cdk.Construct { // Custom resource provider const provider = new SingletonFunction(this, 'Provider', { code: Code.asset(path.join(__dirname, 'log-retention-provider')), - runtime: Runtime.NodeJS810, + runtime: Runtime.NodeJS10x, handler: 'index.handler', uuid: 'aae0aa3c-5b4d-4f87-b02d-85b201efdd8a', lambdaPurpose: 'LogRetention', diff --git a/packages/@aws-cdk/aws-lambda/lib/runtime.ts b/packages/@aws-cdk/aws-lambda/lib/runtime.ts index 23c4ec38f01e2..82cbb2304eab9 100644 --- a/packages/@aws-cdk/aws-lambda/lib/runtime.ts +++ b/packages/@aws-cdk/aws-lambda/lib/runtime.ts @@ -30,6 +30,7 @@ export class Runtime { public static readonly NodeJS43 = new Runtime('nodejs4.3', RuntimeFamily.NodeJS, { supportsInlineCode: true }); public static readonly NodeJS610 = new Runtime('nodejs6.10', RuntimeFamily.NodeJS, { supportsInlineCode: true }); public static readonly NodeJS810 = new Runtime('nodejs8.10', RuntimeFamily.NodeJS, { supportsInlineCode: true }); + public static readonly NodeJS10x = new Runtime('nodejs10.x', RuntimeFamily.NodeJS, { supportsInlineCode: true }); public static readonly Python27 = new Runtime('python2.7', RuntimeFamily.Python, { supportsInlineCode: true }); public static readonly Python36 = new Runtime('python3.6', RuntimeFamily.Python, { supportsInlineCode: true }); public static readonly Python37 = new Runtime('python3.7', RuntimeFamily.Python, { supportsInlineCode: true }); diff --git a/packages/@aws-cdk/aws-lambda/test/integ.bucket-notifications.expected.json b/packages/@aws-cdk/aws-lambda/test/integ.bucket-notifications.expected.json index 738b14605a43c..d797b40166aad 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.bucket-notifications.expected.json +++ b/packages/@aws-cdk/aws-lambda/test/integ.bucket-notifications.expected.json @@ -99,7 +99,7 @@ "Arn" ] }, - "Runtime": "nodejs6.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "MyFunctionServiceRole3C357FF2" @@ -260,7 +260,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10", + "Runtime": "nodejs10.x", "Timeout": 300 } } diff --git a/packages/@aws-cdk/aws-lambda/test/integ.bucket-notifications.ts b/packages/@aws-cdk/aws-lambda/test/integ.bucket-notifications.ts index 6898b68d48336..e738c105d6561 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.bucket-notifications.ts +++ b/packages/@aws-cdk/aws-lambda/test/integ.bucket-notifications.ts @@ -11,7 +11,7 @@ const bucketA = new s3.Bucket(stack, 'MyBucket', { }); const fn = new lambda.Function(stack, 'MyFunction', { - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, handler: 'index.handler', code: lambda.Code.inline(`exports.handler = ${handler.toString()}`) }); diff --git a/packages/@aws-cdk/aws-lambda/test/integ.lambda.expected.json b/packages/@aws-cdk/aws-lambda/test/integ.lambda.expected.json index eac87632a5aa2..90848f19a1a05 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.lambda.expected.json +++ b/packages/@aws-cdk/aws-lambda/test/integ.lambda.expected.json @@ -75,7 +75,7 @@ "Arn" ] }, - "Runtime": "nodejs6.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "MyLambdaServiceRoleDefaultPolicy5BBC6F68", diff --git a/packages/@aws-cdk/aws-lambda/test/integ.lambda.ts b/packages/@aws-cdk/aws-lambda/test/integ.lambda.ts index e76b4f90121a8..fc15883776d87 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.lambda.ts +++ b/packages/@aws-cdk/aws-lambda/test/integ.lambda.ts @@ -9,7 +9,7 @@ const stack = new cdk.Stack(app, 'aws-cdk-lambda-1'); const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); fn.addToRolePolicy(new iam.PolicyStatement().addAllResources().addAction('*')); diff --git a/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.expected.json b/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.expected.json index af2da01f41b56..93710e21a624a 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.expected.json +++ b/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.expected.json @@ -52,7 +52,7 @@ } }, "CompatibleRuntimes": [ - "nodejs8.10" + "nodejs10.x" ], "Description": "A layer to test the L2 construct", "LicenseInfo": "Apache-2.0" @@ -124,7 +124,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10", + "Runtime": "nodejs10.x", "Layers": [ { "Ref": "MyLayer38944FA5" diff --git a/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.ts b/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.ts index 3d79d80a89d95..410aebb028668 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.ts +++ b/packages/@aws-cdk/aws-lambda/test/integ.layer-version.lit.ts @@ -12,7 +12,7 @@ const awsAccountId = stack.accountId; /// !show const layer = new lambda.LayerVersion(stack, 'MyLayer', { code: lambda.Code.directory(path.join(__dirname, 'layer-code')), - compatibleRuntimes: [lambda.Runtime.NodeJS810], + compatibleRuntimes: [lambda.Runtime.NodeJS10x], license: 'Apache-2.0', description: 'A layer to test the L2 construct', }); @@ -26,7 +26,7 @@ layer.addPermission('remote-account-grant', { accountId: awsAccountId }); new lambda.Function(stack, 'MyLayeredLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, layers: [layer], }); /// !hide diff --git a/packages/@aws-cdk/aws-lambda/test/integ.log-retention.expected.json b/packages/@aws-cdk/aws-lambda/test/integ.log-retention.expected.json index 9ef732e1d267b..c4e18a90edaa3 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.log-retention.expected.json +++ b/packages/@aws-cdk/aws-lambda/test/integ.log-retention.expected.json @@ -54,7 +54,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "OneWeekServiceRole05A6F9F8" @@ -196,7 +196,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB", @@ -257,7 +257,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "OneMonthServiceRoleFBD1064F" @@ -340,7 +340,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "OneYearServiceRole24D47762" diff --git a/packages/@aws-cdk/aws-lambda/test/integ.log-retention.ts b/packages/@aws-cdk/aws-lambda/test/integ.log-retention.ts index 08475cc79d5b8..a9eb53b263ab8 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.log-retention.ts +++ b/packages/@aws-cdk/aws-lambda/test/integ.log-retention.ts @@ -9,21 +9,21 @@ const stack = new cdk.Stack(app, 'aws-cdk-lambda-log-retention'); new lambda.Function(stack, 'OneWeek', { code: new lambda.InlineCode('exports.handler = (event) => console.log(JSON.stringify(event));'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, logRetentionDays: logs.RetentionDays.OneWeek }); new lambda.Function(stack, 'OneMonth', { code: new lambda.InlineCode('exports.handler = (event) => console.log(JSON.stringify(event));'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, logRetentionDays: logs.RetentionDays.OneMonth }); new lambda.Function(stack, 'OneYear', { code: new lambda.InlineCode('exports.handler = (event) => console.log(JSON.stringify(event));'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, logRetentionDays: logs.RetentionDays.OneYear }); diff --git a/packages/@aws-cdk/aws-lambda/test/test.alias.ts b/packages/@aws-cdk/aws-lambda/test/test.alias.ts index 2ffeb46f6219c..14feff83eecf3 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.alias.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.alias.ts @@ -10,7 +10,7 @@ export = { const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('hello()'), handler: 'index.hello', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); const version = fn.addVersion('1'); @@ -45,7 +45,7 @@ export = { const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('hello()'), handler: 'index.hello', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); const version = fn.newVersion(); @@ -73,7 +73,7 @@ export = { const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('hello()'), handler: 'index.hello', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); const version1 = fn.addVersion('1'); @@ -106,7 +106,7 @@ export = { const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('hello()'), handler: 'index.hello', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); const version = fn.addVersion('1'); @@ -137,7 +137,7 @@ export = { const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('hello()'), handler: 'index.hello', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); const version = fn.addVersion('1'); @@ -187,7 +187,7 @@ export = { const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('hello()'), handler: 'index.hello', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); const version = fn.addVersion('1'); @@ -206,7 +206,7 @@ export = { const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('hello()'), handler: 'index.hello', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); const version = fn.addVersion('1'); diff --git a/packages/@aws-cdk/aws-lambda/test/test.code.ts b/packages/@aws-cdk/aws-lambda/test/test.code.ts index f74809a71fc37..fa3a3b9e6ffd1 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.code.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.code.ts @@ -17,7 +17,7 @@ export = { }, 'fails if larger than 4096 bytes'(test: Test) { test.throws( - () => defineFunction(lambda.Code.inline(generateRandomString(4097)), lambda.Runtime.NodeJS610), + () => defineFunction(lambda.Code.inline(generateRandomString(4097)), lambda.Runtime.NodeJS10x), /Lambda source is too large, must be <= 4096 but is 4097/); test.done(); } @@ -52,13 +52,13 @@ export = { // WHEN new lambda.Function(stack, 'Func1', { handler: 'foom', - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, code: directoryAsset }); new lambda.Function(stack, 'Func2', { handler: 'foom', - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, code: directoryAsset }); @@ -82,7 +82,7 @@ export = { // WHEN new lambda.Function(stack, 'Func1', { code: lambda.Code.asset(location), - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, handler: 'foom', }); @@ -103,7 +103,7 @@ export = { const code = new lambda.CfnParametersCode(); new lambda.Function(stack, 'Function', { code, - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, handler: 'index.handler', }); @@ -157,7 +157,7 @@ export = { new lambda.Function(stack, 'Function', { code, - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, handler: 'index.handler', }); @@ -202,7 +202,7 @@ export = { }, }; -function defineFunction(code: lambda.Code, runtime: lambda.Runtime = lambda.Runtime.NodeJS810) { +function defineFunction(code: lambda.Code, runtime: lambda.Runtime = lambda.Runtime.NodeJS10x) { const stack = new cdk.Stack(); return new lambda.Function(stack, 'Func', { handler: 'foom', diff --git a/packages/@aws-cdk/aws-lambda/test/test.lambda.ts b/packages/@aws-cdk/aws-lambda/test/test.lambda.ts index a591078948957..3e5bc787b07e4 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.lambda.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.lambda.ts @@ -16,7 +16,7 @@ export = { new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); expect(stack).toMatch({ Resources: @@ -40,7 +40,7 @@ export = { { Code: { ZipFile: 'foo' }, Handler: 'index.handler', Role: { 'Fn::GetAtt': [ 'MyLambdaServiceRole4539ECB6', 'Arn' ] }, - Runtime: 'nodejs6.10' }, + Runtime: 'nodejs10.x' }, DependsOn: [ 'MyLambdaServiceRole4539ECB6' ] } } }); test.done(); }, @@ -50,7 +50,7 @@ export = { new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, initialPolicy: [new iam.PolicyStatement().addAction("*").addAllResources()] }); expect(stack).toMatch({ Resources: @@ -94,7 +94,7 @@ export = { { Code: { ZipFile: 'foo' }, Handler: 'index.handler', Role: { 'Fn::GetAtt': [ 'MyLambdaServiceRole4539ECB6', 'Arn' ] }, - Runtime: 'nodejs6.10' }, + Runtime: 'nodejs10.x' }, DependsOn: [ 'MyLambdaServiceRoleDefaultPolicy5BBC6F68', 'MyLambdaServiceRole4539ECB6' ] } } } ); test.done(); @@ -295,7 +295,7 @@ export = { new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, functionName: 'OneFunctionToRuleThemAll', deadLetterQueueEnabled: true }); @@ -379,7 +379,7 @@ export = { "Arn" ] }, - "Runtime": "nodejs6.10", + "Runtime": "nodejs10.x", "DeadLetterConfig": { "TargetArn": { "Fn::GetAtt": [ @@ -407,7 +407,7 @@ export = { new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, deadLetterQueueEnabled: true, }); @@ -490,7 +490,7 @@ export = { "Arn" ] }, - "Runtime": "nodejs6.10", + "Runtime": "nodejs10.x", "DeadLetterConfig": { "TargetArn": { "Fn::GetAtt": [ @@ -517,7 +517,7 @@ export = { new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, deadLetterQueueEnabled: false, }); @@ -568,7 +568,7 @@ export = { "Arn" ] }, - "Runtime": "nodejs6.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "MyLambdaServiceRole4539ECB6" @@ -591,7 +591,7 @@ export = { new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, deadLetterQueue: dlQueue, }); @@ -668,7 +668,7 @@ export = { "Arn" ] }, - "Runtime": "nodejs6.10", + "Runtime": "nodejs10.x", "DeadLetterConfig": { "TargetArn": { "Fn::GetAtt": [ @@ -700,7 +700,7 @@ export = { new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, deadLetterQueueEnabled: true, deadLetterQueue: dlQueue, }); @@ -778,7 +778,7 @@ export = { "Arn" ] }, - "Runtime": "nodejs6.10", + "Runtime": "nodejs10.x", "DeadLetterConfig": { "TargetArn": { "Fn::GetAtt": [ @@ -810,7 +810,7 @@ export = { test.throws(() => new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, deadLetterQueueEnabled: false, deadLetterQueue: dlQueue, }), /deadLetterQueue defined but deadLetterQueueEnabled explicitly set to false/); @@ -824,7 +824,7 @@ export = { new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, tracing: lambda.Tracing.Active }); @@ -862,7 +862,7 @@ export = { "Arn" ] }, - "Runtime": "nodejs6.10", + "Runtime": "nodejs10.x", "TracingConfig": { "Mode": "Active" } @@ -882,7 +882,7 @@ export = { new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, tracing: lambda.Tracing.PassThrough }); @@ -920,7 +920,7 @@ export = { "Arn" ] }, - "Runtime": "nodejs6.10", + "Runtime": "nodejs10.x", "TracingConfig": { "Mode": "PassThrough" } @@ -940,7 +940,7 @@ export = { new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, tracing: lambda.Tracing.Disabled }); @@ -978,7 +978,7 @@ export = { "Arn" ] }, - "Runtime": "nodejs6.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "MyLambdaServiceRole4539ECB6" @@ -997,7 +997,7 @@ export = { const fn = new lambda.Function(stack, 'Function', { code: lambda.Code.inline('xxx'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, }); // WHEN @@ -1026,7 +1026,7 @@ export = { const fn = new lambda.Function(stack, 'Function', { code: lambda.Code.inline('xxx'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, }); const service = new iam.ServicePrincipal('apigateway.amazonaws.com'); @@ -1161,17 +1161,17 @@ export = { const stack = new cdk.Stack(undefined, 'TestStack'); const layer = lambda.LayerVersion.fromLayerVersionAttributes(stack, 'TestLayer', { layerVersionArn: 'arn:aws:...', - compatibleRuntimes: [lambda.Runtime.NodeJS810], + compatibleRuntimes: [lambda.Runtime.NodeJS10x], }); // THEN test.throws(() => new lambda.Function(stack, 'Function', { layers: [layer], - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS810, code: lambda.Code.inline('exports.main = function() { console.log("DONE"); }'), handler: 'index.main' }), - /nodejs6.10 is not in \[nodejs8.10\]/); + /nodejs8.10 is not in \[nodejs10.x\]/); test.done(); }, @@ -1181,13 +1181,13 @@ export = { const stack = new cdk.Stack(undefined, 'TestStack'); const layers = new Array(6).fill(lambda.LayerVersion.fromLayerVersionAttributes(stack, 'TestLayer', { layerVersionArn: 'arn:aws:...', - compatibleRuntimes: [lambda.Runtime.NodeJS810], + compatibleRuntimes: [lambda.Runtime.NodeJS10x], })); // THEN test.throws(() => new lambda.Function(stack, 'Function', { layers, - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, code: lambda.Code.inline('exports.main = function() { console.log("DONE"); }'), handler: 'index.main' }), diff --git a/packages/@aws-cdk/aws-lambda/test/test.layers.ts b/packages/@aws-cdk/aws-lambda/test/test.layers.ts index 244c58095ace8..74f0dfd344e0e 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.layers.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.layers.ts @@ -14,7 +14,7 @@ export = testCase({ // WHEN new lambda.LayerVersion(stack, 'LayerVersion', { code, - compatibleRuntimes: [lambda.Runtime.NodeJS810] + compatibleRuntimes: [lambda.Runtime.NodeJS10x] }); // THEN @@ -23,7 +23,7 @@ export = testCase({ S3Bucket: stack.node.resolve(bucket.bucketName), S3Key: 'ObjectKey', }, - CompatibleRuntimes: ['nodejs8.10'] + CompatibleRuntimes: ['nodejs10.x'] })); test.done(); @@ -36,7 +36,7 @@ export = testCase({ const code = new lambda.S3Code(bucket, 'ObjectKey'); const layer = new lambda.LayerVersion(stack, 'LayerVersion', { code, - compatibleRuntimes: [lambda.Runtime.NodeJS810] + compatibleRuntimes: [lambda.Runtime.NodeJS10x] }); // WHEN diff --git a/packages/@aws-cdk/aws-lambda/test/test.subscriptiondestination.ts b/packages/@aws-cdk/aws-lambda/test/test.subscriptiondestination.ts index f07817c5c22c1..8647d3fb19010 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.subscriptiondestination.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.subscriptiondestination.ts @@ -11,7 +11,7 @@ export = { const fn = new lambda.Function(stack, 'MyLambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); const logGroup = new logs.LogGroup(stack, 'LogGroup'); diff --git a/packages/@aws-cdk/aws-lambda/test/test.vpc-lambda.ts b/packages/@aws-cdk/aws-lambda/test/test.vpc-lambda.ts index fb92bbe244c39..8271960a0566b 100644 --- a/packages/@aws-cdk/aws-lambda/test/test.vpc-lambda.ts +++ b/packages/@aws-cdk/aws-lambda/test/test.vpc-lambda.ts @@ -19,7 +19,7 @@ export = { this.lambda = new lambda.Function(this.stack, 'Lambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, vpc: this.vpc, allowAllOutbound: false }); @@ -114,7 +114,7 @@ export = { const lambdaFn = new lambda.Function(stack, 'Lambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, }); // WHEN @@ -135,7 +135,7 @@ export = { new lambda.Function(stack, 'Lambda', { code: new lambda.InlineCode('foo'), handler: 'index.handler', - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, vpc, vpcSubnets: { subnetType: ec2.SubnetType.Public } }); diff --git a/packages/@aws-cdk/aws-sns/test/integ.sns-bucket-notifications.expected.json b/packages/@aws-cdk/aws-sns/test/integ.sns-bucket-notifications.expected.json index b19a908c1bcd2..c1b1422c7f720 100644 --- a/packages/@aws-cdk/aws-sns/test/integ.sns-bucket-notifications.expected.json +++ b/packages/@aws-cdk/aws-sns/test/integ.sns-bucket-notifications.expected.json @@ -229,7 +229,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10", + "Runtime": "nodejs10.x", "Timeout": 300 } } diff --git a/packages/@aws-cdk/aws-sns/test/integ.sns-lambda.expected.json b/packages/@aws-cdk/aws-sns/test/integ.sns-lambda.expected.json index 62614184e66a6..f1c8b2eb27eb5 100644 --- a/packages/@aws-cdk/aws-sns/test/integ.sns-lambda.expected.json +++ b/packages/@aws-cdk/aws-sns/test/integ.sns-lambda.expected.json @@ -57,7 +57,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "EchoServiceRoleBE28060B" diff --git a/packages/@aws-cdk/aws-sns/test/integ.sns-lambda.ts b/packages/@aws-cdk/aws-sns/test/integ.sns-lambda.ts index 315934248e98c..e7a233eebeca4 100644 --- a/packages/@aws-cdk/aws-sns/test/integ.sns-lambda.ts +++ b/packages/@aws-cdk/aws-sns/test/integ.sns-lambda.ts @@ -10,7 +10,7 @@ class SnsToSqs extends cdk.Stack { const fction = new lambda.Function(this, 'Echo', { handler: 'index.handler', - runtime: lambda.Runtime.NodeJS810, + runtime: lambda.Runtime.NodeJS10x, code: lambda.Code.inline(`exports.handler = ${handler.toString()}`) }); diff --git a/packages/@aws-cdk/aws-sns/test/test.sns.ts b/packages/@aws-cdk/aws-sns/test/test.sns.ts index 4f8d9c0e829c6..3087f78b10ef7 100644 --- a/packages/@aws-cdk/aws-sns/test/test.sns.ts +++ b/packages/@aws-cdk/aws-sns/test/test.sns.ts @@ -279,7 +279,7 @@ export = { }); const fction = new lambda.Function(stack, 'MyFunc', { - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, handler: 'index.handler', code: lambda.Code.inline('exports.handler = function(e, c, cb) { return cb() }') }); @@ -343,7 +343,7 @@ export = { "Arn" ] }, - "Runtime": "nodejs6.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "MyFuncServiceRole54065130" @@ -416,7 +416,7 @@ export = { const queue = new sqs.Queue(stack, 'MyQueue'); const func = new lambda.Function(stack, 'MyFunc', { - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, handler: 'index.handler', code: lambda.Code.inline('exports.handler = function(e, c, cb) { return cb() }') }); @@ -545,7 +545,7 @@ export = { "Arn" ] }, - "Runtime": "nodejs6.10" + "Runtime": "nodejs10.x" }, "DependsOn": [ "MyFuncServiceRole54065130" diff --git a/packages/@aws-cdk/aws-sqs/test/integ.bucket-notifications.expected.json b/packages/@aws-cdk/aws-sqs/test/integ.bucket-notifications.expected.json index 57281394ea8f0..b9a4698054b5d 100644 --- a/packages/@aws-cdk/aws-sqs/test/integ.bucket-notifications.expected.json +++ b/packages/@aws-cdk/aws-sqs/test/integ.bucket-notifications.expected.json @@ -207,7 +207,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10", + "Runtime": "nodejs10.x", "Timeout": 300 } }, diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.ec2-task.expected.json b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.ec2-task.expected.json index 39f4bde65a48a..2458f84b541c9 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.ec2-task.expected.json +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.ec2-task.expected.json @@ -825,7 +825,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10", + "Runtime": "nodejs10.x", "Timeout": 300 }, "DependsOn": [ diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.fargate-task.expected.json b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.fargate-task.expected.json index 56f65b123f8fd..61980be02954a 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.fargate-task.expected.json +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/integ.fargate-task.expected.json @@ -447,7 +447,7 @@ "Arn" ] }, - "Runtime": "nodejs8.10", + "Runtime": "nodejs10.x", "Timeout": 300 }, "DependsOn": [ diff --git a/packages/@aws-cdk/runtime-values/test/integ.rtv.lambda.expected.json b/packages/@aws-cdk/runtime-values/test/integ.rtv.lambda.expected.json index 794e175f5738d..47b5f66d77088 100644 --- a/packages/@aws-cdk/runtime-values/test/integ.rtv.lambda.expected.json +++ b/packages/@aws-cdk/runtime-values/test/integ.rtv.lambda.expected.json @@ -105,7 +105,7 @@ "Arn" ] }, - "Runtime": "nodejs6.10", + "Runtime": "nodejs10.x", "Environment": { "Variables": { "RTV_STACK_NAME": { diff --git a/packages/@aws-cdk/runtime-values/test/integ.rtv.lambda.ts b/packages/@aws-cdk/runtime-values/test/integ.rtv.lambda.ts index 0c45cf9b4eb33..0f9c9364731a3 100644 --- a/packages/@aws-cdk/runtime-values/test/integ.rtv.lambda.ts +++ b/packages/@aws-cdk/runtime-values/test/integ.rtv.lambda.ts @@ -14,7 +14,7 @@ class TestStack extends cdk.Stack { const queue = new sqs.Queue(this, 'MyQueue'); const fn = new lambda.Function(this, 'MyFunction', { code: lambda.Code.inline(`exports.handler = ${runtimeCode.toString()}`), - runtime: lambda.Runtime.NodeJS610, + runtime: lambda.Runtime.NodeJS10x, handler: 'index.handler' }); diff --git a/packages/@aws-cdk/runtime-values/test/test.rtv.ts b/packages/@aws-cdk/runtime-values/test/test.rtv.ts index 05eb8b94625b1..c4bbc22c31dc3 100644 --- a/packages/@aws-cdk/runtime-values/test/test.rtv.ts +++ b/packages/@aws-cdk/runtime-values/test/test.rtv.ts @@ -29,7 +29,7 @@ class RuntimeValueTest extends cdk.Construct { }); new lambda.CfnFunction(this, 'Function', { - runtime: 'nodejs6.10', + runtime: 'nodejs10.x', handler: 'index.handler', code: { zipFile: `