@middy/rds-signer 2.5.2 → 2.5.6

package/index.d.ts

@@ -1,19 +1,8 @@
 import { RDS } from 'aws-sdk'
-import { captureAWSClient } from 'aws-xray-sdk'
 import middy from '@middy/core'
+import { Options as MiddyOptions } from '@middy/util'
 
-interface Options<Signer = RDS.Signer> {
-  AwsClient?: new() => Signer
-  awsClientOptions?: Partial<RDS.Types.ClientConfiguration>
-  awsClientAssumeRole?: string
-  awsClientCapture?: typeof captureAWSClient
-  fetchData?: { [key: string]: string }
-  disablePrefetch?: boolean
-  cacheKey?: string
-  cacheExpiry?: number
-  setToEnv?: boolean
-  setToContext?: boolean
-}
+interface Options<Signer = RDS.Signer> extends MiddyOptions<Signer, RDS.Types.ClientConfiguration> {}
 
 declare function rdsSigner (options?: Options): middy.MiddlewareObj
 

package/index.js

@@ -1,98 +1,82 @@
-"use strict";
-
 const {
   canPrefetch,
   getInternal,
   processCache,
   getCache,
   modifyCache
-} = require('@middy/util');
-
-const {
-  Signer
-} = require('aws-sdk/clients/rds.js'); // v2
+} = require('@middy/util')
+const { Signer } = require('aws-sdk/clients/rds.js') // v2
 // const { RDS:{Signer} } = require('@aws-sdk/client-rds') // v3
 
-
 const defaults = {
   AwsClient: Signer,
   awsClientOptions: {},
-  fetchData: {},
-  // { contextKey: {region, hostname, username, database, port} }
+  fetchData: {}, // { contextKey: {region, hostname, username, database, port} }
   disablePrefetch: false,
   cacheKey: 'rds-signer',
   cacheExpiry: -1,
   setToEnv: false,
   setToContext: false
-};
+}
 
 const rdsSignerMiddleware = (opts = {}) => {
-  const options = { ...defaults,
-    ...opts
-  };
+  const options = { ...defaults, ...opts }
 
   const fetch = (request, cachedValues = {}) => {
-    const values = {};
-
+    const values = {}
     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
+      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({}, (err, token) => {
           if (err) {
-            reject(err);
-          } // Catch Missing token, this usually means their is something wrong with the credentials
-
-
+            reject(err)
+          }
+          // 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 => {
-        var _getCache$value, _getCache;
-
-        const value = (_getCache$value = (_getCache = getCache(options.cacheKey)) === null || _getCache === void 0 ? void 0 : _getCache.value) !== null && _getCache$value !== void 0 ? _getCache$value : {};
-        value[internalKey] = undefined;
-        modifyCache(options.cacheKey, value);
-        throw e;
-      }); // aws-sdk v3
+          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())
     }
 
-    return values;
-  };
-
-  let prefetch;
+    return values
+  }
 
+  let prefetch
   if (canPrefetch(options)) {
-    prefetch = processCache(options, fetch);
+    prefetch = processCache(options, fetch)
   }
 
-  const rdsSignerMiddlewareBefore = async request => {
-    var _prefetch;
+  const rdsSignerMiddlewareBefore = async (request) => {
+    const { value } = prefetch ?? processCache(options, fetch, request)
 
-    const {
-      value
-    } = (_prefetch = prefetch) !== null && _prefetch !== void 0 ? _prefetch : processCache(options, fetch, request);
-    Object.assign(request.internal, value);
+    Object.assign(request.internal, value)
 
     if (options.setToContext || options.setToEnv) {
-      const data = await getInternal(Object.keys(options.fetchData), request);
-      if (options.setToEnv) Object.assign(process.env, data);
-      if (options.setToContext) Object.assign(request.context, data);
+      const data = await getInternal(Object.keys(options.fetchData), request)
+      if (options.setToEnv) Object.assign(process.env, data)
+      if (options.setToContext) Object.assign(request.context, data)
     }
 
-    prefetch = null;
-  };
+    prefetch = null
+  }
 
   return {
     before: rdsSignerMiddlewareBefore
-  };
-};
-
-module.exports = rdsSignerMiddleware;
+  }
+}
+module.exports = rdsSignerMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/rds-signer",
-  "version": "2.5.2",
+  "version": "2.5.6",
   "description": "RDS (Relational Database Service) credentials middleware for the middy framework",
   "type": "commonjs",
   "engines": {
@@ -46,13 +46,13 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^2.5.2"
+    "@middy/util": "^2.5.6"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.2",
+    "@middy/core": "^2.5.6",
     "@types/node": "^16.0.0",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "a2bb757a7a13638ae64277f8eecfcf11c1af17d4"
+  "gitHead": "0c789f55b4adf691f977b0d9904d1a805bb3bb2b"
 }