@digitraffic/common 2023.9.14-1 → 2023.10.18-1

package/README.md

@@ -2,6 +2,13 @@
 
 This is a place for common utilities and classes that can be used in other cdk-projects.
 
+## How to build
+
+Use `npm` to build the code i.e.
+
+    npm run build
+    npm run test
+
 ## How to use
 
 In package.json dependencies:

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

@@ -6,28 +6,28 @@ interface ApiParameter {
     type: ParameterType;
     name: string;
 }
-export declare class DigitrafficIntegration {
+export declare class DigitrafficIntegration<T extends string> {
     readonly lambda: IFunction;
     readonly mediaType: MediaType;
     readonly parameters: ApiParameter[];
     readonly sunset?: string;
     constructor(lambda: IFunction, mediaType?: MediaType, sunset?: string);
-    addPathParameter(...names: string[]): this;
-    addQueryParameter(...names: string[]): this;
-    addMultiValueQueryParameter(...names: string[]): this;
+    addPathParameter(...names: T[]): this;
+    addQueryParameter(...names: T[]): this;
+    addMultiValueQueryParameter(...names: T[]): this;
     /**
      * Note that context parameter values needs to be in json format as they will be parsed in template as json.
      * See createRequestTemplates below.
      * @param names for the parameters
      * @returns
      */
-    addContextParameter(...names: string[]): this;
+    addContextParameter(...names: T[]): this;
     /**
      * Do not use Authorization header as that will be consumed by ApiGW.
      * If Authorization header is needed, use lambda authorizers.
      * @param names for the headers
      */
-    addHeaderParameter(...names: string[]): this;
+    addHeaderParameter(...names: T[]): this;
     build(): LambdaIntegration;
     createRequestParameters(): Record<string, string>;
     createRequestTemplates(): Record<string, string>;

package/dist/aws/infra/canaries/canary-alarm.d.ts

@@ -1,6 +1,6 @@
 import { Construct } from "constructs";
 import { CanaryParameters } from "./canary-parameters";
-import { Canary } from "@aws-cdk/aws-synthetics-alpha";
+import { Canary } from "aws-cdk-lib/aws-synthetics";
 export declare class CanaryAlarm {
     constructor(stack: Construct, canary: Canary, params: CanaryParameters);
 }

package/dist/aws/infra/canaries/canary-parameters.d.ts

@@ -1,4 +1,4 @@
-import { Schedule } from "@aws-cdk/aws-synthetics-alpha";
+import { Schedule } from "aws-cdk-lib/aws-synthetics";
 /** Optional env parameters for canary */
 type CanaryEnv = Record<string, string>;
 export interface CanaryParameters {

package/dist/aws/infra/canaries/canary.d.ts

@@ -1,4 +1,4 @@
-import { Canary } from "@aws-cdk/aws-synthetics-alpha";
+import { Canary } from "aws-cdk-lib/aws-synthetics";
 import { Role } from "aws-cdk-lib/aws-iam";
 import { CanaryParameters } from "./canary-parameters";
 import { Construct } from "constructs";

package/dist/aws/infra/canaries/canary.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DigitrafficCanary = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
-const aws_synthetics_alpha_1 = require("@aws-cdk/aws-synthetics-alpha");
+const aws_synthetics_1 = require("aws-cdk-lib/aws-synthetics");
 const canary_alarm_1 = require("./canary-alarm");
-class DigitrafficCanary extends aws_synthetics_alpha_1.Canary {
+class DigitrafficCanary extends aws_synthetics_1.Canary {
     constructor(scope, canaryName, role, params, environmentVariables) {
         super(scope, canaryName, {
-            runtime: aws_synthetics_alpha_1.Runtime.SYNTHETICS_NODEJS_PUPPETEER_4_0,
+            runtime: aws_synthetics_1.Runtime.SYNTHETICS_NODEJS_PUPPETEER_4_0,
             role,
-            test: aws_synthetics_alpha_1.Test.custom({
-                code: new aws_synthetics_alpha_1.AssetCode("dist", {
+            test: aws_synthetics_1.Test.custom({
+                code: new aws_synthetics_1.AssetCode("dist", {
                     exclude: ["lambda", "out", "canaries"],
                 }),
                 handler: params.handler,
@@ -20,7 +20,7 @@ class DigitrafficCanary extends aws_synthetics_alpha_1.Canary {
                 ...params.canaryEnv,
             },
             canaryName,
-            schedule: params.schedule ?? aws_synthetics_alpha_1.Schedule.rate(aws_cdk_lib_1.Duration.minutes(15)),
+            schedule: params.schedule ?? aws_synthetics_1.Schedule.rate(aws_cdk_lib_1.Duration.minutes(15)),
         });
         this.artifactsBucket.grantWrite(role);
         new canary_alarm_1.CanaryAlarm(scope, this, params);

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

@@ -5,6 +5,7 @@ const database_1 = require("../../../database/database");
 const proxy_holder_1 = require("../../runtime/secrets/proxy-holder");
 const rds_holder_1 = require("../../runtime/secrets/rds-holder");
 const utils_1 = require("../../../utils/utils");
+const dt_logger_default_1 = require("../../runtime/dt-logger-default");
 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
 const synthetics = require("Synthetics");
 class DatabaseCheck {
@@ -97,7 +98,10 @@ class DatabaseCountChecker {
         await this.credentialsFunction();
         await (0, database_1.inDatabaseReadonly)(async (db) => {
             for (const check of this.checks) {
-                console.info("canary checking sql " + check.sql);
+                dt_logger_default_1.logger.info({
+                    method: "DatabaseCountChecker.expect",
+                    message: "Running sql: " + check.sql,
+                });
                 const value = await db.one(check.sql);
                 const checkFunction = () => {
                     check.check(value);

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

@@ -10,6 +10,8 @@ const apikey_1 = require("../../runtime/apikey");
 const geometry_1 = require("../../../utils/geometry");
 const utils_1 = require("../../../utils/utils");
 const canary_keys_1 = require("./canary-keys");
+const dt_logger_default_1 = require("../../runtime/dt-logger-default");
+const logging_1 = require("../../../utils/logging");
 exports.API_KEY_HEADER = "x-api-key";
 const baseHeaders = {
     "Digitraffic-User": "internal-digitraffic-canary",
@@ -88,7 +90,10 @@ class UrlChecker {
         // eslint-disable-next-line @typescript-eslint/prefer-optional-chain
         !this.requestOptions.headers ||
             !this.requestOptions.headers[exports.API_KEY_HEADER]) {
-            console.error("No api key defined");
+            dt_logger_default_1.logger.error({
+                method: "UrlChecker.expect403WithoutApiKey",
+                message: "No Api-key defined",
+            });
         }
         const requestOptions = {
             ...this.requestOptions,
@@ -112,7 +117,7 @@ async function getResponseBody(response) {
             return zlib.gunzipSync(body).toString();
         }
         catch (e) {
-            console.info("error " + JSON.stringify(e));
+            (0, logging_1.logException)(dt_logger_default_1.logger, e);
         }
     }
     return body.toString();

package/dist/aws/infra/sqs-queue.js

@@ -48,7 +48,7 @@ class DigitrafficDLQueue {
         });
         const dlqFunctionName = `${dlqName}-Function`;
         const lambda = monitoredfunction_1.MonitoredFunction.create(stack, dlqFunctionName, {
-            runtime: aws_lambda_1.Runtime.NODEJS_14_X,
+            runtime: aws_lambda_1.Runtime.NODEJS_16_X,
             logRetention: aws_logs_1.RetentionDays.ONE_YEAR,
             functionName: dlqFunctionName,
             code: getDlqCode(dlqBucket.bucketName),

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

@@ -10,7 +10,7 @@ const change_case_1 = require("change-case");
 const aws_sqs_1 = require("aws-cdk-lib/aws-sqs");
 const aws_logs_1 = require("aws-cdk-lib/aws-logs");
 const MAX_CONCURRENCY_LIMIT = 100;
-const NODE_RUNTIMES = [aws_lambda_1.Runtime.NODEJS_14_X.name, aws_lambda_1.Runtime.NODEJS_16_X.name];
+const NODE_RUNTIMES = [aws_lambda_1.Runtime.NODEJS_16_X.name, aws_lambda_1.Runtime.NODEJS_18_X.name];
 var ResourceType;
 (function (ResourceType) {
     ResourceType["stackName"] = "STACK_NAME";

package/dist/aws/runtime/dt-logger-default.d.ts

@@ -1,4 +1,8 @@
 import { DtLogger } from "./dt-logger";
+/**
+ * You can use this for method name definition to match DtLogger LoggableType.method parameter.
+ */
+export type { LoggerMethodType } from "./dt-logger";
 /**
  * You can use this for your logging needs or create one locally and configure it as you wish.
  */

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

@@ -2,6 +2,7 @@
 import { Writable } from "stream";
 /** Logging level */
 export type LOG_LEVEL = "DEBUG" | "INFO" | "WARN" | "ERROR";
+export type LoggerMethodType = `${string}.${string}`;
 /**
  * Configuration object for configuring the Digitraffic logging utility
  * @see {@link DtLogger}
@@ -39,7 +40,7 @@ export interface CustomParams {
  */
 export interface LoggableType extends CustomParams {
     /** Name of the method logging the message */
-    method: `${string}.${string}`;
+    method: LoggerMethodType;
     /** Message to log, optional */
     message?: string;
     /** Type of message, optional */

package/dist/aws/runtime/secrets/secret-holder.js

@@ -4,6 +4,7 @@ exports.SecretHolder = void 0;
 const secret_1 = require("./secret");
 const dbsecret_1 = require("./dbsecret");
 const utils_1 = require("../../../utils/utils");
+const dt_logger_default_1 = require("../dt-logger-default");
 // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment
 const NodeTtl = require("node-ttl");
 const DEFAULT_PREFIX = "";
@@ -33,7 +34,10 @@ class SecretHolder {
     }
     async initSecret() {
         const secretValue = await (0, secret_1.getSecret)(this.secretId);
-        console.info("refreshing secret " + this.secretId);
+        dt_logger_default_1.logger.info({
+            method: "SecretHolder.initSecret",
+            message: "Refreshing secret " + this.secretId,
+        });
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
         this.secretCache.push(DEFAULT_SECRET_KEY, secretValue);
     }

package/dist/database/database.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inDatabaseReadonly = exports.inDatabase = exports.inTransaction = exports.initDbConnection = exports.DatabaseEnvironmentKeys = void 0;
 const utils_1 = require("../utils/utils");
+const dt_logger_default_1 = require("../aws/runtime/dt-logger-default");
+const logging_1 = require("../utils/logging");
 var DatabaseEnvironmentKeys;
 (function (DatabaseEnvironmentKeys) {
     DatabaseEnvironmentKeys["DB_USER"] = "DB_USER";
@@ -68,7 +70,7 @@ async function doInDatabase(readonly, fn) {
         return await fn(db);
     }
     catch (e) {
-        console.error("Error in db:", e);
+        (0, logging_1.logException)(dt_logger_default_1.logger, e);
         throw e;
     }
     finally {

package/dist/utils/geometry.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.positionToList = exports.createGmlLineString = exports.distanceBetweenPositionsInM = exports.areDistinctPositions = exports.distanceBetweenPositionsInKm = exports.isFeatureCollection = exports.isValidGeoJson = exports.createFeatureCollection = exports.createGeometry = exports.SRID_WGS84 = void 0;
 const geoJsonValidator = __importStar(require("geojson-validation"));
+const dt_logger_default_1 = require("../aws/runtime/dt-logger-default");
 exports.SRID_WGS84 = 4326;
 /**
  * Creates WKT geometry from GeoJSON geometry
@@ -47,7 +48,10 @@ function createGeometry(geometry) {
         const coordinates = multiPolygon(geometry.coordinates);
         return `MULTIPOLYGON(${coordinates})`;
     }
-    console.error("unsupported locationType=%s", geometry.type);
+    dt_logger_default_1.logger.error({
+        method: "Geometry.createGeometry",
+        message: "Unsupported locationType " + geometry.type,
+    });
     return "POLYGON EMPTY";
 }
 exports.createGeometry = createGeometry;

package/dist/utils/retry.js

@@ -15,6 +15,7 @@ var RetryLogError;
  */
 exports.timeoutFunctions = (function () {
     return {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         noTimeout: (retryCount) => {
             return 0;
         },
@@ -40,6 +41,7 @@ exports.retryPredicates = (function () {
             }
             return false;
         },
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         alwaysRetry: (error) => {
             return true;
         },

package/dist/utils/slack.js

@@ -5,19 +5,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SlackApi = void 0;
 const axios_1 = __importDefault(require("axios"));
+const dt_logger_default_1 = require("../aws/runtime/dt-logger-default");
+const logging_1 = require("./logging");
 class SlackApi {
     constructor(url) {
         this.url = url;
     }
     async notify(text) {
         try {
-            console.info('method=notify Notifying Slack');
+            dt_logger_default_1.logger.info({
+                method: "SlackApi.notify",
+                message: "Sending slack notification",
+            });
             await axios_1.default.post(this.url, {
                 text,
             });
         }
         catch (error) {
-            console.error('method=notify Slack notify failed!');
+            (0, logging_1.logException)(dt_logger_default_1.logger, error);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2023.9.14-1",
+  "version": "2023.10.18-1",
   "description": "",
   "repository": {
     "type": "git",
@@ -17,13 +17,12 @@
     "src/**/*.ts"
   ],
   "peerDependencies": {
-    "@aws-cdk/aws-synthetics-alpha": "^2.85.0-alpha.0",
-    "@types/geojson": "^7946.0.10",
-    "aws-cdk-lib": "^2.85.0",
-    "aws-sdk": "^2.1405.0",
-    "axios": "^1.2.6",
+    "@types/geojson": "^7946.0.11",
+    "aws-cdk-lib": "^2.101.1",
+    "aws-sdk": "^2.1474.0",
+    "axios": "^1.5.1",
     "change-case": "^4.1.2",
-    "constructs": "^10.2.17",
+    "constructs": "^10.3.0",
     "date-fns-tz": "~2.0.0",
     "date-fns": "~2.30.0",
     "etag": "^1.8.1",
@@ -33,27 +32,26 @@
     "pg-promise": "^11.5.0"
   },
   "devDependencies": {
-    "@aws-cdk/aws-synthetics-alpha": "2.85.0-alpha.0",
     "@types/aws-lambda": "~8.10.119",
-    "@types/geojson": "^7946.0.10",
+    "@types/geojson": "^7946.0.11",
     "@types/etag": "^1.8.1",
-    "@types/jest": "^29.5.2",
-    "@types/lodash": "^4.14.195",
-    "@types/node": "18.15.13",
+    "@types/jest": "^29.5.5",
+    "@types/lodash": "^4.14.199",
+    "@types/node": "20.8.4",
     "@types/ramda": "~0.29.1",
     "@types/sinon": "10.0.15",
-    "@typescript-eslint/eslint-plugin": "~5.60.1",
-    "@typescript-eslint/parser": "^5.60.1",
-    "aws-cdk-lib": "~2.85.0",
-    "aws-sdk": "~2.1405.0",
-    "axios": "^1.3.6",
+    "@typescript-eslint/eslint-plugin": "~6.7.5",
+    "@typescript-eslint/parser": "^6.0.0",
+    "aws-cdk-lib": "~2.101.1",
+    "aws-sdk": "~2.1474.0",
+    "axios": "^1.5.1",
     "change-case": "^4.1.2",
-    "constructs": "10.2.61",
+    "constructs": "10.3.0",
     "date-fns-tz": "~2.0.0",
     "date-fns": "~2.30.0",
-    "eslint": "~8.43.0",
+    "eslint": "~8.51.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-deprecation": "~1.4.1",
+    "eslint-plugin-deprecation": "~2.0.0",
     "etag": "^1.8.1",
     "geojson-validation": "^1.0.2",
     "husky": "^8.0.3",

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

@@ -19,7 +19,7 @@ interface ApiParameter {
     name: string;
 }
 
-export class DigitrafficIntegration {
+export class DigitrafficIntegration<T extends string> {
     readonly lambda: IFunction;
     readonly mediaType: MediaType;
     readonly parameters: ApiParameter[] = [];
@@ -35,20 +35,20 @@ export class DigitrafficIntegration {
         this.sunset = sunset;
     }
 
-    addPathParameter(...names: string[]): this {
+    addPathParameter(...names: T[]): this {
         names.forEach((name) => this.parameters.push({ type: "path", name }));
 
         return this;
     }
 
-    addQueryParameter(...names: string[]): this {
+    addQueryParameter(...names: T[]): this {
         names.forEach((name) =>
             this.parameters.push({ type: "querystring", name })
         );
         return this;
     }
 
-    addMultiValueQueryParameter(...names: string[]): this {
+    addMultiValueQueryParameter(...names: T[]): this {
         names.forEach((name) =>
             this.parameters.push({ type: "multivaluequerystring", name })
         );
@@ -61,7 +61,7 @@ export class DigitrafficIntegration {
      * @param names for the parameters
      * @returns
      */
-    addContextParameter(...names: string[]): this {
+    addContextParameter(...names: T[]): this {
         names.forEach((name) =>
             this.parameters.push({ type: "context", name })
         );
@@ -74,7 +74,7 @@ export class DigitrafficIntegration {
      * If Authorization header is needed, use lambda authorizers.
      * @param names for the headers
      */
-    addHeaderParameter(...names: string[]): this {
+    addHeaderParameter(...names: T[]): this {
         names.forEach((name) => this.parameters.push({ type: "header", name }));
 
         return this;

package/src/aws/infra/canaries/canary-alarm.ts

@@ -1,7 +1,7 @@
 import { Construct } from "constructs";
 import { CanaryParameters } from "./canary-parameters";
 import { Alarm, ComparisonOperator } from "aws-cdk-lib/aws-cloudwatch";
-import { Canary } from "@aws-cdk/aws-synthetics-alpha";
+import { Canary } from "aws-cdk-lib/aws-synthetics";
 import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
 import { Topic } from "aws-cdk-lib/aws-sns";
 

package/src/aws/infra/canaries/canary-parameters.ts

@@ -1,4 +1,4 @@
-import { Schedule } from "@aws-cdk/aws-synthetics-alpha";
+import { Schedule } from "aws-cdk-lib/aws-synthetics";
 
 /** Optional env parameters for canary */
 type CanaryEnv = Record<string, string>;

package/src/aws/infra/canaries/canary.ts

@@ -5,7 +5,7 @@ import {
     Runtime,
     Schedule,
     Test,
-} from "@aws-cdk/aws-synthetics-alpha";
+} from "aws-cdk-lib/aws-synthetics";
 import { Role } from "aws-cdk-lib/aws-iam";
 import { CanaryAlarm } from "./canary-alarm";
 import { CanaryParameters } from "./canary-parameters";

package/src/aws/infra/canaries/database-checker.ts

@@ -3,6 +3,7 @@ import { ProxyHolder } from "../../runtime/secrets/proxy-holder";
 import { RdsHolder } from "../../runtime/secrets/rds-holder";
 import { getEnvVariable } from "../../../utils/utils";
 import { Countable } from "../../../database/models";
+import { logger } from "../../runtime/dt-logger-default";
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
 const synthetics = require("Synthetics");
@@ -141,7 +142,10 @@ export class DatabaseCountChecker {
         await this.credentialsFunction();
         await inDatabaseReadonly(async (db: DTDatabase) => {
             for (const check of this.checks) {
-                console.info("canary checking sql " + check.sql);
+                logger.info({
+                    method: "DatabaseCountChecker.expect",
+                    message: "Running sql: " + check.sql,
+                });
 
                 const value = await db.one<Countable>(check.sql);
                 const checkFunction = () => {

package/src/aws/infra/canaries/url-checker.ts

@@ -10,6 +10,8 @@ import { FeatureCollection } from "geojson";
 import { isValidGeoJson } from "../../../utils/geometry";
 import { getEnvVariable } from "../../../utils/utils";
 import { ENV_API_KEY, ENV_HOSTNAME } from "./canary-keys";
+import { logger } from "../../runtime/dt-logger-default";
+import { logException } from "../../../utils/logging";
 
 export const API_KEY_HEADER = "x-api-key";
 
@@ -142,7 +144,10 @@ export class UrlChecker {
             !this.requestOptions.headers ||
             !this.requestOptions.headers[API_KEY_HEADER]
         ) {
-            console.error("No api key defined");
+            logger.error({
+                method: "UrlChecker.expect403WithoutApiKey",
+                message: "No Api-key defined",
+            });
         }
 
         const requestOptions = {
@@ -176,7 +181,7 @@ async function getResponseBody(response: IncomingMessage): Promise<string> {
         try {
             return zlib.gunzipSync(body).toString();
         } catch (e) {
-            console.info("error " + JSON.stringify(e));
+            logException(logger, e);
         }
     }
 

package/src/aws/infra/sqs-queue.ts

@@ -61,7 +61,7 @@ export class DigitrafficDLQueue {
 
         const dlqFunctionName = `${dlqName}-Function`;
         const lambda = MonitoredFunction.create(stack, dlqFunctionName, {
-            runtime: Runtime.NODEJS_14_X,
+            runtime: Runtime.NODEJS_16_X,
             logRetention: RetentionDays.ONE_YEAR,
             functionName: dlqFunctionName,
             code: getDlqCode(dlqBucket.bucketName),

package/src/aws/infra/stack/stack-checking-aspect.ts

@@ -10,7 +10,7 @@ import { LogRetention } from "aws-cdk-lib/aws-logs";
 import IntegrationProperty = CfnMethod.IntegrationProperty;
 
 const MAX_CONCURRENCY_LIMIT = 100;
-const NODE_RUNTIMES = [Runtime.NODEJS_14_X.name, Runtime.NODEJS_16_X.name];
+const NODE_RUNTIMES = [Runtime.NODEJS_16_X.name, Runtime.NODEJS_18_X.name];
 
 enum ResourceType {
     stackName = "STACK_NAME",

package/src/aws/runtime/dt-logger-default.ts

@@ -1,5 +1,10 @@
 import { DtLogger } from "./dt-logger";
 
+/**
+ * You can use this for method name definition to match DtLogger LoggableType.method parameter.
+ */
+export type { LoggerMethodType } from "./dt-logger";
+
 /**
  * You can use this for your logging needs or create one locally and configure it as you wish.
  */

package/src/aws/runtime/dt-logger.ts

@@ -3,6 +3,7 @@ import _ from "lodash";
 
 /** Logging level */
 export type LOG_LEVEL = "DEBUG" | "INFO" | "WARN" | "ERROR";
+export type LoggerMethodType = `${string}.${string}`;
 
 /**
  * Configuration object for configuring the Digitraffic logging utility
@@ -55,7 +56,7 @@ export interface CustomParams {
  */
 export interface LoggableType extends CustomParams {
     /** Name of the method logging the message */
-    method: `${string}.${string}`;
+    method: LoggerMethodType;
     /** Message to log, optional */
     message?: string;
     /** Type of message, optional */

package/src/aws/runtime/secrets/secret-holder.ts

@@ -1,6 +1,7 @@
 import { GenericSecret, getSecret } from "./secret";
 import { checkExpectedSecretKeys } from "./dbsecret";
 import { getEnvVariable } from "../../../utils/utils";
+import { logger } from "../dt-logger-default";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment
 const NodeTtl = require("node-ttl");
@@ -47,7 +48,10 @@ export class SecretHolder<Secret extends GenericSecret> {
     private async initSecret() {
         const secretValue = await getSecret<Secret>(this.secretId);
 
-        console.info("refreshing secret " + this.secretId);
+        logger.info({
+            method: "SecretHolder.initSecret",
+            message: "Refreshing secret " + this.secretId,
+        });
 
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
         this.secretCache.push(DEFAULT_SECRET_KEY, secretValue);

package/src/database/database.ts

@@ -1,5 +1,7 @@
 import { IDatabase, ITask } from "pg-promise";
 import { getEnvVariable, getEnvVariableOrElse } from "../utils/utils";
+import { logger } from "../aws/runtime/dt-logger-default";
+import { logException } from "../utils/logging";
 
 export enum DatabaseEnvironmentKeys {
     DB_USER = "DB_USER",
@@ -97,7 +99,8 @@ async function doInDatabase<T>(
         await db.none("DISCARD ALL");
         return await fn(db);
     } catch (e) {
-        console.error("Error in db:", e);
+        logException(logger, e);
+
         throw e;
     } finally {
         await db.$pool.end();

package/src/utils/geometry.ts

@@ -3,6 +3,7 @@
  */
 import { Feature, FeatureCollection, Geometry, Position } from "geojson";
 import * as geoJsonValidator from "geojson-validation";
+import { logger } from "../aws/runtime/dt-logger-default";
 
 export const SRID_WGS84 = 4326;
 
@@ -29,7 +30,11 @@ export function createGeometry(geometry: Geometry): string {
         return `MULTIPOLYGON(${coordinates})`;
     }
 
-    console.error("unsupported locationType=%s", geometry.type);
+    logger.error({
+        method: "Geometry.createGeometry",
+        message: "Unsupported locationType " + geometry.type,
+    });
+
     return "POLYGON EMPTY";
 }
 

package/src/utils/retry.ts

@@ -16,6 +16,7 @@ export type RetryPredicate = (error: unknown) => boolean;
  */
 export const timeoutFunctions = (function () {
     return {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         noTimeout: (retryCount: number): number => {
             return 0;
         },
@@ -42,6 +43,7 @@ export const retryPredicates = (function () {
             }
             return false;
         },
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         alwaysRetry: (error: unknown): boolean => {
             return true;
         },

package/src/utils/slack.ts

@@ -1,22 +1,26 @@
 import axios from "axios";
+import { logger } from "../aws/runtime/dt-logger-default";
+import { logException } from "./logging";
 
 export class SlackApi {
-
     private readonly url: string;
 
-    constructor(url :string) {
+    constructor(url: string) {
         this.url = url;
     }
 
     async notify(text: string) {
         try {
-            console.info('method=notify Notifying Slack');
+            logger.info({
+                method: "SlackApi.notify",
+                message: "Sending slack notification",
+            });
+
             await axios.post(this.url, {
                 text,
             });
         } catch (error) {
-            console.error('method=notify Slack notify failed!');
+            logException(logger, error);
         }
     }
-
 }