@digitraffic/common 2024.8.13-1 → 2024.8.16-1

package/dist/aws/infra/acl-builder.d.mts

@@ -1,6 +1,9 @@
 import { CfnWebACL } from "aws-cdk-lib/aws-wafv2";
 import type { Construct } from "constructs";
 export type AWSManagedWafRule = "CommonRuleSet" | "AmazonIpReputationList" | "KnownBadInputsRuleSet" | "SQLiRuleSet";
+export type ExcludedAWSRules = {
+    [key in AWSManagedWafRule]?: string[];
+};
 /**
  * Builder class for building CfnWebACL.
  *
@@ -16,7 +19,7 @@ export declare class AclBuilder {
     _customResponseBodies: Record<string, CfnWebACL.CustomResponseBodyProperty>;
     constructor(construct: Construct, name?: string);
     isRuleDefined(rules: AWSManagedWafRule[] | "all", rule: AWSManagedWafRule): boolean;
-    withAWSManagedRules(rules?: AWSManagedWafRule[] | "all"): AclBuilder;
+    withAWSManagedRules(rules?: AWSManagedWafRule[] | "all", excludedRules?: ExcludedAWSRules): AclBuilder;
     withIpRestrictionRule(addresses: string[]): AclBuilder;
     withThrottleRule(name: string, priority: number, limit: number, customResponseBodyKey: string, isHeaderRequired: boolean, isBasedOnIpAndUriPath: boolean): AclBuilder;
     withCustomResponseBody(key: string, customResponseBody: CfnWebACL.CustomResponseBodyProperty): this;

package/dist/aws/infra/acl-builder.mjs

@@ -20,18 +20,18 @@ export class AclBuilder {
     isRuleDefined(rules, rule) {
         return rules === "all" || rules.includes(rule);
     }
-    withAWSManagedRules(rules = "all") {
+    withAWSManagedRules(rules = "all", excludedRules = {}) {
         if (this.isRuleDefined(rules, "CommonRuleSet")) {
-            this._rules.push(createAWSCommonRuleSet());
+            this._rules.push(createAWSCommonRuleSet(excludedRules?.CommonRuleSet));
         }
         if (this.isRuleDefined(rules, "AmazonIpReputationList")) {
-            this._rules.push(createAWSReputationList());
+            this._rules.push(createAWSReputationList(excludedRules?.AmazonIpReputationList));
         }
         if (this.isRuleDefined(rules, "KnownBadInputsRuleSet")) {
-            this._rules.push(createAWSKnownBadInput());
+            this._rules.push(createAWSKnownBadInput(excludedRules?.KnownBadInputsRuleSet));
         }
         if (this.isRuleDefined(rules, "SQLiRuleSet")) {
-            this._rules.push(createAWSAntiSQLInjection());
+            this._rules.push(createAWSAntiSQLInjection(excludedRules?.SQLiRuleSet));
         }
         return this;
     }
@@ -228,7 +228,7 @@ function createThrottleStatement(limit, isHeaderRequired, isBasedOnIpAndUriPath)
         },
     };
 }
-function createAWSCommonRuleSet() {
+function createAWSCommonRuleSet(excludedRules = []) {
     return createRuleProperty("AWS-AWSManagedRulesCommonRuleSet", 70, {
         statement: {
             managedRuleGroupStatement: {
@@ -238,37 +238,40 @@ function createAWSCommonRuleSet() {
                     { name: "NoUserAgent_HEADER" },
                     { name: "SizeRestrictions_BODY" },
                     { name: "GenericRFI_BODY" },
-                ],
+                ].concat((excludedRules ?? []).map(rule => ({ name: rule }))),
             },
         },
     });
 }
-function createAWSReputationList() {
+function createAWSReputationList(excludedRules = []) {
     return createRuleProperty("AWS-AWSManagedRulesAmazonIpReputationList", 80, {
         statement: {
             managedRuleGroupStatement: {
                 vendorName: "AWS",
                 name: "AWSManagedRulesAmazonIpReputationList",
+                excludedRules: (excludedRules ?? []).map(rule => ({ name: rule }))
             },
         },
     });
 }
-function createAWSKnownBadInput() {
+function createAWSKnownBadInput(excludedRules = []) {
     return createRuleProperty("AWS-AWSManagedRulesKnownBadInputsRuleSet", 90, {
         statement: {
             managedRuleGroupStatement: {
                 vendorName: "AWS",
                 name: "AWSManagedRulesKnownBadInputsRuleSet",
+                excludedRules: (excludedRules ?? []).map(rule => ({ name: rule }))
             },
         },
     });
 }
-function createAWSAntiSQLInjection() {
+function createAWSAntiSQLInjection(excludedRules = []) {
     return createRuleProperty("AWS-AWSManagedRulesSQLiRuleSet", 100, {
         statement: {
             managedRuleGroupStatement: {
                 vendorName: "AWS",
                 name: "AWSManagedRulesSQLiRuleSet",
+                excludedRules: (excludedRules ?? []).map(rule => ({ name: rule }))
             },
         },
     });

package/dist/aws/infra/stack/monitoredfunction.mjs

@@ -5,7 +5,7 @@ import { ComparisonOperator, Metric } from "aws-cdk-lib/aws-cloudwatch";
 import { DigitrafficStack } from "./stack.mjs";
 import { databaseFunctionProps, } from "./lambda-configs.mjs";
 import { TrafficType } from "../../../types/traffictype.mjs";
-import _ from "lodash";
+import { chain } from "lodash-es";
 /**
  * Creates a Lambda function that monitors default CloudWatch Lambda metrics with CloudWatch Alarms.
  */
@@ -54,7 +54,7 @@ export class MonitoredFunction extends Function {
      */
     static createV2(stack, name, environment, functionParameters) {
         const functionName = functionParameters?.functionName ??
-            `${stack.configuration.shortName}-${_.chain(name)
+            `${stack.configuration.shortName}-${chain(name)
                 .camelCase()
                 .startCase()
                 .replace(/\s/g, "")
@@ -140,7 +140,7 @@ export class MonitoredDBFunction {
      */
     static create(stack, name, environment, functionParameters) {
         const functionName = functionParameters?.functionName ??
-            `${stack.configuration.shortName}-${_.chain(name)
+            `${stack.configuration.shortName}-${chain(name)
                 .camelCase()
                 .startCase()
                 .replace(/\s/g, "")

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

@@ -6,7 +6,7 @@ import { MediaType } from "../../types/mediatypes.mjs";
 import { DocumentationPart } from "../documentation.mjs";
 import { createDefaultUsagePlan, createUsagePlan } from "../usage-plans.mjs";
 import { DigitrafficStack } from "./stack.mjs";
-import _ from "lodash";
+import { set } from "lodash-es";
 export class DigitrafficRestApi extends RestApi {
     apiKeyIds;
     enableDocumentation;
@@ -59,7 +59,7 @@ export class DigitrafficRestApi extends RestApi {
         }));
     }
     getModelWithReference(model) {
-        return _.set(model, "modelReference", getModelReference(model.modelId, this.restApiId));
+        return set(model, "modelReference", getModelReference(model.modelId, this.restApiId));
     }
     addDocumentationPart(resource, parameterName, resourceName, type, properties) {
         const location = {

package/dist/aws/infra/stack/stack-checking-aspect.mjs

@@ -6,7 +6,7 @@ import { CfnMethod, CfnResource } from "aws-cdk-lib/aws-apigateway";
 import { CfnQueue } from "aws-cdk-lib/aws-sqs";
 import { LogRetention } from "aws-cdk-lib/aws-logs";
 import { kebabCase } from "change-case";
-import _ from "lodash";
+import { snakeCase } from "lodash-es";
 const MAX_CONCURRENCY_LIMIT = 100;
 const NODE_RUNTIMES = [Runtime.NODEJS_20_X.name, Runtime.NODEJS_18_X.name];
 var ResourceType;
@@ -124,7 +124,7 @@ export class StackCheckingAspect {
         return kebabCase(path) === path;
     }
     static isValidQueryString(name) {
-        return _.snakeCase(name) === name;
+        return snakeCase(name) === name;
     }
     checkResourceCasing(node) {
         if (node instanceof CfnResource) {

package/dist/aws/runtime/dt-logger.d.mts

@@ -1,4 +1,4 @@
-import { Writable } from "stream";
+import type { Writable } from "stream";
 /** Logging level */
 export type LOG_LEVEL = "DEBUG" | "INFO" | "WARN" | "ERROR";
 export type LoggerMethodType = `${string}.${string}`;

package/dist/aws/runtime/dt-logger.mjs

@@ -1,5 +1,4 @@
-import { Writable } from "stream";
-import _ from "lodash";
+import { mapKeys, lowerFirst } from "lodash-es";
 /**
  * Helper class for json-logging.
  *
@@ -19,9 +18,8 @@ export class DtLogger {
      * @param {LoggerConfiguration?} [config] - Accepts configuration options @see {@link LoggerConfiguration}
      */
     constructor(config) {
-        this.lambdaName =
-            config?.lambdaName ?? process.env['AWS_LAMBDA_FUNCTION_NAME'];
-        this.runtime = config?.runTime ?? process.env['AWS_EXECUTION_ENV'];
+        this.lambdaName = config?.lambdaName ?? process.env["AWS_LAMBDA_FUNCTION_NAME"];
+        this.runtime = config?.runTime ?? process.env["AWS_EXECUTION_ENV"];
         this.writeStream = config?.writeStream ?? process.stdout;
     }
     /**
@@ -99,6 +97,6 @@ export class DtLogger {
     }
 }
 function removePrefix(prefix, loggable) {
-    return _.mapKeys(loggable, (_index, key) => key.startsWith(prefix) ? _.lowerFirst(key.replace(prefix, "")) : key);
+    return mapKeys(loggable, (_index, key) => key.startsWith(prefix) ? lowerFirst(key.replace(prefix, "")) : key);
 }
 //# sourceMappingURL=dt-logger.mjs.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2024.8.13-1",
+  "version": "2024.8.16-1",
   "description": "",
   "type": "module",
   "repository": {
@@ -117,7 +117,7 @@
     "etag": "^1.8.1",
     "geojson-validation": "^1.0.2",
     "ky": "^1.5.0",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "node-ttl": "^0.2.0",
     "pg-native": "^3.1.0",
     "pg-promise": "^11.9.1"
@@ -136,7 +136,7 @@
     "etag": "^1.8.1",
     "geojson-validation": "^1.0.2",
     "ky": "^1.5.0",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "node-ttl": "^0.2.0",
     "pg-promise": "^11.9.1",
     "@jest/globals": "^29.7.0",
@@ -151,7 +151,7 @@
     "@types/geojson": "^7946.0.14",
     "@types/geojson-validation": "^1.0.3",
     "@types/jest": "^29.5.12",
-    "@types/lodash": "^4.17.7",
+    "@types/lodash-es": "^4.17.7",
     "@types/madge": "^5.0.3",
     "@types/node": "^20.14.9",
     "@typescript-eslint/eslint-plugin": "^7.14.1",
@@ -162,7 +162,7 @@
     "eslint-plugin-deprecation": "^3.0.0",
     "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
-    "madge": "^7.0.0",
+    "madge": "^8.0.0",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
     "ts-jest": "^29.2.4",