@middy/secrets-manager 3.0.0-alpha.3 → 3.0.0-alpha.4

package/index.js

@@ -1,79 +1,68 @@
-import {
-  canPrefetch,
-  createPrefetchClient,
-  createClient,
-  getCache,
-  getInternal,
-  processCache,
-  modifyCache,
-  jsonSafeParse
-} from '@middy/util'
-import SecretsManager from 'aws-sdk/clients/secretsmanager.js' // v2
-// import { SecretsManager } from '@aws-sdk/client-secrets-manager'  // v3
-
+import { canPrefetch, createPrefetchClient, createClient, getCache, getInternal, processCache, modifyCache, jsonSafeParse } from '@middy/util';
+import SecretsManager from 'aws-sdk/clients/secretsmanager.js';
 const defaults = {
   AwsClient: SecretsManager,
   awsClientOptions: {},
   awsClientAssumeRole: undefined,
   awsClientCapture: undefined,
-  fetchData: {}, // If more than 2, consider writing own using ListSecrets
+  fetchData: {},
   disablePrefetch: false,
   cacheKey: 'secrets-manager',
   cacheExpiry: -1,
   setToContext: false
-}
+};
 
 const secretsManagerMiddleware = (opts = {}) => {
-  const options = { ...defaults, ...opts }
+  const options = { ...defaults,
+    ...opts
+  };
 
   const fetch = (request, cachedValues = {}) => {
-    const values = {}
+    const values = {};
 
-    // Multiple secrets can be requested in a single requests,
-    // however this is likely uncommon IRL, increases complexity to handle,
-    // and will require recursive promise resolution impacting performance.
-    // See https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/SecretsManager.html#listSecrets-property
     for (const internalKey of Object.keys(options.fetchData)) {
-      if (cachedValues[internalKey]) continue
-      values[internalKey] = client
-        .getSecretValue({ SecretId: options.fetchData[internalKey] })
-        .promise() // Required for aws-sdk v2
-        .then((resp) => jsonSafeParse(resp.SecretString))
-        .catch((e) => {
-          const value = getCache(options.cacheKey).value ?? {}
-          value[internalKey] = undefined
-          modifyCache(options.cacheKey, value)
-          throw e
-        })
+      if (cachedValues[internalKey]) continue;
+      values[internalKey] = client.getSecretValue({
+        SecretId: options.fetchData[internalKey]
+      }).promise().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 prefetch, client
+    return values;
+  };
+
+  let prefetch, client;
+
   if (canPrefetch(options)) {
-    client = createPrefetchClient(options)
-    prefetch = processCache(options, fetch)
+    client = createPrefetchClient(options);
+    prefetch = processCache(options, fetch);
   }
 
-  const secretsManagerMiddlewareBefore = async (request) => {
+  const secretsManagerMiddlewareBefore = async request => {
     if (!client) {
-      client = await createClient(options, request)
+      client = await createClient(options, request);
     }
 
-    const { value } = prefetch ?? processCache(options, fetch, request)
-
-    Object.assign(request.internal, value)
+    const {
+      value
+    } = prefetch ?? 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)
+      const data = await getInternal(Object.keys(options.fetchData), request);
+      Object.assign(request.context, data);
     }
 
-    prefetch = null
-  }
+    prefetch = null;
+  };
 
   return {
     before: secretsManagerMiddlewareBefore
-  }
-}
-export default secretsManagerMiddleware
+  };
+};
+
+export default secretsManagerMiddleware;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/secrets-manager",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.4",
   "description": "Secrets Manager middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -46,12 +46,12 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^3.0.0-alpha.3"
+    "@middy/util": "^3.0.0-alpha.4"
   },
   "devDependencies": {
-    "@middy/core": "^3.0.0-alpha.3",
+    "@middy/core": "^3.0.0-alpha.4",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "1441158711580313765e6d156046ef0fade0d156"
+  "gitHead": "d4bea7f4e21f6a9bbb1f6f6908361169598b9e53"
 }