reintroduce changes that were removed in the merge

Author: mriccia

statemachine/statemachine.asl.json

@@ -5,7 +5,7 @@
     "Initializer": {
       "Type": "Task",
       "Resource": "${initializerArn}",
-      "Next": "Branching",
+      "Next": "versionPublisher",
       "ResultPath": "$.powerValues",
       "TimeoutSeconds": ${totalExecutionTimeout},
       "Catch": [
@@ -16,10 +16,33 @@
         }
       ]
     },
+    "versionPublisher": {
+      "Type": "Task",
+      "Resource": "${versionPublisherArn}",
+      "Next": "IsCountReached",
+      "ResultPath": "$.powerValues",
+      "TimeoutSeconds": ${totalExecutionTimeout},
+      "Catch": [{
+        "ErrorEquals": [ "States.ALL" ],
+        "Next": "CleanUpOnError",
+        "ResultPath": "$.error"
+      }]
+    },
+    "IsCountReached": {
+      "Type": "Choice",
+      "Choices": [
+        {
+          "Variable": "$.powerValues.iterator.continue",
+          "BooleanEquals": true,
+          "Next": "versionPublisher"
+        }
+      ],
+      "Default": "Branching"
+    },
     "Branching": {
       "Type": "Map",
       "Next": "Cleaner",
-      "ItemsPath": "$.powerValues",
+      "ItemsPath": "$.powerValues.powerValues",
       "ResultPath": "$.stats",
       "ItemSelector": {
         "input.$": "$",
@@ -83,4 +106,4 @@
       "End": true
     }
   }
-}
+}

template.yml

@@ -295,6 +295,7 @@ Resources:
       DefinitionUri: statemachine/statemachine.asl.json
       DefinitionSubstitutions:
         initializerArn: !GetAtt initializer.Arn
+        versionPublisherArn: !GetAtt versionPublisher.Arn
         executorArn: !GetAtt executor.Arn
         cleanerArn: !GetAtt cleaner.Arn
         analyzerArn: !GetAtt analyzer.Arn
@@ -303,4 +304,4 @@ Resources:
 
 Outputs:
   StateMachineARN:
-    Value: !Ref powerTuningStateMachine
+    Value: !Ref powerTuningStateMachine