Skip to content

Commit 5cd6dfa

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into merge-back/2.111.0
2 parents 2ccb59e + d5ef107 commit 5cd6dfa

File tree

612 files changed

+101551
-30274
lines changed

Some content is hidden

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

612 files changed

+101551
-30274
lines changed

‎.github/workflows/github-merit-badger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
1818
thresholds: '[0,3,6,13,25,50]'
1919
badge-type: 'achievement'
20-
ignore-usernames: '[rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,aws-cdk-automation,dependabot[bot],mergify[bot]]'
20+
ignore-usernames: '[rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,aws-cdk-automation,dependabot[bot],mergify[bot]]'

‎.github/workflows/pr-linter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- name: 'Download artifact'
3030
if: github.event_name == 'workflow_run'
31-
uses: actions/github-script@v6
31+
uses: actions/github-script@v7
3232
with:
3333
script: |
3434
let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({

‎.github/workflows/request-cli-integ-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020
- name: Find changed cli files
2121
id: changed-cli-files
22-
uses: tj-actions/changed-files@25ef3926d147cd02fc7e931c1ef50772bbb0d25d
22+
uses: tj-actions/changed-files@da093c1609db0edd0a037ce9664e135f74bf30d9
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |

‎.github/workflows/update-metadata-regions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
2020
status=$(curl -s -o /dev/null -w "%{http_code}" $URL)
2121
echo "STATUS=${status}" >> "$GITHUB_OUTPUT"
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- uses: actions/github-script@v7
2424
if: ${{ steps.download.outputs.STATUS == 200 }}
2525
env:

‎.mergify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pull_request_rules:
1111
label:
1212
add: [ contribution/core ]
1313
conditions:
14-
- author~=^(rix0rrr|MrArnoldPalmer|iliapolo|otaviomacedo|madeline-k|kaizencc|comcalvi|corymhall|peterwoodworth|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton)$
14+
- author~=^(rix0rrr|MrArnoldPalmer|iliapolo|otaviomacedo|madeline-k|kaizencc|comcalvi|corymhall|peterwoodworth|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar)$
1515
- -label~="contribution/core"
1616
- name: automatic merge
1717
actions:

‎CONTRIBUTING.md

+42-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,47 @@ let us know if it's not up-to-date (even better, submit a PR with your correcti
4848
- [Related Repositories](#related-repositories)
4949

5050
## Contribution Workflow Diagram
51-
![A workflow diagram for contributing code to the aws-cdk ecosytem](./docs/contribution_flow.png)
51+
```mermaid
52+
flowchart TD
53+
A(Identify Desired Functionality) --> B(Search For Existing Artifacts)
54+
B --> C[External Packages]
55+
B --> D[Relevant Issues And PRs]
56+
C --> E{"Does A High Quality
57+
Solution Exist?"}
58+
D --> F{"Is There A PR In Progress"}
59+
E --> |Yes| G(("Ask How You
60+
Can Help"))
61+
F --> |Yes| G
62+
E --> |No| H(Evaluate Where To Contribute)
63+
F --> |No| H
64+
H --> I{"Is There Clear Evidence
65+
For Inclusion In AWS-CDK"}
66+
I --> |Yes| subEvidence
67+
I --> |No| J{"Do You Want To Pursue Eventual
68+
Inclusion In AWS-CDK"}
69+
J --> |No| L(("Create Private
70+
Implementation"))
71+
J --> |Yes| K((Publish A Package))
72+
subEvidence --> M(Make Pull Request)
73+
M --> N{"Passes CI Checks, Linters,
74+
And Follows Design Guidelines"}
75+
N --> O(Review)
76+
O --> |Accepted| R(Hooray!)
77+
O --> P(Changes Requested)
78+
P --> Q(Make Changes)
79+
Q --> O
80+
O --> |Refused| K
81+
82+
subgraph subEvidence[Gather Evidence]
83+
direction LR
84+
engagement[Engagement from Multiple users]
85+
core[Intersects With Core Framework Concerns]
86+
quality["Clear, Well Defined, Solution With
87+
Limited Scope And Clear Boundaries"]
88+
external[External Packages]
89+
issues[Relevant Issues And PRs]
90+
end
91+
```
5292

5393
## Where to Contribute
5494

@@ -106,7 +146,7 @@ The following tools need to be installed on your system prior to installing the
106146
- We recommend using a version in [Active LTS](https://nodejs.org/en/about/releases/)
107147
- [Yarn >= 1.19.1, < 2](https://yarnpkg.com/lang/en/docs/install)
108148
- [.NET SDK >= 6.0.x](https://www.microsoft.com/net/download)
109-
- [Python >= 3.6.5, < 4.0](https://www.python.org/downloads/release/python-365/)
149+
- [Python >= 3.8.0, < 4.0](https://www.python.org/downloads/release/python-380/)
110150
- [Docker >= 19.03](https://docs.docker.com/get-docker/)
111151
- the Docker daemon must also be running
112152

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The CDK is available in the following languages:
2323

2424
* JavaScript, TypeScript ([Node.js ≥ 14.15.0](https://nodejs.org/download/release/latest-v14.x/))
2525
* We recommend using a version in [Active LTS](https://nodejs.org/en/about/previous-releases)
26-
* Python ([Python ≥ 3.6](https://www.python.org/downloads/))
26+
* Python ([Python ≥ 3.8](https://www.python.org/downloads/))
2727
* Java ([Java ≥ 8](https://www.oracle.com/technetwork/java/javase/downloads/index.html) and [Maven ≥ 3.5.4](https://maven.apache.org/download.cgi))
2828
* .NET ([.NET ≥ 6.0](https://dotnet.microsoft.com/download))
2929
* Go ([Go ≥ 1.16.4](https://golang.org/))

‎docs/contribution_flow.png

-170 KB
Binary file not shown.

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
"@types/node": "18.11.19",
2020
"@types/prettier": "2.6.0",
2121
"@yarnpkg/lockfile": "^1.1.0",
22-
"aws-sdk-js-codemod": "^0.26.2",
23-
"cdk-generate-synthetic-examples": "^0.1.295",
22+
"aws-sdk-js-codemod": "^0.28.2",
23+
"cdk-generate-synthetic-examples": "^0.1.297",
2424
"conventional-changelog-cli": "^2.2.2",
2525
"fs-extra": "^9.1.0",
2626
"graceful-fs": "^4.2.11",
2727
"jest-junit": "^13.2.0",
28-
"jsii-diff": "1.91.0",
29-
"jsii-pacmak": "1.91.0",
30-
"jsii-reflect": "1.91.0",
28+
"jsii-diff": "1.92.0",
29+
"jsii-pacmak": "1.92.0",
30+
"jsii-reflect": "1.92.0",
3131
"jsii-rosetta": "~5.2.2",
3232
"lerna": "^7.4.2",
3333
"nx": "^16.10.0",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
},
4040
"dependencies": {
4141
"@octokit/rest": "^18.12.0",
42-
"aws-sdk": "^2.1492.0",
43-
"axios": "^1.6.0",
42+
"aws-sdk": "^2.1498.0",
43+
"axios": "^1.6.2",
4444
"fs-extra": "^9.1.0",
4545
"glob": "^7.2.3",
4646
"jest": "^29.7.0",

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.request-authorizer.lit.js.snapshot/RequestAuthorizerInteg.template.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
"UpdateReplacePolicy": "Retain",
189189
"DeletionPolicy": "Retain"
190190
},
191-
"MyRestApiDeploymentB555B582d83364d66d67f510f848797cd89349d5": {
191+
"MyRestApiDeploymentB555B58276a4103e7ef38befb395a9ace5fdce44": {
192192
"Type": "AWS::ApiGateway::Deployment",
193193
"Properties": {
194194
"Description": "Automatically created by the RestApi construct",
@@ -208,7 +208,7 @@
208208
"Type": "AWS::ApiGateway::Stage",
209209
"Properties": {
210210
"DeploymentId": {
211-
"Ref": "MyRestApiDeploymentB555B582d83364d66d67f510f848797cd89349d5"
211+
"Ref": "MyRestApiDeploymentB555B58276a4103e7ef38befb395a9ace5fdce44"
212212
},
213213
"RestApiId": {
214214
"Ref": "MyRestApi2D1F47A9"
@@ -306,6 +306,7 @@
306306
"MyAuthorizer6575980E": {
307307
"Type": "AWS::ApiGateway::Authorizer",
308308
"Properties": {
309+
"AuthorizerResultTtlInSeconds": 300,
309310
"AuthorizerUri": {
310311
"Fn::Join": [
311312
"",
@@ -366,6 +367,7 @@
366367
"MySecondAuthorizer25A69B96": {
367368
"Type": "AWS::ApiGateway::Authorizer",
368369
"Properties": {
370+
"AuthorizerResultTtlInSeconds": 300,
369371
"AuthorizerUri": {
370372
"Fn::Join": [
371373
"",

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.token-authorizer-iam-role.js.snapshot/TokenAuthorizerIAMRoleInteg.template.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
"Arn"
8080
]
8181
},
82+
"AuthorizerResultTtlInSeconds": 300,
8283
"AuthorizerUri": {
8384
"Fn::Join": [
8485
"",
@@ -233,7 +234,7 @@
233234
"UpdateReplacePolicy": "Retain",
234235
"DeletionPolicy": "Retain"
235236
},
236-
"MyRestApiDeploymentB555B582694e8eb3fdb7b5f988ba347d35601979": {
237+
"MyRestApiDeploymentB555B58259401a546b13c99de2d05e5e255a9ede": {
237238
"Type": "AWS::ApiGateway::Deployment",
238239
"Properties": {
239240
"Description": "Automatically created by the RestApi construct",
@@ -251,7 +252,7 @@
251252
"Type": "AWS::ApiGateway::Stage",
252253
"Properties": {
253254
"DeploymentId": {
254-
"Ref": "MyRestApiDeploymentB555B582694e8eb3fdb7b5f988ba347d35601979"
255+
"Ref": "MyRestApiDeploymentB555B58259401a546b13c99de2d05e5e255a9ede"
255256
},
256257
"RestApiId": {
257258
"Ref": "MyRestApi2D1F47A9"

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.token-authorizer.js.snapshot/TokenAuthorizerInteg.template.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
"MyAuthorizer6575980E": {
9797
"Type": "AWS::ApiGateway::Authorizer",
9898
"Properties": {
99+
"AuthorizerResultTtlInSeconds": 600,
99100
"AuthorizerUri": {
100101
"Fn::Join": [
101102
"",
@@ -208,7 +209,7 @@
208209
"UpdateReplacePolicy": "Retain",
209210
"DeletionPolicy": "Retain"
210211
},
211-
"MyRestApiDeploymentB555B582e0e53f2547b469b538202de55968eaf0": {
212+
"MyRestApiDeploymentB555B5827a9cde8f137f97e5aa74fca164d09d74": {
212213
"Type": "AWS::ApiGateway::Deployment",
213214
"Properties": {
214215
"Description": "Automatically created by the RestApi construct",
@@ -226,7 +227,7 @@
226227
"Type": "AWS::ApiGateway::Stage",
227228
"Properties": {
228229
"DeploymentId": {
229-
"Ref": "MyRestApiDeploymentB555B582e0e53f2547b469b538202de55968eaf0"
230+
"Ref": "MyRestApiDeploymentB555B5827a9cde8f137f97e5aa74fca164d09d74"
230231
},
231232
"RestApiId": {
232233
"Ref": "MyRestApi2D1F47A9"

‎packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.token-authorizer.ts

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const authorizerFn = new lambda.Function(stack, 'MyAuthorizerFunction', {
1616

1717
const authorizer = new TokenAuthorizer(stack, 'MyAuthorizer', {
1818
handler: authorizerFn,
19+
resultsCacheTtl: Duration.minutes(10),
1920
});
2021

2122
const restapi = new RestApi(stack, 'MyRestApi', {

‎packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/awscdkeksclusterDefaultTestDeployAssertFBF4B356.assets.json renamed to ‎packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup-selection.js.snapshot/BackupSelectionTestDefaultTestDeployAssertA837BB17.assets.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.js.snapshot/awscdkclusteralbcontrollerDefaultTestDeployAssert78AE94CA.template.json renamed to ‎packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup-selection.js.snapshot/BackupSelectionTestDefaultTestDeployAssertA837BB17.template.json

File renamed without changes.

‎packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup-selection.js.snapshot/cdk-backup-selection.assets.json

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)