feat: rds error should fail loudly in sfn (#6255)

Author: Daniel Hegeman

.happy/terraform/modules/sfn/main.tf

@@ -281,8 +281,7 @@ resource "aws_sfn_state_machine" "state_machine" {
             "BackoffRate": 2.0
         } ],
         "Next": "DeregisterJobDefinition",
-        "ResultPath": null,
-        "OutputPath": "$.[0]"
+        "ResultPath": null
       },
       "HandleErrors": {
         "Type": "Task",
@@ -305,11 +304,48 @@ resource "aws_sfn_state_machine" "state_machine" {
       },
       "DeregisterJobDefinition": {
         "Type": "Task",
-        "End": true,
+        "Next": "CheckForErrors",
         "Parameters": {
-          "JobDefinition.$": "$.batch.JobDefinitionName"
+          "JobDefinition.$": "$[0].batch.JobDefinitionName"
         },
-        "Resource": "arn:aws:states:::aws-sdk:batch:deregisterJobDefinition"
+        "Resource": "arn:aws:states:::aws-sdk:batch:deregisterJobDefinition",
+        "ResultPath": null
+      },
+      "CheckForErrors": {
+        "Type": "Choice",
+        "Choices": [
+          {
+            "Or": [
+              {
+                "Variable": "$[0].error",
+                "IsPresent": true
+              },
+              {
+                "Variable": "$[1].error",
+                "IsPresent": true
+              }
+            ],
+            "Next": "ConversionError"
+          },
+          {
+            "Variable": "$.error",
+            "IsPresent": true,
+            "Next": "DownloadValidateError"
+          }
+        ],
+        "Default": "EndPass"
+      },
+      "ConversionError": {
+        "Type": "Fail",
+        "Cause": "CXG and/or Seurat conversion failed."
+      },
+      "DownloadValidateError": {
+        "Type": "Fail",
+        "Cause": "An error occurred during Download/Validate."
+      },
+      "EndPass": {
+        "Type": "Pass",
+        "End": true
       }
     }
 }