@middy/secrets-manager 7.1.1 → 7.1.3

package/README.md

@@ -30,6 +30,23 @@
 <p>You can read the documentation at: <a href="https://middy.js.org/docs/middlewares/secrets-manager">https://middy.js.org/docs/middlewares/secrets-manager</a></p>
 </div>
 
+## Install
+
+```bash
+npm install --save @middy/secrets-manager @aws-sdk/client-secrets-manager
+```
+
+
+## Documentation and examples
+
+For documentation and examples, refer to the main [Middy monorepo on GitHub](https://github.com/middyjs/middy) or [Middy official website](https://middy.js.org/docs/middlewares/secrets-manager).
+
+
+## Contributing
+
+Everyone is very welcome to contribute to this repository. Feel free to [raise issues](https://github.com/middyjs/middy/issues) or to [submit Pull Requests](https://github.com/middyjs/middy/pulls).
+
+
 ## License
 
 Licensed under [MIT License](LICENSE). Copyright (c) 2017-2026 [will Farrell](https://github.com/willfarrell), [Luciano Mammino](https://github.com/lmammino), and [Middy contributors](https://github.com/middyjs/middy/graphs/contributors).

package/index.d.ts

@@ -11,12 +11,14 @@ import type { Context as LambdaContext } from "aws-lambda";
 export type SecretType<T> = string & { __returnType?: T };
 export declare function secretsManagerParam<T>(path: string): SecretType<T>;
 
-interface SecretsManagerOptions<AwsSecretsManagerClient = SecretsManagerClient>
-	extends Omit<
+export interface SecretsManagerOptions<
+	AwsSecretsManagerClient = SecretsManagerClient,
+> extends Omit<
 		MiddyOptions<AwsSecretsManagerClient, SecretsManagerClientConfig>,
 		"fetchData"
 	> {
 	fetchData?: { [key: string]: string | SecretType<unknown> };
+	fetchRotationDate?: boolean | Record<string, boolean>;
 }
 
 export type Context<TOptions extends SecretsManagerOptions | undefined> =
@@ -47,7 +49,7 @@ declare function secretsManager<
 	options?: TOptions,
 ): middy.MiddlewareObj<
 	unknown,
-	any,
+	unknown,
 	Error,
 	Context<TOptions>,
 	Internal<TOptions>

package/index.js

@@ -38,54 +38,64 @@ const secretsManagerMiddleware = (opts = {}) => {
 		cacheKeyExpiry: { ...defaults.cacheKeyExpiry, ...opts.cacheKeyExpiry },
 	};
 
+	const fetchDataKeys = Object.keys(options.fetchData);
 	const fetchRequest = (request, cachedValues = {}) => {
 		const values = {};
 
-		for (const internalKey of Object.keys(options.fetchData)) {
+		for (const internalKey of fetchDataKeys) {
 			if (cachedValues[internalKey]) continue;
 
-			values[internalKey] = Promise.resolve()
-				.then(() => {
-					if (
-						options.fetchRotationDate === true ||
-						options.fetchRotationDate?.[internalKey]
-					) {
-						const command = new DescribeSecretCommand({
-							SecretId: options.fetchData[internalKey],
-						});
-						return client
-							.send(command)
-							.catch((e) => catchInvalidSignatureException(e, client, command))
-							.then((resp) => {
-								if (options.cacheExpiry < 0) {
-									options.cacheKeyExpiry[internalKey] =
-										resp.NextRotationDate * 1000;
-								} else {
-									options.cacheKeyExpiry[internalKey] = Math.min(
-										Math.max(resp.LastRotationDate, resp.LastChangedDate) *
-											1000 +
-											options.cacheExpiry,
-										resp.NextRotationDate * 1000,
-									);
-								}
-							});
-					}
-				})
-				.then(() => {
-					const command = new GetSecretValueCommand({
-						SecretId: options.fetchData[internalKey],
-					});
-					return client
-						.send(command)
-						.catch((e) => catchInvalidSignatureException(e, client, command));
-				})
-				.then((resp) => jsonSafeParse(resp.SecretString))
-				.catch((e) => {
-					const value = getCache(options.cacheKey).value ?? {};
-					value[internalKey] = undefined;
-					modifyCache(options.cacheKey, value);
-					throw e;
+			const fetchRotation =
+				options.fetchRotationDate === true ||
+				options.fetchRotationDate?.[internalKey];
+			const rotationPromise = fetchRotation
+				? client
+						.send(
+							new DescribeSecretCommand({
+								SecretId: options.fetchData[internalKey],
+							}),
+						)
+						.catch((e) =>
+							catchInvalidSignatureException(
+								e,
+								client,
+								new DescribeSecretCommand({
+									SecretId: options.fetchData[internalKey],
+								}),
+							),
+						)
+						.then((resp) => {
+							if (options.cacheExpiry < 0) {
+								options.cacheKeyExpiry[internalKey] =
+									resp.NextRotationDate * 1000;
+							} else {
+								options.cacheKeyExpiry[internalKey] = Math.min(
+									Math.max(resp.LastRotationDate, resp.LastChangedDate) * 1000 +
+										options.cacheExpiry,
+									resp.NextRotationDate * 1000,
+								);
+							}
+						})
+				: undefined;
+
+			const fetchSecret = () => {
+				const command = new GetSecretValueCommand({
+					SecretId: options.fetchData[internalKey],
 				});
+				return client
+					.send(command)
+					.catch((e) => catchInvalidSignatureException(e, client, command))
+					.then((resp) => jsonSafeParse(resp.SecretString));
+			};
+
+			values[internalKey] = (
+				rotationPromise ? rotationPromise.then(fetchSecret) : fetchSecret()
+			).catch((e) => {
+				const value = getCache(options.cacheKey).value ?? {};
+				value[internalKey] = undefined;
+				modifyCache(options.cacheKey, value);
+				throw e;
+			});
 		}
 		return values;
 	};
@@ -106,7 +116,7 @@ const secretsManagerMiddleware = (opts = {}) => {
 		Object.assign(request.internal, value);
 
 		if (options.setToContext) {
-			const data = await getInternal(Object.keys(options.fetchData), request);
+			const data = await getInternal(fetchDataKeys, request);
 			Object.assign(request.context, data);
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@middy/secrets-manager",
-	"version": "7.1.1",
+	"version": "7.1.3",
 	"description": "Secrets Manager middleware for the middy framework",
 	"type": "module",
 	"engines": {
@@ -63,7 +63,7 @@
 		"url": "https://github.com/sponsors/willfarrell"
 	},
 	"dependencies": {
-		"@middy/util": "7.1.1"
+		"@middy/util": "7.1.3"
 	},
 	"peerDependencies": {
 		"@aws-sdk/client-secrets-manager": "^3.0.0"
@@ -75,9 +75,9 @@
 	},
 	"devDependencies": {
 		"@aws-sdk/client-secrets-manager": "^3.0.0",
-		"@middy/core": "7.1.1",
+		"@middy/core": "7.1.3",
 		"@types/aws-lambda": "^8.0.0",
+		"@types/node": "^22.0.0",
 		"aws-xray-sdk": "^3.3.3"
-	},
-	"gitHead": "7a6c0fbb8ab71d6a2171e678697de9f237568431"
+	}
 }