Skip to content

Commit 762d71b

Browse files
authored
2 parents b0b744d + d11c334 commit 762d71b

File tree

389 files changed

+13077
-1011
lines changed

Some content is hidden

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

389 files changed

+13077
-1011
lines changed

.mergify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pull_request_rules:
1010
label:
1111
add: [ contribution/core ]
1212
conditions:
13-
- author~=^(eladb|RomainMuller|garnaat|nija-at|skinny85|rix0rrr|NGL321|Jerry-AWS|MrArnoldPalmer|NetaNir|iliapolo|njlynch|ericzbeard|ccfife|fulghum|pkandasamy91|SoManyHs|uttarasridhar|otaviomacedo|BenChaimberg|madeline-k|BryanPan342|kaizen3031593|comcalvi|Chriscbr|corymhall|peterwoodworth|ryparker)$
13+
- author~=^(eladb|RomainMuller|garnaat|nija-at|skinny85|rix0rrr|NGL321|Jerry-AWS|MrArnoldPalmer|NetaNir|iliapolo|njlynch|ericzbeard|ccfife|fulghum|pkandasamy91|SoManyHs|uttarasridhar|otaviomacedo|BenChaimberg|madeline-k|BryanPan342|kaizen3031593|comcalvi|Chriscbr|corymhall|peterwoodworth|ryparker|TheRealAmazonKendra)$
1414
- -label~="contribution/core"
1515
- name: automatic merge
1616
actions:

CHANGELOG.md

+38
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,44 @@
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+
## [1.145.0](https://github.com/aws/aws-cdk/compare/v1.144.0...v1.145.0) (2022-02-18)
6+
7+
8+
### Features
9+
10+
* **aws-stepfunctions-tasks:** add environment property for SageMakerCreateTrainingJob ([#18976](https://github.com/aws/aws-cdk/issues/18976)) ([60d6e66](https://github.com/aws/aws-cdk/commit/60d6e66baef9d30db23e93b16f7c6d159ddf58c4)), closes [#18919](https://github.com/aws/aws-cdk/issues/18919)
11+
* **cfnspec:** cloudformation spec v56.0.0 ([#18930](https://github.com/aws/aws-cdk/issues/18930)) ([24a52ae](https://github.com/aws/aws-cdk/commit/24a52ae1c250ec1875e64d6fc4ef8bec2f47399a))
12+
* **cfnspec:** cloudformation spec v57.0.0 ([#19030](https://github.com/aws/aws-cdk/issues/19030)) ([f0acbc4](https://github.com/aws/aws-cdk/commit/f0acbc469d835ad8808f4176eed53bf2af7c66e2))
13+
* **cli:** hotswap for appsync vtl mapping template changes ([#18881](https://github.com/aws/aws-cdk/issues/18881)) ([9858002](https://github.com/aws/aws-cdk/commit/985800228d04b9c2f3ac117e3b41c7f089547d38))
14+
* **codepipeline:** add support for CloudFormation StackSet actions ([#14225](https://github.com/aws/aws-cdk/issues/14225)) ([d8bc0d0](https://github.com/aws/aws-cdk/commit/d8bc0d08a9796724bb31cc5d7552cf99297678d9))
15+
* **config:** S3_BUCKET_LEVEL_PUBLIC_ACCESS_PROHIBITED managed rule ([#18890](https://github.com/aws/aws-cdk/issues/18890)) ([1a7e3e2](https://github.com/aws/aws-cdk/commit/1a7e3e20e005b4165a27506615c7245b88ce998b)), closes [#18888](https://github.com/aws/aws-cdk/issues/18888)
16+
* **core:** stack synthesizer that uses CLI credentials ([#18963](https://github.com/aws/aws-cdk/issues/18963)) ([a36b72b](https://github.com/aws/aws-cdk/commit/a36b72b5045fceada7c96d00770d8c48f2ca1415)), closes [#16888](https://github.com/aws/aws-cdk/issues/16888)
17+
* **ec2:** allow imdsv2 usage on bastion host ([#18955](https://github.com/aws/aws-cdk/issues/18955)) ([8c6777c](https://github.com/aws/aws-cdk/commit/8c6777c904588f9b911d8b8a5d63a65ae1c7aad9))
18+
* **ecs:** support version stages and ids for Secrets ([#18174](https://github.com/aws/aws-cdk/issues/18174)) ([6d091c2](https://github.com/aws/aws-cdk/commit/6d091c2da7749a81c3752953d0bc7db65ab48f45)), closes [#18123](https://github.com/aws/aws-cdk/issues/18123)
19+
* **events:** API Destinations ([#13729](https://github.com/aws/aws-cdk/issues/13729)) ([2adbc14](https://github.com/aws/aws-cdk/commit/2adbc14bae8266a6bd357e752185133a32e4ca87))
20+
* **iot-actions:** add SNS publish action ([#18839](https://github.com/aws/aws-cdk/issues/18839)) ([3a39f6b](https://github.com/aws/aws-cdk/commit/3a39f6bf34eb428c527db1c614ed682c582821fb)), closes [#17700](https://github.com/aws/aws-cdk/issues/17700)
21+
* **iotevents:** create new module for IoT Events actions ([#18956](https://github.com/aws/aws-cdk/issues/18956)) ([3533ea9](https://github.com/aws/aws-cdk/commit/3533ea9cb7ec7fd9e230abd27556a87d3559bdb8)), closes [/github.com/aws/aws-cdk/pull/18869#discussion_r802719713](https://github.com/aws//github.com/aws/aws-cdk/pull/18869/issues/discussion_r802719713)
22+
* **lambda:** allow Topic to be dlq for Lambda ([#18546](https://github.com/aws/aws-cdk/issues/18546)) ([f8d8fe4](https://github.com/aws/aws-cdk/commit/f8d8fe4e1397e3d8da91a3a44f025475c8b7f592)), closes [#16246](https://github.com/aws/aws-cdk/issues/16246)
23+
* **logs:** custom Role for Kinesis destination ([#13553](https://github.com/aws/aws-cdk/issues/13553)) ([bb96621](https://github.com/aws/aws-cdk/commit/bb96621d642fedcf1e22086a249034ca1ab63f73)), closes [#7661](https://github.com/aws/aws-cdk/issues/7661)
24+
* **rds:** simpler way to configure parameters for instance and cluster ([#18126](https://github.com/aws/aws-cdk/issues/18126)) ([3ba9088](https://github.com/aws/aws-cdk/commit/3ba90881dab49f47220872e6e5afef3a7732ef13)), closes [#18124](https://github.com/aws/aws-cdk/issues/18124)
25+
* **s3-deployment:** add `deployedBucket` attribute for sequencing ([#15384](https://github.com/aws/aws-cdk/issues/15384)) ([edac101](https://github.com/aws/aws-cdk/commit/edac1011574f3cf38bb0ac39400bf41c66337ffd))
26+
27+
28+
### Bug Fixes
29+
30+
* **assertions:** 'pattern.indexOf' is not a function ([#19009](https://github.com/aws/aws-cdk/issues/19009)) ([6df26e7](https://github.com/aws/aws-cdk/commit/6df26e7ed73455b77b07707debef5bb26ae78909))
31+
* **assertions:** incorrect assertions when >1 messages on a resource ([#18948](https://github.com/aws/aws-cdk/issues/18948)) ([072e1b9](https://github.com/aws/aws-cdk/commit/072e1b990a43768b88a05dd436dd6d6d9649c13a)), closes [#18840](https://github.com/aws/aws-cdk/issues/18840)
32+
* **aws-cdk:** include nested stacks when building changesets ([#17396](https://github.com/aws/aws-cdk/issues/17396)) ([a7dbeef](https://github.com/aws/aws-cdk/commit/a7dbeef9eae3e00e209d06f5cc5bb3bf3d084d18)), closes [#5722](https://github.com/aws/aws-cdk/issues/5722)
33+
* **cli:** handle attributes of AWS::Events::EventBus when hotswapping ([#18834](https://github.com/aws/aws-cdk/issues/18834)) ([a30a32a](https://github.com/aws/aws-cdk/commit/a30a32aaa5dfb764022370fe7867564d57640bfb)), closes [#18831](https://github.com/aws/aws-cdk/issues/18831)
34+
* **core:** undeployable due to invalid mapping ([#18922](https://github.com/aws/aws-cdk/issues/18922)) ([db28485](https://github.com/aws/aws-cdk/commit/db28485f4d2ea243e4184dd06b52395b4980beba)), closes [#18789](https://github.com/aws/aws-cdk/issues/18789) [#18789](https://github.com/aws/aws-cdk/issues/18789)
35+
* **lambda:** unlock use case for cross-account functions w/ preconfigured permissions ([#18979](https://github.com/aws/aws-cdk/issues/18979)) ([023108a](https://github.com/aws/aws-cdk/commit/023108ac080ba34c82ef0b60fee20014c4a78428)), closes [#18228](https://github.com/aws/aws-cdk/issues/18228) [#18781](https://github.com/aws/aws-cdk/issues/18781) [#18967](https://github.com/aws/aws-cdk/issues/18967) [#18781](https://github.com/aws/aws-cdk/issues/18781)
36+
* **lambda:** Validate Lambda "functionName" parameter ([#17970](https://github.com/aws/aws-cdk/issues/17970)) ([a416a2d](https://github.com/aws/aws-cdk/commit/a416a2d68f14c0711d42b38e81b0091d160dfd6f)), closes [#13264](https://github.com/aws/aws-cdk/issues/13264)
37+
* **pipelines:** self-mutate always adds analytics ([#19010](https://github.com/aws/aws-cdk/issues/19010)) ([bc47b29](https://github.com/aws/aws-cdk/commit/bc47b2937a806d6522a4d9106976200bf6810024)), closes [#18933](https://github.com/aws/aws-cdk/issues/18933)
38+
* **stepfunctions:** imported State Machine sill has region and account from its Stack, instead of its ARN ([#19026](https://github.com/aws/aws-cdk/issues/19026)) ([23329b4](https://github.com/aws/aws-cdk/commit/23329b4ac7c845efe7d0e0d7ce03499e7dd723ac)), closes [#17982](https://github.com/aws/aws-cdk/issues/17982)
39+
* python3 version check with Python 3.10 ([#18754](https://github.com/aws/aws-cdk/issues/18754)) ([0ef6527](https://github.com/aws/aws-cdk/commit/0ef65279cc5f2269046e0bae05d44f5aabc43eb9))
40+
* **stepfunctions-tasks:** EMR Create Cluster does not support dynamic allocation of step concurrency level ([#18972](https://github.com/aws/aws-cdk/issues/18972)) ([d19e538](https://github.com/aws/aws-cdk/commit/d19e5386f737aa58f27c7ac2082306006dcd6d95))
41+
* **synthetics:** generated role has incorrect permissions for cloudwatch logs ([#18946](https://github.com/aws/aws-cdk/issues/18946)) ([f8bb85f](https://github.com/aws/aws-cdk/commit/f8bb85fad8f659a2b72d5d05d7a94c97765a76f8)), closes [#18910](https://github.com/aws/aws-cdk/issues/18910)
42+
543
## [1.144.0](https://github.com/aws/aws-cdk/compare/v1.143.0...v1.144.0) (2022-02-08)
644

745

CHANGELOG.v2.alpha.md

+7
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.14.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.13.0-alpha.0...v2.14.0-alpha.0) (2022-02-25)
6+
7+
8+
### Features
9+
10+
* **apigatewayv2:** Import existing WebSocketApi from attributes ([#18958](https://github.com/aws/aws-cdk/issues/18958)) ([f203845](https://github.com/aws/aws-cdk/commit/f203845d26ae8333f467f1cb91ad965697087d85))
11+
512
## [2.13.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.12.0-alpha.0...v2.13.0-alpha.0) (2022-02-18)
613

714

CHANGELOG.v2.md

+26
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,32 @@
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.14.0](https://github.com/aws/aws-cdk/compare/v2.13.0...v2.14.0) (2022-02-25)
6+
7+
8+
### Features
9+
10+
* **cli:** bundle dependencies ([#18667](https://github.com/aws/aws-cdk/issues/18667)) ([31d135f](https://github.com/aws/aws-cdk/commit/31d135fb51d3cd4e26fbdc132e03815a1416da75))
11+
* **cli:** support for matching notices with arbitrary module names ([#19088](https://github.com/aws/aws-cdk/issues/19088)) ([a87dee7](https://github.com/aws/aws-cdk/commit/a87dee756057e554909207237b70f80af185b110))
12+
* **cli:** support for notices ([#18936](https://github.com/aws/aws-cdk/issues/18936)) ([d37fbbb](https://github.com/aws/aws-cdk/commit/d37fbbbb31003d69da88b9340a6a9c9e1e927ac5))
13+
* **cloudfront-origins:** extend max keepaliveTimeout of HttpOrigin to 180 ([#18837](https://github.com/aws/aws-cdk/issues/18837)) ([171fdcd](https://github.com/aws/aws-cdk/commit/171fdcdf595fcff5b2567b17e6fa73bf0d42e1bc)), closes [#18697](https://github.com/aws/aws-cdk/issues/18697)
14+
* **eks:** Allow helm pull from OCI repositories ([#18547](https://github.com/aws/aws-cdk/issues/18547)) ([7e624d9](https://github.com/aws/aws-cdk/commit/7e624d994c94dbd584643c4cb6e9f8df53dabc18))
15+
* **lambda:** add a fromFunctionName() method ([#19076](https://github.com/aws/aws-cdk/issues/19076)) ([5b92cc3](https://github.com/aws/aws-cdk/commit/5b92cc3a31eea29b40814498fca614eb1c7c8724)), closes [#18255](https://github.com/aws/aws-cdk/issues/18255) [#19031](https://github.com/aws/aws-cdk/issues/19031)
16+
* **pipelines:** ECR source action ([#16385](https://github.com/aws/aws-cdk/issues/16385)) ([fc11ae2](https://github.com/aws/aws-cdk/commit/fc11ae2c4ec3bd9dfe3ff813aa831c744d8ac444)), closes [#16378](https://github.com/aws/aws-cdk/issues/16378)
17+
* **pipelines:** step outputs ([#19024](https://github.com/aws/aws-cdk/issues/19024)) ([0dec2ee](https://github.com/aws/aws-cdk/commit/0dec2ee78a70832c3a697be26c67498460a587dd)), closes [#17189](https://github.com/aws/aws-cdk/issues/17189) [#18893](https://github.com/aws/aws-cdk/issues/18893) [#15943](https://github.com/aws/aws-cdk/issues/15943) [#16407](https://github.com/aws/aws-cdk/issues/16407)
18+
* **rds:** make VPC optional for serverless Clusters ([#17413](https://github.com/aws/aws-cdk/issues/17413)) ([4f7818d](https://github.com/aws/aws-cdk/commit/4f7818dd76bd48ed652407f4852cc97ba57d7395)), closes [#17401](https://github.com/aws/aws-cdk/issues/17401)
19+
* triggers ([#19011](https://github.com/aws/aws-cdk/issues/19011)) ([11d6c69](https://github.com/aws/aws-cdk/commit/11d6c69a8b1ee70cbea025d134be7702dd804444))
20+
21+
22+
### Bug Fixes
23+
24+
* **cli:** hotswapping is slow for many resources deployed at once ([#19081](https://github.com/aws/aws-cdk/issues/19081)) ([040238e](https://github.com/aws/aws-cdk/commit/040238e9285945d1c48ef79474e527b871e7824c)), closes [#19021](https://github.com/aws/aws-cdk/issues/19021)
25+
* **s3-notifications:** notifications allowed with imported kms keys ([#18989](https://github.com/aws/aws-cdk/issues/18989)) ([7441418](https://github.com/aws/aws-cdk/commit/7441418fbf9ffdf8d85a573e3c81c45c5648fe8a))
26+
* API compatibility check fails in CI pipeline ([#19069](https://github.com/aws/aws-cdk/issues/19069)) ([6ec1005](https://github.com/aws/aws-cdk/commit/6ec1005c9cfa9723520885748d759b00be5cd2fa)), closes [#19070](https://github.com/aws/aws-cdk/issues/19070)
27+
* **cloudfront:** trim autogenerated cache policy name ([#18953](https://github.com/aws/aws-cdk/issues/18953)) ([c7394c9](https://github.com/aws/aws-cdk/commit/c7394c96c42cb6a5af1e309bee2a5f11eb3ad35c)), closes [#18918](https://github.com/aws/aws-cdk/issues/18918)
28+
* **elasticloadbalancingv2:** validate port/protocol are not provided for lambda targets ([#19043](https://github.com/aws/aws-cdk/issues/19043)) ([64d26cc](https://github.com/aws/aws-cdk/commit/64d26cc22b1fe456777c3367769ddbe860f26cf3)), closes [#12514](https://github.com/aws/aws-cdk/issues/12514)
29+
* **route53:** fix cross account delegation deployment dependency ([#19047](https://github.com/aws/aws-cdk/issues/19047)) ([692a0d0](https://github.com/aws/aws-cdk/commit/692a0d06f2865503d1d88b0ba8af38ecceaec871)), closes [#19041](https://github.com/aws/aws-cdk/issues/19041)
30+
531
## [2.13.0](https://github.com/aws/aws-cdk/compare/v2.12.0...v2.13.0) (2022-02-18)
632

733

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"jsii-rosetta": "^1.54.0",
2929
"lerna": "^4.0.0",
3030
"patch-package": "^6.4.7",
31+
"semver": "^6.3.0",
3132
"standard-version": "^9.3.2",
3233
"typescript": "~3.9.10"
3334
},

packages/@aws-cdk-containers/ecs-service-extensions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"license": "Apache-2.0",
4040
"devDependencies": {
41-
"@types/jest": "^27.4.0",
41+
"@types/jest": "^27.4.1",
4242
"@aws-cdk/cdk-build-tools": "0.0.0",
4343
"@aws-cdk/cdk-integ-tools": "0.0.0",
4444
"@aws-cdk/aws-autoscaling": "0.0.0",

packages/@aws-cdk/alexa-ask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/cdk-build-tools": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.4.0"
88+
"@types/jest": "^27.4.1"
8989
},
9090
"dependencies": {
9191
"@aws-cdk/core": "0.0.0",

packages/@aws-cdk/app-delivery/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"@aws-cdk/cdk-build-tools": "0.0.0",
7474
"@aws-cdk/cdk-integ-tools": "0.0.0",
7575
"@aws-cdk/pkglint": "0.0.0",
76-
"@types/jest": "^27.4.0",
76+
"@types/jest": "^27.4.1",
7777
"fast-check": "^2.22.0",
7878
"jest": "^27.5.1"
7979
},

packages/@aws-cdk/assert-internal/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"devDependencies": {
2727
"@aws-cdk/cdk-build-tools": "0.0.0",
2828
"@aws-cdk/pkglint": "0.0.0",
29-
"@types/jest": "^27.4.0",
29+
"@types/jest": "^27.4.1",
3030
"jest": "^27.5.1",
3131
"ts-jest": "^27.1.3"
3232
},

packages/@aws-cdk/assert/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@aws-cdk/assert-internal": "0.0.0",
3838
"@aws-cdk/cdk-build-tools": "0.0.0",
3939
"@aws-cdk/pkglint": "0.0.0",
40-
"@types/jest": "^27.0.3",
40+
"@types/jest": "^27.4.1",
4141
"aws-cdk-lib": "0.0.0",
4242
"aws-cdk-migration": "0.0.0",
4343
"constructs": "^10.0.0",

packages/@aws-cdk/assertions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@aws-cdk/cdk-build-tools": "0.0.0",
6666
"@aws-cdk/pkglint": "0.0.0",
6767
"@types/fs-extra": "^9.0.13",
68-
"@types/jest": "^27.4.0",
68+
"@types/jest": "^27.4.1",
6969
"jest": "^27.5.1",
7070
"constructs": "^10.0.0",
7171
"ts-jest": "^27.1.3"

packages/@aws-cdk/assets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"@aws-cdk/cdk-build-tools": "0.0.0",
8282
"@aws-cdk/cdk-integ-tools": "0.0.0",
8383
"@aws-cdk/pkglint": "0.0.0",
84-
"@types/jest": "^27.4.0",
84+
"@types/jest": "^27.4.1",
8585
"@types/sinon": "^9.0.11",
8686
"aws-cdk": "0.0.0",
8787
"jest": "^27.5.1",

packages/@aws-cdk/aws-accessanalyzer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@aws-cdk/cdk-build-tools": "0.0.0",
8787
"@aws-cdk/cfn2ts": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
89-
"@types/jest": "^27.4.0"
89+
"@types/jest": "^27.4.1"
9090
},
9191
"dependencies": {
9292
"@aws-cdk/core": "0.0.0",

packages/@aws-cdk/aws-acmpca/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@aws-cdk/cdk-build-tools": "0.0.0",
8787
"@aws-cdk/cfn2ts": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
89-
"@types/jest": "^27.4.0"
89+
"@types/jest": "^27.4.1"
9090
},
9191
"dependencies": {
9292
"@aws-cdk/core": "0.0.0",

packages/@aws-cdk/aws-amazonmq/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/cdk-build-tools": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.4.0"
88+
"@types/jest": "^27.4.1"
8989
},
9090
"dependencies": {
9191
"@aws-cdk/core": "0.0.0",

packages/@aws-cdk/aws-amplify/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/cdk-integ-tools": "0.0.0",
8888
"@aws-cdk/cfn2ts": "0.0.0",
8989
"@aws-cdk/pkglint": "0.0.0",
90-
"@types/jest": "^27.4.0",
90+
"@types/jest": "^27.4.1",
9191
"@types/yaml": "1.9.6",
9292
"aws-sdk": "^2.848.0"
9393
},

packages/@aws-cdk/aws-apigateway/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/cdk-integ-tools": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.4.0"
88+
"@types/jest": "^27.4.1"
8989
},
9090
"dependencies": {
9191
"@aws-cdk/aws-certificatemanager": "0.0.0",

packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@aws-cdk/cdk-integ-tools": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
8888
"@types/aws-lambda": "^8.10.92",
89-
"@types/jest": "^27.4.0"
89+
"@types/jest": "^27.4.1"
9090
},
9191
"dependencies": {
9292
"@aws-cdk/aws-apigatewayv2": "0.0.0",

packages/@aws-cdk/aws-apigatewayv2-integrations/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"@aws-cdk/cdk-build-tools": "0.0.0",
8383
"@aws-cdk/cdk-integ-tools": "0.0.0",
8484
"@aws-cdk/pkglint": "0.0.0",
85-
"@types/jest": "^27.4.0"
85+
"@types/jest": "^27.4.1"
8686
},
8787
"dependencies": {
8888
"@aws-cdk/aws-apigatewayv2": "0.0.0",

packages/@aws-cdk/aws-apigatewayv2/README.md

+6
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,12 @@ webSocketApi.addRoute('sendmessage', {
404404
});
405405
```
406406

407+
To import an existing WebSocketApi:
408+
409+
```ts
410+
const webSocketApi = apigwv2.WebSocketApi.fromWebSocketApiAttributes(this, 'mywsapi', { webSocketId: 'api-1234' });
411+
```
412+
407413
### Manage Connections Permission
408414

409415
Grant permission to use API Gateway Management API of a WebSocket API by calling the `grantManageConnections` API.

packages/@aws-cdk/aws-apigatewayv2/lib/websocket/api.ts

+36
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,47 @@ export interface WebSocketApiProps {
8585
readonly defaultRouteOptions?: WebSocketRouteOptions;
8686
}
8787

88+
/**
89+
* Attributes for importing a WebSocketApi into the CDK
90+
*/
91+
export interface WebSocketApiAttributes {
92+
/**
93+
* The identifier of the WebSocketApi
94+
*/
95+
readonly webSocketId: string;
96+
97+
/**
98+
* The endpoint URL of the WebSocketApi
99+
* @default - throw san error if apiEndpoint is accessed.
100+
*/
101+
readonly apiEndpoint?: string;
102+
}
103+
104+
88105
/**
89106
* Create a new API Gateway WebSocket API endpoint.
90107
* @resource AWS::ApiGatewayV2::Api
91108
*/
92109
export class WebSocketApi extends ApiBase implements IWebSocketApi {
110+
/**
111+
* Import an existing WebSocket API into this CDK app.
112+
*/
113+
public static fromWebSocketApiAttributes(scope: Construct, id: string, attrs: WebSocketApiAttributes): IWebSocketApi {
114+
class Import extends ApiBase {
115+
public readonly apiId = attrs.webSocketId;
116+
public readonly websocketApiId = attrs.webSocketId;
117+
private readonly _apiEndpoint = attrs.apiEndpoint;
118+
119+
public get apiEndpoint(): string {
120+
if (!this._apiEndpoint) {
121+
throw new Error('apiEndpoint is not configured on the imported WebSocketApi.');
122+
}
123+
return this._apiEndpoint;
124+
}
125+
}
126+
return new Import(scope, id);
127+
}
128+
93129
public readonly apiId: string;
94130
public readonly apiEndpoint: string;
95131

packages/@aws-cdk/aws-apigatewayv2/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"@aws-cdk/cdk-integ-tools": "0.0.0",
9191
"@aws-cdk/cfn2ts": "0.0.0",
9292
"@aws-cdk/pkglint": "0.0.0",
93-
"@types/jest": "^27.4.0"
93+
"@types/jest": "^27.4.1"
9494
},
9595
"dependencies": {
9696
"@aws-cdk/aws-certificatemanager": "0.0.0",

packages/@aws-cdk/aws-apigatewayv2/test/websocket/api.test.ts

+19
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,25 @@ describe('WebSocketApi', () => {
107107
});
108108
});
109109

110+
test('import', () => {
111+
// GIVEN
112+
const stack = new Stack();
113+
const imported = WebSocketApi.fromWebSocketApiAttributes(stack, 'imported', { webSocketId: 'ws-1234', apiEndpoint: 'api-endpoint' });
114+
115+
// THEN
116+
expect(imported.apiId).toEqual('ws-1234');
117+
expect(imported.apiEndpoint).toEqual('api-endpoint');
118+
});
119+
120+
test('apiEndpoint for imported', () => {
121+
// GIVEN
122+
const stack = new Stack();
123+
const api = WebSocketApi.fromWebSocketApiAttributes(stack, 'imported', { webSocketId: 'api-1234' });
124+
125+
// THEN
126+
expect(() => api.apiEndpoint).toThrow(/apiEndpoint is not configured/);
127+
});
128+
110129
describe('grantManageConnections', () => {
111130
test('adds an IAM policy to the principal', () => {
112131
// GIVEN

0 commit comments

Comments
 (0)