fix(rds): Add validation for CfnDBProxyTargetGroup props

aws · Jul 5, 2020 · 84d0a4a · 84d0a4a
1 parent e108ca7
commit 84d0a4a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/packages/@aws-cdk/aws-rds/lib/proxy.ts b/packages/@aws-cdk/aws-rds/lib/proxy.ts
@@ -408,18 +408,24 @@ export class DatabaseProxy extends cdk.Resource
     this.endpoint = this.resource.attrEndpoint;
 
     let dbInstanceIdentifiers: string[] | undefined;
-    if (bindResult.dbClusters) {
-      // support for only instances of a single cluster
-      dbInstanceIdentifiers = bindResult.dbClusters[0].instanceIdentifiers;
-    } else if (bindResult.dbInstances) {
+    if (bindResult.dbInstances) {
       // support for only single instance
       dbInstanceIdentifiers = [ bindResult.dbInstances[0].instanceIdentifier ];
     }
 
+    let dbClusterIdentifiers: string[] | undefined;
+    if (bindResult.dbClusters) {
+      dbClusterIdentifiers = bindResult.dbClusters.map((c) => c.clusterIdentifier);
+    }
+
+    if (!!dbInstanceIdentifiers && !!dbClusterIdentifiers) {
+      throw new Error('Cannot specify both dbInstanceIdentifiers and dbClusterIdentifiers');
+    }
+
     const proxyTargetGroup = new CfnDBProxyTargetGroup(this, 'ProxyTargetGroup', {
       dbProxyName: this.dbProxyName,
       dbInstanceIdentifiers,
-      dbClusterIdentifiers: bindResult.dbClusters?.map((c) => c.clusterIdentifier),
+      dbClusterIdentifiers,
       connectionPoolConfigurationInfo: toConnectionPoolConfigurationInfo(props),
     });
 

diff --git a/packages/@aws-cdk/aws-rds/test/test.proxy.ts b/packages/@aws-cdk/aws-rds/test/test.proxy.ts
@@ -141,14 +141,6 @@ export = {
             Ref: 'DatabaseB269D8BB',
           },
         ],
-        DBInstanceIdentifiers: [
-          {
-            Ref: 'DatabaseInstance1844F58FD',
-          },
-          {
-            Ref: 'DatabaseInstance2AA380DEE',
-          },
-        ],
         TargetGroupName: 'default',
       },
     }, ResourcePart.CompleteDefinition));