@digitraffic/common 2024.4.4-1 → 2024.4.25-1

package/dist/__test__/dependencies.test.d.mts

@@ -0,0 +1 @@
+export {};

package/dist/__test__/dependencies.test.mjs

@@ -0,0 +1,21 @@
+const madge = await import("madge");
+const WHITELISTED_DEPENDENCIES = [
+    // aspect is using DigitrafficStack with instanceof, can't remove
+    `["aws/infra/stack/stack.mjs","aws/infra/stack/stack-checking-aspect.mjs"]`
+];
+function whitelist(circular) {
+    return !WHITELISTED_DEPENDENCIES.includes(JSON.stringify(circular));
+}
+function assertNoErrors(errors) {
+    expect(errors).toHaveLength(0);
+}
+test("circular dependencies", async () => {
+    const instance = await madge.default("dist", {
+        fileExtensions: ["mts", "mjs"]
+    });
+    const circulars = instance.circular();
+    const errors = circulars.filter(whitelist);
+    assertNoErrors(errors);
+});
+export {};
+//# sourceMappingURL=dependencies.test.mjs.map

package/dist/__test__/stack/rest-apis.test.d.mts

@@ -0,0 +1 @@
+export {};

package/dist/__test__/stack/rest-apis.test.mjs

@@ -0,0 +1,42 @@
+import { App } from "aws-cdk-lib";
+import { DigitrafficRestApi } from "../../aws/infra/stack/rest_apis.mjs";
+import { DigitrafficStack } from "../../aws/infra/stack/stack.mjs";
+import { TrafficType } from "../../types/traffictype.mjs";
+import { Match, Template } from "aws-cdk-lib/assertions";
+describe("Rest api test", () => {
+    test("OPTIONS method is added to API-gateway", () => {
+        const app = new App();
+        const stack = new DigitrafficStack(app, "test-stack", {
+            alarmTopicArn: "",
+            production: false,
+            shortName: "test",
+            stackProps: {},
+            trafficType: TrafficType.ROAD,
+            warningTopicArn: ""
+        });
+        const publicApi = new DigitrafficRestApi(stack, "test", "testName");
+        const apiResource = publicApi.root.addResource("api");
+        const versionResource = apiResource.addResource("v1");
+        const testsResource = publicApi.addResourceWithCorsOptionsSubTree(versionResource, "tests");
+        testsResource.addResource("{testId}");
+        const template = Template.fromStack(stack);
+        template.resourcePropertiesCountIs("AWS::ApiGateway::Method", { HttpMethod: "OPTIONS" }, 2);
+        template.hasResource("AWS::ApiGateway::Method", {
+            Properties: {
+                HttpMethod: "OPTIONS",
+                Integration: {
+                    IntegrationResponses: Match.arrayWith([
+                        Match.objectLike({
+                            ResponseParameters: Match.objectEquals({
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,Digitraffic-User'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'",
+                                "method.response.header.Access-Control-Allow-Methods": "'OPTIONS,GET,HEAD'"
+                            }),
+                        })
+                    ]),
+                },
+            }
+        });
+    });
+});
+//# sourceMappingURL=rest-apis.test.mjs.map

package/dist/aws/infra/stack/monitoredfunction.d.mts

@@ -68,7 +68,7 @@ export declare class MonitoredFunction extends Function {
 export declare class MonitoredDBFunction {
     /**
      * Create new MonitoredDBFunction.  Use topics from given DigitrafficStack.  Generate names from given name and configuration shortName.
-     * Grant secret and create log subscription.
+     * Grant secret.
      *
      * For example, shortName FOO and given name update-things will create function FOO-UpdateThings and use code from lambda/update-things/update-things.ts method handler.
      *

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

@@ -4,7 +4,6 @@ import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
 import { ComparisonOperator, Metric } from "aws-cdk-lib/aws-cloudwatch";
 import { DigitrafficStack } from "./stack.mjs";
 import { databaseFunctionProps, } from "./lambda-configs.mjs";
-import { DigitrafficLogSubscriptions } from "./subscription.mjs";
 import { TrafficType } from "../../../types/traffictype.mjs";
 import _ from "lodash";
 /**
@@ -121,7 +120,7 @@ export class MonitoredFunction extends Function {
 export class MonitoredDBFunction {
     /**
      * Create new MonitoredDBFunction.  Use topics from given DigitrafficStack.  Generate names from given name and configuration shortName.
-     * Grant secret and create log subscription.
+     * Grant secret.
      *
      * For example, shortName FOO and given name update-things will create function FOO-UpdateThings and use code from lambda/update-things/update-things.ts method handler.
      *
@@ -144,9 +143,6 @@ export class MonitoredDBFunction {
         const functionProps = databaseFunctionProps(stack, env, functionName, name, functionParameters);
         const mf = MonitoredFunction.create(stack, functionName, functionProps, functionParameters);
         stack.grantSecret(mf);
-        if (stack.configuration.logsDestinationArn) {
-            new DigitrafficLogSubscriptions(stack, mf);
-        }
         return mf;
     }
 }

package/dist/aws/infra/stack/stack-checking-aspect.d.mts

@@ -1,11 +1,9 @@
 import { type IAspect } from "aws-cdk-lib";
-import { DigitrafficStack } from "./stack.mjs";
 import type { IConstruct } from "constructs";
 export declare class StackCheckingAspect implements IAspect {
     private readonly stackShortName?;
     private readonly whitelistedResources?;
     constructor(stackShortName?: string, whitelistedResources?: string[]);
-    static create(stack: DigitrafficStack): StackCheckingAspect;
     visit(node: IConstruct): void;
     private isWhitelisted;
     private addAnnotation;

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

@@ -30,9 +30,6 @@ export class StackCheckingAspect {
         this.stackShortName = stackShortName;
         this.whitelistedResources = whitelistedResources;
     }
-    static create(stack) {
-        return new StackCheckingAspect(stack.configuration.shortName, stack.configuration.whitelistedResources);
-    }
     visit(node) {
         //console.info("visiting class " + node.constructor.name);
         this.checkStack(node);

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

@@ -43,7 +43,7 @@ export class DigitrafficStack extends Stack {
         this.addAspects();
     }
     addAspects() {
-        Aspects.of(this).add(StackCheckingAspect.create(this));
+        Aspects.of(this).add(new StackCheckingAspect(this.configuration.shortName, this.configuration.whitelistedResources));
     }
     createLambdaEnvironment() {
         return this.createDefaultLambdaEnvironment(this.configuration.shortName);

package/dist/aws/runtime/secrets/secret.d.mts

@@ -1,2 +1,8 @@
 export type GenericSecret = Record<string, string>;
 export declare function getSecret<Secret>(secretId: string, prefix?: string): Promise<Secret>;
+/**
+ * Gets variable from environment or from an AWS Secrets Manager secret if not found in the environment.
+ * @param Environment key
+ * @param Secret id in Secrets Manager
+ */
+export declare function getFromEnvOrSecret(key: string, secretId: string): Promise<string>;

package/dist/aws/runtime/secrets/secret.mjs

@@ -1,5 +1,5 @@
 import { SecretsManager } from "@aws-sdk/client-secrets-manager";
-import { getEnvVariable, getEnvVariableOrElse } from "../../../utils/utils.mjs";
+import { getEnvVariable, getEnvVariableOrElse, getEnvVariableSafe } from "../../../utils/utils.mjs";
 import { EnvKeys } from "../environment.mjs";
 // SECRET_OVERRIDE_AWS_REGION might not have been set before import of
 // secret, so we need to lazy initialize SecretsManager
@@ -37,4 +37,21 @@ function parseSecret(secret, prefix) {
     }
     return parsed;
 }
+/**
+ * Gets variable from environment or from an AWS Secrets Manager secret if not found in the environment.
+ * @param Environment key
+ * @param Secret id in Secrets Manager
+ */
+export async function getFromEnvOrSecret(key, secretId) {
+    const envValue = getEnvVariableSafe(key);
+    if (envValue.result === "ok") {
+        return envValue.value;
+    }
+    const secret = await getSecret(secretId);
+    const secretValue = secret[key];
+    if (secretValue !== undefined) {
+        return secretValue;
+    }
+    throw new Error(`Cannot get value with key ${key} from env or secret`);
+}
 //# sourceMappingURL=secret.mjs.map

package/dist/database/last-updated.d.mts

@@ -2,7 +2,6 @@ import type { DTDatabase, DTTransaction } from "./database.mjs";
 export declare enum DataType {
     VS_DATEX2 = "VS_DATEX2",
     COUNTING_SITES_DATA = "COUNTING_SITES_DATA",
-    COUNTING_SITES_METADATA = "COUNTING_SITES_METADATA",
     COUNTING_SITES_METADATA_CHECK = "COUNTING_SITES_METADATA_CHECK",
     MAINTENANCE_TRACKING_DATA_CHECKED = "MAINTENANCE_TRACKING_DATA_CHECKED",
     PERMIT_DATA = "PERMIT_DATA",

package/dist/database/last-updated.mjs

@@ -2,7 +2,6 @@ export var DataType;
 (function (DataType) {
     DataType["VS_DATEX2"] = "VS_DATEX2";
     DataType["COUNTING_SITES_DATA"] = "COUNTING_SITES_DATA";
-    DataType["COUNTING_SITES_METADATA"] = "COUNTING_SITES_METADATA";
     DataType["COUNTING_SITES_METADATA_CHECK"] = "COUNTING_SITES_METADATA_CHECK";
     DataType["MAINTENANCE_TRACKING_DATA_CHECKED"] = "MAINTENANCE_TRACKING_DATA_CHECKED";
     DataType["PERMIT_DATA"] = "PERMIT_DATA";

package/dist/test/db-testutils.mjs

@@ -14,7 +14,14 @@ export function dbTestBase(fn, truncateFn, dbUser, dbPass, dbUri) {
             process.env[DatabaseEnvironmentKeys.DB_PASS] = dbPass;
             process.env[DatabaseEnvironmentKeys.DB_URI] = theDbUri;
             process.env[DatabaseEnvironmentKeys.DB_RO_URI] = theDbUri;
-            await truncateFn(db);
+            // if there's no connection to the database, it will be caught here
+            try {
+                await truncateFn(db);
+            }
+            catch (e) {
+                console.info("cought in commonDbTest:" + JSON.stringify(e));
+                throw e;
+            }
         });
         afterAll(async () => {
             await truncateFn(db);

package/dist/utils/slack.mjs

@@ -13,7 +13,7 @@ export class SlackApi {
                 message: "Sending slack notification",
             });
             await ky.post(this.url, {
-                body: text
+                json: { "text": text }
             });
         }
         catch (error) {

package/dist/utils/utils.d.mts

@@ -75,12 +75,6 @@ export declare function getEnvVariableOr<T>(key: string, fn: () => T): string |
  * @param orElse Alternative value
  */
 export declare function getEnvVariableOrElse<T>(key: string, orElse: T): string | T;
-/**
- * Gets variable from environment or from an AWS Secrets Manager secret if not found in the environment.
- * @param Environment key
- * @param Secret id in Secrets Manager
- */
-export declare function getFromEnvOrSecret(key: string, secretId: string): Promise<string>;
 export declare function setSecretOverideAwsRegionEnv(region: string): void;
 /**
  * ESLint won't allow to call Object.prototype builtin methods.

package/dist/utils/utils.mjs

@@ -1,5 +1,4 @@
 import { EnvKeys } from "../aws/runtime/environment.mjs";
-import { getSecret, } from "../aws/runtime/secrets/secret.mjs";
 /**
  * Check if arrays have only elements that also exists also in other array.
  * Individual element count doesn't matter.
@@ -131,23 +130,6 @@ export function getEnvVariableOr(key, fn) {
 export function getEnvVariableOrElse(key, orElse) {
     return getEnvVariableOr(key, () => orElse);
 }
-/**
- * Gets variable from environment or from an AWS Secrets Manager secret if not found in the environment.
- * @param Environment key
- * @param Secret id in Secrets Manager
- */
-export async function getFromEnvOrSecret(key, secretId) {
-    const envValue = getEnvVariableSafe(key);
-    if (envValue.result === "ok") {
-        return envValue.value;
-    }
-    const secret = await getSecret(secretId);
-    const secretValue = secret[key];
-    if (secretValue !== undefined) {
-        return secretValue;
-    }
-    throw new Error(`Cannot get value with key ${key} from env or secret`);
-}
 export function setSecretOverideAwsRegionEnv(region) {
     setEnvVariable(EnvKeys.SECRET_OVERRIDE_AWS_REGION, region);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2024.4.4-1",
+  "version": "2024.4.25-1",
   "description": "",
   "type": "module",
   "repository": {
@@ -103,11 +103,11 @@
     "./dist/aws/runtime/digitraffic-integration-response": "./dist/aws/runtime/digitraffic-integration-response.mjs"
   },
   "peerDependencies": {
+    "@aws-sdk/client-api-gateway": "^3.540.0",
     "@aws-sdk/client-s3": "^3.540.0",
-    "@aws-sdk/lib-storage": "^3.540.0",
     "@aws-sdk/client-secrets-manager": "^3.540.0",
-    "@aws-sdk/client-api-gateway": "^3.540.0",
     "@aws-sdk/client-sns": "^3.540.0",
+    "@aws-sdk/lib-storage": "^3.540.0",
     "@types/geojson": "^7946.0.14",
     "aws-cdk-lib": "^2.134.0",
     "change-case": "5.0.0",
@@ -123,18 +123,17 @@
     "pg-promise": "^11.5.4"
   },
   "devDependencies": {
-    "aws-sdk": "2.1586.0",
+    "@aws-sdk/client-api-gateway": "3.540.0",
     "@aws-sdk/client-s3": "3.540.0",
-    "@aws-sdk/lib-storage": "3.540.0",
     "@aws-sdk/client-secrets-manager": "3.540.0",
-    "@aws-sdk/client-api-gateway": "3.540.0",
     "@aws-sdk/client-sns": "3.540.0",
+    "@aws-sdk/lib-storage": "3.540.0",
     "@jest/globals": "^29.7.0",
-    "@rushstack/eslint-config": "^3.6.4",
-    "@rushstack/heft": "^0.66.0",
-    "@rushstack/heft-jest-plugin": "^0.11.21",
-    "@rushstack/heft-lint-plugin": "^0.3.20",
-    "@rushstack/heft-typescript-plugin": "^0.3.20",
+    "@rushstack/eslint-config": "^3.6.8",
+    "@rushstack/heft": "^0.66.2",
+    "@rushstack/heft-jest-plugin": "^0.11.23",
+    "@rushstack/heft-lint-plugin": "^0.3.23",
+    "@rushstack/heft-typescript-plugin": "^0.3.21",
     "@smithy/types": "2.12.0",
     "@types/aws-lambda": "8.10.136",
     "@types/etag": "1.8.3",
@@ -142,10 +141,12 @@
     "@types/geojson-validation": "^1.0.3",
     "@types/jest": "29.5.12",
     "@types/lodash": "4.14.202",
+    "@types/madge": "5.0.3",
     "@types/node": "20.11.27",
     "@typescript-eslint/eslint-plugin": "~6.18.1",
-    "@typescript-eslint/parser": "^6.20.0",
-    "aws-cdk-lib": "^2.134.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "aws-cdk-lib": "^2.135.0",
+    "aws-sdk": "2.1586.0",
     "change-case": "5.3.0",
     "constructs": "10.3.0",
     "date-fns": "~2.30.0",
@@ -159,8 +160,9 @@
     "jest-junit": "^16.0.0",
     "ky": "^1.2.3",
     "lodash": "~4.17.21",
+    "madge": "6.1.0",
     "node-ttl": "^0.2.0",
-    "pg-promise": "^11.5.4",
+    "pg-promise": "^11.5.5",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
     "ts-jest": "^29.1.2",