@middy/secrets-manager 5.0.0-alpha.1 → 5.0.0-rc.0

package/index.js

@@ -1,115 +1,73 @@
-import {
-  canPrefetch,
-  createPrefetchClient,
-  createClient,
-  getCache,
-  getInternal,
-  processCache,
-  modifyCache,
-  jsonSafeParse
-} from '@middy/util'
-import {
-  SecretsManagerClient,
-  DescribeSecretCommand,
-  GetSecretValueCommand
-} from '@aws-sdk/client-secrets-manager'
-
+import { canPrefetch, createPrefetchClient, createClient, getCache, getInternal, processCache, modifyCache, jsonSafeParse } from '@middy/util';
+import { SecretsManagerClient, DescribeSecretCommand, GetSecretValueCommand } from '@aws-sdk/client-secrets-manager';
 const defaults = {
-  AwsClient: SecretsManagerClient,
-  awsClientOptions: {},
-  awsClientAssumeRole: undefined,
-  awsClientCapture: undefined,
-  fetchData: {},
-  fetchRotationDate: false, // true: apply to all or {key: true} for individual
-  disablePrefetch: false,
-  cacheKey: 'secrets-manager',
-  cacheKeyExpiry: {},
-  cacheExpiry: -1, // ignored when fetchRotationRules is true/object
-  setToContext: false
-}
-
-const secretsManagerMiddleware = (opts = {}) => {
-  const options = { ...defaults, ...opts }
-
-  const fetch = (request, cachedValues = {}) => {
-    const values = {}
-
-    for (const internalKey of Object.keys(options.fetchData)) {
-      if (cachedValues[internalKey]) continue
-
-      values[internalKey] = Promise.resolve()
-        .then(() => {
-          if (
-            options.fetchRotationDate === true ||
-            options.fetchRotationDate?.[internalKey]
-          ) {
-            return client
-              .send(
-                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
-                  )
+    AwsClient: SecretsManagerClient,
+    awsClientOptions: {},
+    awsClientAssumeRole: undefined,
+    awsClientCapture: undefined,
+    fetchData: {},
+    fetchRotationDate: false,
+    disablePrefetch: false,
+    cacheKey: 'secrets-manager',
+    cacheKeyExpiry: {},
+    cacheExpiry: -1,
+    setToContext: false
+};
+const secretsManagerMiddleware = (opts = {})=>{
+    const options = {
+        ...defaults,
+        ...opts
+    };
+    const fetch = (request, cachedValues = {})=>{
+        const values = {};
+        for (const internalKey of Object.keys(options.fetchData)){
+            if (cachedValues[internalKey]) continue;
+            values[internalKey] = Promise.resolve().then(()=>{
+                if (options.fetchRotationDate === true || options.fetchRotationDate?.[internalKey]) {
+                    return client.send(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);
+                        }
+                    });
                 }
-              })
-          }
-        })
-        .then(() =>
-          client.send(
-            new GetSecretValueCommand({
-              SecretId: options.fetchData[internalKey]
-            })
-          )
-        )
-        .then((resp) => jsonSafeParse(resp.SecretString))
-        .catch((e) => {
-          const value = getCache(options.cacheKey).value ?? {}
-          value[internalKey] = undefined
-          modifyCache(options.cacheKey, value)
-          throw e
-        })
-    }
-    return values
-  }
-
-  let client
-  if (canPrefetch(options)) {
-    client = createPrefetchClient(options)
-    processCache(options, fetch)
-  }
-
-  const secretsManagerMiddlewareBefore = async (request) => {
-    if (!client) {
-      client = await createClient(options, request)
+            }).then(()=>client.send(new GetSecretValueCommand({
+                    SecretId: options.fetchData[internalKey]
+                }))).then((resp)=>jsonSafeParse(resp.SecretString)).catch((e)=>{
+                const value = getCache(options.cacheKey).value ?? {};
+                value[internalKey] = undefined;
+                modifyCache(options.cacheKey, value);
+                throw e;
+            });
+        }
+        return values;
+    };
+    let client;
+    if (canPrefetch(options)) {
+        client = createPrefetchClient(options);
+        processCache(options, fetch);
     }
-
-    const { value } = processCache(options, fetch, request)
-
-    Object.assign(request.internal, value)
-
-    if (options.setToContext) {
-      const data = await getInternal(Object.keys(options.fetchData), request)
-      Object.assign(request.context, data)
-    }
-  }
-
-  return {
-    before: secretsManagerMiddlewareBefore
-  }
-}
-export default secretsManagerMiddleware
-
+    const secretsManagerMiddlewareBefore = async (request)=>{
+        if (!client) {
+            client = await createClient(options, request);
+        }
+        const { value } = processCache(options, fetch, request);
+        Object.assign(request.internal, value);
+        if (options.setToContext) {
+            const data = await getInternal(Object.keys(options.fetchData), request);
+            Object.assign(request.context, data);
+        }
+    };
+    return {
+        before: secretsManagerMiddlewareBefore
+    };
+};
+export default secretsManagerMiddleware;
 // used for TS type inference (see index.d.ts)
-export function secret (name) {
-  return name
+export function secret(name) {
+    return name;
 }
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/secrets-manager",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-rc.0",
   "description": "Secrets Manager middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -58,13 +58,13 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.0.0-alpha.1"
+    "@middy/util": "5.0.0-rc.0"
   },
   "devDependencies": {
     "@aws-sdk/client-secrets-manager": "^3.0.0",
-    "@middy/core": "5.0.0-alpha.1",
+    "@middy/core": "5.0.0-rc.0",
     "@types/aws-lambda": "^8.10.101",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "ebce8d5df8783077fa49ba62ee9be20e8486a7f1"
+  "gitHead": "403c54ba9f05e038d1ee7541f9e4a7a6d46e9916"
 }