@digitraffic/common 2023.4.28-1 → 2023.5.10-1

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

@@ -12,8 +12,6 @@ export interface DbConfiguration {
     readonly instances: number;
     readonly customParameterGroup: boolean;
     readonly securityGroupId: string;
-    readonly superuserName: string;
-    readonly superuserPassword: string;
     readonly proxy: {
         readonly name?: string;
         readonly securityGroupId: string;

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

@@ -4,6 +4,7 @@ exports.DbStack = 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 aws_secretsmanager_1 = require("aws-cdk-lib/aws-secretsmanager");
 const import_util_1 = require("../import-util");
 /**
  * Stack that creates DatabaseCluster.
@@ -43,6 +44,7 @@ class DbStack extends aws_cdk_lib_1.Stack {
             : aws_rds_1.ParameterGroup.fromParameterGroupName(this, "ParameterGroup", `default.aurora-postgresql${configuration.dbVersion.auroraPostgresMajorVersion}`);
     }
     createClusterParameters(configuration, instanceName, vpc, securityGroup, parameterGroup) {
+        const secret = aws_secretsmanager_1.Secret.fromSecretCompleteArn(this, "DBSecret", configuration.secretArn);
         return {
             engine: aws_rds_1.DatabaseClusterEngine.auroraPostgres({
                 version: configuration.dbVersion,
@@ -71,7 +73,7 @@ class DbStack extends aws_cdk_lib_1.Stack {
                 instanceType: configuration.dbInstanceType,
                 parameterGroup,
             },
-            credentials: aws_rds_1.Credentials.fromPassword(configuration.superuserName, aws_cdk_lib_1.SecretValue.unsafePlainText(configuration.superuserPassword)),
+            credentials: aws_rds_1.Credentials.fromPassword(secret.secretValueFromJson("db.superuser").unsafeUnwrap(), secret.secretValueFromJson("db.superuser.password")),
             parameterGroup,
         };
     }
@@ -93,7 +95,7 @@ class DbStack extends aws_cdk_lib_1.Stack {
             throw new Error("Couldn't pull CfnDBInstances from the L1 constructs!");
         }
         cfnInstances.forEach((cfnInstance) => delete cfnInstance.engineVersion);
-        cluster.node.addDependency(parameterGroup, "Create ParameterGroup before DatabaseCluster");
+        cluster.node.addDependency(parameterGroup);
         return cluster;
     }
 }

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

@@ -19,7 +19,9 @@ class NetworkStack extends aws_cdk_lib_1.Stack {
     createVpc(configuration) {
         return new aws_ec2_1.Vpc(this, "DigitrafficVPC", {
             vpcName: configuration.vpcName,
-            availabilityZones: ["eu-west-1a", "eu-west-1b"],
+            availabilityZones: aws_cdk_lib_1.Stack.of(this)
+                .availabilityZones.sort()
+                .slice(0, 2),
             enableDnsHostnames: true,
             enableDnsSupport: true,
             ipAddresses: aws_ec2_1.IpAddresses.cidr(configuration.cidr),

package/dist/utils/date-utils.d.ts

@@ -1,3 +1,4 @@
+export declare const EPOCH: Date;
 /**
  * Counts difference in milliseconds between dates.
  * @param start

package/dist/utils/date-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dateFromIsoString = exports.countDiffInSeconds = exports.countDiffMs = void 0;
+exports.dateFromIsoString = exports.countDiffInSeconds = exports.countDiffMs = exports.EPOCH = void 0;
+exports.EPOCH = new Date(Date.UTC(1970, 0, 1));
 /**
  * Counts difference in milliseconds between dates.
  * @param start

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2023.4.28-1",
+  "version": "2023.5.10-1",
   "description": "",
   "repository": {
     "type": "git",
@@ -17,13 +17,13 @@
     "src/**/*.ts"
   ],
   "peerDependencies": {
-    "@aws-cdk/aws-synthetics-alpha": "^2.62.2-alpha.0",
+    "@aws-cdk/aws-synthetics-alpha": "^2.78.0-alpha.0",
     "@types/geojson": "^7946.0.10",
-    "aws-cdk-lib": "^2.76.0",
-    "aws-sdk": "^2.1362.0",
+    "aws-cdk-lib": "^2.78.0",
+    "aws-sdk": "^2.1374.0",
     "axios": "^1.2.6",
     "change-case": "^4.1.2",
-    "constructs": "^10.1.292",
+    "constructs": "^10.2.17",
     "geojson-validation": "^1.0.2",
     "moment": "^2.29.4",
     "node-ttl": "^0.2.0",
@@ -31,34 +31,34 @@
     "pg-promise": "^11.0.0"
   },
   "devDependencies": {
-    "@aws-cdk/aws-synthetics-alpha": "2.70.0-alpha.0",
-    "@types/aws-lambda": "~8.10.114",
+    "@aws-cdk/aws-synthetics-alpha": "2.78.0-alpha.0",
+    "@types/aws-lambda": "~8.10.115",
     "@types/geojson": "^7946.0.10",
     "@types/jest": "^29.5.1",
     "@types/lodash": "^4.14.194",
     "@types/node": "18.15.13",
-    "@types/ramda": "~0.29.0",
+    "@types/ramda": "~0.29.1",
     "@types/sinon": "10.0.14",
-    "@typescript-eslint/eslint-plugin": "~5.59.0",
-    "@typescript-eslint/parser": "^5.59.0",
-    "aws-cdk-lib": "~2.76.0",
-    "aws-sdk": "~2.1362.0",
+    "@typescript-eslint/eslint-plugin": "~5.59.5",
+    "@typescript-eslint/parser": "^5.59.5",
+    "aws-cdk-lib": "~2.78.0",
+    "aws-sdk": "~2.1374.0",
     "axios": "^1.3.6",
     "change-case": "^4.1.2",
-    "constructs": "10.2.2",
-    "eslint": "~8.38.0",
+    "constructs": "10.2.17",
+    "eslint": "~8.40.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-deprecation": "~1.4.1",
     "geojson-validation": "^1.0.2",
     "husky": "^8.0.3",
     "jest": "^29.5.0",
     "jest-junit": "^16.0.0",
-    "lint-staged": "^13.2.1",
+    "lint-staged": "^13.2.2",
     "moment": "^2.29.4",
     "node-ttl": "^0.2.0",
     "pg-native": "^3.0.1",
     "pg-promise": "^11.4.3",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "ramda": "~0.29.0",
     "rimraf": "^5.0.0",
     "sinon": "15.0.4",

package/src/aws/infra/stacks/db-stack.ts

@@ -1,4 +1,4 @@
-import { Duration, RemovalPolicy, SecretValue, Stack } from "aws-cdk-lib";
+import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
 import {
     InstanceType,
     IVpc,
@@ -19,8 +19,9 @@ import {
     ParameterGroup,
 } from "aws-cdk-lib/aws-rds";
 import { Construct } from "constructs";
-import { exportValue, importVpc } from "../import-util";
+import { Secret } from "aws-cdk-lib/aws-secretsmanager";
 import { InfraStackConfiguration } from "./intra-stack-configuration";
+import { exportValue, importVpc } from "../import-util";
 
 export interface DbConfiguration {
     readonly secretArn: string;
@@ -32,9 +33,6 @@ export interface DbConfiguration {
     readonly customParameterGroup: boolean;
     readonly securityGroupId: string;
 
-    readonly superuserName: string;
-    readonly superuserPassword: string;
-
     readonly proxy: {
         readonly name?: string;
         readonly securityGroupId: string;
@@ -126,6 +124,12 @@ export class DbStack extends Stack {
         securityGroup: ISecurityGroup,
         parameterGroup: IParameterGroup
     ): DatabaseClusterProps {
+        const secret = Secret.fromSecretCompleteArn(
+            this,
+            "DBSecret",
+            configuration.secretArn
+        );
+
         return {
             engine: DatabaseClusterEngine.auroraPostgres({
                 version: configuration.dbVersion,
@@ -155,8 +159,8 @@ export class DbStack extends Stack {
                 parameterGroup,
             },
             credentials: Credentials.fromPassword(
-                configuration.superuserName,
-                SecretValue.unsafePlainText(configuration.superuserPassword)
+                secret.secretValueFromJson("db.superuser").unsafeUnwrap(),
+                secret.secretValueFromJson("db.superuser.password")
             ),
             parameterGroup,
         };
@@ -200,10 +204,7 @@ export class DbStack extends Stack {
         }
         cfnInstances.forEach((cfnInstance) => delete cfnInstance.engineVersion);
 
-        cluster.node.addDependency(
-            parameterGroup,
-            "Create ParameterGroup before DatabaseCluster"
-        );
+        cluster.node.addDependency(parameterGroup);
 
         return cluster;
     }

package/src/aws/infra/stacks/network-stack.ts

@@ -53,7 +53,9 @@ export class NetworkStack extends Stack {
     createVpc(configuration: NetworkConfiguration): Vpc {
         return new Vpc(this, "DigitrafficVPC", {
             vpcName: configuration.vpcName,
-            availabilityZones: ["eu-west-1a", "eu-west-1b"],
+            availabilityZones: Stack.of(this)
+                .availabilityZones.sort()
+                .slice(0, 2), // take two first azs
             enableDnsHostnames: true,
             enableDnsSupport: true,
             ipAddresses: IpAddresses.cidr(configuration.cidr),

package/src/utils/date-utils.ts

@@ -1,4 +1,4 @@
-
+export const EPOCH = new Date(Date.UTC(1970, 0, 1));
 /**
  * Counts difference in milliseconds between dates.
  * @param start
@@ -14,7 +14,7 @@ export function countDiffMs(start: Date, end: Date): number {
  * @param end
  */
 export function countDiffInSeconds(start: Date, end: Date): number {
-    return countDiffMs(start, end)/1000;
+    return countDiffMs(start, end) / 1000;
 }
 
 /**