backported SSM caching fix from 0.16.2 (middyjs#225)

* backported SSM caching fix from 0.16.2
benjifs · May 21, 2020 · 4353922 · 4353922
1 parent 452bc3a
commit 4353922
Show file tree

Hide file tree

Showing 22 changed files with 55 additions and 36 deletions.
diff --git a/lerna.json b/lerna.json
@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "1.0.0-alpha.13"
+  "version": "1.0.0-alpha.14"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "middy-monorepo",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "🛵 The stylish Node.js middleware engine for AWS Lambda",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/cache",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Cache middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/core",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "🛵 The stylish Node.js middleware engine for AWS Lambda (core package)",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/do-not-wait-for-empty-event-loop/package.json b/packages/do-not-wait-for-empty-event-loop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/do-not-wait-for-empty-event-loop",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Middleware for the middy framework that allows to easily disable the wait for empty event loop in a Lambda function",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/error-logger/package.json b/packages/error-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/error-logger",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Input and output logger middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-content-negotiation/package.json b/packages/http-content-negotiation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-content-negotiation",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Http content negotiation middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-cors/package.json b/packages/http-cors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-cors",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "CORS (Cross-Origin Resource Sharing) middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-error-handler/package.json b/packages/http-error-handler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-error-handler",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Http error handler middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-event-normalizer/package.json b/packages/http-event-normalizer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-event-normalizer",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Http event normalizer middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-header-normalizer/package.json b/packages/http-header-normalizer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-header-normalizer",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Http header normalizer middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-json-body-parser/package.json b/packages/http-json-body-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-json-body-parser",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Http JSON body parser middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-partial-response/package.json b/packages/http-partial-response/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-partial-response",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Http partial response middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-urlencode-body-parser/package.json b/packages/http-urlencode-body-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-urlencode-body-parser",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Urlencode body parser middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/input-output-logger/package.json b/packages/input-output-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/input-output-logger",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Input and output logger middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/s3-key-normalizer/package.json b/packages/s3-key-normalizer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/s3-key-normalizer",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "S3 key normalizer middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/ssm/__tests__/index.js b/packages/ssm/__tests__/index.js
@@ -20,7 +20,7 @@ describe('🔒 SSM Middleware', () => {
 
   function testScenario ({ssmMockResponse, ssmMockResponses, middlewareOptions, callbacks, done, delay = 0}) {
     (ssmMockResponses || [ssmMockResponse]).forEach(ssmMockResponse => {
-      getParametersMock.mockReturnValueOnce({
+      getParametersMock.mockReturnValue({
         promise: () => Promise.resolve(ssmMockResponse)
       })
 
@@ -86,16 +86,18 @@ describe('🔒 SSM Middleware', () => {
       },
       middlewareOptions: {
         names: {
-          KEY_NAME: '/dev/service_name/key-value'
+          KEY_NAME: '/dev/service_name/key_name'
         },
         cache: true
       },
       callbacks: [
         () => {
+          expect(process.env.KEY_NAME).toEqual('key-value')
           expect(getParametersMock).toBeCalled()
-          getParametersMock.mockReset()
+          getParametersMock.mockClear()
         },
         () => {
+          expect(process.env.KEY_NAME).toEqual('key-value')
           expect(getParametersMock).not.toBeCalled()
         }
       ],
@@ -120,11 +122,13 @@ describe('🔒 SSM Middleware', () => {
         setToContext: true
       },
       callbacks: [
-        () => {
+        (_, {context}) => {
+          expect(context.secureValue).toEqual('something-secure')
           expect(getParametersMock).toBeCalledWith({'Names': ['/dev/service_name/secure_param'], 'WithDecryption': true})
-          getParametersMock.mockReset()
+          getParametersMock.mockClear()
         },
-        () => {
+        (_, {context}) => {
+          expect(context.secureValue).toEqual('something-secure')
           expect(getParametersMock).not.toBeCalled()
         }
       ],
@@ -146,7 +150,8 @@ describe('🔒 SSM Middleware', () => {
         paramsLoaded: false
       },
       callbacks: [
-        () => {
+        (_, {context}) => {
+          expect(context.secureValue).toEqual('something-secure')
           expect(getParametersMock).toBeCalledWith({'Names': ['/dev/service_name/secure_param'], 'WithDecryption': true})
         }
       ],
@@ -169,11 +174,13 @@ describe('🔒 SSM Middleware', () => {
         paramsLoaded: false
       },
       callbacks: [
-        () => {
+        (_, {context}) => {
+          expect(context.secureValue).toEqual('something-secure')
           expect(getParametersMock).toBeCalledWith({'Names': ['/dev/service_name/secure_param'], 'WithDecryption': true})
-          getParametersMock.mockReset()
+          getParametersMock.mockClear()
         },
-        () => {
+        (_, {context}) => {
+          expect(context.secureValue).toEqual('something-secure')
           expect(getParametersMock).toBeCalledWith({'Names': ['/dev/service_name/secure_param'], 'WithDecryption': true})
         }
       ],
@@ -197,11 +204,13 @@ describe('🔒 SSM Middleware', () => {
         paramsLoaded: false
       },
       callbacks: [
-        () => {
+        (_, {context}) => {
+          expect(context.secureValue).toEqual('something-secure')
           expect(getParametersMock).toBeCalledWith({'Names': ['/dev/service_name/secure_param'], 'WithDecryption': true})
-          getParametersMock.mockReset()
+          getParametersMock.mockClear()
         },
-        () => {
+        (_, {context}) => {
+          expect(context.secureValue).toEqual('something-secure')
           expect(getParametersMock).not.toBeCalled()
         }
       ],

diff --git a/packages/ssm/index.js b/packages/ssm/index.js
@@ -13,14 +13,23 @@ module.exports = opts => {
     cache: false,
     cacheExpiryInMillis: undefined,
     paramsLoaded: false,
+    paramsCache: undefined,
     paramsLoadedAt: new Date(0)
   }
 
   const options = Object.assign({}, defaults, opts)
 
   return {
     before: (handler, next) => {
-      if (!shouldFetchFromParamStore(options)) return next()
+      if (!shouldFetchFromParamStore(options)) {
+        if (options.paramsCache) {
+          const targetParamsObject = getTargetObjectToAssign(handler, options)
+          options.paramsCache.forEach(object => {
+            Object.assign(targetParamsObject, object)
+          })
+        }
+        return next()
+      }
 
       ssmInstance = ssmInstance || getSSMInstance(options.awsSdkOptions)
 
@@ -39,13 +48,13 @@ module.exports = opts => {
 
       const ssmParamNames = getSSMParamValues(options.names)
       if (ssmParamNames.length) {
-        ssmPromises.push(
+        const ssmPromise =
           ssmInstance
             .getParameters({ Names: ssmParamNames, WithDecryption: true })
             .promise()
             .then(handleInvalidParams)
             .then(ssmResponse => getParamsToAssignByName(options.names, ssmResponse))
-        )
+        ssmPromises.push(ssmPromise)
       }
 
       return Promise.all(ssmPromises).then(objectsToMap => {
@@ -54,6 +63,7 @@ module.exports = opts => {
           Object.assign(targetParamsObject, object)
         })
         options.paramsLoaded = true
+        options.paramsCache = objectsToMap
         options.paramsLoadedAt = new Date()
       })
     }

diff --git a/packages/ssm/package.json b/packages/ssm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/ssm",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "SSM (EC2 Systems Manager) parameters middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/validator/package.json b/packages/validator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/validator",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Validator middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/warmup/package.json b/packages/warmup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/warmup",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "description": "Warmup (cold start mitigation) middleware for the middy framework",
   "engines": {
     "node": ">=6.10"