From 2b717b64179cf26f8456f1d6d74ea50d38df60f2 Mon Sep 17 00:00:00 2001 From: Markus Lindqvist Date: Fri, 25 Dec 2020 19:34:09 +0200 Subject: [PATCH] Use latest stable NodeJs runtime for custom resource Lambda --- .../test/integ.chatbot-logretention.expected.json | 2 +- .../aws-lambda/test/integ.log-retention.expected.json | 2 +- packages/@aws-cdk/aws-logs/lib/log-retention.ts | 2 +- packages/@aws-cdk/aws-logs/test/test.log-retention.ts | 5 +++++ .../@aws-cdk/aws-rds/test/integ.instance.lit.expected.json | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/@aws-cdk/aws-chatbot/test/integ.chatbot-logretention.expected.json b/packages/@aws-cdk/aws-chatbot/test/integ.chatbot-logretention.expected.json index 727be77a25991..23c51da03a661 100644 --- a/packages/@aws-cdk/aws-chatbot/test/integ.chatbot-logretention.expected.json +++ b/packages/@aws-cdk/aws-chatbot/test/integ.chatbot-logretention.expected.json @@ -170,7 +170,7 @@ "Arn" ] }, - "Runtime": "nodejs10.x" + "Runtime": "nodejs12.x" }, "DependsOn": [ "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB", 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 f123d24edf60a..6c8c451a2e736 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 @@ -176,7 +176,7 @@ "Arn" ] }, - "Runtime": "nodejs10.x" + "Runtime": "nodejs12.x" }, "DependsOn": [ "LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8aServiceRoleDefaultPolicyADDA7DEB", diff --git a/packages/@aws-cdk/aws-logs/lib/log-retention.ts b/packages/@aws-cdk/aws-logs/lib/log-retention.ts index 97ea68276b00c..44f36e5891cbe 100644 --- a/packages/@aws-cdk/aws-logs/lib/log-retention.ts +++ b/packages/@aws-cdk/aws-logs/lib/log-retention.ts @@ -154,7 +154,7 @@ class LogRetentionFunction extends cdk.Construct { type: 'AWS::Lambda::Function', properties: { Handler: 'index.handler', - Runtime: 'nodejs10.x', + Runtime: 'nodejs12.x', Code: { S3Bucket: asset.s3BucketName, S3Key: asset.s3ObjectKey, diff --git a/packages/@aws-cdk/aws-logs/test/test.log-retention.ts b/packages/@aws-cdk/aws-logs/test/test.log-retention.ts index 1f1faa24350bf..1de0c4d7b777c 100644 --- a/packages/@aws-cdk/aws-logs/test/test.log-retention.ts +++ b/packages/@aws-cdk/aws-logs/test/test.log-retention.ts @@ -40,6 +40,11 @@ export = { ], })); + expect(stack).to(haveResource('AWS::Lambda::Function', { + Handler: 'index.handler', + Runtime: 'nodejs12.x', + })); + expect(stack).to(haveResource('Custom::LogRetention', { 'ServiceToken': { 'Fn::GetAtt': [ diff --git a/packages/@aws-cdk/aws-rds/test/integ.instance.lit.expected.json b/packages/@aws-cdk/aws-rds/test/integ.instance.lit.expected.json index 9952517f5e00e..ca91f92e62644 100644 --- a/packages/@aws-cdk/aws-rds/test/integ.instance.lit.expected.json +++ b/packages/@aws-cdk/aws-rds/test/integ.instance.lit.expected.json @@ -986,7 +986,7 @@ "Type": "AWS::Lambda::Function", "Properties": { "Handler": "index.handler", - "Runtime": "nodejs10.x", + "Runtime": "nodejs12.x", "Code": { "S3Bucket": { "Ref": "AssetParameters884431e2bc651d2b61bd699a29dc9684b0f66911f06bd3ed0635f854bf18e147S3BucketAE1150B3"