@digitraffic/common 2023.2.1-1 → 2023.3.10-1

package/dist/aws/infra/api/responses.d.ts

@@ -19,10 +19,6 @@ export declare const RESPONSE_404_NOT_FOUND: {
  * @deprecated Use DigitrafficMethodResponse
  */
 export declare function methodResponse(status: string, contentType: MediaType, model: IModel, parameters?: Record<string, boolean>): MethodResponse;
-/**
- * @deprecated Use DigitrafficMethodResponse
- */
-export declare function corsMethod(response: MethodResponse): MethodResponse;
 interface IntegrationOptions {
     requestParameters?: {
         [dest: string]: string;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResponse = exports.defaultIntegration = exports.corsMethod = exports.methodResponse = exports.RESPONSE_404_NOT_FOUND = exports.RESPONSE_CORS_INTEGRATION = exports.RESPONSE_500_SERVER_ERROR = exports.RESPONSE_400_BAD_REQUEST = exports.RESPONSE_200_OK = void 0;
+exports.getResponse = exports.defaultIntegration = exports.methodResponse = exports.RESPONSE_404_NOT_FOUND = exports.RESPONSE_CORS_INTEGRATION = exports.RESPONSE_500_SERVER_ERROR = exports.RESPONSE_400_BAD_REQUEST = exports.RESPONSE_200_OK = void 0;
 const response_1 = require("./response");
 const aws_apigateway_1 = require("aws-cdk-lib/aws-apigateway");
 const errors_1 = require("../../types/errors");
@@ -41,20 +41,6 @@ function methodResponse(status, contentType, model, parameters) {
     };
 }
 exports.methodResponse = methodResponse;
-/**
- * @deprecated Use DigitrafficMethodResponse
- */
-function corsMethod(response) {
-    return {
-        ...response,
-        ...{
-            responseParameters: {
-                "method.response.header.Access-Control-Allow-Origin": true,
-            },
-        },
-    };
-}
-exports.corsMethod = corsMethod;
 /**
  * Creates a default Lambda integration for a REST API resource _root_
  * @param lambdaFunction The Lambda function

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-dns-stack.d.ts

@@ -4,6 +4,8 @@ import { InfraStackConfiguration } from "./intra-stack-configuration";
 /**
  * Creates a dns local zone and creates records for cluster endpoints and proxy endpoints.
  *
+ * Please note, that created PrivateHostedZone has RETAIN removalPolicy, so if you want to delete this stack,
+ * you must remove the zone by hand after.
  */
 export declare class DbDnsStack extends Stack {
     constructor(scope: Construct, id: string, isc: InfraStackConfiguration);

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

@@ -10,6 +10,8 @@ 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.
  *
+ * Please note, that created PrivateHostedZone has RETAIN removalPolicy, so if you want to delete this stack,
+ * you must remove the zone by hand after.
  */
 class DbDnsStack extends aws_cdk_lib_1.Stack {
     constructor(scope, id, isc) {

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,12 +12,19 @@ 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;
     };
 }
 /**
+ * Stack that creates DatabaseCluster.
+ *
+ * Please not, that created Cluster has RETAIL removalPolicy, so if you want to delete the stack,
+ * you must first deploy without parameter group, then delete stack and manually delete cluster.
+ *
  * 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
@@ -34,6 +39,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,9 +4,13 @@ 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.
+ *
+ * Please not, that created Cluster has RETAIL removalPolicy, so if you want to delete the stack,
+ * you must first deploy without parameter group, then delete stack and manually delete cluster.
+ *
  * 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
@@ -38,7 +42,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 +71,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,
@@ -92,6 +93,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");
         return cluster;
     }
 }

package/dist/types/urn.d.ts

@@ -0,0 +1 @@
+export type URN<Namespace extends string, NamespaceSpecificString extends string = ""> = `urn:${Namespace}:${NamespaceSpecificString}`;

package/dist/types/urn.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2023.02.01-1",
+  "version": "2023.03.10-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/responses.ts

@@ -68,20 +68,6 @@ export function methodResponse(
     };
 }
 
-/**
- * @deprecated Use DigitrafficMethodResponse
- */
-export function corsMethod(response: MethodResponse): MethodResponse {
-    return {
-        ...response,
-        ...{
-            responseParameters: {
-                "method.response.header.Access-Control-Allow-Origin": true,
-            },
-        },
-    };
-}
-
 interface IntegrationOptions {
     // eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style
     requestParameters?: { [dest: string]: string };

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-dns-stack.ts

@@ -16,6 +16,8 @@ const DEFAULT_RECORD_TTL = Duration.seconds(30);
 /**
  * Creates a dns local zone and creates records for cluster endpoints and proxy endpoints.
  *
+ * Please note, that created PrivateHostedZone has RETAIN removalPolicy, so if you want to delete this stack,
+ * you must remove the zone by hand after.
  */
 export class DbDnsStack extends Stack {
     constructor(scope: Construct, id: string, isc: InfraStackConfiguration) {

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,6 +32,9 @@ export interface DbConfiguration {
     readonly customParameterGroup: boolean;
     readonly securityGroupId: string;
 
+    readonly superuserName: string;
+    readonly superuserPassword: string;
+
     readonly proxy: {
         readonly name?: string;
         readonly securityGroupId: string;
@@ -36,6 +42,11 @@ export interface DbConfiguration {
 }
 
 /**
+ * Stack that creates DatabaseCluster.
+ *
+ * Please not, that created Cluster has RETAIL removalPolicy, so if you want to delete the stack,
+ * you must first deploy without parameter group, then delete stack and manually delete cluster.
+ *
  * 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
@@ -113,8 +124,7 @@ export class DbStack extends Stack {
         instanceName: string,
         vpc: IVpc,
         securityGroup: ISecurityGroup,
-        parameterGroup: IParameterGroup,
-        secret: ISecret
+        parameterGroup: IParameterGroup
     ): DatabaseClusterProps {
         return {
             engine: DatabaseClusterEngine.auroraPostgres({
@@ -144,7 +154,10 @@ export class DbStack extends Stack {
                 instanceType: configuration.dbInstanceType,
                 parameterGroup,
             },
-            credentials: Credentials.fromSecret(secret),
+            credentials: Credentials.fromPassword(
+                configuration.superuserName,
+                SecretValue.unsafePlainText(configuration.superuserPassword)
+            ),
             parameterGroup,
         };
     }
@@ -154,24 +167,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,
@@ -190,6 +200,11 @@ export class DbStack extends Stack {
         }
         cfnInstances.forEach((cfnInstance) => delete cfnInstance.engineVersion);
 
+        cluster.node.addDependency(
+            parameterGroup,
+            "Create ParameterGroup before DatabaseCluster"
+        );
+
         return cluster;
     }
 }

package/src/types/urn.ts

@@ -0,0 +1 @@
+export type URN<Namespace extends string, NamespaceSpecificString extends string = ""> = `urn:${Namespace}:${NamespaceSpecificString}`;