@digitraffic/common 2023.1.31-1 → 2023.2.13-1

package/dist/aws/infra/api/static-integration.js

@@ -52,9 +52,19 @@ class DigitrafficStaticIntegration extends aws_apigateway_1.MockIntegration {
     }
     static createMethodResponse(enableCors) {
         return enableCors
-            ? (0, responses_1.corsMethod)(METHOD_RESPONSE_200)
+            ? corsMethod(METHOD_RESPONSE_200)
             : METHOD_RESPONSE_200;
     }
 }
 exports.DigitrafficStaticIntegration = DigitrafficStaticIntegration;
+function corsMethod(response) {
+    return {
+        ...response,
+        ...{
+            responseParameters: {
+                "method.response.header.Access-Control-Allow-Origin": true,
+            },
+        },
+    };
+}
 //# sourceMappingURL=static-integration.js.map

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

@@ -21,12 +21,12 @@ class DbProxyStack extends aws_cdk_lib_1.Stack {
             secretCompleteArn: configuration.secretArn,
         });
         const proxy = this.createProxy(vpc, secret, configuration);
-        const readerEndpoint = this.createProxyEndpoints(vpc, proxy, configuration.securityGroupId);
+        const readerEndpoint = this.createProxyEndpoints(vpc, proxy, configuration.proxy.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 securityGroup = aws_ec2_1.SecurityGroup.fromSecurityGroupId(this, "securitygroup", configuration.proxy.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,
@@ -38,7 +38,7 @@ class DbProxyStack extends aws_cdk_lib_1.Stack {
             /* nothing */
         };
         return new aws_rds_1.DatabaseProxy(this, proxyId, {
-            dbProxyName: configuration.dbProxyName ?? "AuroraProxy",
+            dbProxyName: configuration.proxy.name ?? "AuroraProxy",
             securityGroups: [securityGroup],
             proxyTarget: aws_rds_1.ProxyTarget.fromCluster(cluster),
             idleClientTimeout: aws_cdk_lib_1.Duration.seconds(1800),

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

@@ -1,11 +1,9 @@
 import { Stack } from "aws-cdk-lib";
-import { Construct } from "constructs";
-import { IVpc } from "aws-cdk-lib/aws-ec2";
+import { InstanceType, IVpc } from "aws-cdk-lib/aws-ec2";
+import { ISecurityGroup } from "aws-cdk-lib/aws-ec2/lib/security-group";
 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 { Construct } from "constructs";
 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;
@@ -14,7 +12,12 @@ export interface DbConfiguration {
     readonly instances: number;
     readonly customParameterGroup: boolean;
     readonly securityGroupId: string;
-    readonly dbProxyName?: string;
+    readonly superuserName: string;
+    readonly superuserPassword: string;
+    readonly proxy: {
+        readonly name?: string;
+        readonly securityGroupId: string;
+    };
 }
 /**
  * How to upgrade major version?
@@ -31,6 +34,6 @@ export declare class DbStack extends Stack {
     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;
+    createClusterParameters(configuration: DbConfiguration, instanceName: string, vpc: IVpc, securityGroup: ISecurityGroup, parameterGroup: IParameterGroup): DatabaseClusterProps;
     createAuroraCluster(isc: InfraStackConfiguration, configuration: DbConfiguration): DatabaseCluster;
 }

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

@@ -4,7 +4,6 @@ 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?
@@ -38,7 +37,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, secret) {
+    createClusterParameters(configuration, instanceName, vpc, securityGroup, parameterGroup) {
         return {
             engine: aws_rds_1.DatabaseClusterEngine.auroraPostgres({
                 version: configuration.dbVersion,
@@ -67,19 +66,16 @@ class DbStack extends aws_cdk_lib_1.Stack {
                 instanceType: configuration.dbInstanceType,
                 parameterGroup,
             },
-            credentials: aws_rds_1.Credentials.fromSecret(secret),
+            credentials: aws_rds_1.Credentials.fromPassword(configuration.superuserName, aws_cdk_lib_1.SecretValue.unsafePlainText(configuration.superuserPassword)),
             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 parameters = this.createClusterParameters(configuration, instanceName, (0, import_util_1.importVpc)(this, isc.environmentName), securityGroup, parameterGroup);
+        // create cluster from the snapshot or from the scratch
         const cluster = configuration.snapshotIdentifier
             ? new aws_rds_1.DatabaseClusterFromSnapshot(this, instanceName, {
                 ...parameters,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2023.01.31-1",
+  "version": "2023.02.13-1",
   "description": "",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
   "peerDependencies": {
     "@aws-cdk/aws-synthetics-alpha": "2.62.2-alpha.0",
     "@types/geojson": "^7946.0.10",
-    "aws-cdk-lib": "^2.62.2",
+    "aws-cdk-lib": "2.62.2",
     "aws-sdk": "^2.1304.0",
     "axios": "^1.2.6",
     "change-case": "^4.1.2",
@@ -35,24 +35,24 @@
     "@types/aws-lambda": "^8.10.110",
     "@types/geojson": "^7946.0.10",
     "@types/jest": "^29.2.5",
-    "@types/node": "^18.11.18",
-    "@types/ramda": "^0.28.21",
+    "@types/node": "^18.13.0",
+    "@types/ramda": "^0.28.23",
     "@types/sinon": "^10.0.13",
-    "@typescript-eslint/eslint-plugin": "^5.48.2",
-    "@typescript-eslint/parser": "^5.48.2",
-    "aws-cdk-lib": "^2.62.2",
+    "@typescript-eslint/eslint-plugin": "^5.51.0",
+    "@typescript-eslint/parser": "^5.51.0",
+    "aws-cdk-lib": "2.62.2",
     "aws-sdk": "^2.1304.0",
     "axios": "^1.2.6",
     "change-case": "^4.1.2",
     "constructs": "^10.1.222",
-    "eslint": "^8.33.0",
+    "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-deprecation": "1.3.3",
     "geojson-validation": "^1.0.2",
     "husky": "^8.0.3",
-    "jest": "^29.1.1",
+    "jest": "^29.4.2",
     "jest-junit": "^15.0.0",
-    "lint-staged": "^13.1.0",
+    "lint-staged": "^13.1.1",
     "moment": "^2.29.4",
     "node-ttl": "^0.2.0",
     "pg-native": "^3.0.1",
@@ -62,7 +62,7 @@
     "rimraf": "^4.1.0",
     "sinon": "^15.0.1",
     "ts-jest": "^29.0.5",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.5"
   },
   "externals": [
     "aws-sdk",

package/src/aws/infra/api/static-integration.ts

@@ -1,10 +1,11 @@
 import {
+    MethodResponse,
     MockIntegration,
     PassthroughBehavior,
     Resource,
 } from "aws-cdk-lib/aws-apigateway";
 import { MediaType } from "../../types/mediatypes";
-import { corsMethod, RESPONSE_CORS_INTEGRATION } from "./responses";
+import { RESPONSE_CORS_INTEGRATION } from "./responses";
 
 const INTEGRATION_RESPONSE_200 = `{
     "statusCode": 200
@@ -94,3 +95,14 @@ export class DigitrafficStaticIntegration extends MockIntegration {
             : METHOD_RESPONSE_200;
     }
 }
+
+function corsMethod(response: MethodResponse): MethodResponse {
+    return {
+        ...response,
+        ...{
+            responseParameters: {
+                "method.response.header.Access-Control-Allow-Origin": true,
+            },
+        },
+    };
+}

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

@@ -38,11 +38,12 @@ export class DbProxyStack extends Stack {
         const secret = Secret.fromSecretAttributes(this, "proxy-secret", {
             secretCompleteArn: configuration.secretArn,
         });
+
         const proxy = this.createProxy(vpc, secret, configuration);
         const readerEndpoint = this.createProxyEndpoints(
             vpc,
             proxy,
-            configuration.securityGroupId
+            configuration.proxy.securityGroupId
         );
         this.setOutputs(configuration, proxy, readerEndpoint);
     }
@@ -52,7 +53,7 @@ export class DbProxyStack extends Stack {
         const securityGroup = SecurityGroup.fromSecurityGroupId(
             this,
             "securitygroup",
-            configuration.securityGroupId
+            configuration.proxy.securityGroupId
         );
 
         const cluster = DatabaseCluster.fromDatabaseClusterAttributes(
@@ -75,7 +76,7 @@ export class DbProxyStack extends Stack {
         };
 
         return new DatabaseProxy(this, proxyId, {
-            dbProxyName: configuration.dbProxyName ?? "AuroraProxy",
+            dbProxyName: configuration.proxy.name ?? "AuroraProxy",
             securityGroups: [securityGroup],
             proxyTarget: ProxyTarget.fromCluster(cluster),
             idleClientTimeout: Duration.seconds(1800),

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

@@ -1,6 +1,11 @@
-import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
-import { Construct } from "constructs";
-import { IVpc, SecurityGroup, SubnetType } from "aws-cdk-lib/aws-ec2";
+import { Duration, RemovalPolicy, SecretValue, Stack } from "aws-cdk-lib";
+import {
+    InstanceType,
+    IVpc,
+    SecurityGroup,
+    SubnetType,
+} from "aws-cdk-lib/aws-ec2";
+import { ISecurityGroup } from "aws-cdk-lib/aws-ec2/lib/security-group";
 import {
     AuroraPostgresEngineVersion,
     CfnDBInstance,
@@ -13,11 +18,9 @@ import {
     IParameterGroup,
     ParameterGroup,
 } from "aws-cdk-lib/aws-rds";
-import { ISecret, Secret } from "aws-cdk-lib/aws-secretsmanager";
+import { Construct } from "constructs";
 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;
@@ -29,7 +32,13 @@ export interface DbConfiguration {
     readonly customParameterGroup: boolean;
     readonly securityGroupId: string;
 
-    readonly dbProxyName?: string;
+    readonly superuserName: string;
+    readonly superuserPassword: string;
+
+    readonly proxy: {
+        readonly name?: string;
+        readonly securityGroupId: string;
+    };
 }
 
 /**
@@ -110,8 +119,7 @@ export class DbStack extends Stack {
         instanceName: string,
         vpc: IVpc,
         securityGroup: ISecurityGroup,
-        parameterGroup: IParameterGroup,
-        secret: ISecret
+        parameterGroup: IParameterGroup
     ): DatabaseClusterProps {
         return {
             engine: DatabaseClusterEngine.auroraPostgres({
@@ -141,7 +149,10 @@ export class DbStack extends Stack {
                 instanceType: configuration.dbInstanceType,
                 parameterGroup,
             },
-            credentials: Credentials.fromSecret(secret),
+            credentials: Credentials.fromPassword(
+                configuration.superuserName,
+                SecretValue.unsafePlainText(configuration.superuserPassword)
+            ),
             parameterGroup,
         };
     }
@@ -151,24 +162,21 @@ export class DbStack extends Stack {
         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,
+            importVpc(this, isc.environmentName),
             securityGroup,
-            parameterGroup,
-            secret
+            parameterGroup
         );
+
+        // create cluster from the snapshot or from the scratch
         const cluster = configuration.snapshotIdentifier
             ? new DatabaseClusterFromSnapshot(this, instanceName, {
                   ...parameters,