Merge branch 'main' into 29062

aws · Mar 8, 2024 · 7e84d68 · 7e84d68
2 parents 69b92d4 + 2dbb381
commit 7e84d68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/aws-cdk-lib/aws-rds/lib/proxy.ts b/packages/aws-cdk-lib/aws-rds/lib/proxy.ts
@@ -104,7 +104,8 @@ export class ProxyTarget {
 
     const engineFamily = engine.engineFamily;
     if (!engineFamily) {
-      throw new Error(`Engine '${engineDescription(engine)}' does not support proxies`);
+      throw new Error('RDS proxies require an engine family to be specified on the database cluster or instance. ' +
+        `No family specified for engine '${engineDescription(engine)}'`);
     }
 
     // allow connecting to the Cluster/Instance from the Proxy

diff --git a/packages/aws-cdk-lib/aws-rds/test/proxy.test.ts b/packages/aws-cdk-lib/aws-rds/test/proxy.test.ts
@@ -203,7 +203,7 @@ describe('proxy', () => {
         vpc,
         secrets: [new secretsmanager.Secret(stack, 'Secret')],
       });
-    }).toThrow(/Engine 'mariadb-10\.0\.24' does not support proxies/);
+    }).toThrow(/RDS proxies require an engine family to be specified on the database cluster or instance. No family specified for engine 'mariadb-10\.0\.24'/);
   });
 
   test('correctly creates a proxy for an imported Cluster if its engine is known', () => {