Skip to content

Commit 6d1b868

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into fix-integ-sdk-v3
2 parents e9da0e0 + ffcae2f commit 6d1b868

189 files changed

Lines changed: 19102 additions & 15187 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.v2.alpha.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
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.
44

5+
## [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)
6+
57
## [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)
68

79

‎CHANGELOG.v2.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
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.
44

5+
## [2.126.0](https://github.com/aws/aws-cdk/compare/v2.125.0...v2.126.0) (2024-02-02)
6+
7+
8+
### Features
9+
10+
* **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))
11+
512
## [2.125.0](https://github.com/aws/aws-cdk/compare/v2.124.0...v2.125.0) (2024-01-31)
613

714

‎packages/@aws-cdk-testing/framework-integ/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
"aws-cdk-lib": "0.0.0",
4444
"aws-sdk": "^2.1548.0",
4545
"aws-sdk-mock": "5.6.0",
46-
"cdk8s": "2.68.32",
47-
"cdk8s-plus-27": "2.7.74",
46+
"cdk8s": "2.68.33",
47+
"cdk8s-plus-27": "2.7.75",
4848
"constructs": "^10.0.0"
4949
},
5050
"repository": {

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-authorizers/test/http/integ.lambda.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const stack = new Stack(app, 'AuthorizerInteg');
1818
const authHandler = new lambda.Function(stack, 'auth-function', {
1919
runtime: lambda.Runtime.NODEJS_18_X,
2020
handler: 'index.handler',
21-
code: lambda.Code.fromAsset(path.join(__dirname, '../auth-handler')),
21+
code: lambda.Code.fromAsset(path.join(__dirname, '..', 'auth-handler')),
2222
});
2323

2424
const authorizer = new HttpLambdaAuthorizer('LambdaAuthorizer', authHandler, {
@@ -41,7 +41,7 @@ const httpApiWithDefaultAuthorizer = new HttpApi(stack, 'MyHttpApiWithDefaultAut
4141
const handler = new lambda.Function(stack, 'lambda', {
4242
runtime: lambda.Runtime.NODEJS_18_X,
4343
handler: 'index.handler',
44-
code: lambda.AssetCode.fromAsset(path.join(__dirname, '../integ.lambda.handler')),
44+
code: lambda.AssetCode.fromAsset(path.join(__dirname, '..', 'integ.lambda.handler')),
4545
});
4646

4747
httpApi.addRoutes({

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2-authorizers/test/http/integ.user-pool.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const httpApiWithDefaultAuthorizer = new HttpApi(stack, 'MyHttpApiWithDefaultAut
3131
const handler = new lambda.Function(stack, 'lambda', {
3232
runtime: lambda.Runtime.NODEJS_18_X,
3333
handler: 'index.handler',
34-
code: lambda.AssetCode.fromAsset(path.join(__dirname, '../integ.user-pool.handler')),
34+
code: lambda.AssetCode.fromAsset(path.join(__dirname, '..', 'integ.user-pool.handler')),
3535
});
3636

3737
httpApi.addRoutes({

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-lambda.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const api = new appsync.GraphqlApi(stack, 'LambdaAPI', {
2828
});
2929

3030
const func = new lambda.Function(stack, 'func', {
31-
code: lambda.Code.fromAsset(path.join(__dirname, 'verify/lambda-tutorial')),
31+
code: lambda.Code.fromAsset(path.join(__dirname, 'verify', 'lambda-tutorial')),
3232
handler: 'lambda-tutorial.handler',
3333
runtime: STANDARD_NODEJS_RUNTIME,
3434
});

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const integ = new IntegTest(app, 'JsResolverIntegTest', { testCases: [stack] });
5858
* Handler that calls our api with an `addTest` Mutation
5959
*/
6060
const invoke = new lambda.Function(stack, 'InvokeApi', {
61-
code: lambda.Code.fromAsset(path.join(__dirname, 'integ-assets/js-resolver-assertion')),
61+
code: lambda.Code.fromAsset(path.join(__dirname, 'integ-assets', 'js-resolver-assertion')),
6262
handler: 'index.handler',
6363
runtime: lambda.Runtime.NODEJS_18_X,
6464
});

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.lambda-auth.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class GraphQLApiLambdaAuthStack extends cdk.Stack {
1212

1313
const func = new lambda.Function(this, 'func', {
1414
code: lambda.Code.fromAsset(
15-
path.join(__dirname, 'verify/lambda-tutorial'),
15+
path.join(__dirname, 'verify', 'lambda-tutorial'),
1616
),
1717
handler: 'lambda-tutorial.handler',
1818
runtime: STANDARD_NODEJS_RUNTIME,

‎packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const prodStage = {
5252
};
5353

5454
new codepipeline.Pipeline(stack, 'Pipeline', {
55+
crossAccountKeys: true,
5556
stages: [
5657
sourceStage,
5758
prodStage,

‎packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ new lambda.Function(lambdaStack, 'Lambda', {
2020
// other resources that your Lambda needs, added to the lambdaStack...
2121

2222
const pipelineStack = new cdk.Stack(app, 'PipelineStack');
23-
const pipeline = new codepipeline.Pipeline(pipelineStack, 'Pipeline');
23+
const pipeline = new codepipeline.Pipeline(pipelineStack, 'Pipeline', {
24+
crossAccountKeys: true,
25+
});
2426

2527
// add the source code repository containing this code to your Pipeline,
2628
// and the source code of the Lambda Function, if they're separate

0 commit comments

Comments
 (0)