@digitraffic/common 2024.1.10-1 → 2024.1.19-1

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

@@ -1,12 +1,12 @@
 import { Role } from "aws-cdk-lib/aws-iam";
 import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
 import { CfnCanary } from "aws-cdk-lib/aws-synthetics";
-import { LambdaEnvironment } from "../stack/lambda-configs";
-import { DigitrafficRestApi } from "../stack/rest_apis";
-import { DigitrafficStack } from "../stack/stack";
-import { DigitrafficCanary } from "./canary";
-import { ENV_API_KEY, ENV_HOSTNAME, ENV_SECRET } from "./canary-keys";
-import { CanaryParameters } from "./canary-parameters";
+import { LambdaEnvironment } from "../stack/lambda-configs.js";
+import { DigitrafficRestApi } from "../stack/rest_apis.js";
+import { DigitrafficStack } from "../stack/stack.js";
+import { DigitrafficCanary } from "./canary.js";
+import { ENV_API_KEY, ENV_HOSTNAME, ENV_SECRET } from "./canary-keys.js";
+import { CanaryParameters } from "./canary-parameters.js";
 
 export interface UrlCanaryParameters extends CanaryParameters {
     readonly hostname: string;

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

@@ -1,17 +1,17 @@
 import { IncomingMessage, RequestOptions } from "http";
-import { Asserter } from "../../../test/asserter";
+import { Asserter } from "../../../test/asserter.js";
 
 // 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: Synthetics = require("Synthetics");
 import zlib = require("zlib");
-import { MediaType } from "../../types/mediatypes";
-import { getApiKeyFromAPIGateway } from "../../runtime/apikey";
+import { MediaType } from "../../types/mediatypes.js";
+import { getApiKeyFromAPIGateway } from "../../runtime/apikey.js";
 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";
+import { isValidGeoJson } from "../../../utils/geometry.js";
+import { getEnvVariable } from "../../../utils/utils.js";
+import { ENV_API_KEY, ENV_HOSTNAME } from "./canary-keys.js";
+import { logger } from "../../runtime/dt-logger-default.js";
+import { logException } from "../../../utils/logging.js";
 
 export const API_KEY_HEADER = "x-api-key";
 

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

@@ -4,10 +4,10 @@ import {
     PassthroughBehavior,
     RequestValidator,
     Resource,
+  IModel
 } from "aws-cdk-lib/aws-apigateway";
 import { Queue } from "aws-cdk-lib/aws-sqs";
 import { PolicyStatement, Role, ServicePrincipal } from "aws-cdk-lib/aws-iam";
-import { IModel } from "aws-cdk-lib/aws-apigateway/lib/model";
 import { Construct } from "constructs";
 
 export function attachQueueToApiGatewayResource(

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

@@ -10,8 +10,8 @@ import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
 import { S3, S3Client } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import { SQSEvent, SQSHandler, SQSRecord } from "aws-lambda";
-import { DigitrafficStack } from "./stack/stack";
-import { MonitoredFunction } from "./stack/monitoredfunction";
+import { DigitrafficStack } from "./stack/stack.js";
+import { MonitoredFunction } from "./stack/monitoredfunction.js";
 
 /**
  * Construct for creating SQS-queues.

package/src/aws/infra/stack/lambda-configs.ts

@@ -9,8 +9,8 @@ import { Duration } from "aws-cdk-lib";
 import { IVpc, SubnetSelection } from "aws-cdk-lib/aws-ec2";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { Role } from "aws-cdk-lib/aws-iam";
-import { DigitrafficStack } from "./stack";
-import { MonitoredFunctionAlarmProps } from "./monitoredfunction";
+import { DigitrafficStack } from "./stack.js";
+import { MonitoredFunctionAlarmProps } from "./monitoredfunction.js";
 
 export type LambdaEnvironment = Record<string, string>;
 

package/src/aws/infra/stack/monitoredfunction.ts

@@ -2,15 +2,15 @@ import { Function, FunctionProps } from "aws-cdk-lib/aws-lambda";
 import { Stack } from "aws-cdk-lib";
 import { SnsAction } from "aws-cdk-lib/aws-cloudwatch-actions";
 import { ComparisonOperator, Metric } from "aws-cdk-lib/aws-cloudwatch";
-import { DigitrafficStack } from "../stack/stack";
+import { DigitrafficStack } from "./stack.js";
 import { ITopic } from "aws-cdk-lib/aws-sns";
 import {
     databaseFunctionProps,
     LambdaEnvironment,
     MonitoredFunctionParameters,
-} from "../stack/lambda-configs";
-import { DigitrafficLogSubscriptions } from "../stack/subscription";
-import { TrafficType } from "../../../types/traffictype";
+} from "./lambda-configs.js";
+import { DigitrafficLogSubscriptions } from "./subscription.js";
+import { TrafficType } from "../../../types/traffictype.js";
 
 import _ from "lodash";
 

package/src/aws/infra/stack/parameters.ts

@@ -1,5 +1,5 @@
 import { StringParameter } from "aws-cdk-lib/aws-ssm";
-import { Construct } from "constructs/lib/construct";
+import { type Construct } from "constructs";
 
 const SSM_ROOT = "/digitraffic" as const;
 const MONITORING_ROOT = "/monitoring" as const;

package/src/aws/infra/stack/rest_apis.ts

@@ -19,12 +19,12 @@ import {
     PolicyStatement,
 } from "aws-cdk-lib/aws-iam";
 import { Construct } from "constructs";
-import { getModelReference } from "../../../utils/api-model";
-import { MediaType } from "../../types/mediatypes";
-import { ModelWithReference } from "../../types/model-with-reference";
-import { DocumentationPart, DocumentationProperties } from "../documentation";
-import { createDefaultUsagePlan, createUsagePlan } from "../usage-plans";
-import { DigitrafficStack } from "./stack";
+import { getModelReference } from "../../../utils/api-model.js";
+import { MediaType } from "../../types/mediatypes.js";
+import { ModelWithReference } from "../../types/model-with-reference.js";
+import { DocumentationPart, DocumentationProperties } from "../documentation.js";
+import { createDefaultUsagePlan, createUsagePlan } from "../usage-plans.js";
+import { DigitrafficStack } from "./stack.js";
 
 import _ from "lodash";
 

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

@@ -1,7 +1,7 @@
 import { Annotations, IAspect, Stack } from "aws-cdk-lib";
 import { CfnFunction, Runtime } from "aws-cdk-lib/aws-lambda";
 import { CfnBucket } from "aws-cdk-lib/aws-s3";
-import { DigitrafficStack, SOLUTION_KEY } from "./stack";
+import { DigitrafficStack, SOLUTION_KEY } from "./stack.js";
 import { IConstruct } from "constructs";
 import { CfnMethod, CfnResource } from "aws-cdk-lib/aws-apigateway";
 import { CfnQueue } from "aws-cdk-lib/aws-sqs";

package/src/aws/infra/stack/stack.ts

@@ -1,15 +1,14 @@
 import { Aspects, Stack, StackProps } from "aws-cdk-lib";
-import { IVpc, SecurityGroup, Vpc } from "aws-cdk-lib/aws-ec2";
-import { ISecurityGroup } from "aws-cdk-lib/aws-ec2/lib/security-group";
+import { type ISecurityGroup, IVpc, SecurityGroup, Vpc } from "aws-cdk-lib/aws-ec2";
 import { ITopic, Topic } from "aws-cdk-lib/aws-sns";
 import { StringParameter } from "aws-cdk-lib/aws-ssm";
 import { ISecret, Secret } from "aws-cdk-lib/aws-secretsmanager";
 import { Function as AWSFunction } from "aws-cdk-lib/aws-lambda";
 
-import { StackCheckingAspect } from "./stack-checking-aspect";
+import { StackCheckingAspect } from "./stack-checking-aspect.js";
 import { Construct } from "constructs";
-import { TrafficType } from "../../../types/traffictype";
-import { DBLambdaEnvironment } from "./lambda-configs";
+import { TrafficType } from "../../../types/traffictype.js";
+import { DBLambdaEnvironment } from "./lambda-configs.js";
 
 const SSM_ROOT = "/digitraffic";
 export const SOLUTION_KEY = "Solution";

package/src/aws/infra/stack/subscription.ts

@@ -1,8 +1,8 @@
 import { CfnSubscriptionFilter } from "aws-cdk-lib/aws-logs";
 import { Function as AWSFunction } from "aws-cdk-lib/aws-lambda";
-import { DigitrafficStack } from "./stack";
+import { DigitrafficStack } from "./stack.js";
 import { Construct } from "constructs";
-import { MonitoredFunction } from "./monitoredfunction";
+import { MonitoredFunction } from "./monitoredfunction.js";
 
 /**
  * Creates a subscription filter that subscribes to a Lambda Log Group and delivers the logs to another destination.

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

@@ -1,14 +1,14 @@
 import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
-import { Construct } from "constructs/lib/construct";
+import { type Construct } from "constructs";
 import {
     PrivateHostedZone,
     RecordSet,
     RecordTarget,
     RecordType,
 } from "aws-cdk-lib/aws-route53";
-import { InfraStackConfiguration } from "./intra-stack-configuration";
-import { importVpc } from "../import-util";
-import { getParameterValue } from "../stack/parameters";
+import { InfraStackConfiguration } from "./intra-stack-configuration.js";
+import { importVpc } from "../import-util.js";
+import { getParameterValue } from "../stack/parameters.js";
 
 const DEFAULT_RECORD_TTL = Duration.seconds(30);
 

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

@@ -7,12 +7,12 @@ import {
 } from "aws-cdk-lib/aws-rds";
 import { ISecret, Secret } from "aws-cdk-lib/aws-secretsmanager";
 import { IVpc, SecurityGroup } from "aws-cdk-lib/aws-ec2";
-import { InfraStackConfiguration } from "./intra-stack-configuration";
-import { DbStack } from "./db-stack";
-import { exportValue, importVpc } from "../import-util";
-import { createParameter } from "../stack/parameters";
+import { InfraStackConfiguration } from "./intra-stack-configuration.js";
+import { DbStack } from "./db-stack.js";
+import { exportValue, importVpc } from "../import-util.js";
+import { createParameter } from "../stack/parameters.js";
 import { Stack, Duration } from "aws-cdk-lib/core";
-import { Construct } from "constructs/lib/construct";
+import { Construct } from "constructs/lib/construct.js";
 
 export interface ProxyConfiguration {
     readonly secretArn: string;

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

@@ -3,8 +3,8 @@ import {
     IVpc,
     SecurityGroup,
     SubnetType,
+  type ISecurityGroup,
 } from "aws-cdk-lib/aws-ec2";
-import { ISecurityGroup } from "aws-cdk-lib/aws-ec2/lib/security-group";
 import {
     AuroraPostgresEngineVersion,
     CfnDBInstance,
@@ -17,12 +17,12 @@ import {
     IParameterGroup,
     ParameterGroup,
 } from "aws-cdk-lib/aws-rds";
-import { Construct } from "constructs/lib/construct";
+import { Construct } from "constructs/lib/construct.js";
 import { Secret } from "aws-cdk-lib/aws-secretsmanager";
-import { InfraStackConfiguration } from "./intra-stack-configuration";
-import { exportValue, importVpc } from "../import-util";
+import { InfraStackConfiguration } from "./intra-stack-configuration.js";
+import { exportValue, importVpc } from "../import-util.js";
 import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib/core";
-import { createParameter } from "../stack/parameters";
+import { createParameter } from "../stack/parameters.js";
 
 export interface DbConfiguration {
     readonly cluster?: ClusterConfiguration;

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

@@ -1,8 +1,8 @@
 import { IpAddresses, IVpc, SubnetType, Vpc } from "aws-cdk-lib/aws-ec2";
-import { InfraStackConfiguration } from "./intra-stack-configuration";
-import { exportValue } from "../import-util";
+import { InfraStackConfiguration } from "./intra-stack-configuration.js";
+import { exportValue } from "../import-util.js";
 import { Stack } from "aws-cdk-lib/core";
-import { Construct } from "constructs/lib/construct";
+import { Construct } from "constructs/lib/construct.js";
 
 export interface NetworkConfiguration {
     readonly vpcName: string;

package/src/aws/runtime/digitraffic-integration-response.ts

@@ -1,9 +1,9 @@
 import { IntegrationResponse } from "aws-cdk-lib/aws-apigateway";
-import { MediaType } from "../types/mediatypes";
+import { MediaType } from "../types/mediatypes.js";
 import {
     getDeprecatedDefaultLambdaResponse,
     RESPONSE_DEFAULT_LAMBDA,
-} from "../infra/api/response";
+} from "../infra/api/response.js";
 
 export abstract class DigitrafficIntegrationResponse {
     static ok(mediaType: MediaType, sunset?: string): IntegrationResponse {

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

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

package/src/aws/runtime/secrets/dbsecret.ts

@@ -1,4 +1,4 @@
-import { GenericSecret } from "./secret";
+import { GenericSecret } from "./secret.js";
 
 export enum RdsProxySecretKey {
     username = "username",

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

@@ -1,7 +1,7 @@
-import { SecretHolder } from "./secret-holder";
-import { RdsProxySecretKey, RdsProxySecret } from "./dbsecret";
-import { getEnvVariable } from "../../../utils/utils";
-import { DatabaseEnvironmentKeys } from "../../../database/database";
+import { SecretHolder } from "./secret-holder.js";
+import { RdsProxySecretKey, RdsProxySecret } from "./dbsecret.js";
+import { getEnvVariable } from "../../../utils/utils.js";
+import { DatabaseEnvironmentKeys } from "../../../database/database.js";
 
 const RDS_PROXY_SECRET_KEYS = Object.values(RdsProxySecretKey);
 

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

@@ -1,7 +1,7 @@
-import { SecretHolder } from "./secret-holder";
-import { RdsSecret, RdsSecretKey } from "./dbsecret";
-import { getEnvVariable } from "../../../utils/utils";
-import { DatabaseEnvironmentKeys } from "../../../database/database";
+import { SecretHolder } from "./secret-holder.js";
+import { RdsSecret, RdsSecretKey } from "./dbsecret.js";
+import { getEnvVariable } from "../../../utils/utils.js";
+import { DatabaseEnvironmentKeys } from "../../../database/database.js";
 
 const RDS_SECRET_KEYS = Object.values(RdsSecretKey);
 

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

@@ -1,7 +1,7 @@
-import { GenericSecret, getSecret } from "./secret";
-import { checkExpectedSecretKeys } from "./dbsecret";
-import { getEnvVariable } from "../../../utils/utils";
-import { logger } from "../dt-logger-default";
+import { GenericSecret, getSecret } from "./secret.js";
+import { checkExpectedSecretKeys } from "./dbsecret.js";
+import { getEnvVariable } from "../../../utils/utils.js";
+import { logger } from "../dt-logger-default.js";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment
 const NodeTtl = require("node-ttl");

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

@@ -1,6 +1,6 @@
 import { SecretsManager } from "aws-sdk";
-import { getEnvVariable, getEnvVariableOrElse } from "../../../utils/utils";
-import { EnvKeys } from "../environment";
+import { getEnvVariable, getEnvVariableOrElse } from "../../../utils/utils.js";
+import { EnvKeys } from "../environment.js";
 
 // SECRET_OVERRIDE_AWS_REGION might not have been set before import of
 // secret, so we need to lazy initialize SecretsManager

package/src/database/cached.ts

@@ -1,5 +1,5 @@
 import { PreparedStatement } from "pg-promise";
-import { DTDatabase, DTTransaction } from "./database";
+import { DTDatabase, DTTransaction } from "./database.js";
 
 export interface CachedValue<T> {
     content: T;

package/src/database/database.ts

@@ -1,7 +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";
+import { getEnvVariable, getEnvVariableOrElse } from "../utils/utils.js";
+import { logger } from "../aws/runtime/dt-logger-default.js";
+import { logException } from "../utils/logging.js";
 
 export enum DatabaseEnvironmentKeys {
     DB_USER = "DB_USER",

package/src/database/last-updated.ts

@@ -1,4 +1,4 @@
-import { DTDatabase, DTTransaction } from "./database";
+import { DTDatabase, DTTransaction } from "./database.js";
 
 export enum DataType {
     VS_DATEX2 = "VS_DATEX2",

package/src/index.ts

@@ -0,0 +1,2 @@
+export { DigitrafficStack } from "./aws/infra/stack/stack.js";
+

package/src/test/db-testutils.ts

@@ -2,8 +2,8 @@ import {
     DatabaseEnvironmentKeys,
     DTDatabase,
     initDbConnection,
-} from "../database/database";
-import { Countable } from "../database/models";
+} from "../database/database.js";
+import { Countable } from "../database/models.js";
 
 export async function assertCount(db: DTDatabase, sql: string, count: number) {
     await db.one(sql).then((x: Countable) => expect(x.count).toEqual(count));

package/src/test/secrets-manager.ts

@@ -1,7 +1,7 @@
 import AWS = require("aws-sdk");
 import * as sinon from "sinon";
-import { EnvKeys } from "../aws/runtime/environment";
-import { setEnvVariable } from "../utils/utils";
+import { EnvKeys } from "../aws/runtime/environment.js";
+import { setEnvVariable } from "../utils/utils.js";
 
 setEnvVariable(EnvKeys.AWS_REGION, "eu-west-1");
 const secretValue = sinon.stub();

package/src/types/nullable.ts

@@ -1,4 +1,4 @@
-import { ValueOf } from "./util-types";
+import { ValueOf } from "./util-types.js";
 
 /**
  * Adds `null` as an accepted type to all properties in given type.

package/src/utils/api-model.ts

@@ -6,7 +6,7 @@ import {
     JsonSchemaType,
     JsonSchemaVersion,
 } from 'aws-cdk-lib/aws-apigateway';
-import {ModelWithReference} from "../aws/types/model-with-reference";
+import {ModelWithReference} from "../aws/types/model-with-reference.js";
 
 /**
  * Get a reference to an OpenAPI model object in a REST API.

package/src/utils/geometry.ts

@@ -3,7 +3,7 @@
  */
 import { Feature, FeatureCollection, Geometry, Position } from "geojson";
 import * as geoJsonValidator from "geojson-validation";
-import { logger } from "../aws/runtime/dt-logger-default";
+import { logger } from "../aws/runtime/dt-logger-default.js";
 
 export const SRID_WGS84 = 4326;
 
@@ -73,11 +73,13 @@ export function createFeatureCollection(
 }
 
 export function isValidGeoJson<T>(json: T): boolean {
-    return geoJsonValidator.valid(json);
+    // Tests complain about this method returning type string[] which is obviously wrong. Therefore, this casting.
+    return geoJsonValidator.valid(json) as unknown as boolean;
 }
 
 export function isFeatureCollection<T>(json: T): boolean {
-    return geoJsonValidator.isFeatureCollection(json);
+    // Tests complain about this method returning type string[] which is obviously wrong. Therefore, this casting.
+    return geoJsonValidator.isFeatureCollection(json) as unknown as boolean;
 }
 
 const DEGREES_TO_RADIANS = 0.017453292519943295; // = Math.PI / 180

package/src/utils/logging.ts

@@ -1,6 +1,6 @@
 import { AxiosError } from "axios";
-import { DtLogger } from "../aws/runtime/dt-logger";
-import { getEnvVariableOrElse } from "./utils";
+import { DtLogger } from "../aws/runtime/dt-logger.js";
+import { getEnvVariableOrElse } from "./utils.js";
 
 const functionName = getEnvVariableOrElse("AWS_LAMBDA_FUNCTION_NAME", "test");
 

package/src/utils/retry.ts

@@ -1,6 +1,6 @@
-import { HttpError } from "../types/http-error";
-import { AsyncTimeoutError } from "../types/async-timeout-error";
-import { logger } from "../aws/runtime/dt-logger-default";
+import { HttpError } from "../types/http-error.js";
+import { AsyncTimeoutError } from "../types/async-timeout-error.js";
+import { logger } from "../aws/runtime/dt-logger-default.js";
 
 export enum RetryLogError {
     LOG_ALL_AS_ERRORS,

package/src/utils/slack.ts

@@ -1,6 +1,6 @@
 import axios from "axios";
-import { logger } from "../aws/runtime/dt-logger-default";
-import { logException } from "./logging";
+import { logger } from "../aws/runtime/dt-logger-default.js";
+import { logException } from "./logging.js";
 
 export class SlackApi {
     private readonly url: string;

package/src/utils/utils.ts

@@ -1,6 +1,6 @@
-import { AwsEnv } from "../types/aws-env";
-import { Either } from "../types/either";
-import { EnvKeys } from "../aws/runtime/environment";
+import { AwsEnv } from "../types/aws-env.js";
+import { Either } from "../types/either.js";
+import { EnvKeys } from "../aws/runtime/environment.js";
 
 /**
  * Check if arrays have only elements that also exists also in other array.