@digitraffic/common 2023.1.23-3 → 2023.1.30-1

package/dist/aws/infra/api/response.js

@@ -90,9 +90,13 @@ class DigitrafficMethodResponse {
                 [mediaType]: model,
             },
             responseParameters: {
-                "method.response.header.Access-Control-Allow-Origin": !disableCors,
-                "method.response.header.Deprecation": deprecation,
-                "method.response.header.Sunset": deprecation,
+                ...(!disableCors && {
+                    "method.response.header.Access-Control-Allow-Origin": true,
+                }),
+                ...(deprecation && {
+                    "method.response.header.Deprecation": true,
+                    "method.response.header.Sunset": true,
+                }),
             },
         };
     }

package/dist/aws/infra/canaries/url-checker.d.ts

@@ -34,7 +34,7 @@ export declare class ContentChecker {
     static checkResponse(fn: (body: string, res: IncomingMessage) => void): CheckerFunction;
 }
 export declare class ContentTypeChecker {
-    static checkContentType(contentType: MediaType): (res: IncomingMessage) => void;
+    static checkContentType(contentType: MediaType): CheckerFunction;
 }
 export declare class GeoJsonChecker {
     static validFeatureCollection(fn?: (json: FeatureCollection) => void): CheckerFunction;

package/dist/aws/infra/canaries/url-checker.js

@@ -233,6 +233,7 @@ class ContentTypeChecker {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 `Wrong content-type ${res.headers["content-type"]}`);
             }
+            return Promise.resolve();
         };
     }
 }

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

@@ -1,13 +1,16 @@
 import { Stack } from "aws-cdk-lib";
 import { Construct } from "constructs";
-import { AuroraPostgresEngineVersion, DatabaseCluster } from "aws-cdk-lib/aws-rds";
+import { IVpc } from "aws-cdk-lib/aws-ec2";
+import { AuroraPostgresEngineVersion, DatabaseCluster, DatabaseClusterProps, IParameterGroup } from "aws-cdk-lib/aws-rds";
+import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
 import { InstanceType } from "aws-cdk-lib/aws-ec2";
 import { InfraStackConfiguration } from "./intra-stack-configuration";
+import { ISecurityGroup } from "aws-cdk-lib/aws-ec2/lib/security-group";
 export interface DbConfiguration {
     readonly secretArn: string;
     readonly dbVersion: AuroraPostgresEngineVersion;
     readonly dbInstanceType: InstanceType;
-    readonly snapshotIdentifier: string;
+    readonly snapshotIdentifier?: string;
     readonly instances: number;
     readonly customParameterGroup: boolean;
     readonly securityGroupId: string;
@@ -27,5 +30,7 @@ export declare class DbStack extends Stack {
     static CLUSTER_WRITE_ENDPOINT_EXPORT_NAME: string;
     static CLUSTER_PORT: number;
     constructor(scope: Construct, id: string, isc: InfraStackConfiguration, configuration: DbConfiguration);
+    createParamaterGroup(configuration: DbConfiguration): IParameterGroup;
+    createClusterParameters(configuration: DbConfiguration, instanceName: string, vpc: IVpc, securityGroup: ISecurityGroup, parameterGroup: IParameterGroup, secret: ISecret): DatabaseClusterProps;
     createAuroraCluster(isc: InfraStackConfiguration, configuration: DbConfiguration): DatabaseCluster;
 }

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

@@ -24,14 +24,8 @@ class DbStack extends aws_cdk_lib_1.Stack {
         (0, import_util_1.exportValue)(this, isc.environmentName, DbStack.CLUSTER_WRITE_ENDPOINT_EXPORT_NAME, cluster.clusterEndpoint.hostname);
         (0, import_util_1.exportValue)(this, isc.environmentName, DbStack.CLUSTER_READ_ENDPOINT_EXPORT_NAME, cluster.clusterReadEndpoint.hostname);
     }
-    createAuroraCluster(isc, configuration) {
-        const instanceName = isc.environmentName + "-db";
-        const secret = aws_secretsmanager_1.Secret.fromSecretAttributes(this, "db-secret", {
-            secretCompleteArn: configuration.secretArn,
-        });
-        const securityGroup = aws_ec2_1.SecurityGroup.fromSecurityGroupId(this, "securitygroup", configuration.securityGroupId);
-        const vpc = (0, import_util_1.importVpc)(this, isc.environmentName);
-        const parameterGroup = configuration.customParameterGroup
+    createParamaterGroup(configuration) {
+        return configuration.customParameterGroup
             ? new aws_rds_1.ParameterGroup(this, `parameter-group-${configuration.dbVersion.auroraPostgresMajorVersion}`, {
                 engine: aws_rds_1.DatabaseClusterEngine.auroraPostgres({
                     version: configuration.dbVersion,
@@ -43,8 +37,9 @@ class DbStack extends aws_cdk_lib_1.Stack {
                 },
             })
             : aws_rds_1.ParameterGroup.fromParameterGroupName(this, "ParameterGroup", `default.aurora-postgresql${configuration.dbVersion.auroraPostgresMajorVersion}`);
-        const cluster = new aws_rds_1.DatabaseClusterFromSnapshot(this, instanceName, {
-            snapshotIdentifier: configuration.snapshotIdentifier,
+    }
+    createClusterParameters(configuration, instanceName, vpc, securityGroup, parameterGroup, secret) {
+        return {
             engine: aws_rds_1.DatabaseClusterEngine.auroraPostgres({
                 version: configuration.dbVersion,
             }),
@@ -74,7 +69,23 @@ class DbStack extends aws_cdk_lib_1.Stack {
             },
             credentials: aws_rds_1.Credentials.fromSecret(secret),
             parameterGroup,
+        };
+    }
+    createAuroraCluster(isc, configuration) {
+        const instanceName = isc.environmentName + "-db";
+        const secret = aws_secretsmanager_1.Secret.fromSecretAttributes(this, "db-secret", {
+            secretCompleteArn: configuration.secretArn,
         });
+        const securityGroup = aws_ec2_1.SecurityGroup.fromSecurityGroupId(this, "securitygroup", configuration.securityGroupId);
+        const vpc = (0, import_util_1.importVpc)(this, isc.environmentName);
+        const parameterGroup = this.createParamaterGroup(configuration);
+        const parameters = this.createClusterParameters(configuration, instanceName, vpc, securityGroup, parameterGroup, secret);
+        const cluster = configuration.snapshotIdentifier
+            ? new aws_rds_1.DatabaseClusterFromSnapshot(this, instanceName, {
+                ...parameters,
+                ...{ snapshotIdentifier: configuration.snapshotIdentifier },
+            })
+            : new aws_rds_1.DatabaseCluster(this, instanceName, parameters);
         // this workaround should prevent stack failing on version upgrade
         const cfnInstances = cluster.node.children.filter((child) => child instanceof aws_rds_1.CfnDBInstance);
         if (cfnInstances.length === 0) {

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

@@ -18,7 +18,7 @@ class NetworkStack extends aws_cdk_lib_1.Stack {
             availabilityZones: ["eu-west-1a", "eu-west-1b"],
             enableDnsHostnames: true,
             enableDnsSupport: true,
-            cidr: configuration.cidr,
+            ipAddresses: aws_ec2_1.IpAddresses.cidr(configuration.cidr),
             subnetConfiguration: [
                 {
                     name: "public",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2023.01.23-3",
+  "version": "2023.01.30-1",
   "description": "",
   "repository": {
     "type": "git",
@@ -17,13 +17,13 @@
     "src/**/*.ts"
   ],
   "peerDependencies": {
-    "@aws-cdk/aws-synthetics-alpha": "^2.50.0-alpha.0",
+    "@aws-cdk/aws-synthetics-alpha": "2.62.2-alpha.0",
     "@types/geojson": "^7946.0.10",
-    "aws-cdk-lib": "^2.51.1",
-    "aws-sdk": "^2.1241.0",
+    "aws-cdk-lib": "^2.62.2",
+    "aws-sdk": "^2.1304.0",
     "axios": "^1.2.0",
     "change-case": "^4.1.2",
-    "constructs": "^10.1.131",
+    "constructs": "^10.1.235",
     "geojson-validation": "^1.0.2",
     "moment": "^2.29.4",
     "node-ttl": "^0.2.0",
@@ -32,8 +32,8 @@
     "spex": "^3.0.0"
   },
   "devDependencies": {
-    "@aws-cdk/aws-synthetics-alpha": "2.60.0-alpha.0",
-    "@types/aws-lambda": "^8.10.109",
+    "@aws-cdk/aws-synthetics-alpha": "2.62.2-alpha.0",
+    "@types/aws-lambda": "^8.10.110",
     "@types/geojson": "^7946.0.10",
     "@types/jest": "^29.2.5",
     "@types/node": "^18.11.18",
@@ -41,8 +41,8 @@
     "@types/sinon": "^10.0.13",
     "@typescript-eslint/eslint-plugin": "^5.48.2",
     "@typescript-eslint/parser": "^5.48.2",
-    "aws-cdk-lib": "^2.60.0",
-    "aws-sdk": "^2.1295.0",
+    "aws-cdk-lib": "^2.62.2",
+    "aws-sdk": "^2.1304.0",
     "axios": "^1.2.2",
     "change-case": "^4.1.2",
     "constructs": "^10.1.222",

package/src/aws/infra/api/response.ts

@@ -119,9 +119,13 @@ export class DigitrafficMethodResponse {
                 [mediaType]: model,
             },
             responseParameters: {
-                "method.response.header.Access-Control-Allow-Origin": !disableCors,
-                "method.response.header.Deprecation": deprecation,
-                "method.response.header.Sunset": deprecation,
+                ...(!disableCors && {
+                    "method.response.header.Access-Control-Allow-Origin": true,
+                }),
+                ...(deprecation && {
+                    "method.response.header.Deprecation": true,
+                    "method.response.header.Sunset": true,
+                }),
             },
         };
     }

package/src/aws/infra/canaries/url-checker.ts

@@ -318,7 +318,7 @@ export class ContentChecker {
 }
 
 export class ContentTypeChecker {
-    static checkContentType(contentType: MediaType) {
+    static checkContentType(contentType: MediaType): CheckerFunction {
         return (res: IncomingMessage) => {
             if (!res.statusCode) {
                 throw new Error("statusCode missing");
@@ -339,6 +339,8 @@ export class ContentTypeChecker {
                     `Wrong content-type ${res.headers["content-type"]!}`
                 );
             }
+
+            return Promise.resolve();
         };
     }
 }

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

@@ -1,6 +1,6 @@
 import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
 import { Construct } from "constructs";
-import { SecurityGroup, SubnetType } from "aws-cdk-lib/aws-ec2";
+import { IVpc, SecurityGroup, SubnetType } from "aws-cdk-lib/aws-ec2";
 import {
     AuroraPostgresEngineVersion,
     CfnDBInstance,
@@ -8,20 +8,23 @@ import {
     DatabaseCluster,
     DatabaseClusterEngine,
     DatabaseClusterFromSnapshot,
+    DatabaseClusterProps,
     InstanceUpdateBehaviour,
+    IParameterGroup,
     ParameterGroup,
 } from "aws-cdk-lib/aws-rds";
-import { Secret } from "aws-cdk-lib/aws-secretsmanager";
+import { ISecret, Secret } from "aws-cdk-lib/aws-secretsmanager";
 import { exportValue, importVpc } from "../import-util";
 import { InstanceType } from "aws-cdk-lib/aws-ec2";
 import { InfraStackConfiguration } from "./intra-stack-configuration";
+import { ISecurityGroup } from "aws-cdk-lib/aws-ec2/lib/security-group";
 
 export interface DbConfiguration {
     readonly secretArn: string;
 
     readonly dbVersion: AuroraPostgresEngineVersion;
     readonly dbInstanceType: InstanceType;
-    readonly snapshotIdentifier: string;
+    readonly snapshotIdentifier?: string;
     readonly instances: number;
     readonly customParameterGroup: boolean;
     readonly securityGroupId: string;
@@ -79,22 +82,8 @@ export class DbStack extends Stack {
         );
     }
 
-    createAuroraCluster(
-        isc: InfraStackConfiguration,
-        configuration: DbConfiguration
-    ): DatabaseCluster {
-        const instanceName = isc.environmentName + "-db";
-        const secret = Secret.fromSecretAttributes(this, "db-secret", {
-            secretCompleteArn: configuration.secretArn,
-        });
-        const securityGroup = SecurityGroup.fromSecurityGroupId(
-            this,
-            "securitygroup",
-            configuration.securityGroupId
-        );
-        const vpc = importVpc(this, isc.environmentName);
-
-        const parameterGroup = configuration.customParameterGroup
+    createParamaterGroup(configuration: DbConfiguration) {
+        return configuration.customParameterGroup
             ? new ParameterGroup(
                   this,
                   `parameter-group-${configuration.dbVersion.auroraPostgresMajorVersion}`,
@@ -114,9 +103,17 @@ export class DbStack extends Stack {
                   "ParameterGroup",
                   `default.aurora-postgresql${configuration.dbVersion.auroraPostgresMajorVersion}`
               );
+    }
 
-        const cluster = new DatabaseClusterFromSnapshot(this, instanceName, {
-            snapshotIdentifier: configuration.snapshotIdentifier,
+    createClusterParameters(
+        configuration: DbConfiguration,
+        instanceName: string,
+        vpc: IVpc,
+        securityGroup: ISecurityGroup,
+        parameterGroup: IParameterGroup,
+        secret: ISecret
+    ): DatabaseClusterProps {
+        return {
             engine: DatabaseClusterEngine.auroraPostgres({
                 version: configuration.dbVersion,
             }),
@@ -146,7 +143,38 @@ export class DbStack extends Stack {
             },
             credentials: Credentials.fromSecret(secret),
             parameterGroup,
+        };
+    }
+
+    createAuroraCluster(
+        isc: InfraStackConfiguration,
+        configuration: DbConfiguration
+    ): DatabaseCluster {
+        const instanceName = isc.environmentName + "-db";
+        const secret = Secret.fromSecretAttributes(this, "db-secret", {
+            secretCompleteArn: configuration.secretArn,
         });
+        const securityGroup = SecurityGroup.fromSecurityGroupId(
+            this,
+            "securitygroup",
+            configuration.securityGroupId
+        );
+        const vpc = importVpc(this, isc.environmentName);
+        const parameterGroup = this.createParamaterGroup(configuration);
+        const parameters = this.createClusterParameters(
+            configuration,
+            instanceName,
+            vpc,
+            securityGroup,
+            parameterGroup,
+            secret
+        );
+        const cluster = configuration.snapshotIdentifier
+            ? new DatabaseClusterFromSnapshot(this, instanceName, {
+                  ...parameters,
+                  ...{ snapshotIdentifier: configuration.snapshotIdentifier },
+              })
+            : new DatabaseCluster(this, instanceName, parameters);
 
         // this workaround should prevent stack failing on version upgrade
         const cfnInstances = cluster.node.children.filter(

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

@@ -1,6 +1,6 @@
 import { Stack } from "aws-cdk-lib";
 import { Construct } from "constructs";
-import { IVpc, SubnetType, Vpc } from "aws-cdk-lib/aws-ec2";
+import { IpAddresses, IVpc, SubnetType, Vpc } from "aws-cdk-lib/aws-ec2";
 import { InfraStackConfiguration } from "./intra-stack-configuration";
 import { exportValue } from "../import-util";
 
@@ -32,7 +32,7 @@ export class NetworkStack extends Stack {
             availabilityZones: ["eu-west-1a", "eu-west-1b"],
             enableDnsHostnames: true,
             enableDnsSupport: true,
-            cidr: configuration.cidr,
+            ipAddresses: IpAddresses.cidr(configuration.cidr),
             subnetConfiguration: [
                 {
                     name: "public",