From becf0a7f32aba5c9437fba2776897e69228251ee Mon Sep 17 00:00:00 2001 From: Ben Limmer Date: Mon, 6 Jan 2025 14:24:40 -0700 Subject: [PATCH] fix: method signature --- packages/aws-cdk-lib/aws-rds/lib/cluster.ts | 7 ++++++- packages/aws-cdk-lib/aws-rds/lib/instance.ts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/aws-cdk-lib/aws-rds/lib/cluster.ts b/packages/aws-cdk-lib/aws-rds/lib/cluster.ts index ecee3c4c7ada0..b23ed56a49883 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/cluster.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/cluster.ts @@ -901,7 +901,12 @@ abstract class DatabaseClusterNew extends DatabaseClusterBase { enableCloudwatchLogsExports: props.cloudwatchLogsExports, // Encryption kmsKeyId: props.storageEncryptionKey?.keyArn, - storageEncrypted: getStorageEncryptedProperty(this, props), + storageEncrypted: getStorageEncryptedProperty( + this, + props.storageEncrypted, + props.storageEncryptedLegacyDefaultValue, + props.storageEncryptionKey, + ), // Tags copyTagsToSnapshot: props.copyTagsToSnapshot ?? true, domain: this.domainId, diff --git a/packages/aws-cdk-lib/aws-rds/lib/instance.ts b/packages/aws-cdk-lib/aws-rds/lib/instance.ts index 60bd3bc091b29..abec694bcc93c 100644 --- a/packages/aws-cdk-lib/aws-rds/lib/instance.ts +++ b/packages/aws-cdk-lib/aws-rds/lib/instance.ts @@ -1198,7 +1198,12 @@ export class DatabaseInstance extends DatabaseInstanceSource implements IDatabas kmsKeyId: props.storageEncryptionKey && props.storageEncryptionKey.keyArn, masterUsername: credentials.username, masterUserPassword: credentials.password?.unsafeUnwrap(), - storageEncrypted: getStorageEncryptedProperty(this, props), + storageEncrypted: getStorageEncryptedProperty( + this, + props.storageEncrypted, + props.storageEncryptedLegacyDefaultValue, + props.storageEncryptionKey, + ), }); this.instanceIdentifier = this.getResourceNameAttribute(instance.ref);