feat(lambda): add nodejs10x runtime and update tests

aws · May 15, 2019 · 383241e · 383241e
1 parent e4e24ab
commit 383241e
Show file tree

Hide file tree

Showing 43 changed files with 102 additions and 101 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts b/.../@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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.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.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.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.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
 });