@digitraffic/common 2025.1.10-1 → 2025.1.15-2

package/dist/aws/infra/stacks/db-stack.d.ts

@@ -1,8 +1,8 @@
 import { type InstanceType, type ISecurityGroup, type IVpc } from "aws-cdk-lib/aws-ec2";
 import { type AuroraPostgresEngineVersion, DatabaseCluster, type DatabaseClusterProps, type IParameterGroup } from "aws-cdk-lib/aws-rds";
+import { Stack } from "aws-cdk-lib/core";
 import type { Construct } from "constructs/lib/construct.js";
 import type { InfraStackConfiguration } from "./intra-stack-configuration.js";
-import { Stack } from "aws-cdk-lib/core";
 export interface DbConfiguration {
     readonly cluster?: ClusterConfiguration;
     readonly clusterImport?: ClusterImportConfiguration;
@@ -15,13 +15,16 @@ export interface DbConfiguration {
     /** If this is not specified, import default vpc */
     readonly vpc?: IVpc;
 }
+export interface ClusterDbInstanceConfiguration {
+    readonly instanceType: InstanceType;
+    readonly isFromLegacyInstanceProps?: boolean;
+}
 export interface ClusterConfiguration {
     readonly securityGroupId: string;
-    readonly dbInstanceType: InstanceType;
     readonly snapshotIdentifier?: string;
-    readonly instances: number;
     readonly dbVersion: AuroraPostgresEngineVersion;
-    readonly storageEncrypted?: boolean;
+    readonly writer: ClusterDbInstanceConfiguration;
+    readonly readers: ClusterDbInstanceConfiguration[];
 }
 export interface ClusterImportConfiguration {
     readonly clusterReadEndpoint: string;

package/dist/aws/infra/stacks/db-stack.js

@@ -1,8 +1,8 @@
 import { SecurityGroup, SubnetType, } from "aws-cdk-lib/aws-ec2";
-import { CfnDBInstance, Credentials, DatabaseCluster, DatabaseClusterEngine, DatabaseClusterFromSnapshot, InstanceUpdateBehaviour, ParameterGroup, } from "aws-cdk-lib/aws-rds";
+import { CfnDBInstance, ClusterInstance, Credentials, DatabaseCluster, DatabaseClusterEngine, DatabaseClusterFromSnapshot, InstanceUpdateBehaviour, ParameterGroup, } from "aws-cdk-lib/aws-rds";
 import { Secret } from "aws-cdk-lib/aws-secretsmanager";
-import { exportValue, importVpc } from "../import-util.js";
 import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib/core";
+import { exportValue, importVpc } from "../import-util.js";
 import { createParameter } from "../stack/parameters.js";
 /**
  * Stack that creates DatabaseCluster.
@@ -64,11 +64,37 @@ export class DbStack extends Stack {
     }
     createClusterParameters(secretArn, clusterConfiguration, instanceName, vpc, securityGroup, parameterGroup) {
         const secret = Secret.fromSecretCompleteArn(this, "DBSecret", secretArn);
+        const defaultDbInstanceProps = {
+            autoMinorVersionUpgrade: true,
+            allowMajorVersionUpgrade: false,
+            enablePerformanceInsights: true,
+            parameterGroup: parameterGroup
+        };
+        const writer = ClusterInstance.provisioned("WriterInstance", {
+            ...{
+                instanceType: clusterConfiguration.writer.instanceType,
+                isFromLegacyInstanceProps: clusterConfiguration.writer.isFromLegacyInstanceProps
+            },
+            ...defaultDbInstanceProps
+        });
+        const readers = clusterConfiguration.readers.map((reader, index) => ClusterInstance.provisioned(`ReaderInstance${index}`, {
+            ...{
+                instanceType: reader.instanceType,
+                isFromLegacyInstanceProps: reader.isFromLegacyInstanceProps,
+            },
+            ...defaultDbInstanceProps
+        }));
         return {
             engine: DatabaseClusterEngine.auroraPostgres({
                 version: clusterConfiguration.dbVersion,
             }),
-            instances: clusterConfiguration.instances,
+            writer,
+            readers,
+            vpcSubnets: {
+                subnetType: SubnetType.PRIVATE_WITH_EGRESS,
+            },
+            securityGroups: [securityGroup],
+            vpc,
             instanceUpdateBehaviour: InstanceUpdateBehaviour.ROLLING,
             instanceIdentifierBase: instanceName + "-",
             cloudwatchLogsExports: ["postgresql"],
@@ -80,21 +106,8 @@ export class DbStack extends Stack {
             deletionProtection: true,
             removalPolicy: RemovalPolicy.RETAIN,
             port: DbStack.CLUSTER_PORT,
-            instanceProps: {
-                autoMinorVersionUpgrade: true,
-                allowMajorVersionUpgrade: false,
-                enablePerformanceInsights: true,
-                vpc,
-                securityGroups: [securityGroup],
-                vpcSubnets: {
-                    subnetType: SubnetType.PRIVATE_WITH_EGRESS,
-                },
-                instanceType: clusterConfiguration.dbInstanceType,
-                parameterGroup,
-            },
             credentials: Credentials.fromPassword(secret.secretValueFromJson("db.superuser").unsafeUnwrap(), secret.secretValueFromJson("db.superuser.password")),
             parameterGroup,
-            //            storageEncrypted: clusterConfiguration.storageEncrypted ?? true,
             monitoringInterval: Duration.seconds(30),
         };
     }
@@ -116,10 +129,13 @@ export class DbStack extends Stack {
             })
             : new DatabaseCluster(this, instanceName, parameters);
         // this workaround should prevent stack failing on version upgrade
+        // https://github.com/aws/aws-cdk/issues/21758
+        // https://github.com/aws/aws-cdk/pull/22185
+        // Maybe this could be removed completely as we don't update db with the CDK?
         const cfnInstances = cluster.node.children.filter((child) => child instanceof CfnDBInstance);
-        if (cfnInstances.length === 0) {
-            throw new Error("Couldn't pull CfnDBInstances from the L1 constructs!");
-        }
+        // if (cfnInstances.length === 0) {
+        //     throw new Error("Couldn't pull CfnDBInstances from the L1 constructs!");
+        // }
         cfnInstances.forEach((cfnInstance) => delete cfnInstance.engineVersion);
         return cluster;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2025.1.10-1",
+  "version": "2025.1.15-2",
   "description": "",
   "type": "module",
   "repository": {