Merge branch 'main' into fix/false-deprecation

aws · Apr 17, 2024 · eecb081 · eecb081
2 parents 545e3d3 + 21804fd
commit eecb081
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/packages/aws-cdk-lib/aws-rds/lib/cluster.ts b/packages/aws-cdk-lib/aws-rds/lib/cluster.ts
@@ -595,10 +595,8 @@ abstract class DatabaseClusterNew extends DatabaseClusterBase {
   constructor(scope: Construct, id: string, props: DatabaseClusterBaseProps) {
     super(scope, id);
 
-    if ((props.vpc && props.instanceProps?.vpc)) {
+    if ((props.vpc && props.instanceProps?.vpc) || (!props.vpc && !props.instanceProps?.vpc)) {
       throw new Error('Provide either vpc or instanceProps.vpc, but not both');
-    } else if (!props.vpc && !props.instanceProps?.vpc) {
-      throw new Error('If instanceProps is not provided then `vpc` must be provided.');
     }
     if ((props.vpcSubnets && props.instanceProps?.vpcSubnets)) {
       throw new Error('Provide either vpcSubnets or instanceProps.vpcSubnets, but not both');

diff --git a/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts b/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts
@@ -67,7 +67,7 @@ describe('cluster new api', () => {
           iamAuthentication: true,
         });
         // THEN
-      }).toThrow(/If instanceProps is not provided then `vpc` must be provided./);
+      }).toThrow(/Provide either vpc or instanceProps.vpc, but not both/);
     });
 
     test('when both vpc and instanceProps.vpc are provided', () => {