Port #326 (#328)

* added test for multiple ssm names with same path * stop inverting userParams object; allow multiple SSM names with same path * remove Object.entries for node 6 support * only fetch duplicated SSM params once * version bump
middyjs · Apr 30, 2019 · cfd121b · cfd121b
1 parent 0e94109
commit cfd121b
Show file tree

Hide file tree

Showing 39 changed files with 64 additions and 50 deletions.
diff --git a/lerna.json b/lerna.json
@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "1.0.0-alpha.29"
+  "version": "1.0.0-alpha.30"
 }
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.29",
+  "version": "1.0.0-alpha.30",
   "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.29",
+  "version": "1.0.0-alpha.30",
   "description": "Cache middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/core",
-  "version": "1.0.0-alpha.29",
+  "version": "1.0.0-alpha.30",
   "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.29",
+  "version": "1.0.0-alpha.30",
   "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-lock.json b/packages/error-logger/package-lock.json
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.29",
+  "version": "1.0.0-alpha.30",
   "description": "Input and output logger middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/function-shield/package-lock.json b/packages/function-shield/package-lock.json
diff --git a/packages/function-shield/package.json b/packages/function-shield/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/function-shield",
-  "version": "1.0.0-alpha.29",
+  "version": "1.0.0-alpha.30",
   "description": "Hardens AWS Lambda execution environment",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-content-negotiation/package-lock.json b/packages/http-content-negotiation/package-lock.json
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.29",
+  "version": "1.0.0-alpha.30",
   "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.29",
+  "version": "1.0.0-alpha.30",
   "description": "CORS (Cross-Origin Resource Sharing) middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-error-handler/package-lock.json b/packages/http-error-handler/package-lock.json
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.29",
+  "version": "1.0.0-alpha.30",
   "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.29",
+  "version": "1.0.0-alpha.30",
   "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.29",
+  "version": "1.0.0-alpha.30",
   "description": "Http header normalizer middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-json-body-parser/package-lock.json b/packages/http-json-body-parser/package-lock.json
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.29",
+  "version": "1.0.0-alpha.30",
   "description": "Http JSON body parser middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-partial-response/package-lock.json b/packages/http-partial-response/package-lock.json
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.29",
+  "version": "1.0.0-alpha.30",
   "description": "Http partial response middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

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

diff --git a/packages/http-security-header/package.json b/packages/http-security-header/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-security-header",
-  "version": "1.0.0-alpha.29",
+  "version": "1.0.0-alpha.30",
   "description": "Applies best practice security headers to responses. It's a simplified port of HelmetJS",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/http-urlencode-body-parser/package-lock.json b/packages/http-urlencode-body-parser/package-lock.json
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.29",
+  "version": "1.0.0-alpha.30",
   "description": "Urlencode body parser middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/input-output-logger/package-lock.json b/packages/input-output-logger/package-lock.json
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.29",
+  "version": "1.0.0-alpha.30",
   "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.29",
+  "version": "1.0.0-alpha.30",
   "description": "S3 key normalizer middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/secrets-manager/package-lock.json b/packages/secrets-manager/package-lock.json
diff --git a/packages/secrets-manager/package.json b/packages/secrets-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/secrets-manager",
-  "version": "1.0.0-alpha.29",
+  "version": "1.0.0-alpha.30",
   "description": "Secrets Manager middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/ssm/__tests__/index.js b/packages/ssm/__tests__/index.js
@@ -331,4 +331,27 @@ describe('🔒 SSM Middleware', () => {
       done
     })
   })
+
+  test('It should allow multiple option names to point at the same SSM path', (done) => {
+    testScenario({
+      ssmMockResponses: [
+        {
+          Parameters: [{ Name: '/dev/service_name/key_name', Value: 'key-value' }]
+        }
+      ],
+      middlewareOptions: {
+        names: {
+          KEY_NAME_1: '/dev/service_name/key_name',
+          KEY_NAME_2: '/dev/service_name/key_name'
+        }
+      },
+      callbacks: [
+        () => {
+          expect(process.env.KEY_NAME_1).toEqual('key-value')
+          expect(process.env.KEY_NAME_2).toEqual('key-value')
+        }
+      ],
+      done
+    })
+  })
 })
diff --git a/packages/ssm/index.js b/packages/ssm/index.js
@@ -54,7 +54,6 @@ module.exports = opts => {
         },
         []
       )
-
       const ssmParamNames = getSSMParamValues(options.names)
       if (ssmParamNames.length) {
         const ssmPromise = ssmInstance
@@ -143,7 +142,7 @@ const getTargetObjectToAssign = (handler, options) =>
   options.setToContext ? handler.context : process.env
 
 const getSSMParamValues = userParamsMap =>
-  Object.keys(userParamsMap).map(key => userParamsMap[key])
+  [...new Set(Object.keys(userParamsMap).map(key => userParamsMap[key]))]
 
 /**
  * Lazily load aws-sdk and initialize SSM constructor
@@ -185,11 +184,9 @@ const handleInvalidParams = ({ Parameters, InvalidParameters }) => {
  * @return {Object} Merged object for assignment to target object
  */
 const getParamsToAssignByName = (userParamsMap, ssmParams) => {
-  const ssmToUserParamsMap = invertObject(userParamsMap)
-
-  return ssmParams.reduce((aggregator, ssmParam) => {
-    aggregator[ssmToUserParamsMap[ssmParam.Name]] = ssmParam.Value
-    return aggregator
+  return Object.keys(userParamsMap).reduce((acc, key) => {
+    acc[key] = ssmParams.find(param => param.Name === userParamsMap[key]).Value
+    return acc
   }, {})
 }
 
@@ -212,9 +209,3 @@ const getParamsToAssignByPath = (
       ssmParam.Value
     return aggregator
   }, {})
-
-const invertObject = obj =>
-  Object.keys(obj).reduce((aggregator, key) => {
-    aggregator[obj[key]] = key
-    return aggregator
-  }, {})
diff --git a/packages/ssm/package-lock.json b/packages/ssm/package-lock.json
diff --git a/packages/ssm/package.json b/packages/ssm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/ssm",
-  "version": "1.0.0-alpha.29",
+  "version": "1.0.0-alpha.30",
   "description": "SSM (EC2 Systems Manager) parameters middleware for the middy framework",
   "engines": {
     "node": ">=6.10"

diff --git a/packages/validator/package-lock.json b/packages/validator/package-lock.json
diff --git a/packages/validator/package.json b/packages/validator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@middy/validator",
-  "version": "1.0.0-alpha.29",
+  "version": "1.0.0-alpha.30",
   "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.29",
+  "version": "1.0.0-alpha.30",
   "description": "Warmup (cold start mitigation) middleware for the middy framework",
   "engines": {
     "node": ">=6.10"