Skip to content

Commit 4aa9cf0

Browse files
authored
Merge branch 'main' into application-signals-slo
2 parents e0fe675 + 9e4c9a9 commit 4aa9cf0

File tree

1,778 files changed

+1438475
-447713
lines changed

Some content is hidden

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

1,778 files changed

+1438475
-447713
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.buck
1717
packages/@aws-cdk-testing/framework-integ/test/**/*.snapshot/**/asset*.zip filter=lfs diff=lfs merge=lfs -text
1818
packages/@aws-cdk/*-alpha/test/**/*.snapshot/**/asset*.zip filter=lfs diff=lfs merge=lfs -text
1919
packages/@aws-cdk/*-alpha/test/*.snapshot/asset.*/bootstrap filter=lfs diff=lfs merge=lfs -text
20+
packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-large-file/asset*/large* filter=lfs diff=lfs merge=lfs -text
21+
packages/@aws-cdk/*-alpha/test/*.snapshot/asset*.zip filter=lfs diff=lfs merge=lfs -text
22+
packages/@aws-cdk-testing/framework-integ/test/**/*.snapshot/asset*.zip filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/region.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,5 @@ body:
8383
* [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_PYTHON_SDK_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L768) for most recent version in `x86_64` and `arm64`.
8484
* [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_GENERIC_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L847) for most recent version in `x86_64` and `arm64`.
8585
* [ ] Add region in [AWS_REGIONS_AND_RULES](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/lib/aws-entities.ts).
86+
* [ ] Add partition info if the region is also a new partition in [PARTITION_MAP](https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L88)
8687
* [ ] Run integ tests and update snapshots

.github/workflows/codecov.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,20 @@ on:
66
pull_request:
77
branches: [ "main" ]
88

9+
permissions:
10+
contents: write # Required for actions/upload-pages-artifact
11+
pages: write # Required for actions/deploy-pages
12+
id-token: write # Required for actions/deploy-pages
13+
914
jobs:
1015
collect:
1116
name: collect
1217
if: github.repository == 'aws/aws-cdk'
1318
runs-on: ubuntu-latest
1419
permissions:
1520
id-token: write
21+
contents: read
22+
pages: write
1623
steps:
1724
- name: Checkout
1825
uses: actions/checkout@v4

.github/workflows/enum-auto-updater.yml

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: CDK Enums Auto Updater
22
on:
33
workflow_dispatch:
4+
schedule:
5+
- cron: '0 0 * * 1'
46

57
jobs:
68
update-l2-enums:
@@ -23,6 +25,44 @@ jobs:
2325
- name: Install dependencies
2426
run: cd tools/@aws-cdk/enum-updater && yarn install --frozen-lockfile && yarn build
2527

28+
- name: Update enum static mapping
29+
run: |
30+
cd tools/@aws-cdk/enum-updater
31+
./bin/update-static-enum-mapping
32+
33+
- name: Check for changes
34+
id: static-mapping-check
35+
run: |
36+
cd tools/@aws-cdk/enum-updater
37+
if [[ -n "$(git status --porcelain ./lib/static-enum-mapping.json)" ]]; then
38+
echo "changes=true" >> $GITHUB_OUTPUT
39+
else
40+
echo "changes=false" >> $GITHUB_OUTPUT
41+
fi
42+
43+
- name: Create PR for static mapping changes
44+
if: steps.static-mapping-check.outputs.changes == 'true'
45+
run: |
46+
cd tools/@aws-cdk/enum-updater
47+
git config --global user.name 'aws-cdk-automation'
48+
git config --global user.email '[email protected]'
49+
50+
# Create a new branch for the module
51+
branchName="enum-update/static-mapping-update"
52+
git checkout -b "$branchName"
53+
54+
git add . # Add all files changed
55+
git commit -m "chore: update enum static mapping"
56+
git push origin "$branchName"
57+
58+
gh pr create --title "chore: update enum static mapping" \
59+
--body "This PR updates the CDK enum mapping file." \
60+
--base main \
61+
--head "$branchName" \
62+
--label "contribution/core,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test"
63+
env:
64+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
65+
2666
- name: Identify Missing Values and Apply Code Changes
2767
run: |
2868
cd tools/@aws-cdk/enum-updater
@@ -40,10 +80,9 @@ jobs:
4080
- name: Commit & Push changes
4181
if: steps.git-check.outputs.changes == 'true'
4282
run: |
83+
# Iterate through each module directory that has changes
4384
git config --global user.name 'aws-cdk-automation'
4485
git config --global user.email '[email protected]'
45-
46-
# Iterate through each module directory that has changes
4786
for module in $(git diff --name-only | grep -E '^packages/(@aws-cdk|aws-cdk-lib)/.*' | sed -E 's|^packages/(@aws-cdk\|aws-cdk-lib)/([^/]+).*|\2|' | sort -u); do
4887
moduleName=$(basename $module)
4988
@@ -79,7 +118,7 @@ jobs:
79118
gh pr create --title "chore(${moduleName#aws-}): add new enum values for ${moduleName#aws-}" \
80119
--body "This PR updates the enum values for ${moduleName#aws-}." \
81120
--base main \
82-
--head "$branchName"
121+
--head "$branchName" \
83122
--label "contribution/core,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test"
84123
done
85124
env:

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

Lines changed: 1 addition & 1 deletion
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,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,aws-cdk-automation,dependabot[bot],mergify[bot]]'
20+
ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,Y-JayKim,aws-cdk-automation,dependabot[bot],mergify[bot]]'
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Security Guardian
2+
on:
3+
pull_request: {}
4+
5+
jobs:
6+
run-security-guardian:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Checkout
10+
uses: actions/checkout@v4
11+
with:
12+
fetch-depth: 0 # Fetches full history
13+
14+
- name: Get list of changed .template.json files
15+
id: filter_files
16+
run: |
17+
echo "Getting changed CloudFormation templates..."
18+
mkdir -p changed_templates
19+
20+
git fetch origin main --depth=1
21+
22+
base_sha="${{ github.event.pull_request.base.sha }}"
23+
head_sha="${{ github.event.pull_request.head.sha }}"
24+
if [[ -z "$base_sha" ]]; then base_sha=$(git merge-base origin/main HEAD); fi
25+
if [[ -z "$head_sha" ]]; then head_sha=HEAD; fi
26+
27+
git diff --name-status "$base_sha" "$head_sha" \
28+
| grep -E '^(A|M)\s+.*\.template\.json$' \
29+
| awk '{print $2}' > changed_files.txt || true
30+
31+
while IFS= read -r file; do
32+
if [ -f "$file" ]; then
33+
safe_name=$(echo "$file" | sed 's|/|_|g')
34+
cp "$file" "changed_templates/$safe_name"
35+
else
36+
echo "::warning::Changed file not found in workspace: $file"
37+
fi
38+
done < changed_files.txt
39+
40+
if [ -s changed_files.txt ]; then
41+
echo "files_changed=true" >> $GITHUB_OUTPUT
42+
else
43+
echo "files_changed=false" >> $GITHUB_OUTPUT
44+
fi
45+
46+
- name: Install cfn-guard
47+
if: steps.filter_files.outputs.files_changed == 'true'
48+
run: |
49+
mkdir -p $HOME/.local/bin
50+
curl -L -o cfn-guard.tar.gz https://github.com/aws-cloudformation/cloudformation-guard/releases/latest/download/cfn-guard-v3-x86_64-ubuntu-latest.tar.gz
51+
tar -xzf cfn-guard.tar.gz
52+
mv cfn-guard-v3-*/cfn-guard $HOME/.local/bin/cfn-guard
53+
chmod +x $HOME/.local/bin/cfn-guard
54+
echo "$HOME/.local/bin" >> $GITHUB_PATH
55+
56+
- name: Install & Build security-guardian
57+
if: steps.filter_files.outputs.files_changed == 'true'
58+
run: yarn install --frozen-lockfile && cd tools/@aws-cdk/security-guardian && yarn build
59+
60+
- name: Run cfn-guard if templates changed
61+
if: steps.filter_files.outputs.files_changed == 'true'
62+
uses: ./tools/@aws-cdk/security-guardian
63+
with:
64+
data_directory: './changed_templates'
65+
rule_set_path: './tools/@aws-cdk/security-guardian/rules/trust_scope_rules.guard'
66+
show_summary: 'fail'
67+
output_format: 'single-line-summary'

.mergify.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ pull_request_rules:
6363
- name: label core
6464
actions:
6565
label:
66-
add: [ contribution/core ]
66+
add: [contribution/core]
6767
conditions:
68-
- author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|TheRealAmazonKendra|mrgrain|pahud|ashishdhingra|kellertk|moelasmar|paulhcsun|GavinZZ|xazhao|gracelu0|shikha372|QuantumNeuralCoder|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere|jiayiwang7|saiyush|5d|iankhou|SimonCMoore)$
68+
- author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|TheRealAmazonKendra|mrgrain|pahud|ashishdhingra|kellertk|moelasmar|paulhcsun|GavinZZ|xazhao|gracelu0|shikha372|QuantumNeuralCoder|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere|jiayiwang7|saiyush|5d|iankhou|SimonCMoore|Y-JayKim)$
6969
- -label~="contribution/core"
7070
- name: automatic merge
7171
actions:
@@ -190,3 +190,14 @@ pull_request_rules:
190190
- "#changes-requested-reviews-by=0"
191191
- status-success~=AWS CodeBuild us-east-1
192192
- status-success=validate-pr
193+
priority_rules:
194+
- name: priority for queue `default-merge`
195+
conditions:
196+
- -label~=(blocked|do-not-merge)
197+
- label~=no-squash
198+
priority: 2500
199+
- name: priority for queue `priority-squash`
200+
conditions:
201+
- -label~=(blocked|do-not-merge|no-squash)
202+
- label~=priority-pr
203+
priority: 2250

CHANGELOG.v2.alpha.md

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,70 @@
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+
## [2.191.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.190.0-alpha.0...v2.191.0-alpha.0) (2025-04-22)
6+
7+
8+
### Features
9+
10+
* **location:** throw ValidationError instead of untyped errors ([#34174](https://github.com/aws/aws-cdk/issues/34174)) ([2ecf14a](https://github.com/aws/aws-cdk/commit/2ecf14a0c3e5a988532975536980d81589ea448e))
11+
* **msk:** throw ValidationError instead of untyped errors ([#34214](https://github.com/aws/aws-cdk/issues/34214)) ([02cb5a4](https://github.com/aws/aws-cdk/commit/02cb5a4284e9aad2f8cc4fc8fcb2c1aebe8f92be))
12+
13+
## [2.190.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.189.1-alpha.0...v2.190.0-alpha.0) (2025-04-16)
14+
15+
16+
### ⚠ BREAKING CHANGES TO EXPERIMENTAL FEATURES
17+
18+
* **ec2-alpha:** The logical ID for the NAT Gateway, defined using the `addNatGateways` method, will be changed, resulting in the NAT Gateway being recreated. Additionally, the domain for the Elastic IP (EIP) will be set to `vpc`, which will also trigger its recreation in the account.
19+
20+
### Features
21+
22+
* **ec2:** enabling features for ipv6 and dualstack support with corresponding unit tests ([#33898](https://github.com/aws/aws-cdk/issues/33898)) ([47a65db](https://github.com/aws/aws-cdk/commit/47a65dbf00ce2a866be2546dcca5be818db70824)), closes [#3873](https://github.com/aws/aws-cdk/issues/3873) [#33493](https://github.com/aws/aws-cdk/issues/33493) [#33493](https://github.com/aws/aws-cdk/issues/33493)
23+
* **ec2:** throw ValidationErrors instead of untyped Errors ([#34127](https://github.com/aws/aws-cdk/issues/34127)) ([93313dd](https://github.com/aws/aws-cdk/commit/93313dded1d719691689c6fb59d7a7a77bb7dade))
24+
* **neptune-alpha:** add engine versions up to v1.4.5.0 ([#33989](https://github.com/aws/aws-cdk/issues/33989)) ([07f1d0a](https://github.com/aws/aws-cdk/commit/07f1d0a9d381fb9bceab0f836a2f1eb7977610c7)), closes [#33807](https://github.com/aws/aws-cdk/issues/33807)
25+
26+
27+
### Bug Fixes
28+
29+
* **ec2-alpha:** add multiple NATGW to the VPC using addNatGateway method ([#34094](https://github.com/aws/aws-cdk/issues/34094)) ([ccd8de7](https://github.com/aws/aws-cdk/commit/ccd8de71c02068e43d36e2445dbb5e51f4aa695b))
30+
* **ec2-alpha:** update default config for Subnet's `assignIpv6AddressOnCreation` ([#34116](https://github.com/aws/aws-cdk/issues/34116)) ([dff2798](https://github.com/aws/aws-cdk/commit/dff279800edd9688fa5de04766ae2667472fe861))
31+
32+
## [2.189.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.189.0-alpha.0...v2.189.1-alpha.0) (2025-04-14)
33+
34+
## [2.189.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.188.0-alpha.0...v2.189.0-alpha.0) (2025-04-09)
35+
36+
37+
### Features
38+
39+
* **ec2-alpha:** implement mapPublicIpOnLaunch prop in SubnetV2 ([#34057](https://github.com/aws/aws-cdk/issues/34057)) ([836c5cf](https://github.com/aws/aws-cdk/commit/836c5cf3e4c627f817e4dc8ed2af28a5bba54792)), closes [#32159](https://github.com/aws/aws-cdk/issues/32159)
40+
41+
42+
### Bug Fixes
43+
44+
* **amplify:** unable to re-run integ test due to missing `status` field in `customRule` ([#33973](https://github.com/aws/aws-cdk/issues/33973)) ([6638c08](https://github.com/aws/aws-cdk/commit/6638c08d56afe7ecc4f23cff4cf334b887001e5e)), closes [#33962](https://github.com/aws/aws-cdk/issues/33962)
45+
46+
## [2.188.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.187.0-alpha.0...v2.188.0-alpha.0) (2025-04-03)
47+
48+
49+
### Features
50+
51+
* **ec2:** add mailmanager vpc endpoints ([#33996](https://github.com/aws/aws-cdk/issues/33996)) ([7ee77d7](https://github.com/aws/aws-cdk/commit/7ee77d71df569d21c280866976109333e3266132))
52+
* **eks-v2-alpha:** add new nodegroup ami type ([#34025](https://github.com/aws/aws-cdk/issues/34025)) ([864a7c6](https://github.com/aws/aws-cdk/commit/864a7c6f6811777971d1349e7552567604167f02))
53+
54+
55+
### Bug Fixes
56+
57+
* **ec2-alpha:** addInternetGW handles shared route table for subnets ([#33824](https://github.com/aws/aws-cdk/issues/33824)) ([3154d01](https://github.com/aws/aws-cdk/commit/3154d016ba31455f2d57ff5d90ee7b394c25e88f)), closes [#33672](https://github.com/aws/aws-cdk/issues/33672)
58+
59+
## [2.187.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.186.0-alpha.0...v2.187.0-alpha.0) (2025-03-31)
60+
61+
62+
### Features
63+
64+
* **apprunner:** throw ValidationError instead of untyped errors ([#33914](https://github.com/aws/aws-cdk/issues/33914)) ([38f89af](https://github.com/aws/aws-cdk/commit/38f89afe2ffdf67b0918e38f861166bdb0f8738f))
65+
* **ec2:** adding `placementGroup` to `LaunchTemplateProps` and `LaunchTemplate` ([#33726](https://github.com/aws/aws-cdk/issues/33726)) ([e5f71db](https://github.com/aws/aws-cdk/commit/e5f71db53ce985172e565eb9da5692d77ab7b268)), closes [#33721](https://github.com/aws/aws-cdk/issues/33721)
66+
* **ec2:** support the new `SupportedRegions` property for `AWS::EC2::VPCEndpointService` ([#33959](https://github.com/aws/aws-cdk/issues/33959)) ([0c77cb6](https://github.com/aws/aws-cdk/commit/0c77cb627e1e7e729205624a9603331f5442af8e))
67+
* **iot:** backfill enum values in iot module ([#33969](https://github.com/aws/aws-cdk/issues/33969)) ([2a8a8a3](https://github.com/aws/aws-cdk/commit/2a8a8a36ed872f7f3de4b24fd7d9c874a3da9dbf))
68+
569
## [2.186.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.185.0-alpha.0...v2.186.0-alpha.0) (2025-03-26)
670

771

0 commit comments

Comments
 (0)