diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-instance-ca-certificate.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-instance-ca-certificate.ts index e0fc4ea13f992..b364d79831cb0 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-instance-ca-certificate.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-instance-ca-certificate.ts @@ -17,7 +17,7 @@ new DatabaseCluster(stack, 'Database', { password: SecretValue.unsafePlainText('7959866cacc02c2d243ecfe177464fe6'), }, instanceType: instanceType, - caCertificate: CaCertificate.RDS_CA_RDS4096_G1, + caCertificate: CaCertificate.RDS_CA_RSA4096_G1, vpcSubnets: { subnetType: SubnetType.PUBLIC }, vpc, removalPolicy: RemovalPolicy.DESTROY, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-ca-certificate.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-ca-certificate.ts index 1dfdc825d6813..69fee94a80cde 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-ca-certificate.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-ca-certificate.ts @@ -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', { diff --git a/packages/aws-cdk-lib/aws-docdb/README.md b/packages/aws-cdk-lib/aws-docdb/README.md index 1185e7bcafc05..539b4a9908eb8 100644 --- a/packages/aws-cdk-lib/aws-docdb/README.md +++ b/packages/aws-cdk-lib/aws-docdb/README.md @@ -255,6 +255,6 @@ const cluster = new docdb.DatabaseCluster(this, 'Database', { subnetType: ec2.SubnetType.PUBLIC, }, vpc, - caCertificate: docdb.CaCertificate.RDS_CA_RDS4096_G1, // CA certificate for all instances under this cluster + caCertificate: docdb.CaCertificate.RDS_CA_RSA4096_G1, // CA certificate for all instances under this cluster }); ``` diff --git a/packages/aws-cdk-lib/aws-docdb/test/cluster.test.ts b/packages/aws-cdk-lib/aws-docdb/test/cluster.test.ts index 949a6c4e6a75d..07a597f399fb6 100644 --- a/packages/aws-cdk-lib/aws-docdb/test/cluster.test.ts +++ b/packages/aws-cdk-lib/aws-docdb/test/cluster.test.ts @@ -86,7 +86,7 @@ describe('DatabaseCluster', () => { password: cdk.SecretValue.unsafePlainText('tooshort'), }, instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.SMALL), - caCertificate: CaCertificate.RDS_CA_RDS4096_G1, + caCertificate: CaCertificate.RDS_CA_RSA4096_G1, vpc, }); diff --git a/packages/aws-cdk-lib/aws-docdb/test/instance.test.ts b/packages/aws-cdk-lib/aws-docdb/test/instance.test.ts index c3803800b8388..320fe71e9d8ac 100644 --- a/packages/aws-cdk-lib/aws-docdb/test/instance.test.ts +++ b/packages/aws-cdk-lib/aws-docdb/test/instance.test.ts @@ -66,7 +66,7 @@ describe('DatabaseInstance', () => { new DatabaseInstance(stack, 'Instance', { cluster: stack.cluster, instanceType: SINGLE_INSTANCE_TYPE, - caCertificate: CaCertificate.RDS_CA_RDS4096_G1, + caCertificate: CaCertificate.RDS_CA_RSA4096_G1, }); // THEN diff --git a/packages/aws-cdk-lib/aws-rds/README.md b/packages/aws-cdk-lib/aws-rds/README.md index 6fad15b4734b5..1d7ad1566304b 100644 --- a/packages/aws-cdk-lib/aws-rds/README.md +++ b/packages/aws-cdk-lib/aws-rds/README.md @@ -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', { @@ -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, }); ``` diff --git a/packages/aws-cdk-lib/aws-rds/lib/ca-certificate.ts b/packages/aws-cdk-lib/aws-rds/lib/ca-certificate.ts index 8c64714cdf9bb..014be74cb87d3 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/ca-certificate.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/ca-certificate.ts @@ -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 * diff --git a/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts b/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts index d27abfb4a8065..fac2485ad40d5 100644 --- a/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts +++ b/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts @@ -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, diff --git a/packages/aws-cdk-lib/aws-rds/test/instance.test.ts b/packages/aws-cdk-lib/aws-rds/test/instance.test.ts index 6c787363f6c4b..505fb57bcfd30 100644 --- a/packages/aws-cdk-lib/aws-rds/test/instance.test.ts +++ b/packages/aws-cdk-lib/aws-rds/test/instance.test.ts @@ -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', {