Merge branch 'master' into corymhall/fix-elbv2-targets-integ

aws · Apr 4, 2022 · d784890 · d784890
2 parents 859b12a + c22aec3
commit d784890
Show file tree

Hide file tree

Showing 29 changed files with 4,261 additions and 345 deletions.
diff --git a/packages/@aws-cdk/aws-secretsmanager/test/integ.secret-name-parsed.ts b/packages/@aws-cdk/aws-secretsmanager/test/integ.secret-name-parsed.ts
@@ -2,6 +2,8 @@ import * as path from 'path';
 import * as cdk from '@aws-cdk/core';
 import * as secretsmanager from '../lib';
 
+/// !cdk-integ Integ-SecretsManager-ParsedSecretName pragma:set-context:@aws-cdk/aws-secretsmanager:parseOwnedSecretName=true
+
 /**
  * Creates several secrets, with varying names and IDs, with the parseOwnedSecretName feature flag set,
  * to verify the secretName returned by `Secret.secretName` matches the `Name` returned by `DescribeSecrets`.
@@ -39,6 +41,9 @@ class SecretsManagerStack extends cdk.Stack {
 }
 
 const app = new cdk.App({
+  context: {
+    '@aws-cdk/aws-secretsmanager:parseOwnedSecretName': true,
+  },
 });
 new SecretsManagerStack(app, 'Integ-SecretsManager-ParsedSecretName');
 app.synth();
diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/apigateway/integ.call-http-api.expected.json b/packages/@aws-cdk/aws-stepfunctions-tasks/test/apigateway/integ.call-http-api.expected.json
@@ -135,7 +135,7 @@
           ]
         },
         "Handler": "index.handler",
-        "Runtime": "nodejs10.x"
+        "Runtime": "nodejs14.x"
       },
       "DependsOn": [
         "HelloHandlerServiceRole11EF7C63"

diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/apigateway/integ.call-http-api.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/apigateway/integ.call-http-api.ts
@@ -18,7 +18,7 @@ const stack = new cdk.Stack(app, 'CallHttpApiInteg');
 const httpApi = new apigatewayv2.HttpApi(stack, 'MyHttpApi');
 
 const handler = new lambda.Function(stack, 'HelloHandler', {
-  runtime: lambda.Runtime.NODEJS_10_X,
+  runtime: lambda.Runtime.NODEJS_14_X,
   handler: 'index.handler',
   code: new lambda.InlineCode('exports.handler = async function(event, context) { return { statusCode: 200, body: "hello, world!" }; };'),
 });

diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/apigateway/integ.call-rest-api.expected.json b/packages/@aws-cdk/aws-stepfunctions-tasks/test/apigateway/integ.call-rest-api.expected.json
@@ -243,7 +243,7 @@
           ]
         },
         "Handler": "index.handler",
-        "Runtime": "nodejs10.x"
+        "Runtime": "nodejs14.x"
       },
       "DependsOn": [
         "HelloServiceRole1E55EA16"

diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/apigateway/integ.call-rest-api.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/apigateway/integ.call-rest-api.ts
@@ -17,7 +17,7 @@ const stack = new cdk.Stack(app, 'CallRestApiInteg');
 const restApi = new apigateway.RestApi(stack, 'MyRestApi');
 
 const hello = new apigateway.LambdaIntegration(new lambda.Function(stack, 'Hello', {
-  runtime: lambda.Runtime.NODEJS_10_X,
+  runtime: lambda.Runtime.NODEJS_14_X,
   handler: 'index.handler',
   code: new lambda.InlineCode('exports.handler = async function(event, context) { return { statusCode: 200, body: "hello, world!" }; };'),
 }));