Skip to content

Commit 5ddf0d7

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into remove-appsync-event-data-source-integrations-temp-schema
2 parents 1b6ce55 + d03e856 commit 5ddf0d7

File tree

2 files changed

+98
-22
lines changed

2 files changed

+98
-22
lines changed

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

Lines changed: 94 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,8 @@ export class AuroraMysqlEngineVersion {
553553
public static readonly VER_2_11_4 = AuroraMysqlEngineVersion.builtIn_5_7('2.11.4');
554554
/** Version "5.7.mysql_aurora.2.11.5". */
555555
public static readonly VER_2_11_5 = AuroraMysqlEngineVersion.builtIn_5_7('2.11.5');
556+
/** Version "5.7.mysql_aurora.2.11.6". */
557+
public static readonly VER_2_11_6 = AuroraMysqlEngineVersion.builtIn_5_7('2.11.6');
556558
/** Version "5.7.mysql_aurora.2.12.0". */
557559
public static readonly VER_2_12_0 = AuroraMysqlEngineVersion.builtIn_5_7('2.12.0');
558560
/** Version "5.7.mysql_aurora.2.12.1". */
@@ -563,6 +565,8 @@ export class AuroraMysqlEngineVersion {
563565
public static readonly VER_2_12_3 = AuroraMysqlEngineVersion.builtIn_5_7('2.12.3');
564566
/** Version "5.7.mysql_aurora.2.12.4". */
565567
public static readonly VER_2_12_4 = AuroraMysqlEngineVersion.builtIn_5_7('2.12.4');
568+
/** Version "5.7.mysql_aurora.2.12.5". */
569+
public static readonly VER_2_12_5 = AuroraMysqlEngineVersion.builtIn_5_7('2.12.5');
566570
/**
567571
* Version "8.0.mysql_aurora.3.01.0"
568572
* @deprecated Aurora MySQL 8.0.mysql_aurora.3.01.0 is no longer supported by Amazon RDS.
@@ -621,6 +625,8 @@ export class AuroraMysqlEngineVersion {
621625
public static readonly VER_3_04_2 = AuroraMysqlEngineVersion.builtIn_8_0('3.04.2');
622626
/** Version "8.0.mysql_aurora.3.04.3". */
623627
public static readonly VER_3_04_3 = AuroraMysqlEngineVersion.builtIn_8_0('3.04.3');
628+
/** Version "8.0.mysql_aurora.3.04.4". */
629+
public static readonly VER_3_04_4 = AuroraMysqlEngineVersion.builtIn_8_0('3.04.4');
624630
/**
625631
* Version "8.0.mysql_aurora.3.05.0"
626632
* @deprecated Aurora MySQL 8.0.mysql_aurora.3.05.0 is no longer supported by Amazon RDS.
@@ -962,27 +968,60 @@ export class AuroraPostgresEngineVersion {
962968
* @deprecated Version 12.10 is no longer supported by Amazon RDS.
963969
*/
964970
public static readonly VER_12_10 = AuroraPostgresEngineVersion.of('12.10', '12', { s3Import: true, s3Export: true });
965-
/** Version "12.11". */
971+
/**
972+
* Version "12.11".
973+
* @deprecated Version 12.11 is no longer supported by Amazon RDS.
974+
*/
966975
public static readonly VER_12_11 = AuroraPostgresEngineVersion.of('12.11', '12', { s3Import: true, s3Export: true });
967-
/** Version "12.12". */
976+
/**
977+
* Version "12.12".
978+
* @deprecated Version 12.12 is no longer supported by Amazon RDS.
979+
*/
968980
public static readonly VER_12_12 = AuroraPostgresEngineVersion.of('12.12', '12', { s3Import: true, s3Export: true });
969-
/** Version "12.13". */
981+
/**
982+
* Version "12.13".
983+
* @deprecated Version 12.13 is no longer supported by Amazon RDS.
984+
*/
970985
public static readonly VER_12_13 = AuroraPostgresEngineVersion.of('12.13', '12', { s3Import: true, s3Export: true });
971-
/** Version "12.14". */
986+
/**
987+
* Version "12.14".
988+
* @deprecated Version 12.14 is no longer supported by Amazon RDS.
989+
*/
972990
public static readonly VER_12_14 = AuroraPostgresEngineVersion.of('12.14', '12', { s3Import: true, s3Export: true });
973-
/** Version "12.15". */
991+
/**
992+
* Version "12.15".
993+
* @deprecated Version 12.15 is no longer supported by Amazon RDS.
994+
*/
974995
public static readonly VER_12_15 = AuroraPostgresEngineVersion.of('12.15', '12', { s3Import: true, s3Export: true });
975-
/** Version "12.16". */
996+
/**
997+
* Version "12.16".
998+
* @deprecated Version 12.16 is no longer supported by Amazon RDS.
999+
*/
9761000
public static readonly VER_12_16 = AuroraPostgresEngineVersion.of('12.16', '12', { s3Import: true, s3Export: true });
977-
/** Version "12.17". */
1001+
/**
1002+
* Version "12.17".
1003+
* @deprecated Version 12.17 is no longer supported by Amazon RDS.
1004+
*/
9781005
public static readonly VER_12_17 = AuroraPostgresEngineVersion.of('12.17', '12', { s3Import: true, s3Export: true });
979-
/** Version "12.18". */
1006+
/**
1007+
* Version "12.18".
1008+
* @deprecated Version 12.18 is no longer supported by Amazon RDS.
1009+
*/
9801010
public static readonly VER_12_18 = AuroraPostgresEngineVersion.of('12.18', '12', { s3Import: true, s3Export: true });
981-
/** Version "12.19". */
1011+
/**
1012+
* Version "12.19".
1013+
* @deprecated Version 12.19 is no longer supported by Amazon RDS.
1014+
*/
9821015
public static readonly VER_12_19 = AuroraPostgresEngineVersion.of('12.19', '12', { s3Import: true, s3Export: true });
983-
/** Version "12.20". */
1016+
/**
1017+
* Version "12.20".
1018+
* @deprecated Version 12.20 is no longer supported by Amazon RDS.
1019+
*/
9841020
public static readonly VER_12_20 = AuroraPostgresEngineVersion.of('12.20', '12', { s3Import: true, s3Export: true });
985-
/** Version "12.21". */
1021+
/**
1022+
* Version "12.21".
1023+
* @deprecated Version 12.21 is no longer supported by Amazon RDS.
1024+
*/
9861025
public static readonly VER_12_21 = AuroraPostgresEngineVersion.of('12.21', '12', { s3Import: true, s3Export: true });
9871026
/** Version "12.22". */
9881027
public static readonly VER_12_22 = AuroraPostgresEngineVersion.of('12.22', '12', { s3Import: true, s3Export: true });
@@ -1006,13 +1045,22 @@ export class AuroraPostgresEngineVersion {
10061045
* @deprecated Version 13.6 is no longer supported by Amazon RDS.
10071046
*/
10081047
public static readonly VER_13_6 = AuroraPostgresEngineVersion.of('13.6', '13', { s3Import: true, s3Export: true });
1009-
/** Version "13.7". */
1048+
/**
1049+
* Version "13.7".
1050+
* @deprecated Version 13.7 is no longer supported by Amazon RDS.
1051+
*/
10101052
public static readonly VER_13_7 = AuroraPostgresEngineVersion.of('13.7', '13', { s3Import: true, s3Export: true });
1011-
/** Version "13.8". */
1053+
/**
1054+
* Version "13.8".
1055+
* @deprecated Version 13.8 is no longer supported by Amazon RDS.
1056+
*/
10121057
public static readonly VER_13_8 = AuroraPostgresEngineVersion.of('13.8', '13', { s3Import: true, s3Export: true });
10131058
/** Version "13.9". */
10141059
public static readonly VER_13_9 = AuroraPostgresEngineVersion.of('13.9', '13', { s3Import: true, s3Export: true });
1015-
/** Version "13.10". */
1060+
/**
1061+
* Version "13.10".
1062+
* @deprecated Version 13.10 is no longer supported by Amazon RDS.
1063+
*/
10161064
public static readonly VER_13_10 = AuroraPostgresEngineVersion.of('13.10', '13', { s3Import: true, s3Export: true });
10171065
/** Version "13.11". */
10181066
public static readonly VER_13_11 = AuroraPostgresEngineVersion.of('13.11', '13', { s3Import: true, s3Export: true });
@@ -1026,21 +1074,36 @@ export class AuroraPostgresEngineVersion {
10261074
public static readonly VER_13_15 = AuroraPostgresEngineVersion.of('13.15', '13', { s3Import: true, s3Export: true });
10271075
/** Version "13.16". */
10281076
public static readonly VER_13_16 = AuroraPostgresEngineVersion.of('13.16', '13', { s3Import: true, s3Export: true });
1029-
/** Version "13.17". */
1077+
/**
1078+
* Version "13.17".
1079+
* @deprecated Version 13.17 is no longer supported by Amazon RDS.
1080+
*/
10301081
public static readonly VER_13_17 = AuroraPostgresEngineVersion.of('13.17', '13', { s3Import: true, s3Export: true });
10311082
/** Version "13.18". */
10321083
public static readonly VER_13_18 = AuroraPostgresEngineVersion.of('13.18', '13', { s3Import: true, s3Export: true });
10331084
/** Version "13.20". */
10341085
public static readonly VER_13_20 = AuroraPostgresEngineVersion.of('13.20', '13', { s3Import: true, s3Export: true });
1035-
/** Version "14.3". */
1086+
/**
1087+
* Version "14.3".
1088+
* @deprecated Version 14.3 is no longer supported by Amazon RDS.
1089+
*/
10361090
public static readonly VER_14_3 = AuroraPostgresEngineVersion.of('14.3', '14', { s3Import: true, s3Export: true });
1037-
/** Version "14.4". */
1091+
/**
1092+
* Version "14.4".
1093+
* @deprecated Version 14.4 is no longer supported by Amazon RDS.
1094+
*/
10381095
public static readonly VER_14_4 = AuroraPostgresEngineVersion.of('14.4', '14', { s3Import: true, s3Export: true });
1039-
/** Version "14.5". */
1096+
/**
1097+
* Version "14.5".
1098+
* @deprecated Version 14.5 is no longer supported by Amazon RDS.
1099+
*/
10401100
public static readonly VER_14_5 = AuroraPostgresEngineVersion.of('14.5', '14', { s3Import: true, s3Export: true });
10411101
/** Version "14.6". */
10421102
public static readonly VER_14_6 = AuroraPostgresEngineVersion.of('14.6', '14', { s3Import: true, s3Export: true });
1043-
/** Version "14.7". */
1103+
/**
1104+
* Version "14.7".
1105+
* @deprecated Version 14.7 is no longer supported by Amazon RDS.
1106+
*/
10441107
public static readonly VER_14_7 = AuroraPostgresEngineVersion.of('14.7', '14', { s3Import: true, s3Export: true });
10451108
/** Version "14.8". */
10461109
public static readonly VER_14_8 = AuroraPostgresEngineVersion.of('14.8', '14', { s3Import: true, s3Export: true });
@@ -1054,13 +1117,19 @@ export class AuroraPostgresEngineVersion {
10541117
public static readonly VER_14_12 = AuroraPostgresEngineVersion.of('14.12', '14', { s3Import: true, s3Export: true });
10551118
/** Version "14.13". */
10561119
public static readonly VER_14_13 = AuroraPostgresEngineVersion.of('14.13', '14', { s3Import: true, s3Export: true });
1057-
/** Version "14.14". */
1120+
/**
1121+
* Version "14.14".
1122+
* @deprecated Version 14.14 is no longer supported by Amazon RDS.
1123+
*/
10581124
public static readonly VER_14_14 = AuroraPostgresEngineVersion.of('14.14', '14', { s3Import: true, s3Export: true });
10591125
/** Version "14.15". */
10601126
public static readonly VER_14_15 = AuroraPostgresEngineVersion.of('14.15', '14', { s3Import: true, s3Export: true });
10611127
/** Version "14.17". */
10621128
public static readonly VER_14_17 = AuroraPostgresEngineVersion.of('14.17', '14', { s3Import: true, s3Export: true });
1063-
/** Version "15.2". */
1129+
/**
1130+
* Version "15.2".
1131+
* @deprecated Version 15.2 is no longer supported by Amazon RDS.
1132+
*/
10641133
public static readonly VER_15_2 = AuroraPostgresEngineVersion.of('15.2', '15', { s3Import: true, s3Export: true });
10651134
/** Version "15.3". */
10661135
public static readonly VER_15_3 = AuroraPostgresEngineVersion.of('15.3', '15', { s3Import: true, s3Export: true });
@@ -1074,7 +1143,10 @@ export class AuroraPostgresEngineVersion {
10741143
public static readonly VER_15_7 = AuroraPostgresEngineVersion.of('15.7', '15', { s3Import: true, s3Export: true });
10751144
/** Version "15.8". */
10761145
public static readonly VER_15_8 = AuroraPostgresEngineVersion.of('15.8', '15', { s3Import: true, s3Export: true });
1077-
/** Version "15.9". */
1146+
/**
1147+
* Version "15.9".
1148+
* @deprecated Version 15.9 is no longer supported by Amazon RDS.
1149+
*/
10781150
public static readonly VER_15_9 = AuroraPostgresEngineVersion.of('15.9', '15', { s3Import: true, s3Export: true });
10791151
/** Version "15.10". */
10801152
public static readonly VER_15_10 = AuroraPostgresEngineVersion.of('15.10', '15', { s3Import: true, s3Export: true });

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@ describe('cluster engine', () => {
153153
const engine_ver_2_12_4 = DatabaseClusterEngine.auroraMysql({
154154
version: AuroraMysqlEngineVersion.VER_2_12_4,
155155
});
156+
const engine_ver_2_12_5 = DatabaseClusterEngine.auroraMysql({
157+
version: AuroraMysqlEngineVersion.VER_2_12_5,
158+
});
156159

157160
// THEN
158161
expect(engine_ver_2_7_3.parameterGroupFamily).toEqual('aurora-mysql5.7');
@@ -166,6 +169,7 @@ describe('cluster engine', () => {
166169
expect(engine_ver_2_11_3.parameterGroupFamily).toEqual('aurora-mysql5.7');
167170
expect(engine_ver_2_12_3.parameterGroupFamily).toEqual('aurora-mysql5.7');
168171
expect(engine_ver_2_12_4.parameterGroupFamily).toEqual('aurora-mysql5.7');
172+
expect(engine_ver_2_12_5.parameterGroupFamily).toEqual('aurora-mysql5.7');
169173
});
170174

171175
test('cluster parameter group correctly determined for AURORA_MYSQL 3.x and given version', () => {

0 commit comments

Comments
 (0)