Skip to content

Commit 44f6d16

Browse files
authored
2 parents 4ec1df8 + 827963a commit 44f6d16

File tree

2,619 files changed

+2248495
-2213759
lines changed

Some content is hidden

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

2,619 files changed

+2248495
-2213759
lines changed

.github/ISSUE_TEMPLATE/region.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,17 @@ body:
6969
7070
🚀 Checklist:
7171
72-
* [ ] Add region in [AWS_CDK_METADATA](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L1) (commented out).
73-
* [ ] Add region and zone id in [ROUTE_53_BUCKET_WEBSITE_ZONE_IDS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L40).
74-
* [ ] Add region and zone id in [EBS_ENV_ENDPOINT_HOSTED_ZONE_IDS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L77).
75-
* [ ] Add region and account in [ELBV2_ACCOUNTS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L116).
76-
* [ ] Add region and account in [DLC_REPOSITORY_ACCOUNTS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L149).
77-
* [ ] Add region and account in [APPMESH_ECR_ACCOUNTS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L174).
78-
* [ ] Add region and ARN in [CLOUDWATCH_LAMBDA_INSIGHTS_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L202) for `1.0.178.0`.
79-
* [ ] Add region and CIDR block address in [FIREHOSE_CIDR_BLOCKS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L498).
80-
* [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L529) for most recent version in `x86_64` and `arm64`.
81-
* [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L608) for most recent version in `x86_64` and `arm64`.
82-
* [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L689) for most recent version in `x86_64` and `arm64`.
83-
* [ ] 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`.
84-
* [ ] 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`.
85-
* [ ] 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)
72+
* [ ] Add region and zone id in [ROUTE_53_BUCKET_WEBSITE_ZONE_IDS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L7).
73+
* [ ] Add region and zone id in [EBS_ENV_ENDPOINT_HOSTED_ZONE_IDS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L48).
74+
* [ ] Add region and account in [ELBV2_ACCOUNTS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L124).
75+
* [ ] Add region and account in [DLC_REPOSITORY_ACCOUNTS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L158).
76+
* [ ] Add region and account in [APPMESH_ECR_ACCOUNTS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L190).
77+
* [ ] Add region and ARN in [CLOUDWATCH_LAMBDA_INSIGHTS_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L485).
78+
* [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L1245) for most recent version in `x86_64` and `arm64`.
79+
* [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L1804) for most recent version in `x86_64` and `arm64`.
80+
* [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L2364) for most recent version in `x86_64` and `arm64`.
81+
* [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_PYTHON_SDK_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L2885) for most recent version in `x86_64` and `arm64`.
82+
* [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_GENERIC_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L3482) for most recent version in `x86_64` and `arm64`.
83+
* [ ] Add region in [AWS_REGIONS_AND_RULES](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/lib/aws-entities.ts#L27).
84+
* [ ] Add partition info if the region is also a new partition in [PARTITION_MAP](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L88)
8785
* [ ] Run integ tests and update snapshots
Lines changed: 76 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: CDK Enums Auto Updater
22
on:
33
workflow_dispatch:
4-
schedule:
5-
- cron: '0 0 * * 1'
4+
schedule: # Runs every Monday at 1pm PT
5+
- cron: '0 13 * * 1'
66

77
jobs:
88
update-l2-enums:
@@ -25,44 +25,6 @@ jobs:
2525
- name: Install dependencies
2626
run: cd tools/@aws-cdk/enum-updater && yarn install --frozen-lockfile && yarn build
2727

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 'aws-cdk-automation@users.noreply.github.com'
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-
6628
- name: Identify Missing Values and Apply Code Changes
6729
run: |
6830
cd tools/@aws-cdk/enum-updater
@@ -80,46 +42,99 @@ jobs:
8042
- name: Commit & Push changes
8143
if: steps.git-check.outputs.changes == 'true'
8244
run: |
45+
# Enable command logging
46+
set -x
47+
48+
echo "=== Starting PR creation process ==="
49+
8350
# Iterate through each module directory that has changes
51+
echo "Storing original branch name..."
8452
git config --global user.name 'aws-cdk-automation'
8553
git config --global user.email 'aws-cdk-automation@users.noreply.github.com'
54+
55+
# Store the original branch name
56+
echo "Storing original branch name..."
57+
original_branch=$(git rev-parse --abbrev-ref HEAD)
58+
echo "Original branch: $original_branch"
59+
8660
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
61+
echo "=== Processing module: $module ==="
8762
moduleName=$(basename $module)
88-
63+
echo "Module name: $moduleName"
64+
65+
# Reset to clean state
66+
echo "Resetting to clean state..."
67+
git reset --hard HEAD
68+
git clean -fd
69+
8970
# Determine the correct path for the module
71+
echo "Determining module path..."
9072
if [[ -d "packages/aws-cdk-lib/$module" ]]; then
9173
modulePath="packages/aws-cdk-lib/$module"
74+
echo "Found module in aws-cdk-lib: $modulePath"
9275
elif [[ -d "packages/@aws-cdk/$module" ]]; then
9376
modulePath="packages/@aws-cdk/$module"
77+
echo "Found module in @aws-cdk: $modulePath"
9478
else
95-
echo "Cannot find module directory for $module"
79+
echo "ERROR: Cannot find module directory for $module"
9680
continue
9781
fi
98-
82+
9983
# Check for existing PR with the same name
100-
prExists=$(gh pr list --state open --search "feat(${moduleName#aws-}): add new enum values for ${moduleName#aws-}" --json number,title -q '.[].number')
101-
102-
# If a PR exists, close it and continue
84+
prExists=$(gh pr list --state open --search "chore(${moduleName#aws-}): add new enum values for ${moduleName#aws-}" --json number,title -q '.[].number')
85+
86+
# If a PR exists, close it
10387
if [[ -n "$prExists" ]]; then
104-
echo "PR already exists for module ${moduleName#aws-}, closing the existing PR."
105-
gh pr close "$prExists" --confirm # Close the PR by its number
88+
echo "Found existing PR #$prExists for module ${moduleName#aws-}, closing it..."
89+
gh pr close "$prExists" --confirm
90+
else
91+
echo "No existing PR found for ${moduleName#aws-}"
10692
fi
107-
108-
# Create a new branch for the module
109-
branchName="enum-update/${moduleName#aws-}"
110-
git checkout -b "$branchName"
11193

94+
# Create/switch to branch for the module
95+
branchName="enum-update/${moduleName#aws-}"
96+
echo "Creating/switching to branch: $branchName"
97+
git checkout -B "$branchName" $original_branch # -B forces branch creation/reset
98+
99+
# Re-run the update script for this specific module
100+
echo "Re-running update script..."
101+
echo "Current directory: $(pwd)"
102+
cd tools/@aws-cdk/enum-updater
103+
echo "Running update-missing-enums script..."
104+
./bin/update-missing-enums
105+
cd ../../..
106+
echo "Returned to: $(pwd)"
107+
108+
echo "Checking for changes after update..."
109+
git status
110+
112111
# Stage, commit, and push changes for the module
113-
git add "$modulePath" # Using the correct path
112+
echo "Staging changes for $modulePath"
113+
git add "$modulePath"
114+
115+
echo "Committing changes..."
114116
git commit -m "chore(${moduleName#aws-}): add new enum values for ${moduleName#aws-}"
115-
git push origin "$branchName"
116-
117-
# Create a new pull request
118-
gh pr create --title "chore(${moduleName#aws-}): add new enum values for ${moduleName#aws-}" \
119-
--body "This PR updates the enum values for ${moduleName#aws-}." \
120-
--base main \
121-
--head "$branchName" \
122-
--label "contribution/core,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test"
117+
118+
# Force push to overwrite any existing branch
119+
echo "Force pushing to remote..."
120+
git push -f origin "$branchName"
121+
122+
# Create a new pull request
123+
echo "Creating pull request..."
124+
gh pr create --title "chore(${moduleName#aws-}): add new enum values for ${moduleName#aws-}" \
125+
--body "This PR updates the enum values for ${moduleName#aws-}." \
126+
--base main \
127+
--head "$branchName" \
128+
--label "contribution/core,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test"
129+
130+
# Return to original branch
131+
echo "Returning to original branch: $original_branch"
132+
git checkout $original_branch
133+
134+
echo "=== Completed processing for module: $module ==="
123135
done
136+
137+
# Disable command logging
138+
set +x
124139
env:
125140
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: CDK Enums Static Mapping Updater
2+
on:
3+
workflow_dispatch:
4+
schedule: # Runs every Monday at 12am PT
5+
- cron: '0 0 * * 1'
6+
7+
jobs:
8+
update-l2-enums:
9+
if: github.repository == 'aws/aws-cdk'
10+
runs-on: ubuntu-latest
11+
permissions:
12+
contents: write
13+
pull-requests: write
14+
steps:
15+
- name: Check Out
16+
uses: actions/checkout@v4
17+
18+
- name: Set up Node
19+
uses: actions/setup-node@v4
20+
with:
21+
node-version: "*"
22+
env:
23+
NODE_OPTIONS: "--max-old-space-size=8196 --experimental-worker ${NODE_OPTIONS:-}"
24+
25+
- name: Install dependencies
26+
run: cd tools/@aws-cdk/enum-updater && yarn install --frozen-lockfile && yarn build
27+
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 'aws-cdk-automation@users.noreply.github.com'
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 -f 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 }}

.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,Y-JayKim,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,ykethan,aws-cdk-automation,dependabot[bot],mergify[bot]]'

.mergify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pull_request_rules:
6565
label:
6666
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|Y-JayKim)$
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|ykethan)$
6969
- -label~="contribution/core"
7070
- name: automatic merge
7171
actions:

CHANGELOG.v2.alpha.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
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.193.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.192.0-alpha.0...v2.193.0-alpha.0) (2025-04-30)
6+
7+
8+
### Features
9+
10+
* **pipes-targets-alpha:** support Amazon Data Firehose target ([#33860](https://github.com/aws/aws-cdk/issues/33860)) ([ebf1ea2](https://github.com/aws/aws-cdk/commit/ebf1ea2a57ec7876fffbe16eddac6b409ae79074))
11+
512
## [2.192.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.191.0-alpha.0...v2.192.0-alpha.0) (2025-04-24)
613

714

0 commit comments

Comments
 (0)