@digitraffic/common 2022.11.2-1 → 2022.11.10-1

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

@@ -5,17 +5,31 @@ declare abstract class DatabaseCheck<T> {
     protected constructor(name: string, sql: string);
     abstract check(value: T): void;
 }
-interface BaseResponse {
+interface CountResponse {
+    count: number;
 }
-export declare class DatabaseChecker {
+/**
+ * Checker for sql that checks the count.  Meaning that the
+ * sql must be structured as select(*) from table where something.
+ */
+export declare class DatabaseCountChecker {
     credentialsFunction: () => Promise<void>;
-    checks: DatabaseCheck<BaseResponse>[];
+    checks: DatabaseCheck<CountResponse>[];
     private constructor();
-    static createForProxy(): DatabaseChecker;
-    static createForRds(): DatabaseChecker;
-    one(name: string, sql: string): this;
-    empty(name: string, sql: string): this;
-    notEmpty(name: string, sql: string): this;
+    static createForProxy(): DatabaseCountChecker;
+    static createForRds(): DatabaseCountChecker;
+    /**
+     * Expect that the count is 1
+     */
+    expectOne(name: string, sql: string): this;
+    /**
+     * Expect that the count is 0
+     */
+    expectZero(name: string, sql: string): this;
+    /**
+     * Expect that the count is 1 or more
+     */
+    expectOneOrMore(name: string, sql: string): this;
     expect(): Promise<string>;
 }
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DatabaseChecker = void 0;
+exports.DatabaseCountChecker = void 0;
 const database_1 = require("../../../database/database");
 const proxy_holder_1 = require("../../runtime/secrets/proxy-holder");
 const rds_holder_1 = require("../../runtime/secrets/rds-holder");
@@ -17,34 +17,30 @@ class DatabaseCheck {
 class CountDatabaseCheck extends DatabaseCheck {
     constructor(name, sql, minCount, maxCount) {
         super(name, sql);
+        if (!sql.toLowerCase().includes("select count(*)")) {
+            throw new Error("sql must contain select count(*)");
+        }
         if (minCount == null && maxCount == null) {
-            throw new Error("no max or min given!");
+            throw new Error("no max or min given");
         }
         this.minCount = minCount;
         this.maxCount = maxCount;
     }
     check(value) {
-        if (!value) {
-            this.failed = true;
-            throw new Error("no return value");
-        }
-        else {
-            if ("count" in value) {
-                if (this.minCount && value.count < this.minCount) {
-                    this.failed = true;
-                    throw new Error(`count was ${value.count}, minimum is ${this.minCount}`);
-                }
-                if (this.maxCount && value.count > this.maxCount) {
-                    this.failed = true;
-                    throw new Error(`count was ${value.count}, max is ${this.maxCount}`);
-                }
+        if ("count" in value) {
+            if (this.minCount && value.count < this.minCount) {
+                this.failed = true;
+                throw new Error(`count was ${value.count}, minimum is ${this.minCount}`);
             }
-            else {
+            if (this.maxCount && value.count > this.maxCount) {
                 this.failed = true;
-                console.info("received " + JSON.stringify(value));
-                throw new Error("no count available");
+                throw new Error(`count was ${value.count}, max is ${this.maxCount}`);
             }
         }
+        else {
+            this.failed = true;
+            throw new Error("no count available");
+        }
     }
 }
 const stepConfig = {
@@ -53,7 +49,11 @@ const stepConfig = {
     screenshotOnStepSuccess: false,
     screenshotOnStepFailure: false,
 };
-class DatabaseChecker {
+/**
+ * Checker for sql that checks the count.  Meaning that the
+ * sql must be structured as select(*) from table where something.
+ */
+class DatabaseCountChecker {
     constructor(credentialsFunction) {
         this.credentialsFunction = credentialsFunction;
         this.checks = [];
@@ -61,20 +61,29 @@ class DatabaseChecker {
         synthetics.getConfiguration().withFailedCanaryMetric(true);
     }
     static createForProxy() {
-        return new DatabaseChecker(() => new proxy_holder_1.ProxyHolder((0, utils_1.getEnvVariable)("SECRET_ID")).setCredentials());
+        return new DatabaseCountChecker(() => new proxy_holder_1.ProxyHolder((0, utils_1.getEnvVariable)("SECRET_ID")).setCredentials());
     }
     static createForRds() {
-        return new DatabaseChecker(() => new rds_holder_1.RdsHolder((0, utils_1.getEnvVariable)("SECRET_ID")).setCredentials());
+        return new DatabaseCountChecker(() => new rds_holder_1.RdsHolder((0, utils_1.getEnvVariable)("SECRET_ID")).setCredentials());
     }
-    one(name, sql) {
+    /**
+     * Expect that the count is 1
+     */
+    expectOne(name, sql) {
         this.checks.push(new CountDatabaseCheck(name, sql, 1, 1));
         return this;
     }
-    empty(name, sql) {
+    /**
+     * Expect that the count is 0
+     */
+    expectZero(name, sql) {
         this.checks.push(new CountDatabaseCheck(name, sql, null, 0));
         return this;
     }
-    notEmpty(name, sql) {
+    /**
+     * Expect that the count is 1 or more
+     */
+    expectOneOrMore(name, sql) {
         this.checks.push(new CountDatabaseCheck(name, sql, 1, null));
         return this;
     }
@@ -86,7 +95,7 @@ class DatabaseChecker {
         await (0, database_1.inDatabaseReadonly)(async (db) => {
             for (const check of this.checks) {
                 console.info("canary checking sql " + check.sql);
-                const value = await db.oneOrNone(check.sql);
+                const value = await db.one(check.sql);
                 const checkFunction = () => {
                     check.check(value);
                 };
@@ -99,5 +108,5 @@ class DatabaseChecker {
         return "OK";
     }
 }
-exports.DatabaseChecker = DatabaseChecker;
+exports.DatabaseCountChecker = DatabaseCountChecker;
 //# sourceMappingURL=database-checker.js.map

package/dist/aws/infra/canaries/database-checker.js.map

@@ -1 +1 @@
-{"version":3,"file":"database-checker.js","sourceRoot":"","sources":["../../../../src/aws/infra/canaries/database-checker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"database-checker.js","sourceRoot":"","sources":["../../../../src/aws/infra/canaries/database-checker.ts"],"names":[],"mappings":"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"}

package/dist/aws/infra/import-util.d.ts

@@ -0,0 +1,21 @@
+import { IVpc } from "aws-cdk-lib/aws-ec2";
+import { Stack } from "aws-cdk-lib";
+import { Construct } from "constructs";
+export declare class OldStackImports {
+    static AURORAINSTANCE_SG_IMPORT_NAME: string;
+    static RDSPROXY_SG_IMPORT_NAME: string;
+}
+/**
+ * Import VPC from other stack outputs
+ */
+export declare function importVpc(scope: Construct, environmentName: string): IVpc;
+/**
+ * Import value from other stack output.  Stack outputs are named with
+ * digitraffic-${environmentName}-${name} pattern and this function takes care of it
+ */
+export declare function importValue(environmentName: string, name: string): string;
+/**
+ * Export value as stack output.  Use same naming pattern as importValue.
+ */
+export declare function exportValue(stack: Stack, environmentName: string, name: string, value: string): void;
+export declare function outputName(environmentName: string, name: string): string;

package/dist/aws/infra/import-util.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.outputName = exports.exportValue = exports.importValue = exports.importVpc = exports.OldStackImports = void 0;
+const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+class OldStackImports {
+}
+exports.OldStackImports = OldStackImports;
+OldStackImports.AURORAINSTANCE_SG_IMPORT_NAME = "AuroraInstanceSG";
+OldStackImports.RDSPROXY_SG_IMPORT_NAME = "RDSProxySG";
+/**
+ * Import VPC from other stack outputs
+ */
+function importVpc(scope, environmentName) {
+    const vpcId = importValue(environmentName, "VPCID");
+    const privateSubnetIds = [
+        importValue(environmentName, "digitrafficprivateASubnet"),
+        importValue(environmentName, "digitrafficprivateBSubnet"),
+    ];
+    const availabilityZones = ["euw1-az1", "euw1-az2"];
+    // VPC reference construction requires vpcId and availability zones
+    // private subnets are used in Lambda configuration
+    return aws_ec2_1.Vpc.fromVpcAttributes(scope, "vpc", {
+        vpcId,
+        privateSubnetIds,
+        availabilityZones,
+    });
+}
+exports.importVpc = importVpc;
+/**
+ * Import value from other stack output.  Stack outputs are named with
+ * digitraffic-${environmentName}-${name} pattern and this function takes care of it
+ */
+function importValue(environmentName, name) {
+    return aws_cdk_lib_1.Fn.importValue(outputName(environmentName, name));
+}
+exports.importValue = importValue;
+/**
+ * Export value as stack output.  Use same naming pattern as importValue.
+ */
+function exportValue(stack, environmentName, name, value) {
+    const exportName = outputName(environmentName, name);
+    new aws_cdk_lib_1.CfnOutput(stack, exportName, {
+        exportName,
+        value,
+    });
+}
+exports.exportValue = exportValue;
+function outputName(environmentName, name) {
+    return `digitraffic-${environmentName}-${name}`;
+}
+exports.outputName = outputName;
+//# sourceMappingURL=import-util.js.map

package/dist/aws/infra/import-util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-util.js","sourceRoot":"","sources":["../../../src/aws/infra/import-util.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAChD,6CAAmD;AAGnD,MAAa,eAAe;;AAA5B,0CAGC;AAFiB,6CAA6B,GAAG,kBAAkB,CAAC;AACnD,uCAAuB,GAAG,YAAY,CAAC;AAGzD;;GAEG;AACH,SAAgB,SAAS,CAAC,KAAgB,EAAE,eAAuB;IAC/D,MAAM,KAAK,GAAG,WAAW,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,gBAAgB,GAAG;QACrB,WAAW,CAAC,eAAe,EAAE,2BAA2B,CAAC;QACzD,WAAW,CAAC,eAAe,EAAE,2BAA2B,CAAC;KAC5D,CAAC;IACF,MAAM,iBAAiB,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAEnD,mEAAmE;IACnE,mDAAmD;IACnD,OAAO,aAAG,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE;QACvC,KAAK;QACL,gBAAgB;QAChB,iBAAiB;KACpB,CAAC,CAAC;AACP,CAAC;AAfD,8BAeC;AAED;;;GAGG;AACH,SAAgB,WAAW,CAAC,eAAuB,EAAE,IAAY;IAC7D,OAAO,gBAAE,CAAC,WAAW,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC;AAFD,kCAEC;AAED;;GAEG;AACH,SAAgB,WAAW,CACvB,KAAY,EACZ,eAAuB,EACvB,IAAY,EACZ,KAAa;IAEb,MAAM,UAAU,GAAG,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAErD,IAAI,uBAAS,CAAC,KAAK,EAAE,UAAU,EAAE;QAC7B,UAAU;QACV,KAAK;KACR,CAAC,CAAC;AACP,CAAC;AAZD,kCAYC;AAED,SAAgB,UAAU,CAAC,eAAuB,EAAE,IAAY;IAC5D,OAAO,eAAe,eAAe,IAAI,IAAI,EAAE,CAAC;AACpD,CAAC;AAFD,gCAEC"}

package/dist/aws/infra/stack/rest_apis.d.ts

@@ -10,7 +10,7 @@ export declare class DigitrafficRestApi extends RestApi {
     constructor(stack: DigitrafficStack, apiId: string, apiName: string, allowFromIpAddresses?: string[] | undefined, config?: Partial<RestApiProps>);
     hostname(): string;
     createUsagePlan(apiKeyId: string, apiKeyName: string): string;
-    createUsagePlanV2(apiName: string): string;
+    createUsagePlanV2(apiName: string, apiKey?: string): string;
     addJsonModel(modelName: string, schema: JsonSchema): ModelWithReference;
     addCSVModel(modelName: string): ModelWithReference;
     private getModelWithReference;

package/dist/aws/infra/stack/rest_apis.js

@@ -38,8 +38,8 @@ class DigitrafficRestApi extends aws_apigateway_1.RestApi {
         this.apiKeyIds.push(newKeyId);
         return newKeyId;
     }
-    createUsagePlanV2(apiName) {
-        const newKeyId = (0, usage_plans_1.createDefaultUsagePlan)(this, apiName).keyId;
+    createUsagePlanV2(apiName, apiKey) {
+        const newKeyId = (0, usage_plans_1.createDefaultUsagePlan)(this, apiName, apiKey).keyId;
         this.apiKeyIds.push(newKeyId);
         return newKeyId;
     }

package/dist/aws/infra/stack/rest_apis.js.map

@@ -1 +1 @@
-{"version":3,"file":"rest_apis.js","sourceRoot":"","sources":["../../../../src/aws/infra/stack/rest_apis.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rest_apis.js","sourceRoot":"","sources":["../../../../src/aws/infra/stack/rest_apis.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,11 @@
+import { Stack } from "aws-cdk-lib";
+import { Construct } from "constructs";
+import { InfraStackConfiguration } from "./intra-stack-configuration";
+/**
+ * Creates a dns local zone and creates records for cluster endpoints and proxy endpoints.
+ *
+ */
+export declare class DbDnsStack extends Stack {
+    constructor(scope: Construct, id: string, isc: InfraStackConfiguration);
+    createDnsRecords(isc: InfraStackConfiguration): void;
+}

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DbDnsStack = void 0;
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const aws_route53_1 = require("aws-cdk-lib/aws-route53");
+const import_util_1 = require("../import-util");
+const db_stack_1 = require("./db-stack");
+const db_proxy_stack_1 = require("./db-proxy-stack");
+const DEFAULT_RECORD_TTL = aws_cdk_lib_1.Duration.seconds(30);
+/**
+ * Creates a dns local zone and creates records for cluster endpoints and proxy endpoints.
+ *
+ */
+class DbDnsStack extends aws_cdk_lib_1.Stack {
+    constructor(scope, id, isc) {
+        super(scope, id, {
+            env: isc.env,
+        });
+        this.createDnsRecords(isc);
+    }
+    createDnsRecords(isc) {
+        const vpc = (0, import_util_1.importVpc)(this, isc.environmentName);
+        const zone = new aws_route53_1.PrivateHostedZone(this, "DNSHostedZone", {
+            zoneName: isc.environmentName + ".local",
+            vpc,
+        });
+        zone.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.RETAIN);
+        const clusterReaderEndpoint = (0, import_util_1.importValue)(isc.environmentName, db_stack_1.DbStack.CLUSTER_READ_ENDPOINT_EXPORT_NAME);
+        const clusterWriterEndpoint = (0, import_util_1.importValue)(isc.environmentName, db_stack_1.DbStack.CLUSTER_WRITE_ENDPOINT_EXPORT_NAME);
+        const proxyReaderEndpoint = (0, import_util_1.importValue)(isc.environmentName, db_proxy_stack_1.DbProxyStack.PROXY_READER_EXPORT_NAME);
+        const proxyWriterEndpoint = (0, import_util_1.importValue)(isc.environmentName, db_proxy_stack_1.DbProxyStack.PROXY_WRITER_EXPORT_NAME);
+        new aws_route53_1.RecordSet(this, "ReaderRecord", {
+            recordType: aws_route53_1.RecordType.CNAME,
+            recordName: `db-ro.${isc.environmentName}.local`,
+            target: aws_route53_1.RecordTarget.fromValues(clusterReaderEndpoint),
+            ttl: DEFAULT_RECORD_TTL,
+            zone,
+        });
+        new aws_route53_1.RecordSet(this, "WriterRecord", {
+            recordType: aws_route53_1.RecordType.CNAME,
+            recordName: `db.${isc.environmentName}.local`,
+            target: aws_route53_1.RecordTarget.fromValues(clusterWriterEndpoint),
+            ttl: DEFAULT_RECORD_TTL,
+            zone,
+        });
+        new aws_route53_1.RecordSet(this, "ProxyReaderRecord", {
+            recordType: aws_route53_1.RecordType.CNAME,
+            recordName: `proxy-ro.${isc.environmentName}.local`,
+            target: aws_route53_1.RecordTarget.fromValues(proxyReaderEndpoint),
+            ttl: DEFAULT_RECORD_TTL,
+            zone,
+        });
+        new aws_route53_1.RecordSet(this, "ProxyWriterRecord", {
+            recordType: aws_route53_1.RecordType.CNAME,
+            recordName: `proxy.${isc.environmentName}.local`,
+            target: aws_route53_1.RecordTarget.fromValues(proxyWriterEndpoint),
+            ttl: DEFAULT_RECORD_TTL,
+            zone,
+        });
+    }
+}
+exports.DbDnsStack = DbDnsStack;
+//# sourceMappingURL=db-dns-stack.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"db-dns-stack.js","sourceRoot":"","sources":["../../../../src/aws/infra/stacks/db-dns-stack.ts"],"names":[],"mappings":";;;AAAA,6CAA6D;AAE7D,yDAKiC;AAEjC,gDAAwD;AACxD,yCAAqC;AACrC,qDAAgD;AAEhD,MAAM,kBAAkB,GAAG,sBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAEhD;;;GAGG;AACH,MAAa,UAAW,SAAQ,mBAAK;IACjC,YAAY,KAAgB,EAAE,EAAU,EAAE,GAA4B;QAClE,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE;YACb,GAAG,EAAE,GAAG,CAAC,GAAG;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED,gBAAgB,CAAC,GAA4B;QACzC,MAAM,GAAG,GAAG,IAAA,uBAAS,EAAC,IAAI,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,IAAI,+BAAiB,CAAC,IAAI,EAAE,eAAe,EAAE;YACtD,QAAQ,EAAE,GAAG,CAAC,eAAe,GAAG,QAAQ;YACxC,GAAG;SACN,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,CAAC,2BAAa,CAAC,MAAM,CAAC,CAAC;QAE9C,MAAM,qBAAqB,GAAG,IAAA,yBAAW,EACrC,GAAG,CAAC,eAAe,EACnB,kBAAO,CAAC,iCAAiC,CAC5C,CAAC;QACF,MAAM,qBAAqB,GAAG,IAAA,yBAAW,EACrC,GAAG,CAAC,eAAe,EACnB,kBAAO,CAAC,kCAAkC,CAC7C,CAAC;QAEF,MAAM,mBAAmB,GAAG,IAAA,yBAAW,EACnC,GAAG,CAAC,eAAe,EACnB,6BAAY,CAAC,wBAAwB,CACxC,CAAC;QACF,MAAM,mBAAmB,GAAG,IAAA,yBAAW,EACnC,GAAG,CAAC,eAAe,EACnB,6BAAY,CAAC,wBAAwB,CACxC,CAAC;QAEF,IAAI,uBAAS,CAAC,IAAI,EAAE,cAAc,EAAE;YAChC,UAAU,EAAE,wBAAU,CAAC,KAAK;YAC5B,UAAU,EAAE,SAAS,GAAG,CAAC,eAAe,QAAQ;YAChD,MAAM,EAAE,0BAAY,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACtD,GAAG,EAAE,kBAAkB;YACvB,IAAI;SACP,CAAC,CAAC;QAEH,IAAI,uBAAS,CAAC,IAAI,EAAE,cAAc,EAAE;YAChC,UAAU,EAAE,wBAAU,CAAC,KAAK;YAC5B,UAAU,EAAE,MAAM,GAAG,CAAC,eAAe,QAAQ;YAC7C,MAAM,EAAE,0BAAY,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACtD,GAAG,EAAE,kBAAkB;YACvB,IAAI;SACP,CAAC,CAAC;QAEH,IAAI,uBAAS,CAAC,IAAI,EAAE,mBAAmB,EAAE;YACrC,UAAU,EAAE,wBAAU,CAAC,KAAK;YAC5B,UAAU,EAAE,YAAY,GAAG,CAAC,eAAe,QAAQ;YACnD,MAAM,EAAE,0BAAY,CAAC,UAAU,CAAC,mBAAmB,CAAC;YACpD,GAAG,EAAE,kBAAkB;YACvB,IAAI;SACP,CAAC,CAAC;QAEH,IAAI,uBAAS,CAAC,IAAI,EAAE,mBAAmB,EAAE;YACrC,UAAU,EAAE,wBAAU,CAAC,KAAK;YAC5B,UAAU,EAAE,SAAS,GAAG,CAAC,eAAe,QAAQ;YAChD,MAAM,EAAE,0BAAY,CAAC,UAAU,CAAC,mBAAmB,CAAC;YACpD,GAAG,EAAE,kBAAkB;YACvB,IAAI;SACP,CAAC,CAAC;IACP,CAAC;CACJ;AApED,gCAoEC"}

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

@@ -0,0 +1,19 @@
+import { Stack } from "aws-cdk-lib";
+import { Construct } from "constructs";
+import { CfnDBProxyEndpoint, DatabaseProxy } from "aws-cdk-lib/aws-rds";
+import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
+import { IVpc } from "aws-cdk-lib/aws-ec2";
+import { InfraStackConfiguration } from "./intra-stack-configuration";
+import { DbConfiguration } from "./db-stack";
+/**
+ * A stack that creates a Database proxy.
+ */
+export declare class DbProxyStack extends Stack {
+    static PROXY_READER_EXPORT_NAME: string;
+    static PROXY_WRITER_EXPORT_NAME: string;
+    readonly isc: InfraStackConfiguration;
+    constructor(scope: Construct, id: string, isc: InfraStackConfiguration, configuration: DbConfiguration);
+    createProxy(vpc: IVpc, secret: ISecret, configuration: DbConfiguration): DatabaseProxy;
+    createProxyEndpoints(vpc: IVpc, proxy: DatabaseProxy, securityGroupId: string): CfnDBProxyEndpoint;
+    setOutputs(configuration: DbConfiguration, proxy: DatabaseProxy, proxyEndpoint: CfnDBProxyEndpoint): void;
+}

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

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DbProxyStack = void 0;
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const aws_rds_1 = require("aws-cdk-lib/aws-rds");
+const aws_secretsmanager_1 = require("aws-cdk-lib/aws-secretsmanager");
+const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
+const db_stack_1 = require("./db-stack");
+const import_util_1 = require("../import-util");
+/**
+ * A stack that creates a Database proxy.
+ */
+class DbProxyStack extends aws_cdk_lib_1.Stack {
+    constructor(scope, id, isc, configuration) {
+        super(scope, id, {
+            env: isc.env,
+        });
+        this.isc = isc;
+        const vpc = (0, import_util_1.importVpc)(this, isc.environmentName);
+        const secret = aws_secretsmanager_1.Secret.fromSecretAttributes(this, "proxy-secret", {
+            secretCompleteArn: configuration.secretArn,
+        });
+        const proxy = this.createProxy(vpc, secret, configuration);
+        const readerEndpoint = this.createProxyEndpoints(vpc, proxy, configuration.securityGroupId);
+        this.setOutputs(configuration, proxy, readerEndpoint);
+    }
+    createProxy(vpc, secret, configuration) {
+        const proxyId = `${this.isc.environmentName}-proxy`;
+        const securityGroup = aws_ec2_1.SecurityGroup.fromSecurityGroupId(this, "securitygroup", configuration.securityGroupId);
+        const cluster = aws_rds_1.DatabaseCluster.fromDatabaseClusterAttributes(this, "db-cluster", {
+            clusterIdentifier: (0, import_util_1.importValue)(this.isc.environmentName, db_stack_1.DbStack.CLUSTER_IDENTIFIER_EXPORT_NAME),
+            engine: aws_rds_1.DatabaseClusterEngine.AURORA_POSTGRESQL,
+            port: db_stack_1.DbStack.CLUSTER_PORT,
+        });
+        // CDK tries to allow connections between proxy and cluster
+        // this does not work on cluster references
+        cluster.connections.allowDefaultPortFrom = () => {
+            /* nothing */
+        };
+        return new aws_rds_1.DatabaseProxy(this, proxyId, {
+            dbProxyName: configuration.dbProxyName ?? "AuroraProxy",
+            securityGroups: [securityGroup],
+            proxyTarget: aws_rds_1.ProxyTarget.fromCluster(cluster),
+            idleClientTimeout: aws_cdk_lib_1.Duration.seconds(1800),
+            maxConnectionsPercent: 50,
+            maxIdleConnectionsPercent: 25,
+            borrowTimeout: aws_cdk_lib_1.Duration.seconds(120),
+            requireTLS: false,
+            secrets: [secret],
+            vpc: vpc,
+        });
+    }
+    createProxyEndpoints(vpc, proxy, securityGroupId) {
+        return new aws_rds_1.CfnDBProxyEndpoint(this, "ReaderEndpoint", {
+            dbProxyEndpointName: "ReaderEndpoint",
+            dbProxyName: proxy.dbProxyName,
+            vpcSubnetIds: vpc.privateSubnets.map((sub) => sub.subnetId),
+            vpcSecurityGroupIds: [securityGroupId],
+            targetRole: "READ_ONLY",
+        });
+    }
+    setOutputs(configuration, proxy, proxyEndpoint) {
+        const readerEndpoint = configuration.instances > 1
+            ? proxyEndpoint.attrEndpoint
+            : proxy.endpoint;
+        // if only one instance, then there is no reader-endpoint
+        (0, import_util_1.exportValue)(this, this.isc.environmentName, DbProxyStack.PROXY_READER_EXPORT_NAME, readerEndpoint);
+        (0, import_util_1.exportValue)(this, this.isc.environmentName, DbProxyStack.PROXY_WRITER_EXPORT_NAME, proxy.endpoint);
+    }
+}
+exports.DbProxyStack = DbProxyStack;
+DbProxyStack.PROXY_READER_EXPORT_NAME = "db-reader-endpoint";
+DbProxyStack.PROXY_WRITER_EXPORT_NAME = "db-writer-endpoint";
+//# sourceMappingURL=db-proxy-stack.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"db-proxy-stack.js","sourceRoot":"","sources":["../../../../src/aws/infra/stacks/db-proxy-stack.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,31 @@
+import { Stack } from "aws-cdk-lib";
+import { Construct } from "constructs";
+import { AuroraPostgresEngineVersion, DatabaseCluster } from "aws-cdk-lib/aws-rds";
+import { InstanceType } from "aws-cdk-lib/aws-ec2";
+import { InfraStackConfiguration } from "./intra-stack-configuration";
+export interface DbConfiguration {
+    readonly secretArn: string;
+    readonly dbVersion: AuroraPostgresEngineVersion;
+    readonly dbInstanceType: InstanceType;
+    readonly snapshotIdentifier: string;
+    readonly instances: number;
+    readonly customParameterGroup: boolean;
+    readonly securityGroupId: string;
+    readonly dbProxyName?: string;
+}
+/**
+ * How to upgrade major version?
+ * 0. Set correct SG for db-stack and db-proxy-stack(this step will be removed in the future)
+ * 1. Update db-stack WITHOUT parameter group
+ * 2. Upgrade extensions by hand
+ * 3. Upgrade database from the AWS console
+ * 4. Update db-stack with the upgraded version and custom parameter group
+ */
+export declare class DbStack extends Stack {
+    static CLUSTER_IDENTIFIER_EXPORT_NAME: string;
+    static CLUSTER_READ_ENDPOINT_EXPORT_NAME: string;
+    static CLUSTER_WRITE_ENDPOINT_EXPORT_NAME: string;
+    static CLUSTER_PORT: number;
+    constructor(scope: Construct, id: string, isc: InfraStackConfiguration, configuration: DbConfiguration);
+    createAuroraCluster(isc: InfraStackConfiguration, configuration: DbConfiguration): DatabaseCluster;
+}

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

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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");
+/**
+ * How to upgrade major version?
+ * 0. Set correct SG for db-stack and db-proxy-stack(this step will be removed in the future)
+ * 1. Update db-stack WITHOUT parameter group
+ * 2. Upgrade extensions by hand
+ * 3. Upgrade database from the AWS console
+ * 4. Update db-stack with the upgraded version and custom parameter group
+ */
+class DbStack extends aws_cdk_lib_1.Stack {
+    constructor(scope, id, isc, configuration) {
+        super(scope, id, {
+            env: isc.env,
+        });
+        const cluster = this.createAuroraCluster(isc, configuration);
+        (0, import_util_1.exportValue)(this, isc.environmentName, DbStack.CLUSTER_IDENTIFIER_EXPORT_NAME, cluster.clusterIdentifier);
+        (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
+            ? new aws_rds_1.ParameterGroup(this, `parameter-group-${configuration.dbVersion.auroraPostgresMajorVersion}`, {
+                engine: aws_rds_1.DatabaseClusterEngine.auroraPostgres({
+                    version: configuration.dbVersion,
+                }),
+                parameters: {
+                    "pg_stat_statements.track": "ALL",
+                    random_page_cost: "1",
+                },
+            })
+            : 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,
+            engine: aws_rds_1.DatabaseClusterEngine.auroraPostgres({
+                version: configuration.dbVersion,
+            }),
+            instances: configuration.instances,
+            instanceUpdateBehaviour: aws_rds_1.InstanceUpdateBehaviour.ROLLING,
+            instanceIdentifierBase: instanceName + "-",
+            cloudwatchLogsExports: ["postgresql"],
+            backup: {
+                retention: aws_cdk_lib_1.Duration.days(35),
+                preferredWindow: "01:00-02:00",
+            },
+            preferredMaintenanceWindow: "mon:03:00-mon:04:00",
+            deletionProtection: true,
+            removalPolicy: aws_cdk_lib_1.RemovalPolicy.RETAIN,
+            port: DbStack.CLUSTER_PORT,
+            instanceProps: {
+                autoMinorVersionUpgrade: true,
+                allowMajorVersionUpgrade: false,
+                enablePerformanceInsights: true,
+                vpc,
+                securityGroups: [securityGroup],
+                vpcSubnets: {
+                    subnetType: aws_ec2_1.SubnetType.PRIVATE_WITH_NAT,
+                },
+                instanceType: configuration.dbInstanceType,
+                parameterGroup,
+            },
+            credentials: aws_rds_1.Credentials.fromSecret(secret),
+            parameterGroup,
+        });
+        // 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) {
+            throw new Error("Couldn't pull CfnDBInstances from the L1 constructs!");
+        }
+        cfnInstances.forEach((cfnInstance) => delete cfnInstance.engineVersion);
+        return cluster;
+    }
+}
+exports.DbStack = DbStack;
+DbStack.CLUSTER_IDENTIFIER_EXPORT_NAME = "db-cluster";
+DbStack.CLUSTER_READ_ENDPOINT_EXPORT_NAME = "db-cluster-reader-endpoint";
+DbStack.CLUSTER_WRITE_ENDPOINT_EXPORT_NAME = "db-cluster-writer-endpoint";
+DbStack.CLUSTER_PORT = 5432;
+//# sourceMappingURL=db-stack.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"db-stack.js","sourceRoot":"","sources":["../../../../src/aws/infra/stacks/db-stack.ts"],"names":[],"mappings":"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"}

package/dist/aws/infra/stacks/intra-stack-configuration.d.ts

@@ -0,0 +1,5 @@
+import { Environment } from "aws-cdk-lib";
+export interface InfraStackConfiguration {
+    readonly env: Environment;
+    readonly environmentName: string;
+}

package/dist/aws/infra/stacks/intra-stack-configuration.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=intra-stack-configuration.js.map

package/dist/aws/infra/stacks/intra-stack-configuration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"intra-stack-configuration.js","sourceRoot":"","sources":["../../../../src/aws/infra/stacks/intra-stack-configuration.ts"],"names":[],"mappings":""}