@middy/rds-signer 5.0.3 → 5.2.0

package/index.js

@@ -1,60 +1,74 @@
-import { canPrefetch, getInternal, processCache, getCache, modifyCache } from '@middy/util';
-import { Signer } from '@aws-sdk/rds-signer';
+import {
+  canPrefetch,
+  getInternal,
+  processCache,
+  getCache,
+  modifyCache
+} from '@middy/util'
+import { Signer } from '@aws-sdk/rds-signer'
+
 const defaults = {
-    AwsClient: Signer,
-    awsClientOptions: {},
-    fetchData: {},
-    disablePrefetch: false,
-    cacheKey: 'rds-signer',
-    cacheKeyExpiry: {},
-    cacheExpiry: -1,
-    setToContext: false
-};
-const rdsSignerMiddleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    const fetch = (request, cachedValues = {})=>{
-        const values = {};
-        for (const internalKey of Object.keys(options.fetchData)){
-            if (cachedValues[internalKey]) continue;
-            const client = new options.AwsClient({
-                ...options.awsClientOptions,
-                ...options.fetchData[internalKey]
-            });
-            values[internalKey] = client.getAuthToken().then((token)=>{
-                if (!token.includes('X-Amz-Security-Token=')) {
-                    throw new Error('X-Amz-Security-Token Missing', {
-                        cause: {
-                            package: '@middy/rds-signer'
-                        }
-                    });
-                }
-                return token;
-            }).catch((e)=>{
-                const value = getCache(options.cacheKey).value ?? {};
-                value[internalKey] = undefined;
-                modifyCache(options.cacheKey, value);
-                throw e;
-            });
-        }
-        return values;
-    };
-    if (canPrefetch(options)) {
-        processCache(options, fetch);
+  AwsClient: Signer,
+  awsClientOptions: {},
+  fetchData: {},
+  disablePrefetch: false,
+  cacheKey: 'rds-signer',
+  cacheKeyExpiry: {},
+  cacheExpiry: -1,
+  setToContext: false
+}
+
+const rdsSignerMiddleware = (opts = {}) => {
+  const options = { ...defaults, ...opts }
+
+  const fetch = (request, cachedValues = {}) => {
+    const values = {}
+    for (const internalKey of Object.keys(options.fetchData)) {
+      if (cachedValues[internalKey]) continue
+
+      const client = new options.AwsClient({
+        ...options.awsClientOptions,
+        ...options.fetchData[internalKey]
+      })
+      values[internalKey] = client
+        .getAuthToken()
+        .then((token) => {
+          // Catch Missing token, this usually means their is something wrong with the credentials
+          if (!token.includes('X-Amz-Security-Token=')) {
+            throw new Error('X-Amz-Security-Token Missing', {
+              cause: { package: '@middy/rds-signer' }
+            })
+          }
+          return token
+        })
+        .catch((e) => {
+          const value = getCache(options.cacheKey).value ?? {}
+          value[internalKey] = undefined
+          modifyCache(options.cacheKey, value)
+          throw e
+        })
+    }
+
+    return values
+  }
+
+  if (canPrefetch(options)) {
+    processCache(options, fetch)
+  }
+
+  const rdsSignerMiddlewareBefore = async (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)
     }
-    const rdsSignerMiddlewareBefore = async (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: rdsSignerMiddlewareBefore
-    };
-};
-export default rdsSignerMiddleware;
+  }
 
+  return {
+    before: rdsSignerMiddlewareBefore
+  }
+}
+export default rdsSignerMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/rds-signer",
-  "version": "5.0.3",
+  "version": "5.2.0",
   "description": "RDS (Relational Database Service) credentials middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -60,14 +60,14 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.0.3"
+    "@middy/util": "5.2.0"
   },
   "devDependencies": {
     "@aws-sdk/rds-signer": "^3.0.0",
-    "@middy/core": "5.0.3",
+    "@middy/core": "5.2.0",
     "@types/aws-lambda": "^8.10.101",
     "@types/node": "^20.0.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "87660575a7ac2b52e4153c407a4c63c9449dcd0d"
+  "gitHead": "2d9096a49cd8fb62359517be96d6c93609df41f0"
 }