Merge branch 'main' into fix-integ-sdk-v3

aws · Feb 2, 2024 · 6d1b868 · 6d1b868
2 parents e9da0e0 + ffcae2f
commit 6d1b868
Show file tree

Hide file tree

Showing 189 changed files with 19,102 additions and 15,187 deletions.
diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.126.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.125.0-alpha.0...v2.126.0-alpha.0) (2024-02-02)
+
 ## [2.125.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.124.0-alpha.0...v2.125.0-alpha.0) (2024-01-31)
 
 

diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.126.0](https://github.com/aws/aws-cdk/compare/v2.125.0...v2.126.0) (2024-02-02)
+
+
+### Features
+
+* **migrate:** Add CDK Migrate `--from-scan` functionality ([#28962](https://github.com/aws/aws-cdk/issues/28962)) ([bbc14b3](https://github.com/aws/aws-cdk/commit/bbc14b32801f103bc465fd910d507ffa0d06b7fe))
+
 ## [2.125.0](https://github.com/aws/aws-cdk/compare/v2.124.0...v2.125.0) (2024-01-31)
 
 

diff --git a/packages/@aws-cdk-testing/framework-integ/package.json b/packages/@aws-cdk-testing/framework-integ/package.json
@@ -43,8 +43,8 @@
     "aws-cdk-lib": "0.0.0",
     "aws-sdk": "^2.1548.0",
     "aws-sdk-mock": "5.6.0",
-    "cdk8s": "2.68.32",
-    "cdk8s-plus-27": "2.7.74",
+    "cdk8s": "2.68.33",
+    "cdk8s-plus-27": "2.7.75",
     "constructs": "^10.0.0"
   },
   "repository": {

diff --git a/...s-cdk-testing/framework-integ/test/aws-apigatewayv2-authorizers/test/http/integ.lambda.ts b/...s-cdk-testing/framework-integ/test/aws-apigatewayv2-authorizers/test/http/integ.lambda.ts
@@ -18,7 +18,7 @@ const stack = new Stack(app, 'AuthorizerInteg');
 const authHandler = new lambda.Function(stack, 'auth-function', {
   runtime: lambda.Runtime.NODEJS_18_X,
   handler: 'index.handler',
-  code: lambda.Code.fromAsset(path.join(__dirname, '../auth-handler')),
+  code: lambda.Code.fromAsset(path.join(__dirname, '..', 'auth-handler')),
 });
 
 const authorizer = new HttpLambdaAuthorizer('LambdaAuthorizer', authHandler, {
@@ -41,7 +41,7 @@ const httpApiWithDefaultAuthorizer = new HttpApi(stack, 'MyHttpApiWithDefaultAut
 const handler = new lambda.Function(stack, 'lambda', {
   runtime: lambda.Runtime.NODEJS_18_X,
   handler: 'index.handler',
-  code: lambda.AssetCode.fromAsset(path.join(__dirname, '../integ.lambda.handler')),
+  code: lambda.AssetCode.fromAsset(path.join(__dirname, '..', 'integ.lambda.handler')),
 });
 
 httpApi.addRoutes({

diff --git a/...dk-testing/framework-integ/test/aws-apigatewayv2-authorizers/test/http/integ.user-pool.ts b/...dk-testing/framework-integ/test/aws-apigatewayv2-authorizers/test/http/integ.user-pool.ts
@@ -31,7 +31,7 @@ const httpApiWithDefaultAuthorizer = new HttpApi(stack, 'MyHttpApiWithDefaultAut
 const handler = new lambda.Function(stack, 'lambda', {
   runtime: lambda.Runtime.NODEJS_18_X,
   handler: 'index.handler',
-  code: lambda.AssetCode.fromAsset(path.join(__dirname, '../integ.user-pool.handler')),
+  code: lambda.AssetCode.fromAsset(path.join(__dirname, '..', 'integ.user-pool.handler')),
 });
 
 httpApi.addRoutes({

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-lambda.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-lambda.ts
@@ -28,7 +28,7 @@ const api = new appsync.GraphqlApi(stack, 'LambdaAPI', {
 });
 
 const func = new lambda.Function(stack, 'func', {
-  code: lambda.Code.fromAsset(path.join(__dirname, 'verify/lambda-tutorial')),
+  code: lambda.Code.fromAsset(path.join(__dirname, 'verify', 'lambda-tutorial')),
   handler: 'lambda-tutorial.handler',
   runtime: STANDARD_NODEJS_RUNTIME,
 });

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.ts
@@ -58,7 +58,7 @@ const integ = new IntegTest(app, 'JsResolverIntegTest', { testCases: [stack] });
  * Handler that calls our api with an `addTest` Mutation
  */
 const invoke = new lambda.Function(stack, 'InvokeApi', {
-  code: lambda.Code.fromAsset(path.join(__dirname, 'integ-assets/js-resolver-assertion')),
+  code: lambda.Code.fromAsset(path.join(__dirname, 'integ-assets', 'js-resolver-assertion')),
   handler: 'index.handler',
   runtime: lambda.Runtime.NODEJS_18_X,
 });

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.lambda-auth.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.lambda-auth.ts
@@ -12,7 +12,7 @@ class GraphQLApiLambdaAuthStack extends cdk.Stack {
 
     const func = new lambda.Function(this, 'func', {
       code: lambda.Code.fromAsset(
-        path.join(__dirname, 'verify/lambda-tutorial'),
+        path.join(__dirname, 'verify', 'lambda-tutorial'),
       ),
       handler: 'lambda-tutorial.handler',
       runtime: STANDARD_NODEJS_RUNTIME,

diff --git a/...ng/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.ts b/...ng/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.ts
@@ -52,6 +52,7 @@ const prodStage = {
 };
 
 new codepipeline.Pipeline(stack, 'Pipeline', {
+  crossAccountKeys: true,
   stages: [
     sourceStage,
     prodStage,

diff --git a/...nteg/test/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts b/...nteg/test/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts
@@ -20,7 +20,9 @@ new lambda.Function(lambdaStack, 'Lambda', {
 // other resources that your Lambda needs, added to the lambdaStack...
 
 const pipelineStack = new cdk.Stack(app, 'PipelineStack');
-const pipeline = new codepipeline.Pipeline(pipelineStack, 'Pipeline');
+const pipeline = new codepipeline.Pipeline(pipelineStack, 'Pipeline', {
+  crossAccountKeys: true,
+});
 
 // add the source code repository containing this code to your Pipeline,
 // and the source code of the Lambda Function, if they're separate

diff --git a/...s-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-pipeline.ts b/...s-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-pipeline.ts
@@ -10,7 +10,9 @@ const app = new cdk.App();
 
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-lambda');
 
-const pipeline = new codepipeline.Pipeline(stack, 'Pipeline');
+const pipeline = new codepipeline.Pipeline(stack, 'Pipeline', {
+  crossAccountKeys: true,
+});
 
 const sourceStage = pipeline.addStage({ stageName: 'Source' });
 const bucket = new s3.Bucket(stack, 'PipelineBucket', {

diff --git a/...testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.ts b/...testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.ts
@@ -39,6 +39,7 @@ const deployStage = {
 };
 
 new codepipeline.Pipeline(stack, 'Pipeline', {
+  crossAccountKeys: true,
   stages: [
     sourceStage,
     deployStage,

diff --git a/...@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn.ts b/...@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn.ts
@@ -8,7 +8,9 @@ const app = new cdk.App();
 
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-cloudformation');
 
-const pipeline = new codepipeline.Pipeline(stack, 'Pipeline');
+const pipeline = new codepipeline.Pipeline(stack, 'Pipeline', {
+  crossAccountKeys: true,
+});
 
 const bucket = new s3.Bucket(stack, 'PipelineBucket', {
   versioned: true,

diff --git a/...ng/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.ts b/...ng/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.ts
@@ -47,6 +47,7 @@ const testAction = new cpactions.CodeBuildAction({
 });
 
 new codepipeline.Pipeline(stack, 'Pipeline', {
+  crossAccountKeys: true,
   stages: [
     {
       stageName: 'source',

diff --git a/...ework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-custom-event.ts b/...ework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-custom-event.ts
@@ -32,6 +32,7 @@ const eventPattern
 
 const pipeline = new codepipeline.Pipeline(stack, 'Pipeline', {
   pipelineName: 'IntegCustomEventPipeline',
+  crossAccountKeys: true,
   stages: [
     {
       stageName: 'source',

diff --git a/...ing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-main.ts b/...ing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-main.ts
@@ -15,6 +15,7 @@ const repo = new codecommit.Repository(stack, 'MyRepo', {
 });
 
 new codepipeline.Pipeline(stack, 'Pipeline', {
+  crossAccountKeys: true,
   stages: [
     {
       stageName: 'source',

diff --git a/...-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit.ts b/...-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit.ts
@@ -16,6 +16,7 @@ const repo = new codecommit.Repository(stack, 'MyRepo', {
 });
 
 new codepipeline.Pipeline(stack, 'Pipeline', {
+  crossAccountKeys: true,
   stages: [
     {
       stageName: 'source',

diff --git a/...ework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.ts b/...ework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.ts
@@ -32,7 +32,7 @@ const bucket = new s3.Bucket(stack, 'PipelineBucket', {
 });
 
 const artifact = new deploy.BucketDeployment(stack, 'DeployApp', {
-  sources: [deploy.Source.asset(path.join(__dirname, 'assets/nodejs.zip'))],
+  sources: [deploy.Source.asset(path.join(__dirname, 'assets', 'nodejs.zip'))],
   destinationBucket: bucket,
   extract: false,
 });

diff --git a/...s-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-events.ts b/...s-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-events.ts
@@ -13,7 +13,9 @@ const app = new cdk.App();
 
 const stack = new cdk.Stack(app, 'aws-cdk-pipeline-event-target');
 
-const pipeline = new codepipeline.Pipeline(stack, 'MyPipeline');
+const pipeline = new codepipeline.Pipeline(stack, 'MyPipeline', {
+  crossAccountKeys: true,
+});
 
 const repository = new codecommit.Repository(stack, 'CodeCommitRepo', {
   repositoryName: 'foo',

diff --git a/...esting/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.ts b/...esting/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.ts
@@ -15,7 +15,9 @@ const simpleStateMachine = new stepfunctions.StateMachine(stack, 'SimpleStateMac
   definition: startState,
 });
 
-const pipeline = new codepipeline.Pipeline(stack, 'MyPipeline');
+const pipeline = new codepipeline.Pipeline(stack, 'MyPipeline', {
+  crossAccountKeys: true,
+});
 pipeline.addStage({
   stageName: 'Source',
   actions: [

diff --git a/...ing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-with-replication.ts b/...ing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-with-replication.ts
@@ -31,6 +31,7 @@ const bucket = new Bucket(stack1, 'ReplicationBucket', {
 
 const artifact = new Artifact();
 const pipeline = new Pipeline(stack2, 'Pipeline', {
+  crossAccountKeys: true,
   crossRegionReplicationBuckets: {
     'us-east-1': bucket,
   },

diff --git a/.../test/aws-codepipeline-actions/test/s3/integ.source-bucket-events-cross-stack-same-env.ts b/.../test/aws-codepipeline-actions/test/s3/integ.source-bucket-events-cross-stack-same-env.ts
@@ -16,6 +16,7 @@ const bucket = new s3.Bucket(bucketStack, 'Bucket', {
 const pipelineStack = new Stack(app, 'PipelineStack');
 const sourceOutput = new codepipeline.Artifact();
 new codepipeline.Pipeline(pipelineStack, 'Pipeline', {
+  crossAccountKeys: true,
   stages: [
     {
       stageName: 'Source',

diff --git a/...k-integ/test/aws-cognito/test/integ.user-pool-pre-token-generation-v2.js.snapshot/cdk.out b/...k-integ/test/aws-cognito/test/integ.user-pool-pre-token-generation-v2.js.snapshot/cdk.out
diff --git a/...l-pre-token-generation-v2.js.snapshot/integ-user-pool-pre-token-generation-v2.assets.json b/...l-pre-token-generation-v2.js.snapshot/integ-user-pool-pre-token-generation-v2.assets.json