@digitraffic/common 2024.8.16-1 → 2024.8.27-1

package/dist/aws/infra/stacks/{db-dns-stack.d.mts → db-dns-stack.d.ts}

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

package/dist/aws/infra/stacks/{db-dns-stack.mjs → db-dns-stack.js}

@@ -1,8 +1,8 @@
 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";
+import { PrivateHostedZone, RecordSet, RecordTarget, RecordType } from "aws-cdk-lib/aws-route53";
+import { importVpc } from "../import-util.js";
+import { getParameterValue } from "../stack/parameters.js";
 const DEFAULT_RECORD_TTL = Duration.seconds(30);
 /**
  * Creates a dns local zone and creates records for cluster endpoints and proxy endpoints.
@@ -58,4 +58,4 @@ export class DbDnsStack extends Stack {
         });
     }
 }
-//# sourceMappingURL=db-dns-stack.mjs.map
+//# sourceMappingURL=db-dns-stack.js.map

package/dist/aws/infra/stacks/{db-proxy-stack.d.mts → db-proxy-stack.d.ts}

@@ -1,9 +1,9 @@
 import { CfnDBProxyEndpoint, DatabaseProxy } from "aws-cdk-lib/aws-rds";
 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 type { InfraStackConfiguration } from "./intra-stack-configuration.js";
 import { Stack } from "aws-cdk-lib/core";
-import { Construct } from "constructs/lib/construct.js";
+import type { Construct } from "constructs/lib/construct.js";
 export interface ProxyConfiguration {
     readonly secretArn: string;
     readonly name?: string;

package/dist/aws/infra/stacks/{db-proxy-stack.mjs → db-proxy-stack.js}

@@ -1,11 +1,10 @@
 import { CfnDBProxyEndpoint, DatabaseCluster, DatabaseClusterEngine, DatabaseProxy, ProxyTarget, } from "aws-cdk-lib/aws-rds";
 import { Secret } from "aws-cdk-lib/aws-secretsmanager";
 import { SecurityGroup } from "aws-cdk-lib/aws-ec2";
-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";
+import { DbStack } from "./db-stack.js";
+import { exportValue, importVpc } from "../import-util.js";
+import { createParameter } from "../stack/parameters.js";
+import { Duration, Stack } from "aws-cdk-lib/core";
 /**
  * A stack that creates a Database proxy.
  */
@@ -72,4 +71,4 @@ export class DbProxyStack extends Stack {
         });
     }
 }
-//# sourceMappingURL=db-proxy-stack.mjs.map
+//# sourceMappingURL=db-proxy-stack.js.map

package/dist/aws/infra/stacks/{db-stack.d.mts → db-stack.d.ts}

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

package/dist/aws/infra/stacks/{db-stack.mjs → db-stack.js}

@@ -1,10 +1,9 @@
-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 { SecurityGroup, SubnetType, } from "aws-cdk-lib/aws-ec2";
+import { CfnDBInstance, Credentials, DatabaseCluster, DatabaseClusterEngine, DatabaseClusterFromSnapshot, InstanceUpdateBehaviour, ParameterGroup, } from "aws-cdk-lib/aws-rds";
 import { Secret } from "aws-cdk-lib/aws-secretsmanager";
-import { exportValue, importVpc } from "../import-util.mjs";
+import { exportValue, importVpc } from "../import-util.js";
 import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib/core";
-import { createParameter } from "../stack/parameters.mjs";
+import { createParameter } from "../stack/parameters.js";
 /**
  * Stack that creates DatabaseCluster.
  *
@@ -102,11 +101,9 @@ export class DbStack extends Stack {
     createAuroraCluster(isc, configuration, clusterConfiguration, parameterGroups) {
         const instanceName = isc.environmentName + "-db";
         const securityGroup = SecurityGroup.fromSecurityGroupId(this, "securitygroup", clusterConfiguration.securityGroupId);
-        const vpc = configuration.vpc
-            ? configuration.vpc
-            : importVpc(this, isc.environmentName);
+        const vpc = configuration.vpc ? configuration.vpc : importVpc(this, isc.environmentName);
         if (parameterGroups[0] === undefined) {
-            throw Error('ParameterGroups should not be empty');
+            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
@@ -127,4 +124,4 @@ export class DbStack extends Stack {
         return cluster;
     }
 }
-//# sourceMappingURL=db-stack.mjs.map
+//# sourceMappingURL=db-stack.js.map

package/dist/aws/infra/stacks/intra-stack-configuration.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=intra-stack-configuration.js.map

package/dist/aws/infra/stacks/{network-stack.d.mts → network-stack.d.ts}

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

package/dist/aws/infra/stacks/{network-stack.mjs → network-stack.js}

@@ -1,7 +1,6 @@
 import { IpAddresses, SubnetType, Vpc } from "aws-cdk-lib/aws-ec2";
-import { exportValue } from "../import-util.mjs";
+import { exportValue } from "../import-util.js";
 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) {
@@ -13,7 +12,7 @@ export class NetworkStack extends Stack {
             this.vpc.publicSubnets[1] === undefined ||
             this.vpc.privateSubnets[0] === undefined ||
             this.vpc.privateSubnets[1] === undefined) {
-            throw Error('Subnets are not set correctly');
+            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);
@@ -24,9 +23,7 @@ export class NetworkStack extends Stack {
     createVpc(configuration) {
         return new Vpc(this, "DigitrafficVPC", {
             vpcName: configuration.vpcName,
-            availabilityZones: Stack.of(this)
-                .availabilityZones.sort()
-                .slice(0, 2), // take two first azs
+            availabilityZones: Stack.of(this).availabilityZones.sort().slice(0, 2), // take two first azs
             enableDnsHostnames: true,
             enableDnsSupport: true,
             ipAddresses: IpAddresses.cidr(configuration.cidr),
@@ -45,4 +42,4 @@ export class NetworkStack extends Stack {
         });
     }
 }
-//# sourceMappingURL=network-stack.mjs.map
+//# sourceMappingURL=network-stack.js.map

package/dist/aws/infra/{usage-plans.d.mts → usage-plans.d.ts}

@@ -1,4 +1,4 @@
-import { type 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 → usage-plans.js}

@@ -1,4 +1,3 @@
-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
@@ -36,4 +35,4 @@ export function createDefaultUsagePlan(api, apiName, value) {
     plan.addApiKey(apiKey);
     return apiKey;
 }
-//# sourceMappingURL=usage-plans.mjs.map
+//# sourceMappingURL=usage-plans.js.map

package/dist/aws/runtime/{apikey.mjs → apikey.js}

@@ -18,4 +18,4 @@ export async function getApiKeyFromAPIGateway(keyId) {
 
     return client.send(command);*/
 }
-//# sourceMappingURL=apikey.mjs.map
+//# sourceMappingURL=apikey.js.map

package/dist/aws/runtime/{digitraffic-integration-response.d.mts → digitraffic-integration-response.d.ts}

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

package/dist/aws/runtime/{digitraffic-integration-response.mjs → digitraffic-integration-response.js}

@@ -1,5 +1,5 @@
-import { MediaType } from "../types/mediatypes.mjs";
-import { getDeprecatedDefaultLambdaResponse, RESPONSE_DEFAULT_LAMBDA, } from "../infra/api/response.mjs";
+import { MediaType } from "../types/mediatypes.js";
+import { getDeprecatedDefaultLambdaResponse, RESPONSE_DEFAULT_LAMBDA } from "../infra/api/response.js";
 export class DigitrafficIntegrationResponse {
     static ok(mediaType, sunset) {
         return this.create("200", mediaType, sunset);
@@ -14,11 +14,9 @@ export class DigitrafficIntegrationResponse {
         return {
             statusCode,
             responseTemplates: {
-                [mediaType]: sunset
-                    ? getDeprecatedDefaultLambdaResponse(sunset)
-                    : RESPONSE_DEFAULT_LAMBDA,
+                [mediaType]: sunset ? getDeprecatedDefaultLambdaResponse(sunset) : RESPONSE_DEFAULT_LAMBDA,
             },
         };
     }
 }
-//# sourceMappingURL=digitraffic-integration-response.mjs.map
+//# sourceMappingURL=digitraffic-integration-response.js.map

package/dist/aws/runtime/{dt-logger-default.d.mts → dt-logger-default.d.ts}

@@ -1,8 +1,8 @@
-import { DtLogger } from "./dt-logger.mjs";
+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.mjs";
+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/dist/aws/runtime/{dt-logger-default.mjs → dt-logger-default.js}

@@ -1,6 +1,6 @@
-import { DtLogger } from "./dt-logger.mjs";
+import { DtLogger } from "./dt-logger.js";
 /**
  * You can use this for your logging needs or create one locally and configure it as you wish.
  */
 export const logger = new DtLogger();
-//# sourceMappingURL=dt-logger-default.mjs.map
+//# sourceMappingURL=dt-logger-default.js.map

package/dist/aws/runtime/{dt-logger.mjs → dt-logger.js}

@@ -1,4 +1,5 @@
-import { mapKeys, lowerFirst } from "lodash-es";
+import { lowerFirst, mapKeys } from "lodash-es";
+import { getEnvVariableOrElse } from "../../utils/utils.js";
 /**
  * Helper class for json-logging.
  *
@@ -18,8 +19,9 @@ 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 ?? getEnvVariableOrElse("AWS_LAMBDA_FUNCTION_NAME", "unknown lambda name");
+        this.runtime = config?.runTime ?? getEnvVariableOrElse("AWS_EXECUTION_ENV", "unknown runtime");
         this.writeStream = config?.writeStream ?? process.stdout;
     }
     /**
@@ -96,7 +98,10 @@ export class DtLogger {
         this.writeStream.write(JSON.stringify(logMessage) + "\n");
     }
 }
+/**
+ * Removes given prefixes from the keys of the object.
+ */
 function removePrefix(prefix, loggable) {
     return mapKeys(loggable, (_index, key) => key.startsWith(prefix) ? lowerFirst(key.replace(prefix, "")) : key);
 }
-//# sourceMappingURL=dt-logger.mjs.map
+//# sourceMappingURL=dt-logger.js.map

package/dist/aws/runtime/{environment.mjs → environment.js}

@@ -9,7 +9,7 @@ export var EnvKeys;
  */
 export function envValue(key, defaultValue) {
     const value = process.env[key];
-    if (value == null) {
+    if (value === null || value === undefined) {
         if (defaultValue) {
             return defaultValue;
         }
@@ -17,4 +17,4 @@ export function envValue(key, defaultValue) {
     }
     return value;
 }
-//# sourceMappingURL=environment.mjs.map
+//# sourceMappingURL=environment.js.map

package/dist/aws/runtime/{s3.d.mts → s3.d.ts}

@@ -1,4 +1,4 @@
 import type { ObjectCannedACL } from "@aws-sdk/client-s3";
-import { S3Client } from "@aws-sdk/client-s3";
+import { type S3Client } from "@aws-sdk/client-s3";
 import { type NodeJsRuntimeStreamingBlobPayloadInputTypes } from "@smithy/types";
 export declare function uploadToS3(s3: S3Client, bucketName: string, body: NodeJsRuntimeStreamingBlobPayloadInputTypes, objectName: string, cannedAcl?: ObjectCannedACL, contentType?: string): Promise<void>;

package/dist/aws/runtime/{s3.mjs → s3.js}

@@ -1,6 +1,6 @@
-import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
+import { PutObjectCommand } from "@aws-sdk/client-s3";
 import {} from "@smithy/types";
-import { logger } from "./dt-logger-default.mjs";
+import { logger } from "./dt-logger-default.js";
 export async function uploadToS3(s3, bucketName, body, objectName, cannedAcl, contentType) {
     const command = new PutObjectCommand({
         Bucket: bucketName,
@@ -19,4 +19,4 @@ export async function uploadToS3(s3, bucketName, body, objectName, cannedAcl, co
         });
     }
 }
-//# sourceMappingURL=s3.mjs.map
+//# sourceMappingURL=s3.js.map

package/dist/aws/runtime/secrets/{dbsecret.d.mts → dbsecret.d.ts}

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

package/dist/aws/runtime/secrets/{dbsecret.mjs → dbsecret.js}

@@ -1,3 +1,4 @@
+import { logger } from "../dt-logger-default.js";
 export var RdsProxySecretKey;
 (function (RdsProxySecretKey) {
     RdsProxySecretKey["username"] = "username";
@@ -15,8 +16,11 @@ export var RdsSecretKey;
 export function checkExpectedSecretKeys(keys, secret) {
     const missingKeys = keys.filter((key) => !(key in secret));
     if (missingKeys.length) {
-        console.error(`method=checkExpectedSecretKeys secret didn't contain the key(s) ${missingKeys.toString()}`);
+        logger.error({
+            method: "dbsecret.checkExpectedSecretKeys",
+            message: `secret didn't contain the key(s) ${missingKeys.toString()}`,
+        });
         throw new Error("Expected keys were not found");
     }
 }
-//# sourceMappingURL=dbsecret.mjs.map
+//# sourceMappingURL=dbsecret.js.map

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

@@ -0,0 +1,25 @@
+import { SecretHolder } from "./secret-holder.js";
+import { RdsProxySecretKey } from "./dbsecret.js";
+import { getEnvVariable, setEnvVariable } from "../../../utils/utils.js";
+import { DatabaseEnvironmentKeys } from "../../../database/database.js";
+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);
+    }
+    static create() {
+        return new ProxyHolder(getEnvVariable("SECRET_ID"));
+    }
+    async setCredentials() {
+        const secret = await this.secretHolder.get();
+        setEnvVariable(DatabaseEnvironmentKeys.DB_USER, secret.username);
+        setEnvVariable(DatabaseEnvironmentKeys.DB_PASS, secret.password);
+        setEnvVariable(DatabaseEnvironmentKeys.DB_URI, secret.proxy_host);
+        setEnvVariable(DatabaseEnvironmentKeys.DB_RO_URI, secret.proxy_ro_host);
+    }
+}
+//# sourceMappingURL=proxy-holder.js.map

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

@@ -0,0 +1,25 @@
+import { SecretHolder } from "./secret-holder.js";
+import { RdsSecretKey } from "./dbsecret.js";
+import { getEnvVariable, setEnvVariable } from "../../../utils/utils.js";
+import { DatabaseEnvironmentKeys } from "../../../database/database.js";
+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);
+    }
+    static create() {
+        return new RdsHolder(getEnvVariable("SECRET_ID"));
+    }
+    async setCredentials() {
+        const secret = await this.secretHolder.get();
+        setEnvVariable(DatabaseEnvironmentKeys.DB_USER, secret.username);
+        setEnvVariable(DatabaseEnvironmentKeys.DB_PASS, secret.password);
+        setEnvVariable(DatabaseEnvironmentKeys.DB_URI, secret.host);
+        setEnvVariable(DatabaseEnvironmentKeys.DB_RO_URI, secret.ro_host);
+    }
+}
+//# sourceMappingURL=rds-holder.js.map

package/dist/aws/runtime/secrets/{secret-holder.d.mts → secret-holder.d.ts}

@@ -1,4 +1,7 @@
-import { type GenericSecret } from "./secret.mjs";
+import { type GenericSecret } from "./secret.js";
+declare const DEFAULT_CONFIGURATION: {
+    readonly ttl: number;
+};
 /**
  * Utility class for getting secrets from Secret Manager.
  * Supports prefix for secrets, checking of expected keys and ttl-configuration.
@@ -9,19 +12,17 @@ import { type GenericSecret } from "./secret.mjs";
  *
  * If you want secret manager to get values from different region than the lambda runtime is running, you can override this by
  * setting the region with utils setSecretOverideAwsRegionEnv method.
- *
  */
 export declare class SecretHolder<Secret extends GenericSecret> {
     private readonly secretId;
     private readonly prefix;
     private readonly expectedKeys;
     private readonly secretCache;
-    constructor(secretId: string, prefix?: string, expectedKeys?: string[], configuration?: {
-        ttl: number;
-    });
+    constructor(secretId: string, prefix?: string, expectedKeys?: string[], configuration?: typeof DEFAULT_CONFIGURATION);
     private initSecret;
     static create<S extends GenericSecret>(prefix?: string, expectedKeys?: string[]): SecretHolder<S>;
     get(): Promise<Secret>;
     private parseSecret;
     private getSecret;
 }
+export {};

package/dist/aws/runtime/secrets/{secret-holder.mjs → secret-holder.js}

@@ -1,7 +1,7 @@
-import { getSecret } from "./secret.mjs";
-import { checkExpectedSecretKeys } from "./dbsecret.mjs";
-import { getEnvVariable } from "../../../utils/utils.mjs";
-import { logger } from "../dt-logger-default.mjs";
+import { getSecret } from "./secret.js";
+import { checkExpectedSecretKeys } from "./dbsecret.js";
+import { getEnvVariable } from "../../../utils/utils.js";
+import { logger } from "../dt-logger-default.js";
 import NodeTtl from "node-ttl";
 const DEFAULT_PREFIX = "";
 const DEFAULT_SECRET_KEY = "SECRET";
@@ -18,7 +18,6 @@ const DEFAULT_CONFIGURATION = {
  *
  * If you want secret manager to get values from different region than the lambda runtime is running, you can override this by
  * setting the region with utils setSecretOverideAwsRegionEnv method.
- *
  */
 export class SecretHolder {
     secretId;
@@ -29,7 +28,6 @@ export class SecretHolder {
         this.secretId = secretId;
         this.prefix = prefix;
         this.expectedKeys = expectedKeys;
-        // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
         this.secretCache = new NodeTtl(configuration);
     }
     async initSecret() {
@@ -38,7 +36,6 @@ export class SecretHolder {
             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);
     }
     static create(prefix = DEFAULT_PREFIX, expectedKeys = []) {
@@ -46,9 +43,7 @@ export class SecretHolder {
     }
     async get() {
         const secret = await this.getSecret();
-        const parsedSecret = this.prefix === DEFAULT_PREFIX
-            ? secret
-            : this.parseSecret(secret, `${this.prefix}.`);
+        const parsedSecret = this.prefix === DEFAULT_PREFIX ? secret : this.parseSecret(secret, `${this.prefix}.`);
         if (this.expectedKeys.length > 0) {
             checkExpectedSecretKeys(this.expectedKeys, parsedSecret);
         }
@@ -60,6 +55,10 @@ export class SecretHolder {
         for (const key in secret) {
             if (key.startsWith(prefix)) {
                 const withoutPrefix = key.substring(skip);
+                // skip undefined values
+                if (!secret[key]) {
+                    continue;
+                }
                 parsed[withoutPrefix] = secret[key];
             }
         }
@@ -70,7 +69,7 @@ export class SecretHolder {
         if (!secret) {
             await this.initSecret();
         }
-        return secret ?? (this.secretCache.get(DEFAULT_SECRET_KEY));
+        return secret ?? this.secretCache.get(DEFAULT_SECRET_KEY);
     }
 }
-//# sourceMappingURL=secret-holder.mjs.map
+//# sourceMappingURL=secret-holder.js.map

package/dist/aws/runtime/secrets/{secret.mjs → secret.js}

@@ -1,6 +1,6 @@
 import { SecretsManager } from "@aws-sdk/client-secrets-manager";
-import { getEnvVariable, getEnvVariableOrElse, getEnvVariableSafe } from "../../../utils/utils.mjs";
-import { EnvKeys } from "../environment.mjs";
+import { getEnvVariable, getEnvVariableOrElse, getEnvVariableSafe } 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
 let smClient;
@@ -32,6 +32,10 @@ function parseSecret(secret, prefix) {
     for (const key in secret) {
         if (key.startsWith(prefix)) {
             const withoutPrefix = key.substring(skip);
+            // skip undefined values
+            if (!secret[key]) {
+                continue;
+            }
             parsed[withoutPrefix] = secret[key];
         }
     }
@@ -54,4 +58,4 @@ export async function getFromEnvOrSecret(key, secretId) {
     }
     throw new Error(`Cannot get value with key ${key} from env or secret`);
 }
-//# sourceMappingURL=secret.mjs.map
+//# sourceMappingURL=secret.js.map

package/dist/aws/types/{errors.mjs → errors.js}

@@ -10,4 +10,4 @@ export class ValidationError extends Error {
         this.statusCode = statusCode;
     }
 }
-//# sourceMappingURL=errors.mjs.map
+//# sourceMappingURL=errors.js.map

package/dist/aws/types/{lambda-response.mjs → lambda-response.js}

@@ -67,4 +67,4 @@ export class LambdaResponse {
 function toBase64(body) {
     return Buffer.from(body).toString("base64");
 }
-//# sourceMappingURL=lambda-response.mjs.map
+//# sourceMappingURL=lambda-response.js.map

package/dist/aws/types/{mediatypes.mjs → mediatypes.js}

@@ -11,4 +11,4 @@ export var MediaType;
     MediaType["TEXT_CSV"] = "text/csv";
     MediaType["APPLICATION_JSON_UTF8"] = "application/json;charset=UTF-8";
 })(MediaType || (MediaType = {}));
-//# sourceMappingURL=mediatypes.mjs.map
+//# sourceMappingURL=mediatypes.js.map

package/dist/aws/types/{model-with-reference.d.mts → model-with-reference.d.ts}

@@ -1,4 +1,4 @@
-import { Model } from "aws-cdk-lib/aws-apigateway";
+import type { Model } from "aws-cdk-lib/aws-apigateway";
 /**
  * Model object with a reference to an API Gateway model object.
  */

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=model-with-reference.js.map

package/dist/aws/types/proxytypes.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=proxytypes.js.map

package/dist/aws/types/tags.js

@@ -0,0 +1,4 @@
+// DEPRECATED! This must be replaced with new application specific tags
+export const BETA_TAGS = ["Beta"];
+export const DATA_V1_TAGS = ["Data v1"];
+//# sourceMappingURL=tags.js.map

package/dist/database/{cached.d.mts → cached.d.ts}

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

package/dist/database/{cached.mjs → cached.js}

@@ -32,10 +32,8 @@ export function getJsonFromCache(db, cacheKey) {
         .then((value) => value?.content ?? undefined);
 }
 export async function getFromCache(db, cacheKey) {
-    return db
-        .oneOrNone(PS_GET_CACHE_VALUE, [cacheKey])
-        .then((result) => {
+    return db.oneOrNone(PS_GET_CACHE_VALUE, [cacheKey]).then((result) => {
         return result ?? undefined;
     });
 }
-//# sourceMappingURL=cached.mjs.map
+//# sourceMappingURL=cached.js.map

package/dist/database/{database.mjs → database.js}

@@ -1,7 +1,7 @@
 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";
+import { getEnvVariable, getEnvVariableOrElse } from "../utils/utils.js";
+import { logger } from "../aws/runtime/dt-logger-default.js";
+import { logException } from "../utils/logging.js";
 export var DatabaseEnvironmentKeys;
 (function (DatabaseEnvironmentKeys) {
     DatabaseEnvironmentKeys["DB_USER"] = "DB_USER";
@@ -13,15 +13,12 @@ export var DatabaseEnvironmentKeys;
 import pgpImport from "pg-promise";
 const pgp = pgpImport();
 // convert numeric types to number instead of string
-// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
 pgp.pg.types.setTypeParser(pgp.pg.types.builtins.INT8, (value) => {
     return parseInt(value);
 });
-// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
 pgp.pg.types.setTypeParser(pgp.pg.types.builtins.FLOAT8, (value) => {
     return parseFloat(value);
 });
-// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
 pgp.pg.types.setTypeParser(pgp.pg.types.builtins.NUMERIC, (value) => {
     return parseFloat(value);
 });
@@ -39,7 +36,6 @@ pgp.pg.types.setTypeParser(pgp.pg.types.builtins.NUMERIC, (value) => {
  */
 export function initDbConnection(username, password, applicationName, url, options) {
     const finalUrl = `postgresql://${username}:${password}@${url}?application_name=${applicationName}`;
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
     return pgp(finalUrl, options);
 }
 export function inTransaction(fn) {
@@ -71,4 +67,4 @@ async function doInDatabase(readonly, fn) {
         await db.$pool.end();
     }
 }
-//# sourceMappingURL=database.mjs.map
+//# sourceMappingURL=database.js.map

package/dist/database/{last-updated.d.mts → last-updated.d.ts}

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