Skip to content

Commit 3f43e62

Browse files
Merge branch 'main' into chore/lambda-advanced-log-format-validation
2 parents 0e45f05 + be24aa5 commit 3f43e62

File tree

286 files changed

+42996
-7870
lines changed

Some content is hidden

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

286 files changed

+42996
-7870
lines changed

.github/workflows/pr-linter.yml

Lines changed: 1 addition & 1 deletion
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/update-metadata-regions.yml

Lines changed: 1 addition & 1 deletion
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:

CONTRIBUTING.md

Lines changed: 42 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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/))

buildspec-pr.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ phases:
1414
# this also takes care of launching the docker daemon.
1515
- /root/ecr-proxy/start.sh
1616

17-
# CodeBuild always runs as root, allow npm to operate as such
18-
- npm config set unsafe-perm true
19-
2017
# Install yarn if it wasn't already present in the image
2118
- yarn --version || npm -g install yarn
2219

buildspec.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ phases:
1010
# this also takes care of launching the docker daemon.
1111
- /root/ecr-proxy/start.sh
1212

13-
# CodeBuild always runs as root, allow npm to operate as such
14-
- npm config set unsafe-perm true
15-
1613
# Install yarn if it wasn't already present in the image
1714
- yarn --version || npm -g install yarn
1815

docs/contribution_flow.png

-170 KB
Binary file not shown.

package.json

Lines changed: 5 additions & 5 deletions
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

Lines changed: 2 additions & 2 deletions
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-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/asset.8dd3f997ac74aa13ef09bc8bed060ecdbe3111898c6bbc0eb4f2130c9c53233b/index.js

Lines changed: 1 addition & 0 deletions
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-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
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-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/integ-dns-validated-certificate.assets.json

Lines changed: 6 additions & 6 deletions
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-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/integ-dns-validated-certificate.template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@
9696
"S3Bucket": {
9797
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
9898
},
99-
"S3Key": "fb83c347f6a5e3099f787c17ce0845a70a81fd83fdc20eb2e4e1cb01961a8774.zip"
99+
"S3Key": "8dd3f997ac74aa13ef09bc8bed060ecdbe3111898c6bbc0eb4f2130c9c53233b.zip"
100100
},
101+
"Handler": "index.certificateRequestHandler",
101102
"Role": {
102103
"Fn::GetAtt": [
103104
"CertificateCertificateRequestorFunctionServiceRoleC04C13DA",
104105
"Arn"
105106
]
106107
},
107-
"Handler": "index.certificateRequestHandler",
108108
"Runtime": "nodejs18.x",
109109
"Timeout": 900
110110
},

packages/@aws-cdk-testing/framework-integ/test/aws-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/integ.json

Lines changed: 1 addition & 1 deletion
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-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/integtestDefaultTestDeployAssert24D5C536.assets.json

Lines changed: 1 addition & 1 deletion
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-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/manifest.json

Lines changed: 4 additions & 2 deletions
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-certificatemanager/test/integ.dns-validated-certificate.js.snapshot/tree.json

Lines changed: 4 additions & 4 deletions
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-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.assets.json

Lines changed: 6 additions & 6 deletions
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-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
"S3Bucket": {
320320
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
321321
},
322-
"S3Key": "0b1f5aa55d045066ed91316b823a808060c12737e0575ab7cefe2335324108b0.zip"
322+
"S3Key": "e976a796f036a5efbf44b99e44cfb5a961df08d8dbf7cd37e60bf216fb982a00.zip"
323323
},
324324
"Environment": {
325325
"Variables": {

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
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-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/codepipelineelasticbeanstalkdeployDefaultTestDeployAssert785E452B.assets.json

Lines changed: 1 addition & 1 deletion
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-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/integ.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)