@middy/rds-signer 3.0.0-alpha.3 → 3.0.0-alpha.4

package/index.js

@@ -1,80 +1,74 @@
-import {
-  canPrefetch,
-  getInternal,
-  processCache,
-  getCache,
-  modifyCache
-} from '@middy/util'
-import RDS from 'aws-sdk/clients/rds.js' // v2
-// import { RDS:{Signer} } from '@aws-sdk/client-rds' // v3
-
+import { canPrefetch, getInternal, processCache, getCache, modifyCache } from '@middy/util';
+import RDS from 'aws-sdk/clients/rds.js';
 const defaults = {
   AwsClient: RDS.Signer,
   awsClientOptions: {},
-  fetchData: {}, // { contextKey: {region, hostname, username, database, port} }
+  fetchData: {},
   disablePrefetch: false,
   cacheKey: 'rds-signer',
   cacheExpiry: -1,
   setToContext: false
-}
+};
 
 const rdsSignerMiddleware = (opts = {}) => {
-  const options = { ...defaults, ...opts }
+  const options = { ...defaults,
+    ...opts
+  };
 
   const fetch = (request, cachedValues = {}) => {
-    const values = {}
-    for (const internalKey of Object.keys(options.fetchData)) {
-      if (cachedValues[internalKey]) continue
+    const values = {};
 
-      const client = new options.AwsClient({
-        ...options.awsClientOptions,
+    for (const internalKey of Object.keys(options.fetchData)) {
+      if (cachedValues[internalKey]) continue;
+      const client = new options.AwsClient({ ...options.awsClientOptions,
         ...options.fetchData[internalKey]
-      })
-      // AWS doesn't support getAuthToken.promise() in aws-sdk v2 :( See https://github.com/aws/aws-sdk-js/issues/3595
+      });
       values[internalKey] = new Promise((resolve, reject) => {
         client.getAuthToken({}, (e, token) => {
           if (e) {
-            reject(e)
+            reject(e);
           }
-          // Catch Missing token, this usually means their is something wrong with the credentials
+
           if (!token.includes('X-Amz-Security-Token=')) {
-            reject(new Error('X-Amz-Security-Token Missing'))
+            reject(new Error('X-Amz-Security-Token Missing'));
           }
-          resolve(token)
-        })
-      }).catch((e) => {
-        const value = getCache(options.cacheKey).value ?? {}
-        value[internalKey] = undefined
-        modifyCache(options.cacheKey, value)
-        throw e
-      })
-      // aws-sdk v3
-      // values[internalKey] = createClient(awsClientOptions, request).then(client => client.getAuthToken())
+
+          resolve(token);
+        });
+      }).catch(e => {
+        const value = getCache(options.cacheKey).value ?? {};
+        value[internalKey] = undefined;
+        modifyCache(options.cacheKey, value);
+        throw e;
+      });
     }
 
-    return values
-  }
+    return values;
+  };
+
+  let prefetch;
 
-  let prefetch
   if (canPrefetch(options)) {
-    prefetch = processCache(options, fetch)
+    prefetch = processCache(options, fetch);
   }
 
-  const rdsSignerMiddlewareBefore = async (request) => {
-    const { value } = prefetch ?? processCache(options, fetch, request)
-
-    Object.assign(request.internal, value)
+  const rdsSignerMiddlewareBefore = async request => {
+    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: rdsSignerMiddlewareBefore
-  }
-}
-export default rdsSignerMiddleware
+  };
+};
+
+export default rdsSignerMiddleware;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/rds-signer",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.4",
   "description": "RDS (Relational Database Service) credentials middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -48,13 +48,13 @@
   },
   "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",
     "@types/node": "^17.0.0",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "1441158711580313765e6d156046ef0fade0d156"
+  "gitHead": "d4bea7f4e21f6a9bbb1f6f6908361169598b9e53"
 }