Skip to content

Commit 495204f

Browse files
authored
chore(rds): fix certificate enum values misspelling (#30135)
Closes #30132 ### Reason for this change Slight misspelling of enum values. ### Description of changes Fixed the name. Deprecated the old values. Changed values in tests & readmes ### Description of how you validated changes No behavior change as underlying value is the same. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent b2eb86c commit 495204f

File tree

9 files changed

+24
-10
lines changed

9 files changed

+24
-10
lines changed

packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-instance-ca-certificate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ new DatabaseCluster(stack, 'Database', {
1717
password: SecretValue.unsafePlainText('7959866cacc02c2d243ecfe177464fe6'),
1818
},
1919
instanceType: instanceType,
20-
caCertificate: CaCertificate.RDS_CA_RDS4096_G1,
20+
caCertificate: CaCertificate.RDS_CA_RSA4096_G1,
2121
vpcSubnets: { subnetType: SubnetType.PUBLIC },
2222
vpc,
2323
removalPolicy: RemovalPolicy.DESTROY,

packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-ca-certificate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ new DatabaseInstance(stack, 'Instance', {
1515
}),
1616
instanceType: InstanceType.of(InstanceClass.T3, InstanceSize.MICRO),
1717
vpc,
18-
caCertificate: CaCertificate.RDS_CA_RDS2048_G1,
18+
caCertificate: CaCertificate.RDS_CA_RSA2048_G1,
1919
});
2020

2121
new integ.IntegTest(app, 'InstanceCACertificateTest', {

packages/aws-cdk-lib/aws-docdb/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,6 @@ const cluster = new docdb.DatabaseCluster(this, 'Database', {
255255
subnetType: ec2.SubnetType.PUBLIC,
256256
},
257257
vpc,
258-
caCertificate: docdb.CaCertificate.RDS_CA_RDS4096_G1, // CA certificate for all instances under this cluster
258+
caCertificate: docdb.CaCertificate.RDS_CA_RSA4096_G1, // CA certificate for all instances under this cluster
259259
});
260260
```

packages/aws-cdk-lib/aws-docdb/test/cluster.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ describe('DatabaseCluster', () => {
8686
password: cdk.SecretValue.unsafePlainText('tooshort'),
8787
},
8888
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.SMALL),
89-
caCertificate: CaCertificate.RDS_CA_RDS4096_G1,
89+
caCertificate: CaCertificate.RDS_CA_RSA4096_G1,
9090
vpc,
9191
});
9292

packages/aws-cdk-lib/aws-docdb/test/instance.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe('DatabaseInstance', () => {
6666
new DatabaseInstance(stack, 'Instance', {
6767
cluster: stack.cluster,
6868
instanceType: SINGLE_INSTANCE_TYPE,
69-
caCertificate: CaCertificate.RDS_CA_RDS4096_G1,
69+
caCertificate: CaCertificate.RDS_CA_RSA4096_G1,
7070
});
7171

7272
// THEN

packages/aws-cdk-lib/aws-rds/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ declare const vpc: ec2.Vpc;
312312
const cluster = new rds.DatabaseCluster(this, 'Database', {
313313
engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_3_01_0 }),
314314
writer: rds.ClusterInstance.provisioned('writer', {
315-
caCertificate: rds.CaCertificate.RDS_CA_RDS2048_G1,
315+
caCertificate: rds.CaCertificate.RDS_CA_RSA2048_G1,
316316
}),
317317
readers: [
318318
rds.ClusterInstance.serverlessV2('reader', {
@@ -527,7 +527,7 @@ declare const vpc: ec2.Vpc;
527527
new rds.DatabaseInstance(this, 'Instance', {
528528
engine: rds.DatabaseInstanceEngine.mysql({ version: rds.MysqlEngineVersion.VER_8_0_30 }),
529529
vpc,
530-
caCertificate: rds.CaCertificate.RDS_CA_RDS2048_G1,
530+
caCertificate: rds.CaCertificate.RDS_CA_RSA2048_G1,
531531
});
532532
```
533533

packages/aws-cdk-lib/aws-rds/lib/ca-certificate.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,28 @@ export class CaCertificate {
1616

1717
/**
1818
* rds-ca-rsa2048-g1 certificate authority
19+
*
20+
* @deprecated use RDS_CA_RSA2048_G1 (slight misspelling)
1921
*/
2022
public static readonly RDS_CA_RDS2048_G1 = CaCertificate.of('rds-ca-rsa2048-g1');
2123

24+
/**
25+
* rds-ca-rsa2048-g1 certificate authority
26+
*/
27+
public static readonly RDS_CA_RSA2048_G1 = CaCertificate.of('rds-ca-rsa2048-g1');
28+
2229
/**
2330
* rds-ca-rsa4096-g1 certificate authority
31+
*
32+
* @deprecated use RDS_CA_RSA4096_G1 (slight misspelling)
2433
*/
2534
public static readonly RDS_CA_RDS4096_G1 = CaCertificate.of('rds-ca-rsa4096-g1');
2635

36+
/**
37+
* rds-ca-rsa4096-g1 certificate authority
38+
*/
39+
public static readonly RDS_CA_RSA4096_G1 = CaCertificate.of('rds-ca-rsa4096-g1');
40+
2741
/**
2842
* Custom CA certificate
2943
*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,11 +1154,11 @@ describe('cluster new api', () => {
11541154
vpc,
11551155
writer: ClusterInstance.provisioned('writer', {
11561156
instanceType: ec2.InstanceType.of(ec2.InstanceClass.M5, ec2.InstanceSize.XLARGE24 ),
1157-
caCertificate: CaCertificate.RDS_CA_RDS4096_G1,
1157+
caCertificate: CaCertificate.RDS_CA_RSA4096_G1,
11581158
}),
11591159
readers: [
11601160
ClusterInstance.serverlessV2('reader', {
1161-
caCertificate: CaCertificate.RDS_CA_RDS2048_G1,
1161+
caCertificate: CaCertificate.RDS_CA_RSA2048_G1,
11621162
}),
11631163
ClusterInstance.provisioned('reader2', {
11641164
promotionTier: 1,

packages/aws-cdk-lib/aws-rds/test/instance.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2053,7 +2053,7 @@ describe('instance', () => {
20532053
engine: rds.DatabaseInstanceEngine.mysql({ version: rds.MysqlEngineVersion.VER_8_0_30 }),
20542054
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.SMALL),
20552055
vpc,
2056-
caCertificate: rds.CaCertificate.RDS_CA_RDS2048_G1,
2056+
caCertificate: rds.CaCertificate.RDS_CA_RSA2048_G1,
20572057
});
20582058

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

0 commit comments

Comments
 (0)