@allthings/cloud-toolkit 5.1.0-beta.1 → 5.1.0-beta.2

package/dist/lib.cjs.js

@@ -967,16 +967,32 @@ const getSecrets = async (ssm, config, parameters_, defaultValues) => {
         return defaultValues;
     }
 };
+const fetchParameterValue = async (ssm, config, parameter_) => {
+    const parameter = await ssm.send(new clientSsm.GetParameterCommand({
+        Name: `${config.prefix ?? ''}${parameter_}`,
+        WithDecryption: true,
+    }));
+    return parameter?.Parameter?.Value;
+};
+const getRequiredSecret = async (ssm, config, parameter_) => {
+    const value = await fetchParameterValue(ssm, config, parameter_);
+    if (value === undefined) {
+        throw new Error(`Could not retrieve parameter ${parameter_} from AWS SSM parameter store`);
+    }
+    return value;
+};
 const getSecret = async (ssm, config, parameter_, defaultValue) => {
+    if (defaultValue === undefined) {
+        if (config.onlyDefault) {
+            throw new Error(`Cannot retrieve parameter ${parameter_}: onlyDefault is enabled and no default value was provided`);
+        }
+        return getRequiredSecret(ssm, config, parameter_);
+    }
     if (config.onlyDefault) {
         return defaultValue;
     }
     try {
-        const parameter = await ssm.send(new clientSsm.GetParameterCommand({
-            Name: `${config.prefix ?? ''}${parameter_}`,
-            WithDecryption: true,
-        }));
-        return parameter?.Parameter?.Value ?? defaultValue;
+        return (await fetchParameterValue(ssm, config, parameter_)) ?? defaultValue;
     }
     catch (error) {
         if (config.logger) {
@@ -985,19 +1001,6 @@ const getSecret = async (ssm, config, parameter_, defaultValue) => {
         return defaultValue;
     }
 };
-const getSecureStringParameter = async (ssm, config, parameter_) => {
-    if (config.onlyDefault) {
-        throw new Error(`Cannot retrieve parameter ${parameter_}: getSecureStringParameter has no default value, but onlyDefault is enabled`);
-    }
-    const parameter = await ssm.send(new clientSsm.GetParameterCommand({
-        Name: `${config.prefix ?? ''}${parameter_}`,
-        WithDecryption: true,
-    }));
-    if (parameter?.Parameter?.Value === undefined) {
-        throw new Error(`Could not retrieve parameter ${parameter_} from AWS SSM parameter store`);
-    }
-    return parameter.Parameter.Value;
-};
 const parameterStore = (userConfig) => {
     const { clientConfig, ...config } = {
         ...DEFAULT_CLIENT_CONFIG$1,
@@ -1005,9 +1008,8 @@ const parameterStore = (userConfig) => {
     };
     const ssm = new clientSsm.SSMClient(clientConfig);
     return {
-        getSecret: (parameter, defaultValue = '') => getSecret(ssm, config, parameter, defaultValue),
+        getSecret: (parameter, defaultValue) => getSecret(ssm, config, parameter, defaultValue),
         getSecrets: (parameters, defaultValues = []) => getSecrets(ssm, config, parameters, defaultValues),
-        getSecureStringParameter: (parameter) => getSecureStringParameter(ssm, config, parameter),
     };
 };
 

package/dist/lib.esm.mjs

@@ -7,7 +7,7 @@ import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
 import { DynamoDBDocumentClient, UpdateCommand, ScanCommand, QueryCommand, PutCommand, GetCommand, DeleteCommand, BatchWriteCommand } from '@aws-sdk/lib-dynamodb';
 import Bottleneck from 'bottleneck';
 import { LambdaClient, InvokeCommand } from '@aws-sdk/client-lambda';
-import { SSMClient, GetParameterCommand, GetParametersCommand } from '@aws-sdk/client-ssm';
+import { SSMClient, GetParametersCommand, GetParameterCommand } from '@aws-sdk/client-ssm';
 import { SESv2Client, SendEmailCommand } from '@aws-sdk/client-sesv2';
 import { createTransport } from 'nodemailer';
 import { SQSClient, SendMessageCommand, SendMessageBatchCommand, GetQueueUrlCommand, ReceiveMessageCommand, DeleteMessageCommand } from '@aws-sdk/client-sqs';
@@ -945,16 +945,32 @@ const getSecrets = async (ssm, config, parameters_, defaultValues) => {
         return defaultValues;
     }
 };
+const fetchParameterValue = async (ssm, config, parameter_) => {
+    const parameter = await ssm.send(new GetParameterCommand({
+        Name: `${config.prefix ?? ''}${parameter_}`,
+        WithDecryption: true,
+    }));
+    return parameter?.Parameter?.Value;
+};
+const getRequiredSecret = async (ssm, config, parameter_) => {
+    const value = await fetchParameterValue(ssm, config, parameter_);
+    if (value === undefined) {
+        throw new Error(`Could not retrieve parameter ${parameter_} from AWS SSM parameter store`);
+    }
+    return value;
+};
 const getSecret = async (ssm, config, parameter_, defaultValue) => {
+    if (defaultValue === undefined) {
+        if (config.onlyDefault) {
+            throw new Error(`Cannot retrieve parameter ${parameter_}: onlyDefault is enabled and no default value was provided`);
+        }
+        return getRequiredSecret(ssm, config, parameter_);
+    }
     if (config.onlyDefault) {
         return defaultValue;
     }
     try {
-        const parameter = await ssm.send(new GetParameterCommand({
-            Name: `${config.prefix ?? ''}${parameter_}`,
-            WithDecryption: true,
-        }));
-        return parameter?.Parameter?.Value ?? defaultValue;
+        return (await fetchParameterValue(ssm, config, parameter_)) ?? defaultValue;
     }
     catch (error) {
         if (config.logger) {
@@ -963,19 +979,6 @@ const getSecret = async (ssm, config, parameter_, defaultValue) => {
         return defaultValue;
     }
 };
-const getSecureStringParameter = async (ssm, config, parameter_) => {
-    if (config.onlyDefault) {
-        throw new Error(`Cannot retrieve parameter ${parameter_}: getSecureStringParameter has no default value, but onlyDefault is enabled`);
-    }
-    const parameter = await ssm.send(new GetParameterCommand({
-        Name: `${config.prefix ?? ''}${parameter_}`,
-        WithDecryption: true,
-    }));
-    if (parameter?.Parameter?.Value === undefined) {
-        throw new Error(`Could not retrieve parameter ${parameter_} from AWS SSM parameter store`);
-    }
-    return parameter.Parameter.Value;
-};
 const parameterStore = (userConfig) => {
     const { clientConfig, ...config } = {
         ...DEFAULT_CLIENT_CONFIG$1,
@@ -983,9 +986,8 @@ const parameterStore = (userConfig) => {
     };
     const ssm = new SSMClient(clientConfig);
     return {
-        getSecret: (parameter, defaultValue = '') => getSecret(ssm, config, parameter, defaultValue),
+        getSecret: (parameter, defaultValue) => getSecret(ssm, config, parameter, defaultValue),
         getSecrets: (parameters, defaultValues = []) => getSecrets(ssm, config, parameters, defaultValues),
-        getSecureStringParameter: (parameter) => getSecureStringParameter(ssm, config, parameter),
     };
 };
 

package/dist/src/aws/index.d.ts

@@ -1,5 +1,5 @@
 export { default as dynamodb, IDynamoDBConfig, IDynamoDBInstance, IUnprocessedItems, TBatchWriteItems, TDeleteItem, TGetItem, TPutItem, TQueryTable, TScanTable, TUpdateItem, } from './dynamodb';
 export { ILambda, ILambdaInstance, default as lambda, TInvokeLambda, } from './lambda';
-export { DEFAULT_CLIENT_CONFIG as DEFAULT_PARAMETER_STORE_CLIENT_CONFIG, IParameterStore, IParameterStoreInstance, default as parameterStore, TGetSecret, TGetSecrets, TGetSecureStringParameter, } from './parameterStore';
+export { DEFAULT_CLIENT_CONFIG as DEFAULT_PARAMETER_STORE_CLIENT_CONFIG, IParameterStore, IParameterStoreInstance, default as parameterStore, TGetSecret, TGetSecrets, } from './parameterStore';
 export { DEFAULT_CLIENT_CONFIG as DEFAULT_SES_CLIENT_CONFIG, IEmailAttachment, IEmailOptions, ISES, ISESInstance, default as ses, TSendMail, } from './ses';
 export { ISQS, ISQSInstance, default as sqs, TDeleteQueueItem, TGetQueueItems, TGetQueueUrl, TSendMessage, } from './sqs';

package/dist/src/aws/parameterStore.d.ts

@@ -13,12 +13,10 @@ interface IParameter {
 }
 export type TGetSecret = (parameter: string, defaultValue?: string) => Promise<string>;
 export type TGetSecrets = (parameters: string[], defaultValues?: IParameter[]) => Promise<IParameter[]>;
-export type TGetSecureStringParameter = (parameter: string) => Promise<string>;
 export declare const DEFAULT_CLIENT_CONFIG: IParameterStore;
 export interface IParameterStoreInstance {
     getSecret: TGetSecret;
     getSecrets: TGetSecrets;
-    getSecureStringParameter: TGetSecureStringParameter;
 }
 declare const parameterStore: (userConfig: IParameterStore) => IParameterStoreInstance;
 export default parameterStore;

package/dist/src/index.d.ts

@@ -1,5 +1,5 @@
 export { Alagarr, default as alagarr, ClientError, HandlerFunction, IInterfaceAlagarrOptions, IInterfaceHeaders, IInterfaceQueryParameters, IInterfaceRequest, IInterfaceResponse, ServerError, } from './alagarr';
-export { DEFAULT_PARAMETER_STORE_CLIENT_CONFIG, DEFAULT_SES_CLIENT_CONFIG, dynamodb, IDynamoDBConfig, IDynamoDBInstance, IEmailAttachment, IEmailOptions, ILambda, ILambdaInstance, IParameterStore, IParameterStoreInstance, ISES, ISESInstance, ISQS, ISQSInstance, IUnprocessedItems, lambda, parameterStore, ses, sqs, TBatchWriteItems, TDeleteItem, TDeleteQueueItem, TGetItem, TGetQueueItems, TGetQueueUrl, TGetSecret, TGetSecrets, TGetSecureStringParameter, TInvokeLambda, TPutItem, TQueryTable, TScanTable, TSendMail, TSendMessage, TUpdateItem, } from './aws';
+export { DEFAULT_PARAMETER_STORE_CLIENT_CONFIG, DEFAULT_SES_CLIENT_CONFIG, dynamodb, IDynamoDBConfig, IDynamoDBInstance, IEmailAttachment, IEmailOptions, ILambda, ILambdaInstance, IParameterStore, IParameterStoreInstance, ISES, ISESInstance, ISQS, ISQSInstance, IUnprocessedItems, lambda, parameterStore, ses, sqs, TBatchWriteItems, TDeleteItem, TDeleteQueueItem, TGetItem, TGetQueueItems, TGetQueueUrl, TGetSecret, TGetSecrets, TInvokeLambda, TPutItem, TQueryTable, TScanTable, TSendMail, TSendMessage, TUpdateItem, } from './aws';
 export { atob, btoa } from './base64';
 export { default as logger } from './logger/logger';
 export { asyncReduce, deepFlatten, flatten, List, partial, splitEvery, times, until, } from './utils';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allthings/cloud-toolkit",
-  "version": "5.1.0-beta.1",
+  "version": "5.1.0-beta.2",
   "description": "",
   "author": "Allthings GmbH",
   "keywords": [