Skip to content

Commit d19d968

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into add-elasticbeanstalk-record-target
2 parents 94b9638 + c4ba858 commit d19d968

398 files changed

Lines changed: 15806 additions & 4183 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.

‎.gitallowed‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ account: '856666278305'
2323
account: '840364872350'
2424
account: '422531588944'
2525
account: '924023996002'
26+
account: '919366029133' #cn-north-1
27+
account: '919830735681' #cn-northwest-1
2628

2729
# The account IDs of password rotation applications of Serverless Application Repository
2830
# https://docs.aws.amazon.com/secretsmanager/latest/userguide/enable-rotation-rds.html

‎.github/workflows/README.md‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# AWS CDK GitHub Actions
2+
3+
These workflows and actions are configured in the AWS CDK GitHub repository.
4+
5+
## Pull Request Triggered
6+
7+
### Auto Approve
8+
[auto-approve.yml](auto-approve.yml): Approves merging PRs with the
9+
`pr/auto-approve` label.
10+
Owner: Core CDK team
11+
12+
### PR Linter
13+
[pr-linter.yml](pr-linter.yml): Runs `tools/@aws-cdk-prlint` on each PR to
14+
check for correctness.
15+
Owner: Core CDK team
16+
17+
### v2-main PR automation
18+
[v2-pull-request.yml](v2-pull-request.yml): Runs `pkglint` on merge forward PRs
19+
and commits the results.
20+
Owner: Core CDK team
21+
22+
### Label Assigner
23+
[issue-label-assign.yml](issue-label-assign.yml): Github action for automatically adding labels and/or setting assignees when an Issue or PR is opened or edited based on user-defined Area
24+
Owner: CDK support team
25+
26+
## Issue Triggered
27+
28+
### Closed Issue Message
29+
[closed-issue-message.yml](closed-issue-message.yml): Adds a reminder message
30+
to issues that are closed.
31+
Owner: CDK support team
32+
33+
### Label Assigner
34+
[issue-label-assign.yml](issue-label-assign.yml): Github action for automatically adding labels and/or setting assignees when an Issue or PR is opened or edited based on user-defined Area
35+
Owner: CDK support team
36+
37+
## Scheduled Actions
38+
39+
### Issue Lifecycle Handling
40+
[close-stale-issues.yml](close-stale-issues.yml): Handles labeling issues and
41+
PRs with `closing-soon`, `response-requested`, etc.
42+
Owner: CDK support team
43+
44+
### Yarn Upgrader
45+
[yarn-upgrade.yml](yarn-upgrade.yml): Upgrades yarn dependencies and creates a
46+
patch file for downloading.
47+
Owner: Core CDK team

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ on:
88
jobs:
99
auto-approve:
1010
if: >
11-
contains(github.event.pull_request.labels.*.name, 'pr/auto-approve') &&
12-
(github.event.pull_request.user.login == 'aws-cdk-automation'
13-
|| github.event.pull_request.user.login == 'dependabot[bot]'
14-
|| github.event.pull_request.user.login == 'dependabot-preview[bot]')
11+
github.event.pull_request.user.login == 'dependabot[bot]'
12+
|| github.event.pull_request.user.login == 'dependabot-preview[bot]'
13+
|| (contains(github.event.pull_request.labels.*.name, 'pr/auto-approve')
14+
&& github.event.pull_request.user.login == 'aws-cdk-automation')
1515
runs-on: ubuntu-latest
1616
permissions:
1717
pull-requests: write

‎.github/workflows/close-stale-issues.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: "Close Stale Issues"
44
on:
55
workflow_dispatch:
66
schedule:
7-
- cron: "0 6 * * *"
7+
- cron: "0 */4 * * *"
88

99
jobs:
1010
cleanup:

‎.github/workflows/issue-label-assign.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
test:
1212
permissions:
1313
issues: write
14+
pull-requests: write
1415
runs-on: ubuntu-latest
1516
steps:
1617
- uses: peterwoodworth/issue-action@main
@@ -23,6 +24,7 @@ jobs:
2324
{"area":"@aws-cdk/alexa-ask","keywords":["alexa-ask","alexa", "cfnskill"],"labels":["@aws-cdk/alexa-ask"],"assignees":["madeline-k"]},
2425
{"area":"@aws-cdk/app-delivery","keywords":["app-delivery","PipelineDeployStackAction"],"labels":["@aws-cdk/app-delivery"],"assignees":["skinny85"]},
2526
{"area":"@aws-cdk/assert","keywords":["assert"],"labels":["@aws-cdk/assert"],"assignees":["nija-at"]},
27+
{"area":"@aws-cdk/assertions","keywords":["assertions"],"labels":["@aws-cdk/assertions"],"assignees":["nija-at"]},
2628
{"area":"@aws-cdk/assets","keywords":["assets","staging"],"labels":["@aws-cdk/assets"],"assignees":["eladb"]},
2729
{"area":"@aws-cdk/aws-accessanalyzer","keywords":["aws-accessanalyzer","accessanalyzer","cfnanalyzer"],"labels":["@aws-cdk/aws-accessanalyzer"],"assignees":["skinny85"]},
2830
{"area":"@aws-cdk/aws-acmpca","keywords":["aws-acmpca","acmpca","certificateauthority"],"labels":["@aws-cdk/aws-acmpca"],"assignees":["skinny85"]},
@@ -55,7 +57,7 @@ jobs:
5557
{"area":"@aws-cdk/aws-certificatemanager","keywords":["aws-certificatemanager","certificate-manager","dnsvalidatedcertificate","acm"],"labels":["@aws-cdk/aws-certificatemanager"],"assignees":["njlynch"]},
5658
{"area":"@aws-cdk/aws-chatbot","keywords":["aws-chatbot","chatbot","slackchannelconfiguration"],"labels":["@aws-cdk/aws-chatbot"],"assignees":["kaizen3031593"]},
5759
{"area":"@aws-cdk/aws-cloud9","keywords":["aws-cloud9","cloud 9","ec2environment"],"labels":["@aws-cdk/aws-cloud9"],"assignees":["skinny85"]},
58-
{"area":"@aws-cdk/aws-cloudformation","keywords":["aws-cloudformation","nestedstack","customresource"],"labels":["@aws-cdk/aws-cloudformation"],"assignees":["rix0rrr"]},
60+
{"area":"@aws-cdk/aws-cloudformation","keywords":["aws-cloudformation","nestedstack"],"labels":["@aws-cdk/aws-cloudformation"],"assignees":["rix0rrr"]},
5961
{"area":"@aws-cdk/aws-cloudfront","keywords":["aws-cloudfront","cloud front","cachepolicy","cloudfrontwebdistribution"],"labels":["@aws-cdk/aws-cloudfront"],"assignees":["njlynch"]},
6062
{"area":"@aws-cdk/aws-cloudfront-origins","keywords":["aws-cloudfront-origins","cloudfront origins"],"labels":["@aws-cdk/aws-cloudfront-origins"],"assignees":["njlynch"]},
6163
{"area":"@aws-cdk/aws-cloudtrail","keywords":["aws-cloudtrail","cloud trail","trail"],"labels":["@aws-cdk/aws-cloudtrail"],"assignees":["rix0rrr"]},
@@ -67,8 +69,8 @@ jobs:
6769
{"area":"@aws-cdk/aws-codedeploy","keywords":["aws-codedeploy","code-deploy","customlambdadeploymentconfig","ecsapplication","lambdaapplication","lambdadeploymentgroup","serverapplication"],"labels":["@aws-cdk/aws-codedeploy"],"assignees":["skinny85"]},
6870
{"area":"@aws-cdk/aws-codeguruprofiler","keywords":["aws-codeguruprofiler","codeguru-profiler","profilinggroup"],"labels":["@aws-cdk/aws-codeguruprofiler"],"assignees":["skinny85"]},
6971
{"area":"@aws-cdk/aws-codegurureviewer","keywords":["aws-codegurureviewer","codeguru-reviewer"],"labels":["@aws-cdk/aws-codegurureviewer"],"assignees":["skinny85"]},
70-
{"area":"@aws-cdk/aws-codepipeline","keywords":["aws-codepipeline","code-pipeline","pipeline"],"labels":["@aws-cdk/aws-codepipeline"],"assignees":["skinny85"]},
71-
{"area":"@aws-cdk/aws-codepipeline-actions","keywords":["aws-codepipeline-actions","codepipeline actions","jenkinsprovider"],"labels":["@aws-cdk/aws-codepipeline-actions"],"assignees":["skinny85"]},
72+
{"area":"@aws-cdk/aws-codepipeline","keywords":["aws-codepipeline","code-pipeline"],"labels":["@aws-cdk/aws-codepipeline"],"assignees":["skinny85"]},
73+
{"area":"@aws-cdk/aws-codepipeline-actions","keywords":["aws-codepipeline-actions","codepipeline-actions","jenkinsprovider"],"labels":["@aws-cdk/aws-codepipeline-actions"],"assignees":["skinny85"]},
7274
{"area":"@aws-cdk/aws-codestar","keywords":["aws-codestar","codestar","githubrepository"],"labels":["@aws-cdk/aws-codestar"],"assignees":["skinny85"]},
7375
{"area":"@aws-cdk/aws-codestarconnections","keywords":["aws-codestarconnections","codestar-connections"],"labels":["@aws-cdk/aws-codestarconnections"],"assignees":["skinny85"]},
7476
{"area":"@aws-cdk/aws-codestarnotifications","keywords":["aws-codestarnotifications","codestar-notifications"],"labels":["@aws-cdk/aws-codestarnotifications"],"assignees":["skinny85"]},

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ yarn-error.log
4545
.nzm-*
4646

4747
/.versionrc.json
48+
RELEASE_NOTES.md

‎.mergify.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
# See https://doc.mergify.io
2+
queue_rules:
3+
- name: default
4+
conditions:
5+
- status-success~=AWS CodeBuild us-east-1
26

37
pull_request_rules:
48
- name: label core
59
actions:
610
label:
711
add: [ contribution/core ]
812
conditions:
9-
- 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)$
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)$
1014
- -label~="contribution/core"
1115
- name: automatic merge
1216
actions:
1317
comment:
1418
message: Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
15-
merge:
16-
strict: smart
19+
queue:
20+
name: default
1721
method: squash
18-
strict_method: merge
1922
commit_message: title+body
2023
conditions:
2124
- base!=release

‎.yarnrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
11
--install.check-files true # install will verify file tree of packages for consistency
2+
3+
# Use the npm registry instead of yarns mirror.
4+
# npm treats registry.npmjs.org as a special value that means 'the current
5+
# configured package' in package-lock and npm-shrinkwrap. if we use
6+
# registry.yarnpkg.com in our shrinkwrap then users with a custom registry will
7+
# be forced to registry.yarnpkg.com.
8+
# https://github.com/npm/cli/issues/3783
9+
registry "https://registry.npmjs.org"
10+
ignore-engines true # the 'engines' key for 'aws-cdk-lib' has specifies node14 as min while v1 will remain at node10

0 commit comments

Comments
 (0)