Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): 1.73.0 #11414

Merged
merged 51 commits into from
Nov 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
030c5c5
feat(route53-targets): aws-apigatewayv2 target (#10191)
johanneswuerbach Nov 6, 2020
78c8b42
chore(deps-dev): bump @types/lodash from 4.14.164 to 4.14.165 (#11322)
dependabot-preview[bot] Nov 6, 2020
0925743
Merge branch 'master' into merge-back/1.72.0
mergify[bot] Nov 6, 2020
0587329
chore(merge-back): 1.72.0 (#11328)
mergify[bot] Nov 6, 2020
47b698e
fix(cfn-include): Fn::FindInMap cannot be used for boolean properties…
skinny85 Nov 6, 2020
2c55c4d
chore: update bug issue template (#11336)
RomainMuller Nov 6, 2020
40d0bbb
chore(core): update metadata tests to reflect v2 changes (#11320)
Nov 6, 2020
dfbf97b
chore(cognito): revert re-organization and use @internal instead so t…
shivlaks Nov 6, 2020
9eff751
feat(apigateway): default value for enum type in schema models (#11064)
mmuller88 Nov 6, 2020
52da8cb
fix(apigateway): api key not supported for SpecRestApi (#11235)
ayush987goyal Nov 6, 2020
a4567f5
fix(rds): customizing secret results in unusable password and lost at…
jogold Nov 6, 2020
13d713e
feat(appmesh): remove from*Name() methods and replace with from*Attri…
Nov 6, 2020
4186264
docs(cli): Fix directory in README.template.md (#11334)
MartinAltmayer Nov 6, 2020
d946a95
chore: fix toc in contribution guide (#11329)
Nov 6, 2020
f1d5435
chore(deps-dev): bump parcel from 2.0.0-nightly.438 to 2.0.0-nightly.…
dependabot-preview[bot] Nov 7, 2020
0a3e980
feat(appmesh): change VirtualRouter's Listener to a union-like class …
Nov 7, 2020
54c276d
feat(region-info): added AppMesh ECR account for eu-south-1 region (#…
rajal-amzn Nov 7, 2020
1c10c4a
chore(deps-dev): bump fast-check from 2.6.0 to 2.6.1 (#11352)
dependabot-preview[bot] Nov 7, 2020
9769a1b
chore(deps): bump aws-sdk from 2.785.0 to 2.787.0 (#11345)
dependabot-preview[bot] Nov 7, 2020
651ee5c
chore(deps): bump diff from 4.0.2 to 5.0.0 (#11354)
dependabot-preview[bot] Nov 8, 2020
51cd8af
chore(deps): bump ts-jest from 26.4.3 to 26.4.4 (#11356)
dependabot-preview[bot] Nov 8, 2020
7ab5ab8
fix(elasticsearch): use correct latency metric names (#11175)
arkon Nov 8, 2020
550dd99
chore(deps-dev): bump parcel from 2.0.0-nightly.440 to 2.0.0-nightly.…
dependabot-preview[bot] Nov 9, 2020
0153028
feat(elasticloadbalancingv2): add load balancer lookups (#11089)
misterjoshua Nov 9, 2020
ab9bcf2
feat(pipelines): ShellScriptAction can configure environment (#11229)
tdikland Nov 9, 2020
6efa5e1
feat(cli): process credentials (#11114)
hoegertn Nov 9, 2020
07c3ac8
chore(lambda-nodejs): drop coverage requirement (#11370)
rix0rrr Nov 9, 2020
37a149b
fix(cli): Python `id` parameter in init template conflicts with built…
ericzbeard Nov 9, 2020
4887ba6
fix(cli): deployments are skipped if stack is in a _failed state (#10…
Nov 9, 2020
5d907b6
feat(cognito): user pools - non-ascii email domains (#11099)
wtho Nov 9, 2020
3009490
fix(cloudwatch): composite alarm ARN uses wrong separator (#11186)
Khufu-I Nov 9, 2020
474f6c6
feat(cognito): user pool resource server (#11118)
iRoachie Nov 9, 2020
17611d6
chore(apigatewayv2): move lambda and http proxy integrations to the '…
Nov 9, 2020
521d990
chore(deps): bump aws-sdk from 2.787.0 to 2.788.0 (#11377)
dependabot-preview[bot] Nov 9, 2020
76a1afa
chore(deps-dev): bump parcel from 2.0.0-nightly.442 to 2.0.0-nightly.…
dependabot-preview[bot] Nov 10, 2020
24de577
feat(cloudwatch): different view types in GraphWidget (#11160)
AnderEnder Nov 10, 2020
4b4d011
fix(appsync): HttpDataSource extends BackedDataSource instead of Base…
cm-wada-yusuke Nov 10, 2020
8058b38
chore(deps): bump @typescript-eslint/eslint-plugin from 4.6.1 to 4.7.…
dependabot-preview[bot] Nov 10, 2020
55e9576
feat(cloudwatch): add methods for lazy addition of graph metrics (#11…
hoegertn Nov 10, 2020
32c164c
feat(pipelines): room for extra sequential intermediary actions in Cd…
adriantaut Nov 10, 2020
cdb9942
feat(core): natively support .dockerignore (#10922)
blaenk Nov 10, 2020
787cc46
chore: 2.0.0a0 is accidentally identified as 0.0.0 by pack script (#1…
Nov 10, 2020
76c795a
feat(eks): IAM Roles for service accounts in imported clusters (#10774)
aka-toxa Nov 10, 2020
e3fcfad
chore(deps): bump promptly from 3.1.0 to 3.2.0 (#11393)
dependabot-preview[bot] Nov 10, 2020
64ae541
chore(ubergen): switch to ubergen.exclude as a filter instead of priv…
Nov 10, 2020
a8cef9a
chore: do not login to DockerHub (#11358)
iliapolo Nov 10, 2020
2468fdc
docs(codedeploy): correct pre-defined Deployment Configuration names …
tiefps Nov 10, 2020
9638924
chore(deps-dev): bump nock from 13.0.4 to 13.0.5 (#11404)
dependabot-preview[bot] Nov 11, 2020
daf2a20
chore(deps): bump aws-sdk from 2.788.0 to 2.789.0 (#11398)
dependabot-preview[bot] Nov 11, 2020
8545350
chore: include attributions for aws-cdk-lib (#11413)
Nov 11, 2020
a9e40fa
chore(release): 1.73.0
Nov 11, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitallowed
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ account: '123456789012'
account: '772975370895'
account: '856666278305'
account: '840364872350'
account: '422531588944'
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ What is the unexpected behavior you were seeing? If you got an error, paste it h

### Environment

- **CLI Version :**
- **CDK CLI Version :**
- **Framework Version:**
- **Node.js Version:** <!-- Version of Node.js (run the command `node -v`) -->
- **OS :**
Expand Down
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,50 @@

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.

## [1.73.0](https://github.com/aws/aws-cdk/compare/v1.72.0...v1.73.0) (2020-11-11)


### ⚠ BREAKING CHANGES TO EXPERIMENTAL FEATURES

* **apigatewayv2:** `LambdaProxyIntegration` and `HttpProxyIntegration`
classes have moved to the `@aws-cdk/aws-apigatewayv2-integration` module.
* **appmesh:** VirtualRouter's Listeners are no longer a struct; use the static factory methods of the `VirtualNodeListener` class to obtain instances of them
* **appmesh:** VirtualRouter accepts a list of listeners instead of a single listener
* **appmesh:** all `fromResourceName()` methods in the AppMesh module have been replaced with `fromResourceAttributes()`

### Features

* **apigateway:** default value for enum type in schema models ([#11064](https://github.com/aws/aws-cdk/issues/11064)) ([9eff751](https://github.com/aws/aws-cdk/commit/9eff751609597c35baadb559144b2069a2211215)), closes [#11065](https://github.com/aws/aws-cdk/issues/11065)
* **appmesh:** change VirtualRouter's Listener to a union-like class ([#11277](https://github.com/aws/aws-cdk/issues/11277)) ([0a3e980](https://github.com/aws/aws-cdk/commit/0a3e980cb880ee546d0840281aa9e2a781d7412b))
* **appmesh:** remove from*Name() methods and replace with from*Attributes() ([#11266](https://github.com/aws/aws-cdk/issues/11266)) ([13d713e](https://github.com/aws/aws-cdk/commit/13d713e6358b29e55a626c44c7b2f0dcd946fddc))
* **cli:** process credentials ([#11114](https://github.com/aws/aws-cdk/issues/11114)) ([6efa5e1](https://github.com/aws/aws-cdk/commit/6efa5e10e01a5f46b914601a807b932b4c745dae)), closes [#3008](https://github.com/aws/aws-cdk/issues/3008)
* **cloudwatch:** add methods for lazy addition of graph metrics ([#11380](https://github.com/aws/aws-cdk/issues/11380)) ([55e9576](https://github.com/aws/aws-cdk/commit/55e9576810d8cb3115b7bd52d704ffe793a3dd27)), closes [#11305](https://github.com/aws/aws-cdk/issues/11305)
* **cloudwatch:** different view types in GraphWidget ([#11160](https://github.com/aws/aws-cdk/issues/11160)) ([24de577](https://github.com/aws/aws-cdk/commit/24de5774379b7258f3629448a760b86613acc397)), closes [#11063](https://github.com/aws/aws-cdk/issues/11063)
* **cognito:** user pool resource server ([#11118](https://github.com/aws/aws-cdk/issues/11118)) ([474f6c6](https://github.com/aws/aws-cdk/commit/474f6c673e9f419bbc80c1a7797348e98767e8c9))
* **cognito:** user pools - non-ascii email domains ([#11099](https://github.com/aws/aws-cdk/issues/11099)) ([5d907b6](https://github.com/aws/aws-cdk/commit/5d907b62abd4428c27677965353fb04d92267e2c)), closes [#8473](https://github.com/aws/aws-cdk/issues/8473) [#8473](https://github.com/aws/aws-cdk/issues/8473)
* **core:** natively support .dockerignore ([#10922](https://github.com/aws/aws-cdk/issues/10922)) ([cdb9942](https://github.com/aws/aws-cdk/commit/cdb9942bebc60abf98a74c6f9071e3527f0f01e1))
* **eks:** IAM Roles for service accounts in imported clusters ([#10774](https://github.com/aws/aws-cdk/issues/10774)) ([76c795a](https://github.com/aws/aws-cdk/commit/76c795ae37d4168e8a98b3bc81034b455a8ae05e)), closes [#10601](https://github.com/aws/aws-cdk/issues/10601)
* **elasticloadbalancingv2:** add load balancer lookups ([#11089](https://github.com/aws/aws-cdk/issues/11089)) ([0153028](https://github.com/aws/aws-cdk/commit/0153028e6438eb13b07b8f2043745e5bc3faa6b7)), closes [#11088](https://github.com/aws/aws-cdk/issues/11088)
* **pipelines:** room for extra sequential intermediary actions in CdkStage addApplication() ([#11376](https://github.com/aws/aws-cdk/issues/11376)) ([32c164c](https://github.com/aws/aws-cdk/commit/32c164c4aa498b9bce03583f76cc21c7257a48ef))
* **pipelines:** ShellScriptAction can configure environment ([#11229](https://github.com/aws/aws-cdk/issues/11229)) ([ab9bcf2](https://github.com/aws/aws-cdk/commit/ab9bcf26ecb8c171cf4ba3bdc795cb45c7096fd8)), closes [#10919](https://github.com/aws/aws-cdk/issues/10919)
* **region-info:** added AppMesh ECR account for eu-south-1 region ([#11207](https://github.com/aws/aws-cdk/issues/11207)) ([54c276d](https://github.com/aws/aws-cdk/commit/54c276d215fd636c2f8970795512a838377b2f21))
* **route53-targets:** aws-apigatewayv2 target ([#10191](https://github.com/aws/aws-cdk/issues/10191)) ([030c5c5](https://github.com/aws/aws-cdk/commit/030c5c58e2cedda8e74d7988dc44b042def9e703))


### Bug Fixes

* **apigateway:** api key not supported for SpecRestApi ([#11235](https://github.com/aws/aws-cdk/issues/11235)) ([52da8cb](https://github.com/aws/aws-cdk/commit/52da8cb3c65c41bf7cbd3c8001cf586a5c89041b)), closes [#11079](https://github.com/aws/aws-cdk/issues/11079)
* **appsync:** HttpDataSource extends BackedDataSource instead of BaseDataSource ([#11185](https://github.com/aws/aws-cdk/issues/11185)) ([4b4d011](https://github.com/aws/aws-cdk/commit/4b4d0114e849ad96fccafd4cebb0edbead83ed83)), closes [#11183](https://github.com/aws/aws-cdk/issues/11183)
* **cfn-include:** Fn::FindInMap cannot be used for boolean properties ([#11323](https://github.com/aws/aws-cdk/issues/11323)) ([47b698e](https://github.com/aws/aws-cdk/commit/47b698ebfea300978e101234bcd80145b6f1ed17)), closes [#11300](https://github.com/aws/aws-cdk/issues/11300)
* **cli:** deployments are skipped if stack is in a _failed state ([#10847](https://github.com/aws/aws-cdk/issues/10847)) ([4887ba6](https://github.com/aws/aws-cdk/commit/4887ba6004b20c86c0025d16e235b8333d6efa6b)), closes [#10784](https://github.com/aws/aws-cdk/issues/10784)
* **cli:** Python `id` parameter in init template conflicts with built-in ([#10874](https://github.com/aws/aws-cdk/issues/10874)) ([37a149b](https://github.com/aws/aws-cdk/commit/37a149b03751810d9ed984e415bbfb216881e74b))
* **cloudwatch:** composite alarm ARN uses wrong separator ([#11186](https://github.com/aws/aws-cdk/issues/11186)) ([3009490](https://github.com/aws/aws-cdk/commit/3009490c4e1e1a10a9e4ea52cefe03aac296d649))
* **elasticsearch:** use correct latency metric names ([#11175](https://github.com/aws/aws-cdk/issues/11175)) ([7ab5ab8](https://github.com/aws/aws-cdk/commit/7ab5ab8dad9ad08ff43602d5ee78c31e6b8413ed)), closes [#11174](https://github.com/aws/aws-cdk/issues/11174)
* **rds:** customizing secret results in unusable password and lost attachment ([#11237](https://github.com/aws/aws-cdk/issues/11237)) ([a4567f5](https://github.com/aws/aws-cdk/commit/a4567f53d6e06d50f22d56364f69f0209c48874e)), closes [#11040](https://github.com/aws/aws-cdk/issues/11040)


* **apigatewayv2:** move lambda and http proxy integrations to the 'integrations' module ([#11339](https://github.com/aws/aws-cdk/issues/11339)) ([17611d6](https://github.com/aws/aws-cdk/commit/17611d6e0f1085505c90cf4d6d4f22b91c530ce1))

## [1.72.0](https://github.com/aws/aws-cdk/compare/v1.71.0...v1.72.0) (2020-11-06)


Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ and let us know if it's not up-to-date (even better, submit a PR with your corr
- [API Compatibility Checks](#api-compatibility-checks)
- [Examples](#examples)
- [Feature Flags](#feature-flags)
- [Versioning](#versioning)
- [Versioning and Release](#versioning-and-release)
- [Troubleshooting](#troubleshooting)
- [Debugging](#debugging)
- [Connecting the VS Code Debugger](#connecting-the-vs-code-debugger)
Expand Down
6 changes: 5 additions & 1 deletion allowed-breaking-changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
# and that won't typecheck if Manifest.load() adds a union arm and now returns A | B | C.
change-return-type:@aws-cdk/cloud-assembly-schema.Manifest.load

# Adding any new context queries will add to the ContextQueryProperties type,
# which changes the signature of MissingContext.
weakened:@aws-cdk/cloud-assembly-schema.MissingContext

removed:@aws-cdk/core.BootstraplessSynthesizer.DEFAULT_ASSET_PUBLISHING_ROLE_ARN
removed:@aws-cdk/core.DefaultStackSynthesizer.DEFAULT_ASSET_PUBLISHING_ROLE_ARN
removed:@aws-cdk/core.DefaultStackSynthesizerProps.assetPublishingExternalId
Expand Down Expand Up @@ -47,4 +51,4 @@ incompatible-argument:@aws-cdk/aws-ecs.Ec2TaskDefinition.addVolume
incompatible-argument:@aws-cdk/aws-ecs.FargateTaskDefinition.<initializer>
incompatible-argument:@aws-cdk/aws-ecs.FargateTaskDefinition.addVolume
incompatible-argument:@aws-cdk/aws-ecs.TaskDefinition.<initializer>
incompatible-argument:@aws-cdk/aws-ecs.TaskDefinition.addVolume
incompatible-argument:@aws-cdk/aws-ecs.TaskDefinition.addVolume
9 changes: 4 additions & 5 deletions buildspec-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ version: 0.2
phases:
install:
commands:
# Start docker daemon inside the container
- nohup /usr/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 --storage-driver=overlay2&
- timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
# login to DockerHub to avoid throttling
- docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD}

# baked in our image.
# this also takes care of launching the docker daemon.
- /root/ecr-proxy/start.sh

# Install yarn if it wasn't already present in the image
- yarn --version || npm -g install yarn
Expand Down
9 changes: 4 additions & 5 deletions buildspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ version: 0.2
phases:
install:
commands:
# Start docker daemon inside the container
- nohup /usr/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 --storage-driver=overlay2&
- timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
# login to DockerHub to avoid throttling
- docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD}

# baked in our image.
# this also takes care of launching the docker daemon.
- /root/ecr-proxy/start.sh

# Install yarn if it wasn't already present in the image
- yarn --version || npm -g install yarn
Expand Down
2 changes: 1 addition & 1 deletion pack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ cp ${changelog_file} ${distdir}/CHANGELOG.md
# defensive: make sure our artifacts don't use the version marker (this means
# that "pack" will always fails when building in a dev environment)
# when we get to 10.0.0, we can fix this...
if find dist/ | grep "${marker}"; then
if find dist/ | grep -F "${marker}"; then
echo "ERROR: build artifacts use the version marker '${marker}' instead of a real version."
echo "This is expected for builds in a development environment but should not happen in CI builds!"
exit 1
Expand Down
18 changes: 18 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
"**/jszip/**",
"@aws-cdk/aws-codepipeline-actions/case",
"@aws-cdk/aws-codepipeline-actions/case/**",
"@aws-cdk/aws-cognito/punycode",
"@aws-cdk/aws-cognito/punycode/**",
"@aws-cdk/aws-ecr-assets/minimatch",
"@aws-cdk/aws-ecr-assets/minimatch/**",
"@aws-cdk/aws-eks/yaml",
Expand All @@ -63,34 +65,50 @@
"@aws-cdk/cloud-assembly-schema/jsonschema/**",
"@aws-cdk/cloud-assembly-schema/semver",
"@aws-cdk/cloud-assembly-schema/semver/**",
"@aws-cdk/core/@balena/dockerignore",
"@aws-cdk/core/@balena/dockerignore/**",
"@aws-cdk/core/fs-extra",
"@aws-cdk/core/fs-extra/**",
"@aws-cdk/core/ignore",
"@aws-cdk/core/ignore/**",
"@aws-cdk/core/minimatch",
"@aws-cdk/core/minimatch/**",
"@aws-cdk/cx-api/semver",
"@aws-cdk/cx-api/semver/**",
"@aws-cdk/yaml-cfn/yaml",
"@aws-cdk/yaml-cfn/yaml/**",
"aws-cdk-lib/@balena/dockerignore",
"aws-cdk-lib/@balena/dockerignore/**",
"aws-cdk-lib/case",
"aws-cdk-lib/case/**",
"aws-cdk-lib/fs-extra",
"aws-cdk-lib/fs-extra/**",
"aws-cdk-lib/ignore",
"aws-cdk-lib/ignore/**",
"aws-cdk-lib/jsonschema",
"aws-cdk-lib/jsonschema/**",
"aws-cdk-lib/minimatch",
"aws-cdk-lib/minimatch/**",
"aws-cdk-lib/punycode",
"aws-cdk-lib/punycode/**",
"aws-cdk-lib/semver",
"aws-cdk-lib/semver/**",
"aws-cdk-lib/yaml",
"aws-cdk-lib/yaml/**",
"monocdk/@balena/dockerignore",
"monocdk/@balena/dockerignore/**",
"monocdk/case",
"monocdk/case/**",
"monocdk/fs-extra",
"monocdk/fs-extra/**",
"monocdk/ignore",
"monocdk/ignore/**",
"monocdk/jsonschema",
"monocdk/jsonschema/**",
"monocdk/minimatch",
"monocdk/minimatch/**",
"monocdk/punycode",
"monocdk/punycode/**",
"monocdk/semver",
"monocdk/semver/**",
"monocdk/yaml",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,12 +276,9 @@ export class AppMeshExtension extends ServiceExtension {
// and other similar behaviors.
this.virtualRouter = new appmesh.VirtualRouter(this.scope, `${this.parentService.id}-virtual-router`, {
mesh: this.mesh,
listener: {
portMapping: {
port: containerextension.trafficPort,
protocol: this.protocol,
},
},
listeners: [
this.virtualRouterListener(containerextension.trafficPort),
],
virtualRouterName: `${this.parentService.id}`,
});

Expand Down Expand Up @@ -331,4 +328,13 @@ export class AppMeshExtension extends ServiceExtension {
// nodes from the other service.
this.virtualNode.addBackends(otherAppMesh.virtualService);
}

private virtualRouterListener(port: number): appmesh.VirtualRouterListener {
switch (this.protocol) {
case appmesh.Protocol.HTTP: return appmesh.VirtualRouterListener.http(port);
case appmesh.Protocol.HTTP2: return appmesh.VirtualRouterListener.http2(port);
case appmesh.Protocol.GRPC: return appmesh.VirtualRouterListener.grpc(port);
case appmesh.Protocol.TCP: return appmesh.VirtualRouterListener.tcp(port);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3323,7 +3323,7 @@
"ecrRepo": "840364872350"
},
"eu-south-1": {
"ecrRepo": "840364872350"
"ecrRepo": "422531588944"
},
"eu-west-1": {
"ecrRepo": "840364872350"
Expand Down Expand Up @@ -3382,7 +3382,7 @@
"ecrRepo": "840364872350"
},
"eu-south-1": {
"ecrRepo": "840364872350"
"ecrRepo": "422531588944"
},
"eu-west-1": {
"ecrRepo": "840364872350"
Expand Down Expand Up @@ -3441,7 +3441,7 @@
"ecrRepo": "840364872350"
},
"eu-south-1": {
"ecrRepo": "840364872350"
"ecrRepo": "422531588944"
},
"eu-west-1": {
"ecrRepo": "840364872350"
Expand Down Expand Up @@ -3491,4 +3491,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2142,7 +2142,7 @@
"ecrRepo": "840364872350"
},
"eu-south-1": {
"ecrRepo": "840364872350"
"ecrRepo": "422531588944"
},
"eu-west-1": {
"ecrRepo": "840364872350"
Expand Down Expand Up @@ -2201,7 +2201,7 @@
"ecrRepo": "840364872350"
},
"eu-south-1": {
"ecrRepo": "840364872350"
"ecrRepo": "422531588944"
},
"eu-west-1": {
"ecrRepo": "840364872350"
Expand Down Expand Up @@ -2235,4 +2235,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion packages/@aws-cdk/app-delivery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@types/nodeunit": "^0.0.31",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"fast-check": "^2.6.0",
"fast-check": "^2.6.1",
"nodeunit": "^0.11.3",
"pkglint": "0.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"cdk-build-tools": "0.0.0",
"jest": "^26.6.3",
"pkglint": "0.0.0",
"ts-jest": "^26.4.3"
"ts-jest": "^26.4.4"
},
"dependencies": {
"@aws-cdk/cloud-assembly-schema": "0.0.0",
Expand Down
9 changes: 9 additions & 0 deletions packages/@aws-cdk/assets/lib/fs/options.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { IgnoreMode } from '@aws-cdk/core';
import { FollowMode } from './follow-mode';

/**
Expand All @@ -18,6 +19,14 @@ export interface CopyOptions {
* @default nothing is excluded
*/
readonly exclude?: string[];

/**
* The ignore behavior to use for exclude patterns.
*
* @default - GLOB for file assets, DOCKER or GLOB for docker assets depending on whether the
* '@aws-cdk/aws-ecr-assets:dockerIgnoreSupport' flag is set.
*/
readonly ignoreMode?: IgnoreMode;
}

/**
Expand Down
1 change: 1 addition & 0 deletions packages/@aws-cdk/assets/lib/staging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export class Staging extends AssetStaging {
super(scope, id, {
sourcePath: props.sourcePath,
exclude: props.exclude,
ignoreMode: props.ignoreMode,
extraHash: props.extraHash,
follow: toSymlinkFollow(props.follow),
});
Expand Down
9 changes: 4 additions & 5 deletions packages/@aws-cdk/aws-apigateway/lib/api-key.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { IResource as IResourceBase, Resource, Stack } from '@aws-cdk/core';
import { Construct } from 'constructs';
import { CfnApiKey } from './apigateway.generated';
import { ResourceOptions } from './resource';
import { RestApi } from './restapi';
import { IRestApi } from './restapi';
import { QuotaSettings, ThrottleSettings, UsagePlan, UsagePlanPerApiStage } from './usage-plan';

/**
Expand Down Expand Up @@ -47,11 +47,10 @@ export interface ApiKeyOptions extends ResourceOptions {
*/
export interface ApiKeyProps extends ApiKeyOptions {
/**
* [disable-awslint:ref-via-interface]
* A list of resources this api key is associated with.
* @default none
*/
readonly resources?: RestApi[];
readonly resources?: IRestApi[];

/**
* An AWS Marketplace customer identifier to use when integrating with the AWS SaaS Marketplace.
Expand Down Expand Up @@ -183,12 +182,12 @@ export class ApiKey extends ApiKeyBase {
});
}

private renderStageKeys(resources: RestApi[] | undefined): CfnApiKey.StageKeyProperty[] | undefined {
private renderStageKeys(resources: IRestApi[] | undefined): CfnApiKey.StageKeyProperty[] | undefined {
if (!resources) {
return undefined;
}

return resources.map((resource: RestApi) => {
return resources.map((resource: IRestApi) => {
const restApi = resource;
const restApiId = restApi.restApiId;
const stageName = restApi.deploymentStage!.stageName.toString();
Expand Down
6 changes: 6 additions & 0 deletions packages/@aws-cdk/aws-apigateway/lib/json-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ export interface JsonSchema {
readonly title?: string;
readonly description?: string;
readonly 'enum'?: any[];
/**
* The default value if you use an enum.
*
* @default - not set
*/
readonly default?: any;
readonly format?: string;
readonly definitions?: { [name: string]: JsonSchema };

Expand Down
Loading