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

package/README.md

@@ -1,26 +1,36 @@
-# Middy rds-signer middleware
-
-<div align="center">
-  <img alt="Middy logo" src="https://raw.githubusercontent.com/middyjs/middy/main/docs/img/middy-logo.png"/>
-</div>
-
 <div align="center">
+  <h1>Middy rds-signer middleware</h1>
+  <img alt="Middy logo" src="https://raw.githubusercontent.com/middyjs/middy/main/docs/img/middy-logo.svg"/>
   <p><strong>RDS Signer middleware for the middy framework, the stylish Node.js middleware engine for AWS Lambda</strong></p>
-</div>
-
-<div align="center">
 <p>
-  <a href="http://badge.fury.io/js/%40middy%2Frds-signer">
+  <a href="https://www.npmjs.com/package/@middy/rds-signer?activeTab=versions">
     <img src="https://badge.fury.io/js/%40middy%2Frds-signer.svg" alt="npm version" style="max-width:100%;">
   </a>
+  <a href="https://packagephobia.com/result?p=@middy/rds-signer">
+    <img src="https://packagephobia.com/badge?p=@middy/rds-signer" alt="npm install size" style="max-width:100%;">
+  </a>
+  <a href="https://github.com/middyjs/middy/actions">
+    <img src="https://github.com/middyjs/middy/workflows/Tests/badge.svg" alt="GitHub Actions test status badge" style="max-width:100%;">
+  </a>
+  <br/>
+   <a href="https://standardjs.com/">
+    <img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard Code Style"  style="max-width:100%;">
+  </a>
   <a href="https://snyk.io/test/github/middyjs/middy">
     <img src="https://snyk.io/test/github/middyjs/middy/badge.svg" alt="Known Vulnerabilities" data-canonical-src="https://snyk.io/test/github/middyjs/middy" style="max-width:100%;">
   </a>
-  <a href="https://standardjs.com/">
-    <img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard Code Style"  style="max-width:100%;">
+  <a href="https://lgtm.com/projects/g/middyjs/middy/context:javascript">
+    <img src="https://img.shields.io/lgtm/grade/javascript/g/middyjs/middy.svg?logo=lgtm&logoWidth=18" alt="Language grade: JavaScript" style="max-width:100%;">
+  </a>
+  <a href="https://bestpractices.coreinfrastructure.org/projects/5280">
+    <img src="https://bestpractices.coreinfrastructure.org/projects/5280/badge" alt="Core Infrastructure Initiative (CII) Best Practices"  style="max-width:100%;">
   </a>
+  <br/>
   <a href="https://gitter.im/middyjs/Lobby">
-    <img src="https://badges.gitter.im/gitterHQ/gitter.svg" alt="Chat on Gitter"  style="max-width:100%;">
+    <img src="https://badges.gitter.im/gitterHQ/gitter.svg" alt="Chat on Gitter" style="max-width:100%;">
+  </a>
+  <a href="https://stackoverflow.com/questions/tagged/middy?sort=Newest&uqlId=35052">
+    <img src="https://img.shields.io/badge/StackOverflow-[middy]-yellow" alt="Ask questions on StackOverflow" style="max-width:100%;">
   </a>
 </p>
 </div>
@@ -39,7 +49,7 @@ npm install --save @middy/rds-signer
 ## Options
 
 - `AwsClient` (object) (default `AWS.RDS.Signer`): AWS.RDS.Signer class constructor (e.g. that has been instrumented with AWS XRay). Must be from `aws-sdk` v2.
-- `awsClientOptions` (object) (optional): Options to pass to AWS.RDS.Signer class constructor.
+- `awsClientOptions` (object) (default `undefined`): Options to pass to AWS.RDS.Signer class constructor.
 - `fetchData` (object) (required): Mapping of internal key name to API request parameters.
 - `disablePrefetch` (boolean) (default `false`): On cold start requests will trigger early if they can. Setting `awsClientAssumeRole` disables prefetch.
 - `cacheKey` (string) (default `rds-signer`): Cache key for the fetched data responses. Must be unique across all middleware.

package/index.js

@@ -1,80 +1,3 @@
-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:{},disablePrefetch:false,cacheKey:'rds-signer',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]=new Promise((resolve,reject)=>{client.getAuthToken({},(e,token)=>{if(e){reject(e)}if(!token.includes('X-Amz-Security-Token=')){reject(new Error('[rds-signer] X-Amz-Security-Token Missing'))}resolve(token)})}).catch(e=>{const value=getCache(options.cacheKey).value??{};value[internalKey]=undefined;modifyCache(options.cacheKey,value);throw e})}return values};let prefetch;if(canPrefetch(options)){prefetch=processCache(options,fetch)}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)}prefetch=null};return{before:rdsSignerMiddlewareBefore}};export default rdsSignerMiddleware
 
-const defaults = {
-  AwsClient: RDS.Signer,
-  awsClientOptions: {},
-  fetchData: {}, // { contextKey: {region, hostname, username, database, port} }
-  disablePrefetch: false,
-  cacheKey: 'rds-signer',
-  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]
-      })
-      // 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)
-          }
-          // 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'))
-          }
-          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
-  if (canPrefetch(options)) {
-    prefetch = processCache(options, fetch)
-  }
-
-  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)
-    }
-
-    prefetch = null
-  }
-
-  return {
-    before: rdsSignerMiddlewareBefore
-  }
-}
-export default rdsSignerMiddleware
+//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/rds-signer",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.7",
   "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.7"
   },
   "devDependencies": {
-    "@middy/core": "^3.0.0-alpha.3",
+    "@middy/core": "^3.0.0-alpha.7",
     "@types/node": "^17.0.0",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "1441158711580313765e6d156046ef0fade0d156"
+  "gitHead": "5cef39ebe49c201f97d71bb0680004de4b82cb91"
 }