@digitraffic/common 2024.1.24-3 → 2024.3.11-1

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

@@ -1,4 +1,8 @@
 import { CfnSubscriptionFilter } from "aws-cdk-lib/aws-logs";
+import { Function as AWSFunction } from "aws-cdk-lib/aws-lambda";
+import { DigitrafficStack } from "./stack.mjs";
+import { Construct } from "constructs";
+import { MonitoredFunction } from "./monitoredfunction.mjs";
 /**
  * Creates a subscription filter that subscribes to a Lambda Log Group and delivers the logs to another destination.
  * https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html

package/dist/aws/infra/stacks/db-dns-stack.d.mts

@@ -1,6 +1,6 @@
 import { Stack } from "aws-cdk-lib";
 import { type Construct } from "constructs";
-import { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
+import type { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
 /**
  * Creates a dns local zone and creates records for cluster endpoints and proxy endpoints.
  *

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

@@ -1,4 +1,5 @@
 import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
+import {} from "constructs";
 import { PrivateHostedZone, RecordSet, RecordTarget, RecordType, } from "aws-cdk-lib/aws-route53";
 import { importVpc } from "../import-util.mjs";
 import { getParameterValue } from "../stack/parameters.mjs";

package/dist/aws/infra/stacks/db-proxy-stack.d.mts

@@ -1,7 +1,7 @@
 import { CfnDBProxyEndpoint, DatabaseProxy } from "aws-cdk-lib/aws-rds";
-import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
-import { IVpc } from "aws-cdk-lib/aws-ec2";
-import { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
+import { type ISecret } from "aws-cdk-lib/aws-secretsmanager";
+import { type IVpc } from "aws-cdk-lib/aws-ec2";
+import type { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
 import { Stack } from "aws-cdk-lib/core";
 import { Construct } from "constructs/lib/construct.js";
 export interface ProxyConfiguration {

package/dist/aws/infra/stacks/db-proxy-stack.mjs

@@ -5,10 +5,14 @@ import { DbStack } from "./db-stack.mjs";
 import { exportValue, importVpc } from "../import-util.mjs";
 import { createParameter } from "../stack/parameters.mjs";
 import { Stack, Duration } from "aws-cdk-lib/core";
+import { Construct } from "constructs/lib/construct.js";
 /**
  * A stack that creates a Database proxy.
  */
 export class DbProxyStack extends Stack {
+    isc;
+    static PROXY_READER_EXPORT_NAME = "db-reader-endpoint";
+    static PROXY_WRITER_EXPORT_NAME = "db-writer-endpoint";
     constructor(scope, id, isc, configuration) {
         super(scope, id, {
             env: isc.env,
@@ -68,6 +72,4 @@ export class DbProxyStack extends Stack {
         });
     }
 }
-DbProxyStack.PROXY_READER_EXPORT_NAME = "db-reader-endpoint";
-DbProxyStack.PROXY_WRITER_EXPORT_NAME = "db-writer-endpoint";
 //# sourceMappingURL=db-proxy-stack.mjs.map

package/dist/aws/infra/stacks/db-stack.d.mts

@@ -1,7 +1,7 @@
-import { InstanceType, IVpc, type ISecurityGroup } from "aws-cdk-lib/aws-ec2";
-import { AuroraPostgresEngineVersion, DatabaseCluster, DatabaseClusterProps, IParameterGroup } from "aws-cdk-lib/aws-rds";
+import { InstanceType, type IVpc, type ISecurityGroup } from "aws-cdk-lib/aws-ec2";
+import { AuroraPostgresEngineVersion, DatabaseCluster, type DatabaseClusterProps, type IParameterGroup } from "aws-cdk-lib/aws-rds";
 import { Construct } from "constructs/lib/construct.js";
-import { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
+import type { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
 import { Stack } from "aws-cdk-lib/core";
 export interface DbConfiguration {
     readonly cluster?: ClusterConfiguration;

package/dist/aws/infra/stacks/db-stack.mjs

@@ -1,5 +1,6 @@
-import { SecurityGroup, SubnetType, } from "aws-cdk-lib/aws-ec2";
-import { CfnDBInstance, Credentials, DatabaseCluster, DatabaseClusterEngine, DatabaseClusterFromSnapshot, InstanceUpdateBehaviour, ParameterGroup, } from "aws-cdk-lib/aws-rds";
+import { InstanceType, SecurityGroup, SubnetType, } from "aws-cdk-lib/aws-ec2";
+import { AuroraPostgresEngineVersion, CfnDBInstance, Credentials, DatabaseCluster, DatabaseClusterEngine, DatabaseClusterFromSnapshot, InstanceUpdateBehaviour, ParameterGroup, } from "aws-cdk-lib/aws-rds";
+import { Construct } from "constructs/lib/construct.js";
 import { Secret } from "aws-cdk-lib/aws-secretsmanager";
 import { exportValue, importVpc } from "../import-util.mjs";
 import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib/core";
@@ -14,11 +15,15 @@ import { createParameter } from "../stack/parameters.mjs";
  * stack, but cluster is not part of the stack after that.
  */
 export class DbStack extends Stack {
+    static CLUSTER_PORT = 5432;
+    static CLUSTER_IDENTIFIER_EXPORT_NAME = "db-cluster";
+    static CLUSTER_READ_ENDPOINT_EXPORT_NAME = "db-cluster-reader-endpoint";
+    static CLUSTER_WRITE_ENDPOINT_EXPORT_NAME = "db-cluster-writer-endpoint";
+    clusterIdentifier = "";
     constructor(scope, id, isc, configuration) {
         super(scope, id, {
             env: isc.env,
         });
-        this.clusterIdentifier = "";
         const parameterGroups = this.createParameterGroups(configuration.customParameterGroups, configuration.workmem ?? 524288);
         if ((configuration.cluster && configuration.clusterImport) ||
             (!configuration.cluster && !configuration.clusterImport)) {
@@ -100,6 +105,9 @@ export class DbStack extends Stack {
         const vpc = configuration.vpc
             ? configuration.vpc
             : importVpc(this, isc.environmentName);
+        if (parameterGroups[0] === undefined) {
+            throw Error('ParameterGroups should not be empty');
+        }
         const parameters = this.createClusterParameters(configuration.secretArn, clusterConfiguration, instanceName, vpc, securityGroup, parameterGroups[0]);
         // create cluster from the snapshot or from the scratch
         const cluster = clusterConfiguration.snapshotIdentifier
@@ -119,8 +127,4 @@ export class DbStack extends Stack {
         return cluster;
     }
 }
-DbStack.CLUSTER_PORT = 5432;
-DbStack.CLUSTER_IDENTIFIER_EXPORT_NAME = "db-cluster";
-DbStack.CLUSTER_READ_ENDPOINT_EXPORT_NAME = "db-cluster-reader-endpoint";
-DbStack.CLUSTER_WRITE_ENDPOINT_EXPORT_NAME = "db-cluster-writer-endpoint";
 //# sourceMappingURL=db-stack.mjs.map

package/dist/aws/infra/stacks/intra-stack-configuration.d.mts

@@ -1,4 +1,4 @@
-import { Environment } from "aws-cdk-lib/core";
+import type { Environment } from "aws-cdk-lib/core";
 export interface InfraStackConfiguration {
     readonly env: Environment;
     readonly environmentName: string;

package/dist/aws/infra/stacks/network-stack.d.mts

@@ -1,5 +1,5 @@
-import { IVpc, Vpc } from "aws-cdk-lib/aws-ec2";
-import { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
+import { type IVpc, Vpc } from "aws-cdk-lib/aws-ec2";
+import type { InfraStackConfiguration } from "./intra-stack-configuration.mjs";
 import { Stack } from "aws-cdk-lib/core";
 import { Construct } from "constructs/lib/construct.js";
 export interface NetworkConfiguration {

package/dist/aws/infra/stacks/network-stack.mjs

@@ -1,12 +1,20 @@
 import { IpAddresses, SubnetType, Vpc } from "aws-cdk-lib/aws-ec2";
 import { exportValue } from "../import-util.mjs";
 import { Stack } from "aws-cdk-lib/core";
+import { Construct } from "constructs/lib/construct.js";
 export class NetworkStack extends Stack {
+    vpc;
     constructor(scope, id, isc, configuration) {
         super(scope, id, {
             env: isc.env,
         });
         this.vpc = this.createVpc(configuration);
+        if (this.vpc.publicSubnets[0] === undefined ||
+            this.vpc.publicSubnets[1] === undefined ||
+            this.vpc.privateSubnets[0] === undefined ||
+            this.vpc.privateSubnets[1] === undefined) {
+            throw Error('Subnets are not set correctly');
+        }
         exportValue(this, isc.environmentName, "VPCID", this.vpc.vpcId);
         exportValue(this, isc.environmentName, "digitrafficpublicASubnet", this.vpc.publicSubnets[0].subnetId);
         exportValue(this, isc.environmentName, "digitrafficpublicBSubnet", this.vpc.publicSubnets[1].subnetId);

package/dist/aws/infra/usage-plans.d.mts

@@ -1,4 +1,4 @@
-import { IApiKey, RestApi } from "aws-cdk-lib/aws-apigateway";
+import { type IApiKey, RestApi } from "aws-cdk-lib/aws-apigateway";
 /**
  * Creates an usage plan for a REST API with a single API key
  * @param api The REST API

package/dist/aws/infra/usage-plans.mjs

@@ -1,3 +1,4 @@
+import { RestApi } from "aws-cdk-lib/aws-apigateway";
 /**
  * Creates an usage plan for a REST API with a single API key
  * @param api The REST API

package/dist/aws/runtime/apikey.d.mts

@@ -1,2 +1,2 @@
-import { APIGateway } from "aws-sdk";
-export declare function getApiKeyFromAPIGateway(keyId: string): Promise<APIGateway.Types.ApiKey>;
+import type { UpdateApiKeyCommandOutput } from "@aws-sdk/client-api-gateway";
+export declare function getApiKeyFromAPIGateway(keyId: string): Promise<UpdateApiKeyCommandOutput>;

package/dist/aws/runtime/apikey.mjs

@@ -1,9 +1,9 @@
-import { APIGateway } from "aws-sdk";
+import { APIGateway } from "@aws-sdk/client-api-gateway";
 export function getApiKeyFromAPIGateway(keyId) {
     const agw = new APIGateway();
     return agw.getApiKey({
         apiKey: keyId,
         includeValue: true,
-    }).promise();
+    });
 }
 //# sourceMappingURL=apikey.mjs.map

package/dist/aws/runtime/digitraffic-integration-response.d.mts

@@ -1,4 +1,4 @@
-import { IntegrationResponse } from "aws-cdk-lib/aws-apigateway";
+import type { IntegrationResponse } from "aws-cdk-lib/aws-apigateway";
 import { MediaType } from "../types/mediatypes.mjs";
 export declare abstract class DigitrafficIntegrationResponse {
     static ok(mediaType: MediaType, sunset?: string): IntegrationResponse;

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

@@ -1,3 +1,4 @@
+import { Writable } from "stream";
 import _ from "lodash";
 /**
  * Helper class for json-logging.
@@ -9,6 +10,9 @@ import _ from "lodash";
  * * the actual message (as json or as string)
  */
 export class DtLogger {
+    lambdaName;
+    runtime;
+    writeStream;
     /**
      * Create a new Logger instance.
      * @constructor
@@ -16,8 +20,8 @@ export class DtLogger {
      */
     constructor(config) {
         this.lambdaName =
-            config?.lambdaName ?? process.env.AWS_LAMBDA_FUNCTION_NAME;
-        this.runtime = config?.runTime ?? process.env.AWS_EXECUTION_ENV;
+            config?.lambdaName ?? process.env['AWS_LAMBDA_FUNCTION_NAME'];
+        this.runtime = config?.runTime ?? process.env['AWS_EXECUTION_ENV'];
         this.writeStream = config?.writeStream ?? process.stdout;
     }
     /**

package/dist/aws/runtime/messaging.d.mts

@@ -1,4 +1,4 @@
-import { SNS } from "aws-sdk";
+import { SNS as SNSType } from "@aws-sdk/client-sns";
 /**
  * Utility function for publishing SNS messages.
  * Made because using *await* with AWS APIs doesn't require calling promise() but nothing works if it isn't called.
@@ -7,4 +7,4 @@ import { SNS } from "aws-sdk";
  * @param topicArn
  * @param sns
  */
-export declare function snsPublish(message: string, topicArn: string, sns: SNS): Promise<void>;
+export declare function snsPublish(message: string, topicArn: string, sns: SNSType): Promise<void>;

package/dist/aws/runtime/messaging.mjs

@@ -1,3 +1,4 @@
+import { SNS as SNSType } from "@aws-sdk/client-sns";
 /**
  * Utility function for publishing SNS messages.
  * Made because using *await* with AWS APIs doesn't require calling promise() but nothing works if it isn't called.
@@ -12,15 +13,15 @@ export async function snsPublish(message, topicArn, sns) {
         TopicArn: topicArn,
     };
     try {
-        await sns.publish(publishParams).promise();
+        await sns.publish(publishParams);
     }
     catch (error) {
-        console.error('method=snsPublish error, retrying', error);
+        console.error("method=snsPublish error, retrying", error);
         try {
-            await sns.publish(publishParams).promise();
+            await sns.publish(publishParams);
         }
         catch (e2) {
-            console.error('method=snsPublish error after retry', e2);
+            console.error("method=snsPublish error after retry", e2);
         }
     }
 }

package/dist/aws/runtime/s3.d.mts

@@ -1,2 +1,4 @@
-import { S3 } from "aws-sdk";
-export declare function uploadToS3<Body extends S3.Body | undefined>(bucketName: string, body: Body, objectName: string, cannedAcl?: string, contentType?: string): Promise<void>;
+/// <reference types="node" resolution-mode="require"/>
+import type { ObjectCannedACL } from "@aws-sdk/client-s3";
+import { Readable } from "node:stream";
+export declare function uploadToS3(bucketName: string, body: Readable, objectName: string, cannedAcl?: ObjectCannedACL, contentType?: string): Promise<void>;

package/dist/aws/runtime/s3.mjs

@@ -1,26 +1,31 @@
-import { S3 } from "aws-sdk";
+import { Upload } from "@aws-sdk/lib-storage";
+import { S3 } from "@aws-sdk/client-s3";
+import { Readable } from "node:stream";
 export async function uploadToS3(bucketName, body, objectName, cannedAcl, contentType) {
     const s3 = new S3();
     try {
         await doUpload(s3, bucketName, body, objectName, cannedAcl, contentType);
     }
     catch (error) {
-        console.warn('method=uploadToS3 retrying upload to bucket %s', bucketName);
+        console.warn("method=uploadToS3 retrying upload to bucket %s", bucketName);
         try {
             await doUpload(s3, bucketName, body, objectName, cannedAcl, contentType);
         }
         catch (e2) {
-            console.error('method=uploadToS3 failed retrying upload to bucket %s', bucketName);
+            console.error("method=uploadToS3 failed retrying upload to bucket %s", bucketName);
         }
     }
 }
 function doUpload(s3, bucketName, body, filename, cannedAcl, contentType) {
-    return s3.upload({
-        Bucket: bucketName,
-        Body: body,
-        Key: filename,
-        ACL: cannedAcl,
-        ContentType: contentType,
-    }).promise();
+    return new Upload({
+        client: s3,
+        params: {
+            Bucket: bucketName,
+            Body: body,
+            Key: filename,
+            ACL: cannedAcl,
+            ContentType: contentType,
+        },
+    }).done();
 }
 //# sourceMappingURL=s3.mjs.map

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

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

package/dist/aws/runtime/secrets/proxy-holder.mjs

@@ -7,6 +7,7 @@ const RDS_PROXY_SECRET_KEYS = Object.values(RdsProxySecretKey);
  * Holds credentials for RDS Proxy access.
  */
 export class ProxyHolder {
+    secretHolder;
     constructor(secretId) {
         this.secretHolder = new SecretHolder(secretId, "", RDS_PROXY_SECRET_KEYS);
     }

package/dist/aws/runtime/secrets/rds-holder.mjs

@@ -7,6 +7,7 @@ const RDS_SECRET_KEYS = Object.values(RdsSecretKey);
  * Holds credentials for RDS access.
  */
 export class RdsHolder {
+    secretHolder;
     constructor(secretId) {
         this.secretHolder = new SecretHolder(secretId, "", RDS_SECRET_KEYS);
     }

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

@@ -1,4 +1,4 @@
-import { GenericSecret } from "./secret.mjs";
+import { type GenericSecret } from "./secret.mjs";
 /**
  * Utility class for getting secrets from Secret Manager.
  * Supports prefix for secrets, checking of expected keys and ttl-configuration.

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

@@ -21,6 +21,10 @@ const DEFAULT_CONFIGURATION = {
  *
  */
 export class SecretHolder {
+    secretId;
+    prefix;
+    expectedKeys;
+    secretCache;
     constructor(secretId, prefix = "", expectedKeys = [], configuration = DEFAULT_CONFIGURATION) {
         this.secretId = secretId;
         this.prefix = prefix;
@@ -55,7 +59,8 @@ export class SecretHolder {
         const skip = prefix.length;
         for (const key in secret) {
             if (key.startsWith(prefix)) {
-                parsed[key.substring(skip)] = secret[key];
+                const withoutPrefix = key.substring(skip);
+                parsed[withoutPrefix] = secret[key];
             }
         }
         return parsed;

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

@@ -1,6 +1,6 @@
-import { SecretsManager } from "aws-sdk";
 import { getEnvVariable, getEnvVariableOrElse } from "../../../utils/utils.mjs";
 import { EnvKeys } from "../environment.mjs";
+const { SecretsManager } = await import("@aws-sdk/client-secrets-manager");
 // SECRET_OVERRIDE_AWS_REGION might not have been set before import of
 // secret, so we need to lazy initialize SecretsManager
 let smClient;
@@ -14,11 +14,9 @@ function getSmClient() {
     return smClient;
 }
 export async function getSecret(secretId, prefix = "") {
-    const secretObj = await getSmClient()
-        .getSecretValue({
+    const secretObj = await getSmClient().getSecretValue({
         SecretId: secretId,
-    })
-        .promise();
+    });
     if (!secretObj.SecretString) {
         throw new Error("No secret found!");
     }
@@ -33,7 +31,8 @@ function parseSecret(secret, prefix) {
     const skip = prefix.length;
     for (const key in secret) {
         if (key.startsWith(prefix)) {
-            parsed[key.substring(skip)] = secret[key];
+            const withoutPrefix = key.substring(skip);
+            parsed[withoutPrefix] = secret[key];
         }
     }
     return parsed;

package/dist/aws/types/errors.mjs

@@ -4,6 +4,7 @@ export const ERROR_MESSAGE = "ERROR";
 export const OK_MESSAGE = "OK";
 export const BAD_REQUEST_MESSAGE = "BAD REQUEST";
 export class ValidationError extends Error {
+    statusCode;
     constructor(statusCode, body) {
         super(body);
         this.statusCode = statusCode;

package/dist/aws/types/lambda-response.mjs

@@ -1,5 +1,10 @@
 import etag from "etag";
 export class LambdaResponse {
+    status;
+    body;
+    fileName;
+    timestamp;
+    etag;
     constructor(status, body, fileName, timestamp) {
         this.status = status;
         this.body = body;

package/dist/aws/types/model-with-reference.mjs

@@ -1,2 +1,2 @@
-export {};
+import { Model } from "aws-cdk-lib/aws-apigateway";
 //# sourceMappingURL=model-with-reference.mjs.map

package/dist/database/cached.d.mts

@@ -1,4 +1,4 @@
-import { DTDatabase, DTTransaction } from "./database.mjs";
+import type { DTDatabase, DTTransaction } from "./database.mjs";
 export interface CachedValue<T> {
     content: T;
     last_updated: Date;

package/dist/database/database.mjs

@@ -1,3 +1,4 @@
+import {} from "pg-promise";
 import { getEnvVariable, getEnvVariableOrElse } from "../utils/utils.mjs";
 import { logger } from "../aws/runtime/dt-logger-default.mjs";
 import { logException } from "../utils/logging.mjs";

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

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

package/dist/test/db-testutils.d.mts

@@ -1,3 +1,3 @@
-import { DTDatabase } from "../database/database.mjs";
+import { type DTDatabase } from "../database/database.mjs";
 export declare function assertCount(db: DTDatabase, sql: string, count: number): Promise<void>;
 export declare function dbTestBase(fn: (db: DTDatabase) => void, truncateFn: (db: DTDatabase) => Promise<void>, dbUser: string, dbPass: string, dbUri: string): () => void;

package/dist/test/db-testutils.mjs

@@ -3,7 +3,7 @@ export async function assertCount(db, sql, count) {
     await db.one(sql).then((x) => expect(x.count).toEqual(count));
 }
 export function dbTestBase(fn, truncateFn, dbUser, dbPass, dbUri) {
-    const theDbUri = process.env.DB_URI ?? dbUri;
+    const theDbUri = process.env['DB_URI'] ?? dbUri;
     console.log(`Test database URI: ${theDbUri}`);
     return () => {
         const db = initDbConnection(dbUser, dbPass, "test", theDbUri, {

package/dist/test/httpserver.mjs

@@ -1,4 +1,4 @@
-import { createServer } from "http";
+import { Server, createServer } from "http";
 import { parse } from "url";
 export const ERROR_NO_MATCH = "NO MATCH";
 export const ERRORCODE_NOT_FOUND = 404;
@@ -6,6 +6,9 @@ export const ERRORCODE_NOT_FOUND = 404;
  * A mock HTTP server created for testing connections from a Lambda to an outside integration
  */
 export class TestHttpServer {
+    server;
+    debug;
+    messageStack;
     constructor() {
         this.debug = false;
         this.messageStack = [];
@@ -14,7 +17,7 @@ export class TestHttpServer {
         return this.messageStack.length;
     }
     getRequestBody(callNumber) {
-        return this.messageStack[callNumber];
+        return this.messageStack[callNumber] ?? '';
     }
     listen(port, props, debug = false, statusCode = 200) {
         this.debug = debug;
@@ -45,7 +48,8 @@ export class TestHttpServer {
                 req.on("end", () => {
                     // assume sent data is in JSON format
                     this.messageStack[this.messageStack.length] = dataStr;
-                    res.end(props[path](req.url, dataStr));
+                    const invokable = props[path];
+                    res.end(invokable(req.url, dataStr));
                 });
             }
             else {

package/dist/test/mock-ky.d.mts

@@ -0,0 +1,2 @@
+import type { ResponsePromise } from "ky";
+export declare function mockKyResponse(status: number, body: string): ResponsePromise;

package/dist/test/mock-ky.mjs

@@ -0,0 +1,15 @@
+export function mockKyResponse(status, body) {
+    const response = new Response(body, {
+        status: status,
+    });
+    const promise = Promise.resolve(response);
+    // The ky ResponsePromise is just Promise<Response> with some convenience methods.
+    return Object.assign(promise, {
+        arrayBuffer: () => response.arrayBuffer(),
+        blob: () => response.blob(),
+        formData: () => response.formData(),
+        json: () => response.json(),
+        text: () => response.text(),
+    });
+}
+//# sourceMappingURL=mock-ky.mjs.map

package/dist/test/secrets-manager.d.mts

@@ -1,9 +1,10 @@
-import * as sinon from "sinon";
+import { SecretsManager } from "@aws-sdk/client-secrets-manager";
+import sinon from "sinon";
 /**
  * Stub Secrets Manager for tests.  You must call this
  * before you instantiate Secrets Manager(this might happen when you import the function that uses Secrets Manager).
  *
  * To mock the actual secret, call mockSecret()
  */
-export declare function stubSecretsManager(): sinon.SinonStub<any[], any>;
+export declare function stubSecretsManager(): sinon.SinonStubbedInstance<SecretsManager>;
 export declare function mockSecret<Secret>(secret: Secret): void;

package/dist/test/secrets-manager.mjs

@@ -1,9 +1,12 @@
-import AWS from "aws-sdk";
-import * as sinon from "sinon";
+import { SecretsManager } from "@aws-sdk/client-secrets-manager";
+import sinon from "sinon";
 import { EnvKeys } from "../aws/runtime/environment.mjs";
 import { setEnvVariable } from "../utils/utils.mjs";
+import { jest } from '@jest/globals';
 setEnvVariable(EnvKeys.AWS_REGION, "eu-west-1");
-const secretValue = sinon.stub();
+const emptySecret = { $metadata: {} };
+const SecretsManagerStubInstance = sinon.createStubInstance(SecretsManager);
+SecretsManagerStubInstance.getSecretValue.resolves(emptySecret);
 /**
  * Stub Secrets Manager for tests.  You must call this
  * before you instantiate Secrets Manager(this might happen when you import the function that uses Secrets Manager).
@@ -11,24 +14,19 @@ const secretValue = sinon.stub();
  * To mock the actual secret, call mockSecret()
  */
 export function stubSecretsManager() {
-    const smStub = {
-        getSecretValue: secretValue,
-    };
-    sinon.stub(AWS, "SecretsManager").returns(smStub);
-    return smStub.getSecretValue;
+    jest.unstable_mockModule("@aws-sdk/client-secrets-manager", function () {
+        return {
+            SecretsManager: sinon.stub().returns(SecretsManagerStubInstance)
+        };
+    });
+    return SecretsManagerStubInstance;
 }
 export function mockSecret(secret) {
     if (!secret) {
-        secretValue.returns({
-            promise: sinon.stub().returns({}),
-        });
+        SecretsManagerStubInstance.getSecretValue.resolves({ ...emptySecret });
     }
     else {
-        secretValue.returns({
-            promise: sinon.stub().returns({
-                SecretString: JSON.stringify(secret),
-            }),
-        });
+        SecretsManagerStubInstance.getSecretValue.resolves({ SecretString: JSON.stringify(secret) });
     }
 }
 //# sourceMappingURL=secrets-manager.mjs.map

package/dist/test/testutils.mjs

@@ -27,7 +27,7 @@ export function shuffle(array) {
     // pretty fast way to copy an array, not necessarily the fastest
     const newArray = array.slice(0);
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    newArray.sort((x) => 0.5 - Math.random());
+    newArray.sort((_) => 0.5 - Math.random());
     return newArray;
 }
 //# sourceMappingURL=testutils.mjs.map

package/dist/types/http-error.mjs

@@ -1,4 +1,5 @@
 export class HttpError extends Error {
+    statusCode;
     constructor(statusCode, message) {
         super(message);
         this.statusCode = statusCode;

package/dist/types/nullable.d.mts

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

package/dist/utils/api-model.d.mts

@@ -1,5 +1,5 @@
-import { RestApi, Model, JsonSchema, RequestValidator, JsonSchemaType, JsonSchemaVersion } from 'aws-cdk-lib/aws-apigateway';
-import { ModelWithReference } from "../aws/types/model-with-reference.mjs";
+import { RestApi, Model, type JsonSchema, RequestValidator, JsonSchemaType, JsonSchemaVersion } from 'aws-cdk-lib/aws-apigateway';
+import type { ModelWithReference } from "../aws/types/model-with-reference.mjs";
 /**
  * Get a reference to an OpenAPI model object in a REST API.
  * Can be used to supply a reference to properties of a GeoJSON feature.

package/dist/utils/api-model.mjs

@@ -1,4 +1,4 @@
-import { JsonSchemaType, JsonSchemaVersion, } from 'aws-cdk-lib/aws-apigateway';
+import { RestApi, Model, RequestValidator, JsonSchemaType, JsonSchemaVersion, } from 'aws-cdk-lib/aws-apigateway';
 /**
  * Get a reference to an OpenAPI model object in a REST API.
  * Can be used to supply a reference to properties of a GeoJSON feature.

package/dist/utils/geojson-types.d.mts

@@ -1,7 +1,7 @@
 /**
  * GeoJSON types
  */
-import { LineString, Point, Position } from "geojson";
+import type { LineString, Point, Position } from "geojson";
 export declare class GeoJsonPoint implements Point {
     readonly type = "Point";
     readonly coordinates: Position;