Skip to content

Commit 7abe8fc

Browse files
authored
chore(rds): support 10.11.9, 10.6.19, 10.5.26 for MariaDB (#31366)
Add new minor versions. Ref: [Amazon RDS for MariaDB supports minors 10.11.9, 10.6.19, 10.5.26](https://aws.amazon.com/about-aws/whats-new/2024/09/amazon-rds-mariadb-minors-10/) ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent ab73e53 commit 7abe8fc

File tree

2 files changed

+60
-0
lines changed

2 files changed

+60
-0
lines changed

Diff for: packages/aws-cdk-lib/aws-rds/lib/instance-engine.ts

+6
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,8 @@ export class MariaDbEngineVersion {
494494
public static readonly VER_10_5_24 = MariaDbEngineVersion.of('10.5.24', '10.5');
495495
/** Version "10.5.25". */
496496
public static readonly VER_10_5_25 = MariaDbEngineVersion.of('10.5.25', '10.5');
497+
/** Version "10.5.26". */
498+
public static readonly VER_10_5_26 = MariaDbEngineVersion.of('10.5.26', '10.5');
497499

498500
/** Version "10.6" (only a major version, without a specific minor version). */
499501
public static readonly VER_10_6 = MariaDbEngineVersion.of('10.6', '10.6');
@@ -539,6 +541,8 @@ export class MariaDbEngineVersion {
539541
public static readonly VER_10_6_17 = MariaDbEngineVersion.of('10.6.17', '10.6');
540542
/** Version "10.6.18". */
541543
public static readonly VER_10_6_18 = MariaDbEngineVersion.of('10.6.18', '10.6');
544+
/** Version "10.6.19". */
545+
public static readonly VER_10_6_19 = MariaDbEngineVersion.of('10.6.19', '10.6');
542546

543547
/** Version "10.11" (only a major version, without a specific minor version). */
544548
public static readonly VER_10_11 = MariaDbEngineVersion.of('10.11', '10.11');
@@ -552,6 +556,8 @@ export class MariaDbEngineVersion {
552556
public static readonly VER_10_11_7 = MariaDbEngineVersion.of('10.11.7', '10.11');
553557
/** Version "10.11.8". */
554558
public static readonly VER_10_11_8 = MariaDbEngineVersion.of('10.11.8', '10.11');
559+
/** Version "10.11.9". */
560+
public static readonly VER_10_11_9 = MariaDbEngineVersion.of('10.11.9', '10.11');
555561

556562
/**
557563
* Create a new MariaDbEngineVersion with an arbitrary version.

Diff for: packages/aws-cdk-lib/aws-rds/test/instance-engine.test.ts

+54
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Template } from '../../assertions';
2+
import * as ec2 from '../../aws-ec2';
23
import * as iam from '../../aws-iam';
34
import * as cdk from '../../core';
45
import * as rds from '../lib';
@@ -262,4 +263,57 @@ describe('instance engine', () => {
262263
expect(engineConfig.features?.s3Export).toEqual('s3Export');
263264
});
264265
});
266+
267+
describe('MariaDB engine version', () => {
268+
test.each([
269+
['10.4', rds.MariaDbEngineVersion.VER_10_4],
270+
['10.4.29', rds.MariaDbEngineVersion.VER_10_4_29],
271+
['10.4.30', rds.MariaDbEngineVersion.VER_10_4_30],
272+
['10.4.31', rds.MariaDbEngineVersion.VER_10_4_31],
273+
['10.4.32', rds.MariaDbEngineVersion.VER_10_4_32],
274+
['10.4.33', rds.MariaDbEngineVersion.VER_10_4_33],
275+
['10.4.34', rds.MariaDbEngineVersion.VER_10_4_34],
276+
['10.5', rds.MariaDbEngineVersion.VER_10_5],
277+
['10.5.20', rds.MariaDbEngineVersion.VER_10_5_20],
278+
['10.5.21', rds.MariaDbEngineVersion.VER_10_5_21],
279+
['10.5.22', rds.MariaDbEngineVersion.VER_10_5_22],
280+
['10.5.23', rds.MariaDbEngineVersion.VER_10_5_23],
281+
['10.5.24', rds.MariaDbEngineVersion.VER_10_5_24],
282+
['10.5.25', rds.MariaDbEngineVersion.VER_10_5_25],
283+
['10.5.26', rds.MariaDbEngineVersion.VER_10_5_26],
284+
['10.6', rds.MariaDbEngineVersion.VER_10_6],
285+
['10.6.13', rds.MariaDbEngineVersion.VER_10_6_13],
286+
['10.6.14', rds.MariaDbEngineVersion.VER_10_6_14],
287+
['10.6.15', rds.MariaDbEngineVersion.VER_10_6_15],
288+
['10.6.16', rds.MariaDbEngineVersion.VER_10_6_16],
289+
['10.6.17', rds.MariaDbEngineVersion.VER_10_6_17],
290+
['10.6.18', rds.MariaDbEngineVersion.VER_10_6_18],
291+
['10.6.19', rds.MariaDbEngineVersion.VER_10_6_19],
292+
['10.11', rds.MariaDbEngineVersion.VER_10_11],
293+
['10.11.4', rds.MariaDbEngineVersion.VER_10_11_4],
294+
['10.11.5', rds.MariaDbEngineVersion.VER_10_11_5],
295+
['10.11.6', rds.MariaDbEngineVersion.VER_10_11_6],
296+
['10.11.7', rds.MariaDbEngineVersion.VER_10_11_7],
297+
['10.11.8', rds.MariaDbEngineVersion.VER_10_11_8],
298+
['10.11.9', rds.MariaDbEngineVersion.VER_10_11_9],
299+
])('is passed correctly for %s', (engineVersion, version) => {
300+
301+
// WHEN
302+
const stack = new cdk.Stack();
303+
const vpc = new ec2.Vpc(stack, 'VPC');
304+
305+
new rds.DatabaseInstance(stack, 'Instance', {
306+
engine: rds.DatabaseInstanceEngine.mariaDb({ version }),
307+
vpc,
308+
});
309+
310+
// THEN
311+
Template.fromStack(stack).hasResource('AWS::RDS::DBInstance', {
312+
Properties: {
313+
Engine: 'mariadb',
314+
EngineVersion: engineVersion,
315+
},
316+
});
317+
});
318+
});
265319
});

0 commit comments

Comments
 (0)