Merge pull request #27 from mhuguesaws/bugfix/#26_job_states

Fix switched vcpus and memory value

Author: mhuguesaws

src/batch-job-states.json

@@ -55,11 +55,73 @@
                 {
                     "Variable": "$.LastEventType",
                     "StringMatches": "RUNNING",
-                    "Next": "ChoicePlatform"
+                    "Next": "Set VCPU and MEMORY"
                 }
             ],
             "Default": "Success"
         },
+        "Set VCPU and MEMORY":
+        {
+            "Type": "Choice",
+            "Choices":
+            [
+                {
+                    "And":
+                    [
+                        {
+                            "Variable": "$$.Execution.Input.detail.container.resourceRequirements[1].type",
+                            "StringMatches": "VCPU"
+                        },
+                        {
+                            "Variable": "$$.Execution.Input.detail.container.resourceRequirements[0].type",
+                            "StringMatches": "MEMORY"
+                        }
+                    ],
+                    "Next": "Set VCPU [1] and MEMORY [0]"
+                },
+                {
+                    "And":
+                    [
+                        {
+                            "Variable": "$$.Execution.Input.detail.container.resourceRequirements[0].type",
+                            "StringMatches": "VCPU"
+                        },
+                        {
+                            "Variable": "$$.Execution.Input.detail.container.resourceRequirements[1].type",
+                            "StringMatches": "MEMORY"
+                        }
+                    ],
+                    "Next": "Set VCPU [0] and MEMORY [1]"
+                }
+            ],
+            "Default": "Fail"
+        },
+        "Set VCPU [0] and MEMORY [1]":
+        {
+            "Type": "Pass",
+            "Next": "ChoicePlatform",
+            "ResultPath": "$.Resource",
+            "Parameters":
+            {
+                "VCPU.$": "$.Detail.container.resourceRequirements[0].value",
+                "MEMORY.$": "$.Detail.container.resourceRequirements[1].value"
+            }
+        },
+        "Set VCPU [1] and MEMORY [0]":
+        {
+            "Type": "Pass",
+            "Next": "ChoicePlatform",
+            "ResultPath": "$.Resource",
+            "Parameters":
+            {
+                "VCPU.$": "$.Detail.container.resourceRequirements[1].value",
+                "MEMORY.$": "$.Detail.container.resourceRequirements[0].value"
+            }
+        },
+        "Fail":
+        {
+            "Type": "Fail"
+        },
         "ChoicePlatform":
         {
             "Type": "Choice",
@@ -97,7 +159,8 @@
                     }
                 }
             },
-            "Next": "DynamoDB PutItem EC2"
+            "Next": "DynamoDB PutItem EC2",
+            "ResultPath": "$.Instance"
         },
         "DynamoDB PutItem EC2":
         {
@@ -134,31 +197,31 @@
                     },
                     "vCPUs":
                     {
-                        "N.$": "$$.Execution.Input.detail.container.resourceRequirements[0].value"
+                        "N.$": "$.Resource.VCPU"
                     },
                     "memory":
                     {
-                        "N.$": "$$.Execution.Input.detail.container.resourceRequirements[1].value"
+                        "N.$": "$.Resource.MEMORY"
                     },
                     "containerInstanceArn":
                     {
                         "S.$": "$$.Execution.Input.detail.container.containerInstanceArn"
                     },
                     "purchaseOption":
                     {
-                        "S.$": "$.Item.PurchaseOption.S"
+                        "S.$": "$.Instance.Item.PurchaseOption.S"
                     },
                     "instanceType":
                     {
-                        "S.$": "$.Item.InstanceType.S"
+                        "S.$": "$.Instance.Item.InstanceType.S"
                     },
                     "availabilityZone":
                     {
-                        "S.$": "$.Item.AvailabilityZone.S"
+                        "S.$": "$.Instance.Item.AvailabilityZone.S"
                     },
                     "instanceId":
                     {
-                        "S.$": "$.Item.InstanceId.S"
+                        "S.$": "$.Instance.Item.InstanceId.S"
                     },
                     "platform":
                     {