Merge branch 'main' into go-build-breaks-with-space

aws · Jan 3, 2024 · 1b4f978 · 1b4f978
2 parents 5826ca9 + 669e6ff
commit 1b4f978
Show file tree

Hide file tree

Showing 19 changed files with 2,315 additions and 63 deletions.
diff --git a/...framework-integ/test/aws-rds/test/integ.proxy.js.snapshot/aws-cdk-rds-proxy.template.json b/...framework-integ/test/aws-rds/test/integ.proxy.js.snapshot/aws-cdk-rds-proxy.template.json
@@ -601,6 +601,7 @@
     "Auth": [
      {
       "AuthScheme": "SECRETS",
+      "ClientPasswordAuthType": "POSTGRES_SCRAM_SHA_256",
       "IAMAuth": "DISABLED",
       "SecretArn": {
        "Ref": "dbInstanceSecretAttachment88CFBDAE"

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.proxy.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.proxy.ts
@@ -27,6 +27,7 @@ new rds.DatabaseProxy(stack, 'dbProxy', {
   secrets: [dbInstance.secret!],
   proxyTarget: rds.ProxyTarget.fromInstance(dbInstance),
   vpc,
+  clientPasswordAuthType: rds.ClientPasswordAuthType.POSTGRES_SCRAM_SHA_256,
 });
 
 const cluster = new rds.DatabaseCluster(stack, 'dbCluster', {

diff --git a/...t/aws-rds/test/integ.serverless-cluster-scaling.js.snapshot/aws-cdk-rds-integ.assets.json b/...t/aws-rds/test/integ.serverless-cluster-scaling.js.snapshot/aws-cdk-rds-integ.assets.json