Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump RDS Postgres Engine Version to 16.2 #30219

Merged
merged 4 commits into from
May 15, 2024
Merged

chore: bump RDS Postgres Engine Version to 16.2 #30219

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9f1fbf
Bump RDS Postgres Engine Version to 16.2
May 15, 2024
070a5dd
Merge branch 'main' into bump-rds
Leo10Gama May 15, 2024
311a513
Update integration tests with new RDS Postgres version
May 15, 2024
08e4db9
Merge branch 'main' into bump-rds
Leo10Gama May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions packages/aws-cdk-lib/aws-rds/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ Example for max storage configuration:
```ts
declare const vpc: ec2.Vpc;
const instance = new rds.DatabaseInstance(this, 'Instance', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
// optional, defaults to m5.large
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.SMALL),
vpc,
Expand All @@ -431,7 +431,7 @@ To use dual-stack mode, specify `NetworkType.DUAL` on the `networkType` property
```ts
declare const vpc: ec2.Vpc; // VPC and subnets must have IPv6 CIDR blocks
const instance = new rds.DatabaseInstance(this, 'Instance', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
vpc,
networkType: rds.NetworkType.DUAL,
publiclyAccessible: false,
Expand All @@ -447,7 +447,7 @@ a source database respectively:
declare const vpc: ec2.Vpc;
new rds.DatabaseInstanceFromSnapshot(this, 'Instance', {
snapshotIdentifier: 'my-snapshot',
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
// optional, defaults to m5.large
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.LARGE),
vpc,
Expand Down Expand Up @@ -602,7 +602,7 @@ The following examples use a `DatabaseInstance`, but the same usage is applicabl

```ts
declare const vpc: ec2.Vpc;
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 });
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 });
new rds.DatabaseInstance(this, 'InstanceWithUsername', {
engine,
vpc,
Expand All @@ -627,7 +627,7 @@ Secrets generated by `fromGeneratedSecret()` can be customized:

```ts
declare const vpc: ec2.Vpc;
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 });
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 });
const myKey = new kms.Key(this, 'MyKey');

new rds.DatabaseInstance(this, 'InstanceWithCustomizedSecret', {
Expand All @@ -648,7 +648,7 @@ As noted above, Databases created with `DatabaseInstanceFromSnapshot` or `Server

```ts
declare const vpc: ec2.Vpc;
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 });
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 });
const myKey = new kms.Key(this, 'MyKey');

new rds.DatabaseInstanceFromSnapshot(this, 'InstanceFromSnapshotWithCustomizedSecret', {
Expand Down Expand Up @@ -1024,7 +1024,7 @@ const auditLogGroup = cluster.cloudwatchLogGroups.audit;
// Exporting logs from an instance
const instance = new rds.DatabaseInstance(this, 'Instance', {
engine: rds.DatabaseInstanceEngine.postgres({
version: rds.PostgresEngineVersion.VER_15_2,
version: rds.PostgresEngineVersion.VER_16_2,
}),
vpc,
cloudwatchLogsExports: ['postgresql'], // Export the PostgreSQL logs
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-rds/test/instance-engine.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ describe('instance engine', () => {

describe('PostgreSQL engine bindToInstance', () => {
test('returns s3 import/export feature if the version supports it', () => {
const engineNewerVersion = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 });
const engineNewerVersion = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 });

const engineConfig = engineNewerVersion.bindToInstance(new cdk.Stack(), {});
expect(engineConfig.features?.s3Import).toEqual('s3Import');
Expand Down
36 changes: 18 additions & 18 deletions packages/aws-cdk-lib/aws-rds/test/instance.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ describe('instance', () => {
// WHEN
const instance = new rds.DatabaseInstanceFromSnapshot(stack, 'Instance', {
snapshotIdentifier: 'my-snapshot',
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.LARGE),
vpc,
cloudwatchLogsExports: [],
Expand Down Expand Up @@ -446,7 +446,7 @@ describe('instance', () => {
test('create an instance from snapshot', () => {
new rds.DatabaseInstanceFromSnapshot(stack, 'Instance', {
snapshotIdentifier: 'my-snapshot',
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.LARGE),
vpc,
});
Expand Down Expand Up @@ -856,7 +856,7 @@ describe('instance', () => {
test('addRotationSingleUser()', () => {
// GIVEN
const instance = new rds.DatabaseInstance(stack, 'Database', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
vpc,
});

Expand All @@ -883,7 +883,7 @@ describe('instance', () => {
test('addRotationMultiUser()', () => {
// GIVEN
const instance = new rds.DatabaseInstance(stack, 'Database', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
vpc,
});

Expand Down Expand Up @@ -935,7 +935,7 @@ describe('instance', () => {
// WHEN
// DB in isolated subnet (no internet connectivity)
const instance = new rds.DatabaseInstance(stack, 'Database', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
vpc: vpcWithIsolated,
vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_ISOLATED },
});
Expand Down Expand Up @@ -997,7 +997,7 @@ describe('instance', () => {
// WHEN
// DB in isolated subnet (no internet connectivity)
const instance = new rds.DatabaseInstance(stack, 'Database', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
vpc: vpcWithIsolated,
vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_ISOLATED },
});
Expand Down Expand Up @@ -1053,7 +1053,7 @@ describe('instance', () => {
// WHEN
// DB in isolated subnet (no internet connectivity)
const instance = new rds.DatabaseInstance(stack, 'Database', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
vpc: vpcIsolatedOnly,
vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_ISOLATED },
});
Expand Down Expand Up @@ -1559,7 +1559,7 @@ describe('instance', () => {

test('reuse an existing subnet group', () => {
new rds.DatabaseInstance(stack, 'Database', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
vpc,
subnetGroup: rds.SubnetGroup.fromSubnetGroupName(stack, 'SubnetGroup', 'my-subnet-group'),
});
Expand All @@ -1572,7 +1572,7 @@ describe('instance', () => {

test('defaultChild returns the DB Instance', () => {
const instance = new rds.DatabaseInstance(stack, 'Database', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
vpc,
});

Expand All @@ -1584,7 +1584,7 @@ describe('instance', () => {
new rds.DatabaseInstance(stack, 'Instance', {
vpc,
engine: rds.DatabaseInstanceEngine.postgres({
version: rds.PostgresEngineVersion.VER_15_2,
version: rds.PostgresEngineVersion.VER_16_2,
}),
});

Expand Down Expand Up @@ -1720,7 +1720,7 @@ describe('instance', () => {
test('fromGeneratedSecret', () => {
// WHEN
new rds.DatabaseInstance(stack, 'Database', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
vpc,
credentials: rds.Credentials.fromGeneratedSecret('postgres'),
});
Expand All @@ -1746,7 +1746,7 @@ describe('instance', () => {
test('fromGeneratedSecret with replica regions', () => {
// WHEN
new rds.DatabaseInstance(stack, 'Database', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
vpc,
credentials: rds.Credentials.fromGeneratedSecret('postgres', {
replicaRegions: [{ region: 'eu-west-1' }],
Expand All @@ -1766,7 +1766,7 @@ describe('instance', () => {
test('fromPassword', () => {
// WHEN
new rds.DatabaseInstance(stack, 'Database', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
vpc,
credentials: rds.Credentials.fromPassword('postgres', cdk.SecretValue.ssmSecure('/dbPassword', '1')),
});
Expand Down Expand Up @@ -1899,7 +1899,7 @@ describe('instance', () => {
const instanceType = ec2.InstanceType.of(ec2.InstanceClass.T3, ec2.InstanceSize.SMALL);
const backupRetention = cdk.Duration.days(5);
const source = new rds.DatabaseInstance(stack, 'Source', {
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 }),
engine: rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 }),
backupRetention,
instanceType,
vpc,
Expand All @@ -1912,13 +1912,13 @@ describe('instance', () => {
instanceType,
vpc,
});
}).toThrow(/Cannot set 'backupRetention', as engine 'postgres-15.2' does not support automatic backups for read replicas/);
}).toThrow(/Cannot set 'backupRetention', as engine 'postgres-16.2' does not support automatic backups for read replicas/);
});

test('read replica with allocatedStorage', () => {
// GIVEN
const instanceType = ec2.InstanceType.of(ec2.InstanceClass.T3, ec2.InstanceSize.SMALL);
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 });
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 });
const parameterGroup = new rds.ParameterGroup(stack, 'ParameterGroup', { engine });
const source = new rds.DatabaseInstance(stack, 'Source', {
engine,
Expand All @@ -1944,7 +1944,7 @@ describe('instance', () => {
test('can set parameter group on read replica', () => {
// GIVEN
const instanceType = ec2.InstanceType.of(ec2.InstanceClass.T3, ec2.InstanceSize.SMALL);
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 });
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 });
const parameterGroup = new rds.ParameterGroup(stack, 'ParameterGroup', { engine });
const source = new rds.DatabaseInstance(stack, 'Source', {
engine,
Expand Down Expand Up @@ -2008,7 +2008,7 @@ describe('instance', () => {
test('engine is specified for read replica using domain', () => {
// GIVEN
const instanceType = ec2.InstanceType.of(ec2.InstanceClass.T3, ec2.InstanceSize.SMALL);
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_15_2 });
const engine = rds.DatabaseInstanceEngine.postgres({ version: rds.PostgresEngineVersion.VER_16_2 });
const source = new rds.DatabaseInstance(stack, 'Source', {
engine,
instanceType,
Expand Down