Merge pull request #92 from alexcasalboni/bugfix-optional-mapping-exe…

…cutor-map Bugfix: optional mapping for Executor input (map)
alexcasalboni · Jun 10, 2020 · 76846d5 · 76846d5
2 parents 267620f + ae61d77
commit 76846d5
Show file tree

Hide file tree

Showing 4 changed files with 165 additions and 108 deletions.
diff --git a/lambda/executor.js b/lambda/executor.js
@@ -61,15 +61,16 @@ const validateInput = (lambdaARN, value, num) => {
 };
 
 const extractDataFromInput = (event) => {
+    const input = event.input; // original state machine input
     return {
-        lambdaARN: event.lambdaARN,
         value: parseInt(event.value, 10),
-        num: parseInt(event.num, 10),
-        enableParallel: !!event.parallelInvocation,
-        payload: event.payload,
-        dryRun: event.dryRun === true,
-        preProcessorARN: event.preProcessorARN,
-        postProcessorARN: event.postProcessorARN,
+        lambdaARN: input.lambdaARN,
+        num: parseInt(input.num, 10),
+        enableParallel: !!input.parallelInvocation,
+        payload: input.payload,
+        dryRun: input.dryRun === true,
+        preProcessorARN: input.preProcessorARN,
+        postProcessorARN: input.postProcessorARN,
     };
 };
 

diff --git a/lambda/utils.js b/lambda/utils.js
@@ -214,7 +214,7 @@ module.exports.invokeLambdaWithProcessors = async(lambdaARN, alias, payload, pre
  * Invoke a given Lambda Function:Alias with payload and return its logs.
  */
 module.exports.invokeLambda = (lambdaARN, alias, payload) => {
-    console.log('Invoking alias ', alias);
+    console.log(`Invoking function ${lambdaARN}:${alias || "$LATEST"} with payload ${JSON.stringify(payload)}`);
     const params = {
         FunctionName: lambdaARN,
         Qualifier: alias,

diff --git a/template.yml b/template.yml
@@ -162,11 +162,8 @@ Resources:
                       "ItemsPath": "$.powerValues",
                       "ResultPath": "$.stats",
                       "Parameters": {
-                        "value.$": "$$.Map.Item.Value",
-                        "lambdaARN.$": "$.lambdaARN",
-                        "num.$": "$.num",
-                        "payload.$": "$.payload",
-                        "parallelInvocation.$": "$.parallelInvocation"
+                        "input.$": "$",
+                        "value.$": "$$.Map.Item.Value"
                       },
                       "MaxConcurrency": 0,
                       "Catch": [{