Skip to content

Commit 5cc82bc

Browse files
paulhcsunpaulhcsun
authored
Merge branch 'main' into chore-ec2-instance-types
2 parents 35d8f0b + bf33efd commit 5cc82bc

8 files changed

Lines changed: 759 additions & 191 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
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@800a2825992141ddde1a8bca8ad394cec34d3188
22+
uses: tj-actions/changed-files@aa08304bd477b800d468db44fe10f6c61f7f7b11
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |

‎packages/@aws-cdk/cloudformation-diff/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
"license": "Apache-2.0",
2525
"dependencies": {
26-
"@aws-cdk/aws-service-spec": "^0.0.52",
27-
"@aws-cdk/service-spec-types": "^0.0.52",
26+
"@aws-cdk/aws-service-spec": "^0.0.53",
27+
"@aws-cdk/service-spec-types": "^0.0.53",
2828
"chalk": "^4",
2929
"diff": "^5.2.0",
3030
"fast-deep-equal": "^3.1.3",

‎packages/@aws-cdk/integ-runner/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"@aws-cdk/cloud-assembly-schema": "0.0.0",
7575
"@aws-cdk/cloudformation-diff": "0.0.0",
7676
"@aws-cdk/cx-api": "0.0.0",
77-
"@aws-cdk/aws-service-spec": "^0.0.52",
77+
"@aws-cdk/aws-service-spec": "^0.0.53",
7878
"cdk-assets": "0.0.0",
7979
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
8080
"aws-cdk": "0.0.0",

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

Lines changed: 63 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,11 @@ export class AuroraMysqlEngineVersion {
325325
* @deprecated Version 5.7.12 is no longer supported by Amazon RDS.
326326
*/
327327
public static readonly VER_5_7_12 = AuroraMysqlEngineVersion.builtIn_5_7('12', false);
328+
/**
329+
* Version "5.7.mysql_aurora.2.02.3"
330+
* @deprecated Version 5.7.mysql_aurora.2.02.3 is no longer supported by Amazon RDS.
331+
*/
332+
public static readonly VER_2_02_3 = AuroraMysqlEngineVersion.builtIn_5_7('2.02.3');
328333
/**
329334
* Version "5.7.mysql_aurora.2.03.2".
330335
* @deprecated Version 5.7.mysql_aurora.2.03.2 is no longer supported by Amazon RDS.
@@ -385,11 +390,21 @@ export class AuroraMysqlEngineVersion {
385390
* @deprecated Version 5.7.mysql_aurora.2.04.8 is no longer supported by Amazon RDS.
386391
*/
387392
public static readonly VER_2_04_8 = AuroraMysqlEngineVersion.builtIn_5_7('2.04.8');
393+
/**
394+
* Version "5.7.mysql_aurora.2.04.9"
395+
* @deprecated Version 5.7.mysql_aurora.2.04.9 is no longer supported by Amazon RDS.
396+
*/
397+
public static readonly VER_2_04_9 = AuroraMysqlEngineVersion.builtIn_5_7('2.04.9');
388398
/**
389399
* Version "5.7.mysql_aurora.2.05.0".
390400
* @deprecated Version 5.7.mysql_aurora.2.05.0 is no longer supported by Amazon RDS.
391401
*/
392402
public static readonly VER_2_05_0 = AuroraMysqlEngineVersion.builtIn_5_7('2.05.0');
403+
/**
404+
* Version "5.7.mysql_aurora.2.05.1"
405+
* @deprecated Version 5.7.mysql_aurora.2.05.1 is no longer supported by Amazon RDS.
406+
*/
407+
public static readonly VER_2_05_1 = AuroraMysqlEngineVersion.builtIn_5_7('2.05.1');
393408
/**
394409
* Version "5.7.mysql_aurora.2.06.0".
395410
* @deprecated Version 5.7.mysql_aurora.2.06.0 is no longer supported by Amazon RDS.
@@ -510,8 +525,8 @@ export class AuroraMysqlEngineVersion {
510525
*/
511526
public static readonly VER_2_10_3 = AuroraMysqlEngineVersion.builtIn_5_7('2.10.3');
512527
/**
513-
* Version "5.7.mysql_aurora.2.11.0".
514-
* This version isn't available for new creations.
528+
* Version "5.7.mysql_aurora.2.11.0"
529+
* @deprecated Version 5.7.mysql_aurora.2.11.0 is no longer supported by Amazon RDS.
515530
*/
516531
public static readonly VER_2_11_0 = AuroraMysqlEngineVersion.builtIn_5_7('2.11.0');
517532
/** Version "5.7.mysql_aurora.2.11.1". */
@@ -524,6 +539,8 @@ export class AuroraMysqlEngineVersion {
524539
public static readonly VER_2_11_4 = AuroraMysqlEngineVersion.builtIn_5_7('2.11.4');
525540
/** Version "5.7.mysql_aurora.2.12.0". */
526541
public static readonly VER_2_12_0 = AuroraMysqlEngineVersion.builtIn_5_7('2.12.0');
542+
/** Version "5.7.mysql_aurora.2.12.1". */
543+
public static readonly VER_2_12_1 = AuroraMysqlEngineVersion.builtIn_5_7('2.12.1');
527544
/** Version "8.0.mysql_aurora.3.01.0". */
528545
public static readonly VER_3_01_0 = AuroraMysqlEngineVersion.builtIn_8_0('3.01.0');
529546
/** Version "8.0.mysql_aurora.3.01.1". */
@@ -540,16 +557,28 @@ export class AuroraMysqlEngineVersion {
540557
public static readonly VER_3_03_0 = AuroraMysqlEngineVersion.builtIn_8_0('3.03.0');
541558
/** Version "8.0.mysql_aurora.3.03.1". */
542559
public static readonly VER_3_03_1 = AuroraMysqlEngineVersion.builtIn_8_0('3.03.1');
560+
/** Version "8.0.mysql_aurora.3.03.2". */
561+
public static readonly VER_3_03_2 = AuroraMysqlEngineVersion.builtIn_8_0('3.03.2');
562+
/** Version "8.0.mysql_aurora.3.03.3". */
563+
public static readonly VER_3_03_3 = AuroraMysqlEngineVersion.builtIn_8_0('3.03.3');
543564
/** Version "8.0.mysql_aurora.3.04.0". */
544565
public static readonly VER_3_04_0 = AuroraMysqlEngineVersion.builtIn_8_0('3.04.0');
545566
/** Version "8.0.mysql_aurora.3.04.1". */
546567
public static readonly VER_3_04_1 = AuroraMysqlEngineVersion.builtIn_8_0('3.04.1');
547-
/** Version "8.0.mysql_aurora.3.05.0". */
568+
/**
569+
* Version "8.0.mysql_aurora.3.05.0"
570+
* @deprecated Aurora MySQL 8.0.mysql_aurora.3.05.0 is no longer supported by Amazon RDS.
571+
*/
548572
public static readonly VER_3_05_0 = AuroraMysqlEngineVersion.builtIn_8_0('3.05.0');
549-
/** Version "8.0.mysql_aurora.3.05.1". */
573+
/**
574+
* Version "8.0.mysql_aurora.3.05.1"
575+
* @deprecated Aurora MySQL 8.0.mysql_aurora.3.05.1 is no longer supported by Amazon RDS.
576+
*/
550577
public static readonly VER_3_05_1 = AuroraMysqlEngineVersion.builtIn_8_0('3.05.1');
551578
/** Version "8.0.mysql_aurora.3.05.2". */
552579
public static readonly VER_3_05_2 = AuroraMysqlEngineVersion.builtIn_8_0('3.05.2');
580+
/** Version "8.0.mysql_aurora.3.06.0". */
581+
public static readonly VER_3_06_0 = AuroraMysqlEngineVersion.builtIn_8_0('3.06.0');
553582

554583
/**
555584
* Create a new AuroraMysqlEngineVersion with an arbitrary version.
@@ -689,6 +718,11 @@ export class AuroraPostgresEngineVersion {
689718
* @deprecated Version 9.6.19 is no longer supported by Amazon RDS.
690719
*/
691720
public static readonly VER_9_6_19 = AuroraPostgresEngineVersion.of('9.6.19', '9.6');
721+
/**
722+
* Version "9.6.22"
723+
* @deprecated Version 9.6.22 is no longer supported by Amazon RDS.
724+
*/
725+
public static readonly VER_9_6_22 = AuroraPostgresEngineVersion.of('9.6.22', '9.6');
692726
/**
693727
* Version "10.4".
694728
* @deprecated Version 10.4 is no longer supported by Amazon RDS.
@@ -806,15 +840,30 @@ export class AuroraPostgresEngineVersion {
806840
* @deprecated Version 11.15 is no longer supported by Amazon RDS.
807841
*/
808842
public static readonly VER_11_15 = AuroraPostgresEngineVersion.of('11.15', '11', { s3Import: true, s3Export: true });
809-
/** Version "11.16". */
843+
/**
844+
* Version "11.16"
845+
* @deprecated Version 11.16 is no longer supported by Amazon RDS.
846+
*/
810847
public static readonly VER_11_16 = AuroraPostgresEngineVersion.of('11.16', '11', { s3Import: true, s3Export: true });
811-
/** Version "11.17". */
848+
/**
849+
* Version "11.17"
850+
* @deprecated Version 11.17 is no longer supported by Amazon RDS.
851+
*/
812852
public static readonly VER_11_17 = AuroraPostgresEngineVersion.of('11.17', '11', { s3Import: true, s3Export: true });
813-
/** Version "11.18". */
853+
/**
854+
* Version "11.18"
855+
* @deprecated Version 11.18 is no longer supported by Amazon RDS.
856+
*/
814857
public static readonly VER_11_18 = AuroraPostgresEngineVersion.of('11.18', '11', { s3Import: true, s3Export: true });
815-
/** Version "11.19". */
858+
/**
859+
* Version "11.19"
860+
* @deprecated Version 11.19 is no longer supported by Amazon RDS.
861+
*/
816862
public static readonly VER_11_19 = AuroraPostgresEngineVersion.of('11.19', '11', { s3Import: true, s3Export: true });
817-
/** Version "11.20". */
863+
/**
864+
* Version "11.20"
865+
* @deprecated Version 11.20 is no longer supported by Amazon RDS.
866+
*/
818867
public static readonly VER_11_20 = AuroraPostgresEngineVersion.of('11.20', '11', { s3Import: true, s3Export: true });
819868
/** Version "11.21". */
820869
public static readonly VER_11_21 = AuroraPostgresEngineVersion.of('11.21', '11', { s3Import: true, s3Export: true });
@@ -895,10 +944,7 @@ export class AuroraPostgresEngineVersion {
895944
public static readonly VER_13_13 = AuroraPostgresEngineVersion.of('13.13', '13', { s3Import: true, s3Export: true });
896945
/** Version "14.3". */
897946
public static readonly VER_14_3 = AuroraPostgresEngineVersion.of('14.3', '14', { s3Import: true, s3Export: true });
898-
/**
899-
* Version "14.4".
900-
* @deprecated Version 14.4 is no longer supported by Amazon RDS.
901-
*/
947+
/** Version "14.4". */
902948
public static readonly VER_14_4 = AuroraPostgresEngineVersion.of('14.4', '14', { s3Import: true, s3Export: true });
903949
/** Version "14.5". */
904950
public static readonly VER_14_5 = AuroraPostgresEngineVersion.of('14.5', '14', { s3Import: true, s3Export: true });
@@ -920,7 +966,10 @@ export class AuroraPostgresEngineVersion {
920966
public static readonly VER_15_4 = AuroraPostgresEngineVersion.of('15.4', '15', { s3Import: true, s3Export: true });
921967
/** Version "15.5". */
922968
public static readonly VER_15_5 = AuroraPostgresEngineVersion.of('15.5', '15', { s3Import: true, s3Export: true });
923-
/** Version "16.0". */
969+
/**
970+
* Version "16.0"
971+
* @deprecated Version 16.0 is no longer supported by Amazon RDS.
972+
*/
924973
public static readonly VER_16_0 = AuroraPostgresEngineVersion.of('16.0', '16', { s3Import: true, s3Export: true });
925974
/** Version "16.1". */
926975
public static readonly VER_16_1 = AuroraPostgresEngineVersion.of('16.1', '16', { s3Import: true, s3Export: true });

0 commit comments

Comments
 (0)