Skip to content

Commit 95a55b7

Browse files
shikha372shikha372
authored
Merge branch 'main' into automation/yarn-upgrade
2 parents 1eee15e + 58c2631 commit 95a55b7

12 files changed

+278
-83
lines changed

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

+8-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
- name: Check for changes
3434
id: static-mapping-check
3535
run: |
36+
cd tools/@aws-cdk/enum-updater
3637
if [[ -n "$(git status --porcelain ./lib/static-enum-mapping.json)" ]]; then
3738
echo "changes=true" >> $GITHUB_OUTPUT
3839
else
@@ -42,6 +43,7 @@ jobs:
4243
- name: Create PR for static mapping changes
4344
if: steps.static-mapping-check.outputs.changes == 'true'
4445
run: |
46+
cd tools/@aws-cdk/enum-updater
4547
git config --global user.name 'aws-cdk-automation'
4648
git config --global user.email '[email protected]'
4749
@@ -56,8 +58,10 @@ jobs:
5658
gh pr create --title "chore: update enum static mapping" \
5759
--body "This PR updates the CDK enum mapping file." \
5860
--base main \
59-
--head "$branchName"
61+
--head "$branchName" \
6062
--label "contribution/core,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test"
63+
env:
64+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6165

6266
- name: Identify Missing Values and Apply Code Changes
6367
run: |
@@ -77,6 +81,8 @@ jobs:
7781
if: steps.git-check.outputs.changes == 'true'
7882
run: |
7983
# Iterate through each module directory that has changes
84+
git config --global user.name 'aws-cdk-automation'
85+
git config --global user.email '[email protected]'
8086
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
8187
moduleName=$(basename $module)
8288
@@ -112,7 +118,7 @@ jobs:
112118
gh pr create --title "chore(${moduleName#aws-}): add new enum values for ${moduleName#aws-}" \
113119
--body "This PR updates the enum values for ${moduleName#aws-}." \
114120
--base main \
115-
--head "$branchName"
121+
--head "$branchName" \
116122
--label "contribution/core,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test"
117123
done
118124
env:

‎.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,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]]'

‎.mergify.yml

+1-1
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)$
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:

‎packages/aws-cdk-lib/aws-codebuild/lib/linux-arm-lambda-build-image.ts

+8
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,18 @@ export class LinuxArmLambdaBuildImage implements IBuildImage {
2323
public static readonly AMAZON_LINUX_2_NODE_18 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:nodejs18');
2424
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:nodejs20` build image. */
2525
public static readonly AMAZON_LINUX_2023_NODE_20 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:nodejs20');
26+
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:nodejs22` build image. */
27+
public static readonly AMAZON_LINUX_2023_NODE_22 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:nodejs22');
2628
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:python3.11` build image. */
2729
public static readonly AMAZON_LINUX_2_PYTHON_3_11 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:python3.11');
2830
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:python3.12` build image. */
2931
public static readonly AMAZON_LINUX_2023_PYTHON_3_12 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:python3.12');
32+
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:python3.13` build image. */
33+
public static readonly AMAZON_LINUX_2023_PYTHON_3_13 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:python3.13');
3034
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:ruby3.2` build image. */
3135
public static readonly AMAZON_LINUX_2_RUBY_3_2 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:ruby3.2');
36+
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:ruby3.4` build image. */
37+
public static readonly AMAZON_LINUX_2023_RUBY_3_4 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:ruby3.4');
3238
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:corretto21` build image. */
3339
public static readonly AMAZON_LINUX_2023_CORRETTO_21 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:corretto21');
3440
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:corretto17` build image. */
@@ -37,6 +43,8 @@ export class LinuxArmLambdaBuildImage implements IBuildImage {
3743
public static readonly AMAZON_LINUX_2_CORRETTO_11 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:corretto11');
3844
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:go1.21` build image. */
3945
public static readonly AMAZON_LINUX_2_GO_1_21 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:go1.21');
46+
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:go1.24` build image. */
47+
public static readonly AMAZON_LINUX_2023_GO_1_24 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:go1.24');
4048
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:dotnet6` build image. */
4149
public static readonly AMAZON_LINUX_2_DOTNET_6 = LinuxArmLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-aarch64-lambda-standard:dotnet6');
4250
/** The `aws/codebuild/amazonlinux-aarch64-lambda-standard:dotnet8` build image. */

‎packages/aws-cdk-lib/aws-codebuild/lib/linux-lambda-build-image.ts

+8
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,18 @@ export class LinuxLambdaBuildImage implements IBuildImage {
2323
public static readonly AMAZON_LINUX_2_NODE_18 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:nodejs18');
2424
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:nodejs20` build image. */
2525
public static readonly AMAZON_LINUX_2023_NODE_20 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:nodejs20');
26+
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:nodejs22` build image. */
27+
public static readonly AMAZON_LINUX_2023_NODE_22 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:nodejs22');
2628
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:python3.11` build image. */
2729
public static readonly AMAZON_LINUX_2_PYTHON_3_11 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:python3.11');
2830
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:python3.12` build image. */
2931
public static readonly AMAZON_LINUX_2023_PYTHON_3_12 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:python3.12');
32+
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:python3.13` build image. */
33+
public static readonly AMAZON_LINUX_2023_PYTHON_3_13 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:python3.13');
3034
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:ruby3.2` build image. */
3135
public static readonly AMAZON_LINUX_2_RUBY_3_2 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:ruby3.2');
36+
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:ruby3.4` build image. */
37+
public static readonly AMAZON_LINUX_2023_RUBY_3_4 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:ruby3.4');
3238
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:corretto21` build image. */
3339
public static readonly AMAZON_LINUX_2023_CORRETTO_21 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:corretto21');
3440
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:corretto17` build image. */
@@ -37,6 +43,8 @@ export class LinuxLambdaBuildImage implements IBuildImage {
3743
public static readonly AMAZON_LINUX_2_CORRETTO_11 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:corretto11');
3844
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:go1.21` build image. */
3945
public static readonly AMAZON_LINUX_2_GO_1_21 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:go1.21');
46+
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:go1.24` build image. */
47+
public static readonly AMAZON_LINUX_2023_GO_1_24 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:go1.24');
4048
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:dotnet6` build image. */
4149
public static readonly AMAZON_LINUX_2_DOTNET_6 = LinuxLambdaBuildImage.fromCodeBuildImageId('aws/codebuild/amazonlinux-x86_64-lambda-standard:dotnet6');
4250
/** The `aws/codebuild/amazonlinux-x86_64-lambda-standard:dotnet8` build image. */

‎packages/aws-cdk-lib/aws-rds/lib/cluster-engine.ts

+12
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,8 @@ export class AuroraMysqlEngineVersion {
561561
public static readonly VER_2_12_2 = AuroraMysqlEngineVersion.builtIn_5_7('2.12.2');
562562
/** Version "5.7.mysql_aurora.2.12.3". */
563563
public static readonly VER_2_12_3 = AuroraMysqlEngineVersion.builtIn_5_7('2.12.3');
564+
/** Version "5.7.mysql_aurora.2.12.4". */
565+
public static readonly VER_2_12_4 = AuroraMysqlEngineVersion.builtIn_5_7('2.12.4');
564566
/**
565567
* Version "8.0.mysql_aurora.3.01.0"
566568
* @deprecated Aurora MySQL 8.0.mysql_aurora.3.01.0 is no longer supported by Amazon RDS.
@@ -643,6 +645,8 @@ export class AuroraMysqlEngineVersion {
643645
public static readonly VER_3_08_0 = AuroraMysqlEngineVersion.builtIn_8_0('3.08.0');
644646
/** Version "8.0.mysql_aurora.3.08.1". */
645647
public static readonly VER_3_08_1 = AuroraMysqlEngineVersion.builtIn_8_0('3.08.1');
648+
/** Version "8.0.mysql_aurora.3.08.2". */
649+
public static readonly VER_3_08_2 = AuroraMysqlEngineVersion.builtIn_8_0('3.08.2');
646650

647651
/**
648652
* Create a new AuroraMysqlEngineVersion with an arbitrary version.
@@ -1026,6 +1030,8 @@ export class AuroraPostgresEngineVersion {
10261030
public static readonly VER_13_17 = AuroraPostgresEngineVersion.of('13.17', '13', { s3Import: true, s3Export: true });
10271031
/** Version "13.18". */
10281032
public static readonly VER_13_18 = AuroraPostgresEngineVersion.of('13.18', '13', { s3Import: true, s3Export: true });
1033+
/** Version "13.20". */
1034+
public static readonly VER_13_20 = AuroraPostgresEngineVersion.of('13.20', '13', { s3Import: true, s3Export: true });
10291035
/** Version "14.3". */
10301036
public static readonly VER_14_3 = AuroraPostgresEngineVersion.of('14.3', '14', { s3Import: true, s3Export: true });
10311037
/** Version "14.4". */
@@ -1052,6 +1058,8 @@ export class AuroraPostgresEngineVersion {
10521058
public static readonly VER_14_14 = AuroraPostgresEngineVersion.of('14.14', '14', { s3Import: true, s3Export: true });
10531059
/** Version "14.15". */
10541060
public static readonly VER_14_15 = AuroraPostgresEngineVersion.of('14.15', '14', { s3Import: true, s3Export: true });
1061+
/** Version "14.17". */
1062+
public static readonly VER_14_17 = AuroraPostgresEngineVersion.of('14.17', '14', { s3Import: true, s3Export: true });
10551063
/** Version "15.2". */
10561064
public static readonly VER_15_2 = AuroraPostgresEngineVersion.of('15.2', '15', { s3Import: true, s3Export: true });
10571065
/** Version "15.3". */
@@ -1070,6 +1078,8 @@ export class AuroraPostgresEngineVersion {
10701078
public static readonly VER_15_9 = AuroraPostgresEngineVersion.of('15.9', '15', { s3Import: true, s3Export: true });
10711079
/** Version "15.10". */
10721080
public static readonly VER_15_10 = AuroraPostgresEngineVersion.of('15.10', '15', { s3Import: true, s3Export: true });
1081+
/** Version "15.12". */
1082+
public static readonly VER_15_12 = AuroraPostgresEngineVersion.of('15.12', '15', { s3Import: true, s3Export: true });
10731083
/**
10741084
* Version "16.0"
10751085
* @deprecated Version 16.0 is no longer supported by Amazon RDS.
@@ -1091,6 +1101,8 @@ export class AuroraPostgresEngineVersion {
10911101
public static readonly VER_16_6 = AuroraPostgresEngineVersion.of('16.6', '16', { s3Import: true, s3Export: true });
10921102
/** Version "16.6 limitless" */
10931103
public static readonly VER_16_6_LIMITLESS = AuroraPostgresEngineVersion.of('16.6-limitless', '16', { s3Import: true, s3Export: true });
1104+
/** Version "16.8". */
1105+
public static readonly VER_16_8 = AuroraPostgresEngineVersion.of('16.8', '16', { s3Import: true, s3Export: true });
10941106
/** Version "17.1". */
10951107
public static readonly VER_17_1 = AuroraPostgresEngineVersion.of('17.1', '17', { s3Import: true, s3Export: true });
10961108
/** Version "17.2". */

0 commit comments

Comments
 (0)