chore: replace Node16 runtimes in unit tests with symbolic runtime (#…

…27011) To lower the effort for our next hunt-and-peck Node upgrade, replace all runtimes in unit tests with symbolic Node versions. * Most of the time, use `NODEJS_LATEST` * Replace expectations of a rendered runtime `"nodejs16.x" -> Runtime.NODEJS_LATEST.name` * For tests where the hash matters, use a hardcoded fake runtime of `"node99.x"`. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Sep 6, 2023 · 66a024f · 66a024f
1 parent 49e5739
commit 66a024f
Show file tree

Hide file tree

Showing 59 changed files with 409 additions and 383 deletions.
diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/test/http/lambda.test.ts b/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/test/http/lambda.test.ts
@@ -1,6 +1,7 @@
 import { Match, Template } from 'aws-cdk-lib/assertions';
 import { HttpApi } from '@aws-cdk/aws-apigatewayv2-alpha';
-import { Code, Function, Runtime } from 'aws-cdk-lib/aws-lambda';
+import { Code, Function } from 'aws-cdk-lib/aws-lambda';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
 import { Duration, Stack } from 'aws-cdk-lib';
 import { DummyRouteIntegration } from './integration';
 import { HttpLambdaAuthorizer, HttpLambdaResponseType } from '../../lib';
@@ -13,7 +14,7 @@ describe('HttpLambdaAuthorizer', () => {
     const api = new HttpApi(stack, 'HttpApi');
 
     const handler = new Function(stack, 'auth-function', {
-      runtime: Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       code: Code.fromInline('exports.handler = () => {return true}'),
       handler: 'index.handler',
     });
@@ -49,7 +50,7 @@ describe('HttpLambdaAuthorizer', () => {
     const api = new HttpApi(stack, 'HttpApi');
 
     const handler = new Function(stack, 'auth-function', {
-      runtime: Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       code: Code.fromInline('exports.handler = () => {return true}'),
       handler: 'index.handler',
     });
@@ -78,7 +79,7 @@ describe('HttpLambdaAuthorizer', () => {
     const api = new HttpApi(stack, 'HttpApi');
 
     const handler = new Function(stack, 'auth-function', {
-      runtime: Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       code: Code.fromInline('exports.handler = () => {return true}'),
       handler: 'index.handler',
     });
@@ -107,7 +108,7 @@ describe('HttpLambdaAuthorizer', () => {
     const api = new HttpApi(stack, 'HttpApi');
 
     const handler = new Function(stack, 'auth-function', {
-      runtime: Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       code: Code.fromInline('exports.handler = () => {return true}'),
       handler: 'index.handler',
     });
@@ -136,7 +137,7 @@ describe('HttpLambdaAuthorizer', () => {
     const api = new HttpApi(stack, 'HttpApi');
 
     const handler = new Function(stack, 'auth-functon', {
-      runtime: Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       code: Code.fromInline('exports.handler = () => {return true}'),
       handler: 'index.handler',
     });

diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/test/websocket/iam.test.ts b/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/test/websocket/iam.test.ts
@@ -1,7 +1,8 @@
 import { Template } from 'aws-cdk-lib/assertions';
 import { WebSocketApi } from '@aws-cdk/aws-apigatewayv2-alpha';
 import { WebSocketLambdaIntegration } from '@aws-cdk/aws-apigatewayv2-integrations-alpha';
-import { Code, Function, Runtime } from 'aws-cdk-lib/aws-lambda';
+import { Code, Function } from 'aws-cdk-lib/aws-lambda';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
 import { Stack } from 'aws-cdk-lib';
 import { WebSocketIamAuthorizer } from '../../lib';
 
@@ -10,7 +11,7 @@ describe('WebSocketLambdaAuthorizer', () => {
     const stack = new Stack();
 
     const handler = new Function(stack, 'auth-function', {
-      runtime: Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       code: Code.fromInline('exports.handler = () => {return true}'),
       handler: 'index.handler',
     });

diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/test/websocket/lambda.test.ts b/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/test/websocket/lambda.test.ts
@@ -1,7 +1,8 @@
 import { Template } from 'aws-cdk-lib/assertions';
 import { WebSocketApi } from '@aws-cdk/aws-apigatewayv2-alpha';
 import { WebSocketLambdaIntegration } from '@aws-cdk/aws-apigatewayv2-integrations-alpha';
-import { Code, Function, Runtime } from 'aws-cdk-lib/aws-lambda';
+import { Code, Function } from 'aws-cdk-lib/aws-lambda';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
 import { Stack } from 'aws-cdk-lib';
 import { WebSocketLambdaAuthorizer } from '../../lib';
 
@@ -11,7 +12,7 @@ describe('WebSocketLambdaAuthorizer', () => {
     const stack = new Stack();
 
     const handler = new Function(stack, 'auth-function', {
-      runtime: Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       code: Code.fromInline('exports.handler = () => {return true}'),
       handler: 'index.handler',
     });

diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/test/http/lambda.test.ts b/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/test/http/lambda.test.ts
@@ -1,6 +1,7 @@
 import { Match, Template } from 'aws-cdk-lib/assertions';
 import { HttpApi, HttpRoute, HttpRouteKey, MappingValue, ParameterMapping, PayloadFormatVersion } from '@aws-cdk/aws-apigatewayv2-alpha';
-import { Code, Function, Runtime } from 'aws-cdk-lib/aws-lambda';
+import { Code, Function } from 'aws-cdk-lib/aws-lambda';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
 import { App, Stack } from 'aws-cdk-lib';
 import { HttpLambdaIntegration } from '../../lib';
 
@@ -111,7 +112,7 @@ describe('LambdaProxyIntegration', () => {
 function fooFunction(stack: Stack, id: string) {
   return new Function(stack, id, {
     code: Code.fromInline('foo'),
-    runtime: Runtime.NODEJS_16_X,
+    runtime: lambda.Runtime.NODEJS_LATEST,
     handler: 'index.handler',
   });
-}
+}
diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/test/websocket/lambda.test.ts b/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/test/websocket/lambda.test.ts
@@ -1,6 +1,7 @@
 import { Template } from 'aws-cdk-lib/assertions';
 import { WebSocketApi } from '@aws-cdk/aws-apigatewayv2-alpha';
-import { Code, Function, Runtime } from 'aws-cdk-lib/aws-lambda';
+import { Code, Function } from 'aws-cdk-lib/aws-lambda';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
 import { Stack } from 'aws-cdk-lib';
 import { WebSocketLambdaIntegration } from '../../lib';
 
@@ -50,7 +51,7 @@ describe('LambdaWebSocketIntegration', () => {
 function fooFunction(stack: Stack, id: string) {
   return new Function(stack, id, {
     code: Code.fromInline('foo'),
-    runtime: Runtime.NODEJS_16_X,
+    runtime: lambda.Runtime.NODEJS_LATEST,
     handler: 'index.handler',
   });
 }
diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/lambda/lambda-function-action.test.ts b/packages/@aws-cdk/aws-iot-actions-alpha/test/lambda/lambda-function-action.test.ts
@@ -11,7 +11,7 @@ test('create a topic rule with lambda action and a lambda permission to be invok
     sql: iot.IotSql.fromStringAsVer20160323("SELECT topic(2) as device_id FROM 'device/+/data'"),
   });
   const func = new lambda.Function(stack, 'MyFunction', {
-    runtime: lambda.Runtime.NODEJS_16_X,
+    runtime: lambda.Runtime.NODEJS_LATEST,
     handler: 'index.handler',
     code: lambda.Code.fromInline('console.log("foo")'),
   });
@@ -60,7 +60,7 @@ test('create two different permissions, when two topic rules have the same actio
   // GIVEN
   const stack = new cdk.Stack();
   const func = new lambda.Function(stack, 'MyFunction', {
-    runtime: lambda.Runtime.NODEJS_16_X,
+    runtime: lambda.Runtime.NODEJS_LATEST,
     handler: 'index.handler',
     code: lambda.Code.fromInline('console.log("foo")'),
   });

diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/s3-bucket.test.ts b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/s3-bucket.test.ts
@@ -240,7 +240,7 @@ describe('S3 destination', () => {
 
     beforeEach(() => {
       lambdaFunction = new lambda.Function(stack, 'DataProcessorFunction', {
-        runtime: lambda.Runtime.NODEJS_16_X,
+        runtime: lambda.Runtime.NODEJS_LATEST,
         code: lambda.Code.fromInline('foo'),
         handler: 'bar',
       });

diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/function.test.ts b/packages/@aws-cdk/aws-lambda-python-alpha/test/function.test.ts
@@ -1,6 +1,7 @@
 import * as path from 'path';
 import { Template } from 'aws-cdk-lib/assertions';
 import { Code, Runtime } from 'aws-cdk-lib/aws-lambda';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
 import { AssetHashType, DockerImage, Stack } from 'aws-cdk-lib';
 import { PythonFunction } from '../lib';
 import { Bundling, BundlingProps } from '../lib/bundling';
@@ -112,7 +113,7 @@ test('throws when entry does not exist', () => {
 test('throws with the wrong runtime family', () => {
   expect(() => new PythonFunction(stack, 'handler1', {
     entry: path.join(__dirname, 'lambda-handler'),
-    runtime: Runtime.NODEJS_16_X,
+    runtime: lambda.Runtime.NODEJS_LATEST,
   })).toThrow(/Only `PYTHON` runtimes are supported/);
 });
 

diff --git a/packages/@aws-cdk/aws-s3objectlambda-alpha/test/s3objectlambda.test.ts b/packages/@aws-cdk/aws-s3objectlambda-alpha/test/s3objectlambda.test.ts
@@ -12,7 +12,7 @@ beforeEach(() => {
   stack = new cdk.Stack();
   bucket = new s3.Bucket(stack, 'MyBucket');
   handler = new lambda.Function(stack, 'MyFunction', {
-    runtime: lambda.Runtime.NODEJS_16_X,
+    runtime: lambda.Runtime.NODEJS_LATEST,
     handler: 'index.hello',
     code: new lambda.InlineCode('def hello(): pass'),
   });

diff --git a/packages/aws-cdk-lib/aws-apigateway/test/authorizers/lambda.test.ts b/packages/aws-cdk-lib/aws-apigateway/test/authorizers/lambda.test.ts
@@ -11,7 +11,7 @@ describe('lambda authorizer', () => {
     const func = new lambda.Function(stack, 'myfunction', {
       handler: 'handler',
       code: lambda.Code.fromInline('foo'),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
     });
 
     const auth = new TokenAuthorizer(stack, 'myauthorizer', {
@@ -84,7 +84,7 @@ describe('lambda authorizer', () => {
     const func = new lambda.Function(stack, 'myfunction', {
       handler: 'handler',
       code: lambda.Code.fromInline('foo'),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
     });
 
     const auth = new RequestAuthorizer(stack, 'myauthorizer', {
@@ -159,7 +159,7 @@ describe('lambda authorizer', () => {
     const func = new lambda.Function(stack, 'myfunction', {
       handler: 'handler',
       code: lambda.Code.fromInline('foo'),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
     });
 
     expect(() => new RequestAuthorizer(stack, 'myauthorizer', {
@@ -175,7 +175,7 @@ describe('lambda authorizer', () => {
     const func = new lambda.Function(stack, 'myfunction', {
       handler: 'handler',
       code: lambda.Code.fromInline('foo'),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
     });
 
     const auth = new TokenAuthorizer(stack, 'myauthorizer', {
@@ -248,7 +248,7 @@ describe('lambda authorizer', () => {
     const func = new lambda.Function(stack, 'myfunction', {
       handler: 'handler',
       code: lambda.Code.fromInline('foo'),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
     });
 
     const auth = new RequestAuthorizer(stack, 'myauthorizer', {
@@ -319,7 +319,7 @@ describe('lambda authorizer', () => {
     const func = new lambda.Function(stack, 'myfunction', {
       handler: 'handler',
       code: lambda.Code.fromInline('foo'),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
     });
 
     const role = new iam.Role(stack, 'authorizerassumerole', {
@@ -409,7 +409,7 @@ describe('lambda authorizer', () => {
     const func = new lambda.Function(stack, 'myfunction', {
       handler: 'handler',
       code: lambda.Code.fromInline('foo'),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
     });
 
     const role = new iam.Role(stack, 'authorizerassumerole', {
@@ -500,7 +500,7 @@ describe('lambda authorizer', () => {
     const func = new lambda.Function(stack, 'myfunction', {
       handler: 'handler',
       code: lambda.Code.fromInline('foo'),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
     });
     const auth = new TokenAuthorizer(stack, 'myauthorizer', {
       handler: func,
@@ -514,7 +514,7 @@ describe('lambda authorizer', () => {
     const func = new lambda.Function(stack, 'myfunction', {
       handler: 'handler',
       code: lambda.Code.fromInline('foo'),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
     });
     const auth = new RequestAuthorizer(stack, 'myauthorizer', {
       handler: func,
@@ -559,7 +559,7 @@ describe('lambda authorizer', () => {
     const func = new lambda.Function(stack, 'myfunction', {
       handler: 'handler',
       code: lambda.Code.fromInline('foo'),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
     });
 
     const auth = new RequestAuthorizer(stack, 'myauthorizer', {

diff --git a/packages/aws-cdk-lib/aws-apigateway/test/cors.test.ts b/packages/aws-cdk-lib/aws-apigateway/test/cors.test.ts
@@ -634,7 +634,7 @@ describe('cors', () => {
     const handler = new lambda.Function(stack, 'handler', {
       handler: 'index.handler',
       code: lambda.Code.fromInline('boom'),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
     });
 
     // WHEN

diff --git a/packages/aws-cdk-lib/aws-apigateway/test/deployment.test.ts b/packages/aws-cdk-lib/aws-apigateway/test/deployment.test.ts
@@ -198,12 +198,12 @@ describe('deployment', () => {
     const stack2 = new Stack();
     const handler1 = new lambda.Function(stack1, 'handler1', {
       code: lambda.Code.fromAsset(path.join(__dirname, 'lambda')),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       handler: 'index.handler',
     });
     const handler2 = new lambda.Function(stack2, 'handler2', {
       code: lambda.Code.fromAsset(path.join(__dirname, 'lambda')),
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       handler: 'index.handler',
     });
 

diff --git a/packages/aws-cdk-lib/aws-apigateway/test/integrations/lambda.test.ts b/packages/aws-cdk-lib/aws-apigateway/test/integrations/lambda.test.ts
@@ -54,7 +54,7 @@ describe('lambda', () => {
     // GIVEN
     const stack = new cdk.Stack();
     const fn = new lambda.Function(stack, 'Handler', {
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       code: lambda.Code.fromInline('foo'),
       handler: 'index.handler',
     });
@@ -102,7 +102,7 @@ describe('lambda', () => {
     // GIVEN
     const stack = new cdk.Stack();
     const fn = new lambda.Function(stack, 'Handler', {
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       code: lambda.Code.fromInline('foo'),
       handler: 'index.handler',
     });
@@ -138,7 +138,7 @@ describe('lambda', () => {
     // GIVEN
     const stack = new cdk.Stack();
     const fn = new lambda.Function(stack, 'Handler', {
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       code: lambda.Code.fromInline('foo'),
       handler: 'index.handler',
     });
@@ -162,7 +162,7 @@ describe('lambda', () => {
     const api = new apigateway.RestApi(stack, 'test-api');
 
     const handler = new lambda.Function(stack, 'MyFunc', {
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       handler: 'index.handler',
       code: lambda.Code.fromInline('loo'),
     });
@@ -228,7 +228,7 @@ describe('lambda', () => {
     });
 
     const handler = new lambda.Function(stack, 'MyFunc', {
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       handler: 'index.handler',
       code: lambda.Code.fromInline('loo'),
     });
@@ -249,7 +249,7 @@ describe('lambda', () => {
     const method = restapi.root.addMethod('ANY');
     const handler = new lambda.Function(stack, 'MyFunc', {
       functionName: 'ThisFunction',
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       handler: 'index.handler',
       code: lambda.Code.fromInline('loo'),
     });
@@ -269,7 +269,7 @@ describe('lambda', () => {
     const restapi = new apigateway.RestApi(stack, 'RestApi');
     const method = restapi.root.addMethod('ANY');
     const handler = new lambda.Function(stack, 'MyFunc', {
-      runtime: lambda.Runtime.NODEJS_16_X,
+      runtime: lambda.Runtime.NODEJS_LATEST,
       handler: 'index.handler',
       code: lambda.Code.fromInline('loo'),
     });