Skip to content

Commit

Permalink
update enum names
Browse files Browse the repository at this point in the history
  • Loading branch information
scanlonp committed May 9, 2024
1 parent f9f3681 commit b0180a5
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ new DatabaseInstance(stack, 'Instance', {
}),
instanceType: InstanceType.of(InstanceClass.T3, InstanceSize.MICRO),
vpc,
caCertificate: CaCertificate.RDS_CA_RDS2048_G1,
caCertificate: CaCertificate.RDS_CA_RSA2048_G1,
});

new integ.IntegTest(app, 'InstanceCACertificateTest', {
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk-lib/aws-rds/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ declare const vpc: ec2.Vpc;
const cluster = new rds.DatabaseCluster(this, 'Database', {
engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_01_0 }),
writer: rds.ClusterInstance.provisioned('writer', {
caCertificate: rds.CaCertificate.RDS_CA_RDS2048_G1,
caCertificate: rds.CaCertificate.RDS_CA_RSA2048_G1,
}),
readers: [
rds.ClusterInstance.serverlessV2('reader', {
Expand Down Expand Up @@ -527,7 +527,7 @@ declare const vpc: ec2.Vpc;
new rds.DatabaseInstance(this, 'Instance', {
engine: rds.DatabaseInstanceEngine.mysql({ version: rds.MysqlEngineVersion.VER_8_0_30 }),
vpc,
caCertificate: rds.CaCertificate.RDS_CA_RDS2048_G1,
caCertificate: rds.CaCertificate.RDS_CA_RSA2048_G1,
});
```

Expand Down
14 changes: 14 additions & 0 deletions packages/aws-cdk-lib/aws-rds/lib/ca-certificate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,28 @@ export class CaCertificate {

/**
* rds-ca-rsa2048-g1 certificate authority
*
* @deprecated use RDS_CA_RSA2048_G1 (slight misspelling)
*/
public static readonly RDS_CA_RDS2048_G1 = CaCertificate.of('rds-ca-rsa2048-g1');

/**
* rds-ca-rsa2048-g1 certificate authority
*/
public static readonly RDS_CA_RSA2048_G1 = CaCertificate.of('rds-ca-rsa2048-g1');

/**
* rds-ca-rsa4096-g1 certificate authority
*
* @deprecated use RDS_CA_RSA4096_G1 (slight misspelling)
*/
public static readonly RDS_CA_RDS4096_G1 = CaCertificate.of('rds-ca-rsa4096-g1');

/**
* rds-ca-rsa4096-g1 certificate authority
*/
public static readonly RDS_CA_RSA4096_G1 = CaCertificate.of('rds-ca-rsa4096-g1');

/**
* Custom CA certificate
*
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk-lib/aws-rds/test/cluster.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1154,11 +1154,11 @@ describe('cluster new api', () => {
vpc,
writer: ClusterInstance.provisioned('writer', {
instanceType: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.XLARGE24 ),
caCertificate: CaCertificate.RDS_CA_RDS4096_G1,
caCertificate: CaCertificate.RDS_CA_RSA4096_G1,
}),
readers: [
ClusterInstance.serverlessV2('reader', {
caCertificate: CaCertificate.RDS_CA_RDS2048_G1,
caCertificate: CaCertificate.RDS_CA_RSA2048_G1,
}),
ClusterInstance.provisioned('reader2', {
promotionTier: 1,
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-rds/test/instance.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2053,7 +2053,7 @@ describe('instance', () => {
engine: rds.DatabaseInstanceEngine.mysql({ version: rds.MysqlEngineVersion.VER_8_0_30 }),
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.SMALL),
vpc,
caCertificate: rds.CaCertificate.RDS_CA_RDS2048_G1,
caCertificate: rds.CaCertificate.RDS_CA_RSA2048_G1,
});

Template.fromStack(stack).hasResourceProperties('AWS::RDS::DBInstance', {
Expand Down

0 comments on commit b0180a5

Please sign in to comment.