@fjall/components-infrastructure 0.89.5 → 0.94.0

package/dist/lib/resources/aws/database/rdsAurora.d.ts

@@ -2,8 +2,10 @@ import { Duration } from "aws-cdk-lib";
 import { Connections, type IConnectable, type IVpc } from "aws-cdk-lib/aws-ec2";
 import { DatabaseCluster, type CfnDBCluster, type IClusterEngine } from "aws-cdk-lib/aws-rds";
 import { Construct } from "constructs";
-import { Secret } from "../secrets";
-import { type EngineConfig, type ProxyConfig, type CredentialsConfig, type AuroraEncryptionConfig, type AuroraWriterConfig, type AuroraReadersConfig, type DatabaseInsightsConfig } from "../../../utils/databaseTypes";
+import { Secret } from "../secrets/index.js";
+import type { ITopic } from "aws-cdk-lib/aws-sns";
+import { type RdsAlarmThresholds } from "../monitoring/index.js";
+import { type EngineConfig, type ProxyConfig, type CredentialsConfig, type AuroraEncryptionConfig, type AuroraWriterConfig, type AuroraReadersConfig, type DatabaseInsightsConfig } from "../../../utils/databaseTypes.js";
 interface RdsProps {
     vpc: IVpc;
     databaseName?: string;
@@ -43,6 +45,12 @@ interface RdsProps {
      * Format: CIDR notation (e.g., "203.0.113.0/32" for single IP)
      */
     allowedIpCidr?: string;
+    /** SNS topic for alarm notifications. Required for alarm creation. */
+    alertsTopic?: ITopic;
+    /** Alarm thresholds. false to disable, undefined for defaults, object to override. */
+    alarms?: RdsAlarmThresholds | false;
+    /** Application ID for alarm tagging. */
+    applicationId?: string;
 }
 export declare class RdsAurora extends Construct implements IConnectable {
     connections: Connections;

package/dist/lib/resources/aws/database/rdsAurora.js

@@ -1,39 +1,45 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RdsAurora = void 0;
-const aws_cdk_lib_1 = require("aws-cdk-lib");
-const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
-const aws_rds_1 = require("aws-cdk-lib/aws-rds");
-const constructs_1 = require("constructs");
-const securityGroup_js_1 = require("../networking/securityGroup.js");
-const secrets_1 = require("../secrets");
-const resourceNaming_1 = require("../../../utils/resourceNaming");
-const rdsProxyOutput_1 = require("./rdsProxyOutput");
-const _1 = require("./");
-const rdsDefaults_1 = require("./rdsDefaults");
-const rdsHelpers_1 = require("./rdsHelpers");
-class RdsAurora extends constructs_1.Construct {
+import { Duration, RemovalPolicy } from "aws-cdk-lib";
+import { Connections, Peer, Port, SubnetType } from "aws-cdk-lib/aws-ec2";
+import { AuroraPostgresEngineVersion, CaCertificate, ClusterInstance, Credentials, DatabaseCluster, DatabaseClusterFromSnapshot, DatabaseClusterEngine, DatabaseProxy, ParameterGroup, ProxyTarget, SnapshotCredentials } from "aws-cdk-lib/aws-rds";
+import { Construct } from "constructs";
+import { SecurityGroup } from "../networking/securityGroup.js";
+import { Secret } from "../secrets/index.js";
+import { ResourceNaming } from "../../../utils/resourceNaming.js";
+import { addProxyCfnOutput } from "./rdsProxyOutput.js";
+import { getDatabaseInsightsRetention } from "./index.js";
+import { RDS_DEFAULTS } from "./rdsDefaults.js";
+import { createRdsAlarms } from "../monitoring/index.js";
+import { DEFAULT_POSTGRES_ENGINE_CONFIG, resolveDatabaseInsights, resolveStorageEncryptionKey, resolvePerformanceInsightsKey, addMultiUserSecretRotation } from "./rdsHelpers.js";
+export class RdsAurora extends Construct {
+    connections;
+    constructId;
+    port;
+    engineConfig;
+    databaseCluster;
+    databaseProxy;
+    databaseCredentials;
+    cfnCluster;
     constructor(scope, id, props) {
         super(scope, id);
         this.constructId = id;
-        this.port = props.port ?? rdsDefaults_1.RDS_DEFAULTS.DEFAULT_PORT;
+        this.port = props.port ?? RDS_DEFAULTS.DEFAULT_PORT;
         // PostgreSQL fallback for direct usage - ensure engine and engineConfig match
-        this.engineConfig = props.engineConfig ?? rdsHelpers_1.DEFAULT_POSTGRES_ENGINE_CONFIG;
-        const { piEnabled, piConfig } = (0, rdsHelpers_1.resolveDatabaseInsights)(props.databaseInsights);
+        this.engineConfig = props.engineConfig ?? DEFAULT_POSTGRES_ENGINE_CONFIG;
+        const { piEnabled, piConfig } = resolveDatabaseInsights(props.databaseInsights);
         // Username priority: snapshotUsername > credentials.username > engine default
         const username = props.snapshotIdentifier && props.snapshotUsername
             ? props.snapshotUsername
             : (props.credentials?.username ?? this.engineConfig.defaultUsername);
         // Global secondary clusters import replicated secret instead of creating new
         if (props.isGlobalSecondary) {
-            this.databaseCredentials = new secrets_1.Secret(this, `${props.databaseName}Credentials`, {
-                secretName: resourceNaming_1.ResourceNaming.credentialsSecretName(id),
+            this.databaseCredentials = new Secret(this, `${props.databaseName}Credentials`, {
+                secretName: ResourceNaming.credentialsSecretName(id),
                 importExisting: true
             });
         }
         else {
-            this.databaseCredentials = new secrets_1.Secret(this, `${props.databaseName}Credentials`, {
-                secretName: resourceNaming_1.ResourceNaming.credentialsSecretName(id),
+            this.databaseCredentials = new Secret(this, `${props.databaseName}Credentials`, {
+                secretName: ResourceNaming.credentialsSecretName(id),
                 generateSecretString: {
                     secretStringTemplate: JSON.stringify({ username }),
                     excludePunctuation: true,
@@ -43,32 +49,32 @@ class RdsAurora extends constructs_1.Construct {
                 replicaRegions: props.secretReplicaRegions
             });
         }
-        const storageEncryptionKey = (0, rdsHelpers_1.resolveStorageEncryptionKey)(this, props.databaseName, props.encryption?.storageKey);
-        const performanceInsightsKey = (0, rdsHelpers_1.resolvePerformanceInsightsKey)(this, props.databaseName, piEnabled, piConfig?.encryptionKey);
-        const clusterSecurityGroup = new securityGroup_js_1.SecurityGroup(this, `${id}SecurityGroup`, {
+        const storageEncryptionKey = resolveStorageEncryptionKey(this, props.databaseName, props.encryption?.storageKey);
+        const performanceInsightsKey = resolvePerformanceInsightsKey(this, props.databaseName, piEnabled, piConfig?.encryptionKey);
+        const clusterSecurityGroup = new SecurityGroup(this, `${id}SecurityGroup`, {
             vpc: props.vpc,
             description: `Security group for Aurora cluster ${props.databaseName}`
         });
-        clusterSecurityGroup.addIngressRule(clusterSecurityGroup, aws_ec2_1.Port.tcp(this.port));
+        clusterSecurityGroup.addIngressRule(clusterSecurityGroup, Port.tcp(this.port));
         // Allow VPC-wide access when enabled (avoids cross-stack cyclic dependencies)
         if (props.allowVpcAccess) {
-            clusterSecurityGroup.addIngressRule(aws_ec2_1.Peer.ipv4(props.vpc.vpcCidrBlock), aws_ec2_1.Port.tcp(this.port), "Allow access from VPC CIDR");
+            clusterSecurityGroup.addIngressRule(Peer.ipv4(props.vpc.vpcCidrBlock), Port.tcp(this.port), "Allow access from VPC CIDR");
         }
         // Allow external access when publicly accessible with allowed IP
         if (props.publiclyAccessible && props.allowedIpCidr) {
-            clusterSecurityGroup.addIngressRule(aws_ec2_1.Peer.ipv4(props.allowedIpCidr), aws_ec2_1.Port.tcp(this.port), "Allow external access from allowed IP");
+            clusterSecurityGroup.addIngressRule(Peer.ipv4(props.allowedIpCidr), Port.tcp(this.port), "Allow external access from allowed IP");
         }
-        this.connections = new aws_ec2_1.Connections({
+        this.connections = new Connections({
             securityGroups: [clusterSecurityGroup],
-            defaultPort: aws_ec2_1.Port.tcp(this.port)
+            defaultPort: Port.tcp(this.port)
         });
         const writerConfig = props.writer ?? {};
         const writerPI = writerConfig.enableDatabaseInsights ?? piEnabled;
         const writerSuffix = writerConfig.identifierSuffix;
         const diMode = piConfig?.mode ?? "standard";
-        const performanceInsightsRetention = (0, _1.getDatabaseInsightsRetention)(diMode);
+        const performanceInsightsRetention = getDatabaseInsightsRetention(diMode);
         const databaseName = props.databaseName || id;
-        const writer = aws_rds_1.ClusterInstance.serverlessV2(`${databaseName}Writer`, {
+        const writer = ClusterInstance.serverlessV2(`${databaseName}Writer`, {
             enablePerformanceInsights: writerPI,
             performanceInsightEncryptionKey: writerPI
                 ? performanceInsightsKey
@@ -76,8 +82,8 @@ class RdsAurora extends constructs_1.Construct {
             performanceInsightRetention: writerPI
                 ? performanceInsightsRetention
                 : undefined,
-            instanceIdentifier: resourceNaming_1.ResourceNaming.writerInstanceId(id, writerSuffix),
-            caCertificate: aws_rds_1.CaCertificate.RDS_CA_RSA4096_G1,
+            instanceIdentifier: ResourceNaming.writerInstanceId(id, writerSuffix),
+            caCertificate: CaCertificate.RDS_CA_RSA4096_G1,
             publiclyAccessible: props.publiclyAccessible,
             ...(writerConfig.availabilityZone && {
                 availabilityZone: writerConfig.availabilityZone
@@ -85,18 +91,18 @@ class RdsAurora extends constructs_1.Construct {
         });
         const readers = this.buildReaders(props, piEnabled, performanceInsightsKey, performanceInsightsRetention);
         const engine = props.engine ||
-            aws_rds_1.DatabaseClusterEngine.auroraPostgres({
-                version: aws_rds_1.AuroraPostgresEngineVersion.of("16.6", "16")
+            DatabaseClusterEngine.auroraPostgres({
+                version: AuroraPostgresEngineVersion.of("16.6", "16")
             });
-        const parameterGroup = new aws_rds_1.ParameterGroup(this, `${props.databaseName}ParameterGroup`, {
+        const parameterGroup = new ParameterGroup(this, `${props.databaseName}ParameterGroup`, {
             engine,
             description: `Parameter group for ${props.databaseName} with security defaults`,
             parameters: this.engineConfig.sslParameters
         });
         // Use public subnets when publicly accessible, otherwise private
         const vpcSubnets = props.publiclyAccessible
-            ? { subnetType: aws_ec2_1.SubnetType.PUBLIC }
-            : { subnetType: aws_ec2_1.SubnetType.PRIVATE_WITH_EGRESS };
+            ? { subnetType: SubnetType.PUBLIC }
+            : { subnetType: SubnetType.PRIVATE_WITH_EGRESS };
         // Common props shared across all cluster creation paths
         const baseClusterProps = {
             vpc: props.vpc,
@@ -104,15 +110,15 @@ class RdsAurora extends constructs_1.Construct {
             securityGroups: [clusterSecurityGroup],
             engine,
             parameterGroup,
-            backup: { retention: aws_cdk_lib_1.Duration.days(props.backupRetention ?? 14) },
+            backup: { retention: Duration.days(props.backupRetention ?? 14) },
             storageEncrypted: true,
             ...(storageEncryptionKey && { storageEncryptionKey }),
-            clusterIdentifier: props.clusterIdentifier?.toLowerCase() || resourceNaming_1.ResourceNaming.clusterId(id),
-            monitoringInterval: props.monitoringInterval || rdsDefaults_1.RDS_DEFAULTS.MONITORING_INTERVAL,
+            clusterIdentifier: props.clusterIdentifier?.toLowerCase() || ResourceNaming.clusterId(id),
+            monitoringInterval: props.monitoringInterval || RDS_DEFAULTS.MONITORING_INTERVAL,
             preferredMaintenanceWindow: props.preferredMaintenanceWindow ||
-                rdsDefaults_1.RDS_DEFAULTS.PREFERRED_MAINTENANCE_WINDOW,
+                RDS_DEFAULTS.PREFERRED_MAINTENANCE_WINDOW,
             port: this.port,
-            removalPolicy: aws_cdk_lib_1.RemovalPolicy.SNAPSHOT,
+            removalPolicy: RemovalPolicy.SNAPSHOT,
             deletionProtection: props.deletionProtection ?? true,
             iamAuthentication: true,
             writer,
@@ -122,7 +128,7 @@ class RdsAurora extends constructs_1.Construct {
         const primaryClusterProps = props.isGlobalSecondary
             ? {}
             : {
-                credentials: aws_rds_1.Credentials.fromSecret(this.databaseCredentials.secret),
+                credentials: Credentials.fromSecret(this.databaseCredentials.secret),
                 defaultDatabaseName: (props.databaseName || id.replace("Rds", "")).replace(/[^a-zA-Z0-9_]/g, "")
             };
         if (props.snapshotIdentifier) {
@@ -130,9 +136,9 @@ class RdsAurora extends constructs_1.Construct {
             const snapshotCredentials = props.isGlobalSecondary
                 ? {}
                 : {
-                    credentials: aws_rds_1.SnapshotCredentials.fromSecret(this.databaseCredentials.secret)
+                    credentials: SnapshotCredentials.fromSecret(this.databaseCredentials.secret)
                 };
-            this.databaseCluster = new aws_rds_1.DatabaseClusterFromSnapshot(this, `${id}Database`, 
+            this.databaseCluster = new DatabaseClusterFromSnapshot(this, `${id}Database`, 
             // Type assertion: CDK's SnapshotCredentials.username is string | undefined
             // but DatabaseClusterFromSnapshotProps expects string. Works at runtime.
             {
@@ -143,7 +149,7 @@ class RdsAurora extends constructs_1.Construct {
         }
         else {
             // Create new cluster
-            this.databaseCluster = new aws_rds_1.DatabaseCluster(this, `${id}Database`, 
+            this.databaseCluster = new DatabaseCluster(this, `${id}Database`, 
             // Type assertion: spread types don't preserve required property narrowing
             { ...baseClusterProps, ...primaryClusterProps });
         }
@@ -165,6 +171,17 @@ class RdsAurora extends constructs_1.Construct {
                 this.addSecretRotation(props);
             }
         }
+        if (props.alertsTopic && props.alarms !== false) {
+            createRdsAlarms({
+                scope: this,
+                databaseName: this.constructId,
+                database: this.databaseCluster,
+                config: typeof props.alarms === "object" ? props.alarms : {},
+                alarmTopic: props.alertsTopic,
+                applicationId: props.applicationId,
+                freeStorageMetricName: "FreeLocalStorage"
+            });
+        }
     }
     buildReaders(props, defaultPIEnabled, piKey, piRetention) {
         if (props.readers === false) {
@@ -185,13 +202,13 @@ class RdsAurora extends constructs_1.Construct {
             : defaultPIEnabled;
         return readerConfigs.map((config, index) => {
             const enablePI = config.enableDatabaseInsights ?? defaultPI;
-            return aws_rds_1.ClusterInstance.serverlessV2(`${props.databaseName}Reader${index + 1}`, {
+            return ClusterInstance.serverlessV2(`${props.databaseName}Reader${index + 1}`, {
                 scaleWithWriter: config.scaleWithWriter ?? index === 0,
                 enablePerformanceInsights: enablePI,
                 performanceInsightEncryptionKey: enablePI ? piKey : undefined,
                 performanceInsightRetention: enablePI ? piRetention : undefined,
-                instanceIdentifier: resourceNaming_1.ResourceNaming.readerInstanceId(this.constructId, index + 1, config.identifierSuffix),
-                caCertificate: aws_rds_1.CaCertificate.RDS_CA_RSA4096_G1,
+                instanceIdentifier: ResourceNaming.readerInstanceId(this.constructId, index + 1, config.identifierSuffix),
+                caCertificate: CaCertificate.RDS_CA_RSA4096_G1,
                 publiclyAccessible: props.publiclyAccessible,
                 ...(config.availabilityZone && {
                     availabilityZone: config.availabilityZone
@@ -204,26 +221,26 @@ class RdsAurora extends constructs_1.Construct {
             return;
         const proxyConfig = props.proxy;
         const vpcSubnets = proxyConfig.vpcSubnets ?? {
-            subnetType: aws_ec2_1.SubnetType.PRIVATE_WITH_EGRESS
+            subnetType: SubnetType.PRIVATE_WITH_EGRESS
         };
-        this.databaseProxy = new aws_rds_1.DatabaseProxy(this, `${props.databaseName}DatabaseProxy`, {
-            dbProxyName: resourceNaming_1.ResourceNaming.proxyName(this.constructId),
-            proxyTarget: aws_rds_1.ProxyTarget.fromCluster(this.databaseCluster),
+        this.databaseProxy = new DatabaseProxy(this, `${props.databaseName}DatabaseProxy`, {
+            dbProxyName: ResourceNaming.proxyName(this.constructId),
+            proxyTarget: ProxyTarget.fromCluster(this.databaseCluster),
             secrets: [this.databaseCredentials.secret],
             securityGroups: [securityGroup],
             vpc: props.vpc,
             vpcSubnets,
             requireTLS: proxyConfig.requireTLS ?? true,
             borrowTimeout: proxyConfig.connectionBorrowTimeout
-                ? aws_cdk_lib_1.Duration.seconds(proxyConfig.connectionBorrowTimeout)
-                : aws_cdk_lib_1.Duration.seconds(120),
+                ? Duration.seconds(proxyConfig.connectionBorrowTimeout)
+                : Duration.seconds(120),
             maxConnectionsPercent: proxyConfig.maxConnections,
             maxIdleConnectionsPercent: proxyConfig.maxIdleConnections
         });
-        (0, rdsProxyOutput_1.addProxyCfnOutput)(this, this.constructId, props.databaseName, this.databaseProxy);
+        addProxyCfnOutput(this, this.constructId, props.databaseName, this.databaseProxy);
     }
     addSecretRotation(props) {
-        (0, rdsHelpers_1.addMultiUserSecretRotation)({
+        addMultiUserSecretRotation({
             scope: this,
             databaseName: props.databaseName,
             constructId: this.constructId,
@@ -254,5 +271,3 @@ class RdsAurora extends constructs_1.Construct {
         return this.databaseCluster;
     }
 }
-exports.RdsAurora = RdsAurora;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsAurora.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsAurora.ts"],"names":[],"mappings":"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","sourcesContent":["import { Duration, RemovalPolicy } from \"aws-cdk-lib\";\nimport { type IKey } from \"aws-cdk-lib/aws-kms\";\nimport {\n  Connections,\n  type IConnectable,\n  type ISecurityGroup,\n  type IVpc,\n  Peer,\n  Port,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport {\n  AuroraPostgresEngineVersion,\n  CaCertificate,\n  ClusterInstance,\n  Credentials,\n  DatabaseCluster,\n  type DatabaseClusterProps,\n  DatabaseClusterFromSnapshot,\n  type DatabaseClusterFromSnapshotProps,\n  DatabaseClusterEngine,\n  type CfnDBCluster,\n  DatabaseProxy,\n  type IClusterEngine,\n  type IClusterInstance,\n  ParameterGroup,\n  type PerformanceInsightRetention,\n  ProxyTarget,\n  SnapshotCredentials\n} from \"aws-cdk-lib/aws-rds\";\nimport { Construct } from \"constructs\";\nimport { SecurityGroup } from \"../networking/securityGroup.js\";\nimport { Secret } from \"../secrets\";\nimport { ResourceNaming } from \"../../../utils/resourceNaming\";\nimport { addProxyCfnOutput } from \"./rdsProxyOutput\";\nimport { getDatabaseInsightsRetention } from \"./\";\nimport { RDS_DEFAULTS } from \"./rdsDefaults\";\nimport {\n  DEFAULT_POSTGRES_ENGINE_CONFIG,\n  resolveDatabaseInsights,\n  resolveStorageEncryptionKey,\n  resolvePerformanceInsightsKey,\n  addMultiUserSecretRotation\n} from \"./rdsHelpers\";\nimport {\n  type EngineConfig,\n  type ProxyConfig,\n  type CredentialsConfig,\n  type AuroraEncryptionConfig,\n  type AuroraWriterConfig,\n  type AuroraReadersConfig,\n  type AuroraReaderConfig,\n  type DatabaseInsightsConfig\n} from \"../../../utils/databaseTypes\";\n\ninterface RdsProps {\n  vpc: IVpc;\n  databaseName?: string;\n  engine?: IClusterEngine;\n  engineConfig?: EngineConfig;\n  clusterIdentifier?: string;\n  writer?: AuroraWriterConfig;\n  readers?: AuroraReadersConfig | false;\n  proxy?: ProxyConfig | false;\n  credentials?: CredentialsConfig;\n  encryption?: AuroraEncryptionConfig;\n  backupRetention?: number;\n  monitoringInterval?: Duration;\n  preferredMaintenanceWindow?: string;\n  port?: number;\n  databaseInsights?: DatabaseInsightsConfig | false;\n  /** Skips secret rotation for secondary clusters in global database */\n  isGlobalSecondary?: boolean;\n  secretReplicaRegions?: string[];\n  deletionProtection?: boolean;\n  /** ARN or identifier of DB cluster snapshot to restore from */\n  snapshotIdentifier?: string;\n  /** Username from the snapshot (required when restoring from snapshot to reset password) */\n  snapshotUsername?: string;\n  /** Allow access from VPC CIDR (avoids cross-stack cyclic dependencies with Lambda) */\n  allowVpcAccess?: boolean;\n  /**\n   * Make database publicly accessible from the internet.\n   * WARNING: This is a security risk and should only be used for development\n   * or when building Payload apps locally that need database access.\n   * When enabled, the database is placed in public subnets.\n   */\n  publiclyAccessible?: boolean;\n  /**\n   * IP address to allow access from when publiclyAccessible is true.\n   * If not specified, access is restricted to VPC only even when public.\n   * Format: CIDR notation (e.g., \"203.0.113.0/32\" for single IP)\n   */\n  allowedIpCidr?: string;\n}\n\nexport class RdsAurora extends Construct implements IConnectable {\n  public connections: Connections;\n\n  private readonly constructId: string;\n  private port: number;\n  private engineConfig: EngineConfig;\n  private databaseCluster: DatabaseCluster;\n  private databaseProxy?: DatabaseProxy;\n  private databaseCredentials: Secret;\n  private cfnCluster?: CfnDBCluster;\n\n  constructor(scope: Construct, id: string, props: RdsProps) {\n    super(scope, id);\n\n    this.constructId = id;\n    this.port = props.port ?? RDS_DEFAULTS.DEFAULT_PORT;\n\n    // PostgreSQL fallback for direct usage - ensure engine and engineConfig match\n    this.engineConfig = props.engineConfig ?? DEFAULT_POSTGRES_ENGINE_CONFIG;\n\n    const { piEnabled, piConfig } = resolveDatabaseInsights(\n      props.databaseInsights\n    );\n\n    // Username priority: snapshotUsername > credentials.username > engine default\n    const username =\n      props.snapshotIdentifier && props.snapshotUsername\n        ? props.snapshotUsername\n        : (props.credentials?.username ?? this.engineConfig.defaultUsername);\n\n    // Global secondary clusters import replicated secret instead of creating new\n    if (props.isGlobalSecondary) {\n      this.databaseCredentials = new Secret(\n        this,\n        `${props.databaseName}Credentials`,\n        {\n          secretName: ResourceNaming.credentialsSecretName(id),\n          importExisting: true\n        }\n      );\n    } else {\n      this.databaseCredentials = new Secret(\n        this,\n        `${props.databaseName}Credentials`,\n        {\n          secretName: ResourceNaming.credentialsSecretName(id),\n          generateSecretString: {\n            secretStringTemplate: JSON.stringify({ username }),\n            excludePunctuation: true,\n            includeSpace: false,\n            generateStringKey: \"password\"\n          },\n          replicaRegions: props.secretReplicaRegions\n        }\n      );\n    }\n\n    const storageEncryptionKey = resolveStorageEncryptionKey(\n      this,\n      props.databaseName,\n      props.encryption?.storageKey\n    );\n\n    const performanceInsightsKey = resolvePerformanceInsightsKey(\n      this,\n      props.databaseName,\n      piEnabled,\n      piConfig?.encryptionKey\n    );\n\n    const clusterSecurityGroup = new SecurityGroup(this, `${id}SecurityGroup`, {\n      vpc: props.vpc,\n      description: `Security group for Aurora cluster ${props.databaseName}`\n    });\n\n    clusterSecurityGroup.addIngressRule(\n      clusterSecurityGroup,\n      Port.tcp(this.port)\n    );\n\n    // Allow VPC-wide access when enabled (avoids cross-stack cyclic dependencies)\n    if (props.allowVpcAccess) {\n      clusterSecurityGroup.addIngressRule(\n        Peer.ipv4(props.vpc.vpcCidrBlock),\n        Port.tcp(this.port),\n        \"Allow access from VPC CIDR\"\n      );\n    }\n\n    // Allow external access when publicly accessible with allowed IP\n    if (props.publiclyAccessible && props.allowedIpCidr) {\n      clusterSecurityGroup.addIngressRule(\n        Peer.ipv4(props.allowedIpCidr),\n        Port.tcp(this.port),\n        \"Allow external access from allowed IP\"\n      );\n    }\n\n    this.connections = new Connections({\n      securityGroups: [clusterSecurityGroup],\n      defaultPort: Port.tcp(this.port)\n    });\n\n    const writerConfig = props.writer ?? {};\n    const writerPI = writerConfig.enableDatabaseInsights ?? piEnabled;\n    const writerSuffix = writerConfig.identifierSuffix;\n    const diMode = piConfig?.mode ?? \"standard\";\n    const performanceInsightsRetention = getDatabaseInsightsRetention(diMode);\n    const databaseName = props.databaseName || id;\n\n    const writer = ClusterInstance.serverlessV2(`${databaseName}Writer`, {\n      enablePerformanceInsights: writerPI,\n      performanceInsightEncryptionKey: writerPI\n        ? performanceInsightsKey\n        : undefined,\n      performanceInsightRetention: writerPI\n        ? performanceInsightsRetention\n        : undefined,\n      instanceIdentifier: ResourceNaming.writerInstanceId(id, writerSuffix),\n      caCertificate: CaCertificate.RDS_CA_RSA4096_G1,\n      publiclyAccessible: props.publiclyAccessible,\n      ...(writerConfig.availabilityZone && {\n        availabilityZone: writerConfig.availabilityZone\n      })\n    });\n\n    const readers = this.buildReaders(\n      props,\n      piEnabled,\n      performanceInsightsKey,\n      performanceInsightsRetention\n    );\n\n    const engine =\n      props.engine ||\n      DatabaseClusterEngine.auroraPostgres({\n        version: AuroraPostgresEngineVersion.of(\"16.6\", \"16\")\n      });\n\n    const parameterGroup = new ParameterGroup(\n      this,\n      `${props.databaseName}ParameterGroup`,\n      {\n        engine,\n        description: `Parameter group for ${props.databaseName} with security defaults`,\n        parameters: this.engineConfig.sslParameters\n      }\n    );\n\n    // Use public subnets when publicly accessible, otherwise private\n    const vpcSubnets = props.publiclyAccessible\n      ? { subnetType: SubnetType.PUBLIC }\n      : { subnetType: SubnetType.PRIVATE_WITH_EGRESS };\n\n    // Common props shared across all cluster creation paths\n    const baseClusterProps = {\n      vpc: props.vpc,\n      vpcSubnets,\n      securityGroups: [clusterSecurityGroup] as ISecurityGroup[],\n      engine,\n      parameterGroup,\n      backup: { retention: Duration.days(props.backupRetention ?? 14) },\n      storageEncrypted: true,\n      ...(storageEncryptionKey && { storageEncryptionKey }),\n      clusterIdentifier:\n        props.clusterIdentifier?.toLowerCase() || ResourceNaming.clusterId(id),\n      monitoringInterval:\n        props.monitoringInterval || RDS_DEFAULTS.MONITORING_INTERVAL,\n      preferredMaintenanceWindow:\n        props.preferredMaintenanceWindow ||\n        RDS_DEFAULTS.PREFERRED_MAINTENANCE_WINDOW,\n      port: this.port,\n      removalPolicy: RemovalPolicy.SNAPSHOT,\n      deletionProtection: props.deletionProtection ?? true,\n      iamAuthentication: true,\n      writer,\n      readers\n    };\n\n    // Credentials and database name for non-global-secondary clusters\n    const primaryClusterProps = props.isGlobalSecondary\n      ? {}\n      : {\n          credentials: Credentials.fromSecret(this.databaseCredentials.secret),\n          defaultDatabaseName: (\n            props.databaseName || id.replace(\"Rds\", \"\")\n          ).replace(/[^a-zA-Z0-9_]/g, \"\")\n        };\n\n    if (props.snapshotIdentifier) {\n      // Create from snapshot - credentials need SnapshotCredentials type\n      const snapshotCredentials = props.isGlobalSecondary\n        ? {}\n        : {\n            credentials: SnapshotCredentials.fromSecret(\n              this.databaseCredentials.secret\n            )\n          };\n\n      this.databaseCluster = new DatabaseClusterFromSnapshot(\n        this,\n        `${id}Database`,\n        // Type assertion: CDK's SnapshotCredentials.username is string | undefined\n        // but DatabaseClusterFromSnapshotProps expects string. Works at runtime.\n        {\n          ...baseClusterProps,\n          ...snapshotCredentials,\n          snapshotIdentifier: props.snapshotIdentifier\n        } as DatabaseClusterFromSnapshotProps\n      );\n    } else {\n      // Create new cluster\n      this.databaseCluster = new DatabaseCluster(\n        this,\n        `${id}Database`,\n        // Type assertion: spread types don't preserve required property narrowing\n        { ...baseClusterProps, ...primaryClusterProps } as DatabaseClusterProps\n      );\n    }\n\n    this.cfnCluster = this.databaseCluster.node.defaultChild as\n      | CfnDBCluster\n      | undefined;\n\n    // Global secondary clusters can't specify these properties\n    if (props.isGlobalSecondary && this.cfnCluster) {\n      this.cfnCluster.masterUsername = undefined;\n      this.cfnCluster.masterUserPassword = undefined;\n      this.cfnCluster.databaseName = undefined;\n    }\n\n    const proxyEnabled = props.proxy !== undefined && props.proxy !== false;\n    if (proxyEnabled) {\n      this.addProxy(props, clusterSecurityGroup);\n    }\n\n    // Secret rotation enabled by default (opt-out with secretRotation: false)\n    if (!props.isGlobalSecondary) {\n      const secretRotationDisabled =\n        props.credentials?.secretRotation === false;\n      if (!secretRotationDisabled) {\n        this.addSecretRotation(props);\n      }\n    }\n  }\n\n  private buildReaders(\n    props: RdsProps,\n    defaultPIEnabled: boolean,\n    piKey?: IKey,\n    piRetention?: PerformanceInsightRetention\n  ): IClusterInstance[] {\n    if (props.readers === false) {\n      return [];\n    }\n\n    let readerConfigs: AuroraReaderConfig[];\n    if (props.readers?.instances) {\n      readerConfigs = props.readers.instances;\n    } else {\n      const count = props.readers?.count ?? 1;\n      readerConfigs = Array.from({ length: count }, (_, i) => ({\n        scaleWithWriter: i === 0\n      }));\n    }\n\n    const defaultPI =\n      props.readers && \"defaultEnableDatabaseInsights\" in props.readers\n        ? (props.readers.defaultEnableDatabaseInsights ?? defaultPIEnabled)\n        : defaultPIEnabled;\n\n    return readerConfigs.map((config, index) => {\n      const enablePI = config.enableDatabaseInsights ?? defaultPI;\n\n      return ClusterInstance.serverlessV2(\n        `${props.databaseName}Reader${index + 1}`,\n        {\n          scaleWithWriter: config.scaleWithWriter ?? index === 0,\n          enablePerformanceInsights: enablePI,\n          performanceInsightEncryptionKey: enablePI ? piKey : undefined,\n          performanceInsightRetention: enablePI ? piRetention : undefined,\n          instanceIdentifier: ResourceNaming.readerInstanceId(\n            this.constructId,\n            index + 1,\n            config.identifierSuffix\n          ),\n          caCertificate: CaCertificate.RDS_CA_RSA4096_G1,\n          publiclyAccessible: props.publiclyAccessible,\n          ...(config.availabilityZone && {\n            availabilityZone: config.availabilityZone\n          })\n        }\n      );\n    });\n  }\n\n  private addProxy(props: RdsProps, securityGroup: SecurityGroup): void {\n    if (!props.proxy) return;\n    const proxyConfig = props.proxy;\n    const vpcSubnets = proxyConfig.vpcSubnets ?? {\n      subnetType: SubnetType.PRIVATE_WITH_EGRESS\n    };\n\n    this.databaseProxy = new DatabaseProxy(\n      this,\n      `${props.databaseName}DatabaseProxy`,\n      {\n        dbProxyName: ResourceNaming.proxyName(this.constructId),\n        proxyTarget: ProxyTarget.fromCluster(this.databaseCluster),\n        secrets: [this.databaseCredentials.secret],\n        securityGroups: [securityGroup],\n        vpc: props.vpc,\n        vpcSubnets,\n        requireTLS: proxyConfig.requireTLS ?? true,\n        borrowTimeout: proxyConfig.connectionBorrowTimeout\n          ? Duration.seconds(proxyConfig.connectionBorrowTimeout)\n          : Duration.seconds(120),\n        maxConnectionsPercent: proxyConfig.maxConnections,\n        maxIdleConnectionsPercent: proxyConfig.maxIdleConnections\n      }\n    );\n\n    addProxyCfnOutput(\n      this,\n      this.constructId,\n      props.databaseName,\n      this.databaseProxy\n    );\n  }\n\n  private addSecretRotation(props: RdsProps): void {\n    addMultiUserSecretRotation({\n      scope: this,\n      databaseName: props.databaseName,\n      constructId: this.constructId,\n      engineConfig: this.engineConfig,\n      credentialsConfig: props.credentials,\n      databaseSecret: this.databaseCredentials.secret,\n      target: this.databaseCluster,\n      vpc: this.databaseCluster.vpc\n    });\n  }\n\n  getHostEndpoint(): string {\n    // Return proxy endpoint if available, otherwise cluster endpoint\n    if (this.databaseProxy) {\n      return this.databaseProxy.endpoint;\n    }\n    return this.databaseCluster.clusterEndpoint.hostname;\n  }\n\n  getHostPort(): string {\n    return String(this.port);\n  }\n\n  getCredentials(): Secret {\n    return this.databaseCredentials;\n  }\n\n  getCfnCluster(): CfnDBCluster | undefined {\n    return this.cfnCluster;\n  }\n\n  getDatabaseCluster(): DatabaseCluster {\n    return this.databaseCluster;\n  }\n}\n"]}

package/dist/lib/resources/aws/database/rdsAuroraGlobal.d.ts

@@ -2,8 +2,8 @@ import { type Duration } from "aws-cdk-lib";
 import { Construct } from "constructs";
 import { type IVpc, type Connections, type IConnectable } from "aws-cdk-lib/aws-ec2";
 import { type IClusterEngine } from "aws-cdk-lib/aws-rds";
-import { type Secret } from "../secrets";
-import { type EngineConfig, type ProxyConfig, type CredentialsConfig, type AuroraEncryptionConfig, type AuroraWriterConfig, type AuroraReadersConfig, type DatabaseInsightsConfig } from "../../../utils/databaseTypes";
+import { type Secret } from "../secrets/index.js";
+import { type EngineConfig, type ProxyConfig, type CredentialsConfig, type AuroraEncryptionConfig, type AuroraWriterConfig, type AuroraReadersConfig, type DatabaseInsightsConfig } from "../../../utils/databaseTypes.js";
 interface RdsAuroraGlobalProps {
     vpc: IVpc;
     databaseName: string;

package/dist/lib/resources/aws/database/rdsAuroraGlobal.js

@@ -1,21 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RdsAuroraGlobal = void 0;
-const aws_cdk_lib_1 = require("aws-cdk-lib");
-const aws_rds_1 = require("aws-cdk-lib/aws-rds");
-const constructs_1 = require("constructs");
-const rdsAurora_1 = require("./rdsAurora");
-const resourceNaming_1 = require("../../../utils/resourceNaming");
-const capitaliseString_1 = require("../../../utils/capitaliseString");
-class RdsAuroraGlobal extends constructs_1.Construct {
+import { CfnOutput, Stack } from "aws-cdk-lib";
+import { CfnGlobalCluster } from "aws-cdk-lib/aws-rds";
+import { Construct } from "constructs";
+import { RdsAurora } from "./rdsAurora.js";
+import { ResourceNaming } from "../../../utils/resourceNaming.js";
+import { toPascalCase } from "../../../utils/capitaliseString.js";
+export class RdsAuroraGlobal extends Construct {
+    connections;
+    constructId;
+    globalCluster;
+    primaryCluster;
+    regionalCluster;
+    props;
+    currentRegion;
+    globalId;
     constructor(scope, id, props) {
         super(scope, id);
         this.constructId = id;
         this.props = props;
-        this.currentRegion = aws_cdk_lib_1.Stack.of(this).region;
+        this.currentRegion = Stack.of(this).region;
         this.globalId =
             props.globalClusterIdentifier?.toLowerCase() ||
-                resourceNaming_1.ResourceNaming.globalClusterId(id);
+                ResourceNaming.globalClusterId(id);
         // create clusters / global cluster depending on region
         this.connections = this.addAuroraCluster();
         this.addGlobalCluster();
@@ -25,7 +30,7 @@ class RdsAuroraGlobal extends constructs_1.Construct {
         return this.globalId;
     }
     getPrimaryClusterIdentifier() {
-        return resourceNaming_1.ResourceNaming.primaryClusterId(this.constructId);
+        return ResourceNaming.primaryClusterId(this.constructId);
     }
     getGlobalClusterEngineString() {
         // Default to aurora-postgresql if no engine specified (matches existing behaviour)
@@ -81,7 +86,7 @@ class RdsAuroraGlobal extends constructs_1.Construct {
                 sourceIdentifier = primaryL1.ref;
             }
         }
-        this.globalCluster = new aws_rds_1.CfnGlobalCluster(this, `${this.props.databaseName}GlobalCluster`, {
+        this.globalCluster = new CfnGlobalCluster(this, `${this.props.databaseName}GlobalCluster`, {
             globalClusterIdentifier: this.globalId,
             sourceDbClusterIdentifier: sourceIdentifier
         });
@@ -124,7 +129,7 @@ class RdsAuroraGlobal extends constructs_1.Construct {
         };
         if (this.props.primaryRegion === this.currentRegion) {
             // primary
-            this.primaryCluster = new rdsAurora_1.RdsAurora(this, `${this.props.databaseName}Primary`, {
+            this.primaryCluster = new RdsAurora(this, `${this.props.databaseName}Primary`, {
                 vpc: this.props.vpc,
                 databaseName: this.props.databaseName,
                 clusterIdentifier: this.getPrimaryClusterIdentifier(),
@@ -139,10 +144,10 @@ class RdsAuroraGlobal extends constructs_1.Construct {
         // secondary region
         // Pass databaseName for resource naming, but flag as global secondary
         // This prevents setting credentials and defaultDatabaseName which are inherited from primary
-        this.regionalCluster = new rdsAurora_1.RdsAurora(this, `${this.props.databaseName}Regional`, {
+        this.regionalCluster = new RdsAurora(this, `${this.props.databaseName}Regional`, {
             vpc: this.props.vpc,
             databaseName: this.props.databaseName,
-            clusterIdentifier: resourceNaming_1.ResourceNaming.secondaryClusterId(this.constructId, this.currentRegion),
+            clusterIdentifier: ResourceNaming.secondaryClusterId(this.constructId, this.currentRegion),
             isGlobalSecondary: true,
             // Secondary doesn't create credentials (uses replicated secret)
             ...commonConfig
@@ -160,8 +165,8 @@ class RdsAuroraGlobal extends constructs_1.Construct {
         return this.regionalCluster.connections;
     }
     addOutputs() {
-        const outputName = (0, capitaliseString_1.toPascalCase)(this.props.databaseName);
-        new aws_cdk_lib_1.CfnOutput(this, `${outputName}GlobalClusterIdentifierOutput`, {
+        const outputName = toPascalCase(this.props.databaseName);
+        new CfnOutput(this, `${outputName}GlobalClusterIdentifierOutput`, {
             value: this.globalId,
             exportName: `${outputName}GlobalClusterIdentifier`
         });
@@ -188,5 +193,3 @@ class RdsAuroraGlobal extends constructs_1.Construct {
         throw new Error("No Aurora cluster available to return port from");
     }
 }
-exports.RdsAuroraGlobal = RdsAuroraGlobal;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsAuroraGlobal.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsAuroraGlobal.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, type Duration, type IResolvable, Stack } from \"aws-cdk-lib\";\nimport { CfnGlobalCluster, type CfnDBCluster } from \"aws-cdk-lib/aws-rds\";\nimport { Construct } from \"constructs\";\nimport {\n  type IVpc,\n  type Connections,\n  type IConnectable\n} from \"aws-cdk-lib/aws-ec2\";\nimport { type IClusterEngine } from \"aws-cdk-lib/aws-rds\";\nimport { RdsAurora } from \"./rdsAurora\";\nimport { type Secret } from \"../secrets\";\nimport {\n  type EngineConfig,\n  type ProxyConfig,\n  type CredentialsConfig,\n  type AuroraEncryptionConfig,\n  type AuroraWriterConfig,\n  type AuroraReadersConfig,\n  type DatabaseInsightsConfig\n} from \"../../../utils/databaseTypes\";\nimport { ResourceNaming } from \"../../../utils/resourceNaming\";\nimport { toPascalCase } from \"../../../utils/capitaliseString\";\n\ninterface RdsAuroraGlobalProps {\n  vpc: IVpc;\n  databaseName: string;\n  /** Primary region where the initial cluster & global cluster resource are created */\n  primaryRegion: string;\n  /** Secondary regions where Aurora clusters will be deployed (for secret replication) */\n  secondaryRegions?: string[];\n  /** Optional deterministic id for the global cluster (should be shared across stacks/regions) */\n  globalClusterIdentifier?: string;\n  /** Optional engine to forward to the underlying cluster */\n  engine?: IClusterEngine;\n  /** Engine-specific configuration (username, SSL params, rotation app) */\n  engineConfig?: EngineConfig;\n  /** Enable write forwarding on secondary clusters to forward writes to primary region */\n  enableGlobalWriteForwarding?: boolean;\n\n  // Instance configuration (applied to all regional clusters)\n  /** Writer instance configuration */\n  writer?: AuroraWriterConfig;\n  /**\n   * Reader instances configuration.\n   * - `{ count: N }` - Simple: N readers with defaults\n   * - `{ instances: [...] }` - Advanced: per-reader config\n   * - `false` - Explicitly disable readers (writer-only cluster)\n   * - Omit - Default: 1 reader\n   */\n  readers?: AuroraReadersConfig | false;\n\n  // Nested configurations (presence-based)\n  /** RDS Proxy configuration. Omit = no proxy, {} = defaults, false = disabled */\n  proxy?: ProxyConfig | false;\n  /** Credentials configuration including username and secret rotation */\n  credentials?: CredentialsConfig;\n  /** Encryption configuration */\n  encryption?: AuroraEncryptionConfig;\n\n  // Operational configuration\n  /** Backup retention in days. Default: 14 */\n  backupRetention?: number;\n  /** CloudWatch monitoring interval. Default: 1 minute */\n  monitoringInterval?: Duration;\n  /** Preferred maintenance window. Default: \"Sat:12:30-Sat:20:30\" */\n  preferredMaintenanceWindow?: string;\n  /** Database port. Default: RDS_DEFAULTS.DEFAULT_PORT */\n  port?: number;\n  databaseInsights?: DatabaseInsightsConfig | false;\n  deletionProtection?: boolean;\n  /** ARN or identifier of DB cluster snapshot to restore from */\n  snapshotIdentifier?: string;\n  /** Username from the snapshot (required when restoring from snapshot to reset password) */\n  snapshotUsername?: string;\n}\n\nexport class RdsAuroraGlobal extends Construct implements IConnectable {\n  public connections: Connections;\n\n  private readonly constructId: string;\n  private globalCluster?: CfnGlobalCluster;\n  private primaryCluster?: RdsAurora;\n  private regionalCluster?: RdsAurora;\n  private props: RdsAuroraGlobalProps;\n  private currentRegion: string;\n  private globalId: string;\n\n  constructor(scope: Construct, id: string, props: RdsAuroraGlobalProps) {\n    super(scope, id);\n\n    this.constructId = id;\n    this.props = props;\n    this.currentRegion = Stack.of(this).region;\n    this.globalId =\n      props.globalClusterIdentifier?.toLowerCase() ||\n      ResourceNaming.globalClusterId(id);\n\n    // create clusters / global cluster depending on region\n    this.connections = this.addAuroraCluster();\n    this.addGlobalCluster();\n    this.addOutputs();\n  }\n\n  getGlobalClusterIdentifier(): string {\n    return this.globalId;\n  }\n\n  getPrimaryClusterIdentifier(): string {\n    return ResourceNaming.primaryClusterId(this.constructId);\n  }\n\n  private getGlobalClusterEngineString(): string {\n    // Default to aurora-postgresql if no engine specified (matches existing behaviour)\n    if (!this.props.engine) return \"aurora-postgresql\";\n\n    // Handle different engine formats safely using unknown and type guards\n    const engine = this.props.engine;\n\n    // CDK's IClusterEngine interface does not expose engineType/engine/name\n    // properties directly, but the concrete implementations (e.g. AuroraMysqlEngineVersion)\n    // do have them at runtime. Cast through unknown to probe these internal fields.\n    // CDK engine internals — may break on CDK upgrades. See rdsAuroraGlobal unit test.\n    const engineRecord = engine as unknown as Record<string, unknown>;\n    let engineType: unknown =\n      engineRecord.engineType ?? engineRecord.engine ?? engineRecord.name;\n\n    // If the engine was provided as a raw string (unlikely but support it)\n    if (typeof engine === \"string\") {\n      engineType = engine;\n    }\n\n    // Fallback to toString() for Token-like objects\n    if (!engineType && typeof engineRecord.toString === \"function\") {\n      try {\n        engineType = engineRecord.toString();\n      } catch (_e) {\n        // toString() may throw on CDK Token objects — fall back to undefined\n        engineType = undefined;\n      }\n    }\n\n    if (typeof engineType !== \"string\") return \"aurora-postgresql\";\n\n    // Normalise common forms: AURORA_POSTGRESQL -> aurora-postgresql, aurora_postgresql -> aurora-postgresql\n    const normalised = engineType.toLowerCase().replace(/_/g, \"-\");\n\n    // If the normalised value is just 'aurora', prefer the more specific postgres default\n    if (normalised === \"aurora\") return \"aurora-postgresql\";\n\n    return normalised;\n  }\n\n  // create the CfnGlobalCluster only in the primary region\n  private addGlobalCluster() {\n    if (this.props.primaryRegion !== this.currentRegion) return;\n\n    // create the global cluster resource referencing the primary cluster identifier\n    // Prefer referencing the L1 DBCluster Ref so CloudFormation will create the\n    // DBCluster first and we avoid identifier-casing mismatches.\n    let sourceIdentifier: string | IResolvable =\n      this.getPrimaryClusterIdentifier();\n    let primaryL1: CfnDBCluster | undefined;\n\n    if (this.primaryCluster) {\n      // Use the helper on RdsAurora to get the underlying L1 DBCluster (more reliable\n      // than relying on node.defaultChild which can vary depending on construct ordering)\n      primaryL1 =\n        this.primaryCluster.getCfnCluster &&\n        this.primaryCluster.getCfnCluster();\n      if (primaryL1) {\n        sourceIdentifier = primaryL1.ref;\n      }\n    }\n\n    this.globalCluster = new CfnGlobalCluster(\n      this,\n      `${this.props.databaseName}GlobalCluster`,\n      {\n        globalClusterIdentifier: this.globalId,\n        sourceDbClusterIdentifier: sourceIdentifier\n      }\n    );\n\n    // ensure the underlying primary DBCluster L1 has the globalClusterIdentifier set\n    if (primaryL1) {\n      // Make the CFN dependency explicit so the DBCluster is created before the GlobalCluster\n      this.globalCluster.addDependsOn(primaryL1);\n      // IMPORTANT: do NOT set the primary DBCluster's `globalClusterIdentifier` here.\n      // If we set the primary DBCluster to reference the global cluster, CloudFormation\n      // will attempt to validate that the global cluster exists when creating the\n      // DBCluster — but the global cluster is created afterward (we add a\n      // dependsOn), which causes a \"Global cluster ... not found\" error. The\n      // correct order is to create the DBCluster first, then create the\n      // CfnGlobalCluster with `sourceDbClusterIdentifier` pointing at the\n      // primary cluster's Ref. Leaving the primary L1 without the\n      // `globalClusterIdentifier` avoids the circular reference.\n    }\n  }\n\n  // create an Aurora cluster in this region (primary or secondary)\n  private addAuroraCluster(): Connections {\n    // Common configuration shared between primary and secondary clusters\n    const commonConfig = {\n      engine: this.props.engine,\n      engineConfig: this.props.engineConfig,\n      // Instance configuration\n      writer: this.props.writer,\n      readers: this.props.readers,\n      // Nested configurations\n      proxy: this.props.proxy,\n      encryption: this.props.encryption,\n      // Operational configuration\n      backupRetention: this.props.backupRetention,\n      monitoringInterval: this.props.monitoringInterval,\n      preferredMaintenanceWindow: this.props.preferredMaintenanceWindow,\n      port: this.props.port,\n      databaseInsights: this.props.databaseInsights,\n      deletionProtection: this.props.deletionProtection,\n      snapshotIdentifier: this.props.snapshotIdentifier,\n      snapshotUsername: this.props.snapshotUsername\n    };\n\n    if (this.props.primaryRegion === this.currentRegion) {\n      // primary\n      this.primaryCluster = new RdsAurora(\n        this,\n        `${this.props.databaseName}Primary`,\n        {\n          vpc: this.props.vpc,\n          databaseName: this.props.databaseName,\n          clusterIdentifier: this.getPrimaryClusterIdentifier(),\n          // Enable secret replication to secondary regions\n          secretReplicaRegions: this.props.secondaryRegions,\n          // Primary region creates credentials\n          credentials: this.props.credentials,\n          ...commonConfig\n        }\n      );\n      return this.primaryCluster.connections;\n    }\n\n    // secondary region\n    // Pass databaseName for resource naming, but flag as global secondary\n    // This prevents setting credentials and defaultDatabaseName which are inherited from primary\n    this.regionalCluster = new RdsAurora(\n      this,\n      `${this.props.databaseName}Regional`,\n      {\n        vpc: this.props.vpc,\n        databaseName: this.props.databaseName,\n        clusterIdentifier: ResourceNaming.secondaryClusterId(\n          this.constructId,\n          this.currentRegion\n        ),\n        isGlobalSecondary: true,\n        // Secondary doesn't create credentials (uses replicated secret)\n        ...commonConfig\n      }\n    );\n\n    // set the L1 DBCluster property so CloudFormation will join it to the global cluster\n    const regionalL1 =\n      this.regionalCluster.getCfnCluster &&\n      this.regionalCluster.getCfnCluster();\n    if (regionalL1) {\n      regionalL1.globalClusterIdentifier = this.globalId;\n\n      // Enable write forwarding if requested\n      if (this.props.enableGlobalWriteForwarding) {\n        regionalL1.enableGlobalWriteForwarding = true;\n      }\n    }\n    return this.regionalCluster.connections;\n  }\n\n  private addOutputs() {\n    const outputName = toPascalCase(this.props.databaseName);\n    new CfnOutput(this, `${outputName}GlobalClusterIdentifierOutput`, {\n      value: this.globalId,\n      exportName: `${outputName}GlobalClusterIdentifier`\n    });\n  }\n\n  getCredentials(): Secret {\n    if (this.primaryCluster) return this.primaryCluster.getCredentials();\n    if (this.regionalCluster) return this.regionalCluster.getCredentials();\n    throw new Error(\"No Aurora cluster available to return credentials from\");\n  }\n\n  getHostEndpoint(): string {\n    if (this.primaryCluster) return this.primaryCluster.getHostEndpoint();\n    if (this.regionalCluster) return this.regionalCluster.getHostEndpoint();\n    throw new Error(\"No Aurora cluster available to return endpoint from\");\n  }\n\n  getHostPort(): string {\n    if (this.primaryCluster) return this.primaryCluster.getHostPort();\n    if (this.regionalCluster) return this.regionalCluster.getHostPort();\n    throw new Error(\"No Aurora cluster available to return port from\");\n  }\n}\n"]}

package/dist/lib/resources/aws/database/rdsDefaults.js

@@ -1,15 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RDS_DEFAULTS = void 0;
-const aws_cdk_lib_1 = require("aws-cdk-lib");
-exports.RDS_DEFAULTS = Object.freeze({
+import { Duration } from "aws-cdk-lib";
+export const RDS_DEFAULTS = Object.freeze({
     /** Default database port: FJALL on phone keypad */
     DEFAULT_PORT: 35255,
     /** Saturday window in UTC — minimises weekday impact for scheduled maintenance */
     PREFERRED_MAINTENANCE_WINDOW: "Sat:12:30-Sat:20:30",
     /** 1 minute — balances monitoring granularity against CloudWatch costs */
-    MONITORING_INTERVAL: aws_cdk_lib_1.Duration.minutes(1),
+    MONITORING_INTERVAL: Duration.minutes(1),
     /** SecretsManager rotation application version for multi-user rotation */
     ROTATION_APP_VERSION: "1.1.367"
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmRzRGVmYXVsdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy9kYXRhYmFzZS9yZHNEZWZhdWx0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBdUM7QUFFMUIsUUFBQSxZQUFZLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUN4QyxtREFBbUQ7SUFDbkQsWUFBWSxFQUFFLEtBQUs7SUFDbkIsa0ZBQWtGO0lBQ2xGLDRCQUE0QixFQUFFLHFCQUFxQjtJQUNuRCwwRUFBMEU7SUFDMUUsbUJBQW1CLEVBQUUsc0JBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ3hDLDBFQUEwRTtJQUMxRSxvQkFBb0IsRUFBRSxTQUFTO0NBQ3ZCLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IER1cmF0aW9uIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5cbmV4cG9ydCBjb25zdCBSRFNfREVGQVVMVFMgPSBPYmplY3QuZnJlZXplKHtcbiAgLyoqIERlZmF1bHQgZGF0YWJhc2UgcG9ydDogRkpBTEwgb24gcGhvbmUga2V5cGFkICovXG4gIERFRkFVTFRfUE9SVDogMzUyNTUsXG4gIC8qKiBTYXR1cmRheSB3aW5kb3cgaW4gVVRDIOKAlCBtaW5pbWlzZXMgd2Vla2RheSBpbXBhY3QgZm9yIHNjaGVkdWxlZCBtYWludGVuYW5jZSAqL1xuICBQUkVGRVJSRURfTUFJTlRFTkFOQ0VfV0lORE9XOiBcIlNhdDoxMjozMC1TYXQ6MjA6MzBcIixcbiAgLyoqIDEgbWludXRlIOKAlCBiYWxhbmNlcyBtb25pdG9yaW5nIGdyYW51bGFyaXR5IGFnYWluc3QgQ2xvdWRXYXRjaCBjb3N0cyAqL1xuICBNT05JVE9SSU5HX0lOVEVSVkFMOiBEdXJhdGlvbi5taW51dGVzKDEpLFxuICAvKiogU2VjcmV0c01hbmFnZXIgcm90YXRpb24gYXBwbGljYXRpb24gdmVyc2lvbiBmb3IgbXVsdGktdXNlciByb3RhdGlvbiAqL1xuICBST1RBVElPTl9BUFBfVkVSU0lPTjogXCIxLjEuMzY3XCJcbn0gYXMgY29uc3QpO1xuIl19

package/dist/lib/resources/aws/database/rdsHelpers.d.ts

@@ -2,8 +2,8 @@ import { type IKey } from "aws-cdk-lib/aws-kms";
 import { type IVpc, type IConnectable } from "aws-cdk-lib/aws-ec2";
 import { type ISecret } from "aws-cdk-lib/aws-secretsmanager";
 import type { Construct } from "constructs";
-import { Secret } from "../secrets";
-import { type DatabaseInsightsConfig, type EngineConfig, type EncryptionKeySpec, type CredentialsConfig } from "../../../utils/databaseTypes";
+import { Secret } from "../secrets/index.js";
+import { type DatabaseInsightsConfig, type EngineConfig, type EncryptionKeySpec, type CredentialsConfig } from "../../../utils/databaseTypes.js";
 /** Default PostgreSQL engine configuration used by both Aurora and Instance constructs. */
 export declare const DEFAULT_POSTGRES_ENGINE_CONFIG: EngineConfig;
 /**