Merge pull request #820 from neuroglia-io/main

Refactor error handling
serverlessworkflow · May 17, 2024 · 6e2d402 · 6e2d402
2 parents ca10bc3 + 0073684
commit 6e2d402
Show file tree

Hide file tree

Showing 8 changed files with 1,161 additions and 528 deletions.
diff --git a/examples/new-patient-onboarding.json b/examples/new-patient-onboarding.json
@@ -16,36 +16,21 @@
                         {
                             "name": "store-patient",
                             "functionRef": "store-patient",
-                            "retryRef": "services-not-available-retry-strategy",
-                            "retryableErrors": [
-                                "service-not-available"
-                            ]
+                            "onErrors": "fault-tolerance"
                         },
                         {
                             "name": "assign-doctor",
                             "functionRef": "assign-doctor",
-                            "retryRef": "services-not-available-retry-strategy",
-                            "retryableErrors": [
-                                "service-not-available"
-                            ]
+                            "onErrors": "fault-tolerance"
                         },
                         {
                             "name": "schedule-appt",
                             "functionRef": "schedule-appt",
-                            "retryRef": "services-not-available-retry-strategy",
-                            "retryableErrors": [
-                                "service-not-available"
-                            ]
+                            "onErrors": "fault-tolerance"
                         }
                     ]
                 }
             ],
-            "onErrors": [
-                {
-                    "errorRef": "service-not-available",
-                    "end": true
-                }
-            ],
             "end": true
         }
     ],
@@ -70,12 +55,29 @@
             "operation": "api/services.json#scheduleAppointment"
         }
     ],
-    "errors": [
-        {
-            "name": "service-not-available",
-            "code": "503"
-        }
-    ],
+    "errors": {
+        "handlers":[
+            {
+                "name": "handle-503-errors",
+                "when":[
+                    {
+                        "status": 503
+                    }
+                ],
+                "retry": "services-not-available-retry-strategy"
+            }
+        ],
+        "policies":[
+            {
+                "name": "fault-tolerance",
+                "handlers":[
+                    {
+                        "refName": "handle-503-errors"
+                    }
+                ]
+            }
+        ]
+    },
     "retries": [
         {
             "name": "services-not-available-retry-strategy",

diff --git a/examples/process-transactions.json b/examples/process-transactions.json
@@ -3,7 +3,6 @@
     "description": "Customer Banking Transactions Workflow",
     "version": "1.0.0",
     "specVersion": "0.8",
-    "autoRetries": true,
     "constants": {
         "largetxamount": 5000
     },

diff --git a/examples/provision-orders.json b/examples/provision-orders.json
@@ -10,17 +10,6 @@
             "operation": "http://myapis.org/provisioningapi.json#doProvision"
         }
     ],
-    "errors": [
-        {
-            "name": "missing-order-id"
-        },
-        {
-            "name": "missing-order-item"
-        },
-        {
-            "name": "missing-order-quantity"
-        }
-    ],
     "states": [
         {
             "name": "provision-order",
@@ -43,16 +32,34 @@
             "transition": "apply-order",
             "onErrors": [
                 {
-                    "errorRef": "missing-order-id",
-                    "transition": "missing-id"
+                    "when": [
+                        {
+                            "type": "/samples/errors/missing-order-id"
+                        }
+                    ],
+                    "then": {
+                        "transition": "missing-id"
+                    } 
                 },
                 {
-                    "errorRef": "missing-order-item",
-                    "transition": "missing-item"
+                    "when": [
+                        {
+                            "type": "/samples/errors/missing-order-item"
+                        }
+                    ],
+                    "then": {
+                        "transition": "missing-item"
+                    } 
                 },
                 {
-                    "errorRef": "missing-order-quantity",
-                    "transition": "missing-quantity"
+                    "when": [
+                        {
+                            "type": "/samples/errors/missing-order-quantity"
+                        }
+                    ],
+                    "then": {
+                        "transition": "missing-quantity"
+                    } 
                 }
             ]
         },

diff --git a/package-lock.json b/package-lock.json
diff --git a/roadmap/README.md b/roadmap/README.md
@@ -37,6 +37,7 @@ _Status description:_
 | ✔️| Add the new `WORKFLOW` reserved keyword to workflow expressions  |
 | ✔️| Update `ForEach` state iteration parameter example. This parameter is an expression variable, not a JSON property  |
 | ✔️| Add the new `rest` function type [spec doc](https://github.com/serverlessworkflow/specification/tree/main/specification.md#using-functions-for-restful-service-invocations) |
+| ✔️| Refactor error handling and retries |
 | ✏️️| Add inline state defs in branches |   |
 | ✏️️| Add "completedBy" functionality |   |
 | ✏️️| Define workflow context |   |