Skip to content

Commit 93ce1c1

Browse files
jogoldjogold
authored
Merge branch 'master' into amplify-l2
2 parents cdb38ec + 34aaca4 commit 93ce1c1

File tree

435 files changed

+20116
-4521
lines changed

Some content is hidden

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

435 files changed

+20116
-4521
lines changed

‎.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: "\U00002753 General Issue"
33
about: Create a new issue
4-
labels: status/needs-triage
4+
labels: needs-triage
55
---
66

77
<!-- NOTE:📕 If issue regarding developer guide, please create issue [here](https://github.com/awsdocs/aws-cdk-guide/issues) -->

‎.github/ISSUE_TEMPLATE/bug.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: "\U0001F41B Bug Report"
33
about: Report a bug
4-
labels: bug, status/needs-triage
4+
labels: bug, needs-triage
55
---
66

77
<!--

‎.github/ISSUE_TEMPLATE/doc.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: "📕 Documentation issue"
33
about: Issue in the reference documentation or developer guide
4-
labels: feature-request, status/needs-triage
4+
labels: feature-request, needs-triage
55
---
66

77
<!--

‎.github/ISSUE_TEMPLATE/feature-request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: "\U0001F680 Feature Request"
33
about: Request a new feature
4-
labels: feature-request, status/needs-triage
4+
labels: feature-request, needs-triage
55
---
66

77
<!-- short description of the feature you are proposing: -->

‎.github/ISSUE_TEMPLATE/general-issues.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: "\U00002753 General Issue"
33
about: Create a new issue
4-
labels: status/needs-triage
4+
labels: needs-triage
55
---
66

77
<!-- NOTE:📕 If there is an issue regarding developer guide, please create an issue [here](https://github.com/awsdocs/aws-cdk-guide/issues) -->

‎.github/actions/prlinter/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "prlinter",
33
"private": true,
4-
"version": "0.0.1",
4+
"version": "999.0.0",
55
"description": "",
66
"main": "index.js",
77
"keywords": [],

‎.github/workflows/auto-approve-dependabot.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Automatically approve PRs made by Dependabot
2+
#
3+
# Written to look at the original author of the PR (instead of the current
4+
# actor) in order to be able to backresolve existing PRs using this action (by
5+
# mass labeling them). Leads to slightly unnecessary spammage of aprovals in a
6+
# PR...
7+
#
8+
# Only does approvals! A different GitHub Action takes care of merging.
9+
name: Auto-approve Dependabot
10+
on:
11+
pull_request:
12+
types:
13+
- labeled
14+
- opened
15+
- ready_for_review
16+
- reopened
17+
- synchronize
18+
- unlabeled
19+
- unlocked
20+
jobs:
21+
build:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: hmarr/auto-approve-action@7782c7e2bdf62b4d79bdcded8332808fd2f179cd
25+
if: github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'dependabot-preview[bot]'
26+
with:
27+
github-token: "${{ secrets.GITHUB_TOKEN }}"

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ pack/
1616
.tools/
1717
coverage/
1818
.nyc_output
19+
.nycrc
1920
.LAST_BUILD
2021
*.sw[a-z]
2122
*~

‎.mergify.yml

+48
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,35 @@ pull_request_rules:
1717
method: squash
1818
strict_method: merge
1919
delete_head_branch: {}
20+
conditions:
21+
- base!=release
22+
- -title~=(WIP|wip)
23+
- -label~=(blocked|do-not-merge|no-squash)
24+
- -merged
25+
- -closed
26+
- author!=dependabot[bot]
27+
- author!=dependabot-preview[bot]
28+
- "#approved-reviews-by>=1"
29+
- -approved-reviews-by~=author
30+
- "#changes-requested-reviews-by=0"
31+
- status-success~=AWS CodeBuild us-east-1
32+
- status-success=Semantic Pull Request
33+
- status-success=mandatory-changes
34+
- name: automatic merge
35+
actions:
36+
comment:
37+
message: Thank you for contributing! Your pull request is now being automatically merged without squashing.
38+
merge:
39+
strict: smart
40+
# Merge instead of squash
41+
method: merge
42+
strict_method: merge
43+
delete_head_branch: {}
2044
conditions:
2145
- -title~=(WIP|wip)
2246
- -label~=(blocked|do-not-merge)
47+
# Only if no-squash is set
48+
- label~=no-squash
2349
- -merged
2450
- -closed
2551
- author!=dependabot[bot]
@@ -63,3 +89,25 @@ pull_request_rules:
6389
- status-failure=Semantic Pull Request
6490
- -merged
6591
- -closed
92+
- name: automatic merge of Dependabot PRs
93+
actions:
94+
comment:
95+
message: Thanks Dependabot!
96+
merge:
97+
# 'strict: false' disables Mergify keeping the branch up-to-date from master.
98+
# It's not necessary: Dependabot will do that itself.
99+
# It's not dangerous: GitHub branch protection settings prevent merging stale branches.
100+
strict: false
101+
method: squash
102+
delete_head_branch: {}
103+
conditions:
104+
- -title~=(WIP|wip)
105+
- -label~=(blocked|do-not-merge)
106+
- -merged
107+
- -closed
108+
- author~=dependabot
109+
- "#approved-reviews-by>=1"
110+
- "#changes-requested-reviews-by=0"
111+
- status-success~=AWS CodeBuild us-east-1
112+
- status-success=Semantic Pull Request
113+
- status-success=mandatory-changes

‎.versionrc.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"skip": { "tag": true },
3+
"packageFiles": [ { "filename": "lerna.json", "type": "json" } ],
4+
"bumpFiles": [ { "filename": "lerna.json", "type": "json" } ]
5+
}

‎CHANGELOG.md

+57
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,63 @@
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+
6+
## [1.25.0](https://github.com/aws/aws-cdk/compare/v1.24.0...v1.25.0) (2020-02-18)
7+
8+
9+
### ⚠ BREAKING CHANGES
10+
11+
* **appsync:** Changes `MappingTemplate.dynamoDbPutItem()` to accept
12+
`PrimaryKey` and `AttributeValues`, which allow configuring the primary
13+
key and to project an object to a set of attribute values.
14+
15+
### Features
16+
17+
* **appsync:** more general mapping template for DynamoDB PutItem ([#6236](https://github.com/aws/aws-cdk/issues/6236)) ([e9937d3](https://github.com/aws/aws-cdk/commit/e9937d3717d07c679d7732db21231a6b4da80130)), closes [#6225](https://github.com/aws/aws-cdk/issues/6225)
18+
* **aws-applicationautoscaling:** support Lambda and Comprehend ([#6191](https://github.com/aws/aws-cdk/issues/6191)) ([bdab747](https://github.com/aws/aws-cdk/commit/bdab7477b8464e04730a2b4b09841008bc6e8ab9))
19+
* **cfn:** update CloudFormation spec to v11.0.0 ([#6311](https://github.com/aws/aws-cdk/issues/6311)) ([ea272fa](https://github.com/aws/aws-cdk/commit/ea272fa270fd7dc09e0388a90e82bfb27a88491f))
20+
21+
22+
### Bug Fixes
23+
24+
* **aws-lambda-nodejs:** Fix parcel invocation when invoked from globally installed cdk cli ([#6206](https://github.com/aws/aws-cdk/issues/6206)) ([ce96e08](https://github.com/aws/aws-cdk/commit/ce96e08a10f86361515f9210a52a37c9101e98fe)), closes [#6204](https://github.com/aws/aws-cdk/issues/6204)
25+
* **codepipeline:** fixed typo in method docs within action.ts ([78a39b7](https://github.com/aws/aws-cdk/commit/78a39b7a07f35b4675fe63cb2134c166f846c6be))
26+
* **eks:** Helm release name length & `--wait` option. ([#6276](https://github.com/aws/aws-cdk/issues/6276)) ([1811e00](https://github.com/aws/aws-cdk/commit/1811e00ff7e90f235198f855051f11f1d457b3a4)), closes [/github.com/helm/helm/blob/b63822ed12de1badbb61736d2f7ea4e756ef757d/pkg/action/install.go#L52-L55](https://github.com/aws//github.com/helm/helm/blob/b63822ed12de1badbb61736d2f7ea4e756ef757d/pkg/action/install.go/issues/L52-L55)
27+
* **lambda-nodejs:** not meaningful parcel error message when build fails ([#6277](https://github.com/aws/aws-cdk/issues/6277)) ([a97b48a](https://github.com/aws/aws-cdk/commit/a97b48ae4a7dafe050997e00bb57bf64117b551b)), closes [#6274](https://github.com/aws/aws-cdk/issues/6274)
28+
29+
## [1.24.0](https://github.com/aws/aws-cdk/compare/v1.23.0...v1.24.0) (2020-02-13)
30+
31+
32+
### Features
33+
34+
* **assert:** add countResourcesLike method ([#6168](https://github.com/aws/aws-cdk/issues/6168)) ([491e2d9](https://github.com/aws/aws-cdk/commit/491e2d970c849cbc00e7cb3def927b12054d572f))
35+
* **cx-api:** clean up features.ts ([#6181](https://github.com/aws/aws-cdk/issues/6181)) ([efd6f3d](https://github.com/aws/aws-cdk/commit/efd6f3d7c7ccd985f386b29dffed47e2b3c6fa7c)), closes [#6098](https://github.com/aws/aws-cdk/issues/6098)
36+
* **dynamodb:** add metrics for dynamodb table ([#6149](https://github.com/aws/aws-cdk/issues/6149)) ([295391e](https://github.com/aws/aws-cdk/commit/295391e901798a8f99415fd72a6b4fa664d75f44))
37+
* **dynamodb:** global tables version 2019.11.21 ([#5821](https://github.com/aws/aws-cdk/issues/5821)) ([8c0c2b1](https://github.com/aws/aws-cdk/commit/8c0c2b130060215509cd6db83f8d6b18f92f857b)), closes [#5752](https://github.com/aws/aws-cdk/issues/5752)
38+
* **ec2:** smarter default for VPN route propagation ([#6071](https://github.com/aws/aws-cdk/issues/6071)) ([5dd8aca](https://github.com/aws/aws-cdk/commit/5dd8aca97c314a2293473f4c6695e844f14aaa62)), closes [#6008](https://github.com/aws/aws-cdk/issues/6008)
39+
* **ec2:** VPC flow logs ([a2fddec](https://github.com/aws/aws-cdk/commit/a2fddec4aa1893d4bf68fdfbb5c9379e58cd19f3)), closes [#3493](https://github.com/aws/aws-cdk/issues/3493)
40+
* **iam:** add ability to create IAM role descriptions ([cee8825](https://github.com/aws/aws-cdk/commit/cee882540527feb2b6f0fee866eb96cccc2eae36))
41+
* **iam:** descriptions for IAM Roles ([a1294d3](https://github.com/aws/aws-cdk/commit/a1294d35015faaf27f44a894a2367fe5791856a6))
42+
* **cfnspec**: update CloudFormation spec to 10.5.0 ([#6195](https://github.com/aws/aws-cdk/issues/6195)) ([47a9949](https://github.com/aws/aws-cdk/commit/47a994916cc7744a2335ae4c7496ad11be86e366))
43+
* **iam:** lookup ManagedPolicy via ARN ([2df2023](https://github.com/aws/aws-cdk/commit/2df2023755d696af0e82a1c83bfd2d4b4e54950d)), closes [#6186](https://github.com/aws/aws-cdk/issues/6186)
44+
* **lambda:** expose `function.deadLetterQueue` ([6656047](https://github.com/aws/aws-cdk/commit/66560479c9417003c8cc61021155b8a8b732fb39)), closes [#6170](https://github.com/aws/aws-cdk/issues/6170)
45+
* **step-functions:** `grantStartExecution` available on imported StateMachine ([5ae81cd](https://github.com/aws/aws-cdk/commit/5ae81cdddd75abedbcef7d856bdb20458fac5fcb)), closes [#6173](https://github.com/aws/aws-cdk/issues/6173)
46+
* **stepfunctions:** EMR service integrations ([c69b6d2](https://github.com/aws/aws-cdk/commit/c69b6d2d712f9c307dd9de214acc96f5f944cc7d)), closes [#5224](https://github.com/aws/aws-cdk/issues/5224)
47+
48+
49+
### Bug Fixes
50+
51+
* **cli**: truncated 'cdk diff' output in pipes ([aba1485](https://github.com/aws/aws-cdk/commit/aba1485765a4ac31e5acabaa945b1b4adde94c6a))
52+
* **apigateway:** deployment fails when Model's contentType is not specified ([#6199](https://github.com/aws/aws-cdk/issues/6199)) ([0bf1403](https://github.com/aws/aws-cdk/commit/0bf1403a9f669556ed7942b5e1dd966f94ba812c)), closes [#6161](https://github.com/aws/aws-cdk/issues/6161)
53+
* **apigateway:** stack deployment fails when a Stage is explicitly specified ([#6165](https://github.com/aws/aws-cdk/issues/6165)) ([879601e](https://github.com/aws/aws-cdk/commit/879601ead3c009cc10bd5d49dbc9d1132fa9ba82)), closes [#6068](https://github.com/aws/aws-cdk/issues/6068)
54+
* **cli:** wrongly assume aws config file always exists ([#6196](https://github.com/aws/aws-cdk/issues/6196)) ([23f8b9f](https://github.com/aws/aws-cdk/commit/23f8b9f5e97f5f229faa9322d840339f6322a234))
55+
* **codebuild:** badge is not allowed for CodeCommit sources ([#6211](https://github.com/aws/aws-cdk/issues/6211)) ([433d957](https://github.com/aws/aws-cdk/commit/433d95763210f8798c604bf62560d2a4ba39d9c6)), closes [#6205](https://github.com/aws/aws-cdk/issues/6205)
56+
* **ec2:** `onePerAz` does not work for looked-up VPCs ([3332d06](https://github.com/aws/aws-cdk/commit/3332d06982c6eb04e4f88c5b01ad745ed18d7e82)), closes [#3126](https://github.com/aws/aws-cdk/issues/3126)
57+
* **ecs-patterns:** allow imported load balancers as inputs ([7f8c90d](https://github.com/aws/aws-cdk/commit/7f8c90decd58d2016611e6f94fc506156e047b59))
58+
* **elasticloadbalancingv2:** logAccessLogs in Base Load Balancer ([#6197](https://github.com/aws/aws-cdk/issues/6197)) ([adbc3b9](https://github.com/aws/aws-cdk/commit/adbc3b93e062b6687c048b36ef4d26ce2c784e53)), closes [#3794](https://github.com/aws/aws-cdk/issues/3794)
59+
* **elbv2:** validate rule priority is a positive number ([#6222](https://github.com/aws/aws-cdk/issues/6222)) ([1fbaafe](https://github.com/aws/aws-cdk/commit/1fbaafe34ce3f45a84a2141f7171e02fb8ec4801)), closes [#3794](https://github.com/aws/aws-cdk/issues/3794)
60+
* **kms:** add TagResource & UntagResource IAM permissions to default key policy ([#6125](https://github.com/aws/aws-cdk/issues/6125)) ([e65a326](https://github.com/aws/aws-cdk/commit/e65a326b7de3d97675e27af7f3cb9f2f8735a01d)), closes [#6102](https://github.com/aws/aws-cdk/issues/6102)
61+
562
## [1.23.0](https://github.com/aws/aws-cdk/compare/v1.22.0...v1.23.0) (2020-02-07)
663

764

‎CONTRIBUTING.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,8 @@ $ cd packages/@aws-cdk/aws-ec2
414414
$ ../../../scripts/buildup
415415
```
416416

417-
Note that `buildup` uses `foreach.sh`, which means it's resumable. If your build fails and you wish to resume, just run `buildup` again. If you wish to restart, run `buildup --restart`.
417+
Note that `buildup` uses `foreach.sh`, which means it's resumable. If your build fails and you wish to resume, just run
418+
`buildup --resume`. If you wish to restart, run `buildup` again.
418419

419420
### Quick Iteration
420421

@@ -635,8 +636,8 @@ The pattern is simple:
635636
form `module.Type:feature` (e.g. `@aws-cdk/core:enableStackNameDuplicates`).
636637
2. Use `node.tryGetContext(cxapi.ENABLE_XXX)` to check if this feature is enabled
637638
in your code. If it is not defined, revert to the legacy behavior.
638-
3. Add your feature flag to
639-
[cx-api/lib/future.ts](https://github.com/aws/aws-cdk/blob/master/packages/%40aws-cdk/cx-api/lib/future.ts).
639+
3. Add your feature flag to the `FUTURE_FLAGS` map in
640+
[cx-api/lib/features.ts](https://github.com/aws/aws-cdk/blob/master/packages/%40aws-cdk/cx-api/lib/features.ts).
640641
This map is inserted to generated `cdk.json` files for new projects created
641642
through `cdk init`.
642643
4. In your PR title (which goes into CHANGELOG), add a `(under feature flag)` suffix. e.g:

‎buildspec.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ phases:
1313
- /bin/bash ./fetch-dotnet-snk.sh
1414
build:
1515
commands:
16+
- /bin/bash ./scripts/align-version.sh
1617
- /bin/bash ./build.sh
1718
post_build:
1819
commands:

‎bump.sh

+3-14
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,7 @@ version=${1:-minor}
1717

1818
echo "Starting ${version} version bump"
1919

20-
export NODE_OPTIONS="--max-old-space-size=4096 ${NODE_OPTIONS:-}"
20+
# /bin/bash ./install.sh
2121

22-
/bin/bash ./install.sh
23-
24-
npx lerna version ${version} --yes --exact --force-publish=* --no-git-tag-version --no-push
25-
26-
# Another round of install to fix package-lock.jsons
27-
/bin/bash ./install.sh
28-
29-
# align "peerDependencies" to actual dependencies after bump
30-
# this is technically only required for major version bumps, but in the meantime we shall do it in every bump
31-
/bin/bash scripts/fix-peer-deps.sh
32-
33-
# Generate CHANGELOG and create a commit
34-
npx standard-version --release --skip.tag=true --commit-all
22+
# Generate CHANGELOG and create a commit (see .versionrc.json)
23+
npx standard-version --release-as ${version}

0 commit comments

Comments
 (0)