Error and Retry handling update (#435) (#445)

* [WIP] Error and Retry handling update

Signed-off-by: Tihomir Surdilovic <[email protected]>

* updated to spec text and all examples

Signed-off-by: Tihomir Surdilovic <[email protected]>

* update per todays discussion

Signed-off-by: Tihomir Surdilovic <[email protected]>

Author: tsurdilo

comparisons/comparison-argo.md

@@ -683,10 +683,6 @@ states:
       arguments:
         args:
         - import random; import sys; exit_code = random.choice([0, 1, 1]); sys.exit(exit_code)
-  onErrors:
-  - error: "*"
-    retryRef: All workflow errors retry strategy
-    end: true
   end: true
 ```
 
@@ -862,62 +858,69 @@ id: exit-handlers-
 name: Exit/Error Handling Example
 version: '1.0'
 specVersion: '0.7'
+autoRetries: true
 start: intentional-fail-state
 functions:
-- name: intentional-fail-function
-  metadata:
-    image: alpine:latest
-    command: "[sh, -c]"
-- name: send-email-function
-  metadata:
-    image: alpine:latest
-    command: "[sh, -c]"
-- name: celebrate-cry-function
-  metadata:
-    image: alpine:latest
-    command: "[sh, -c]"
+  - name: intentional-fail-function
+    metadata:
+      image: alpine:latest
+      command: "[sh, -c]"
+  - name: send-email-function
+    metadata:
+      image: alpine:latest
+      command: "[sh, -c]"
+  - name: celebrate-cry-function
+    metadata:
+      image: alpine:latest
+      command: "[sh, -c]"
+errors:
+  - name: IntentionalError
+    code: '404'
 states:
-- name: intentional-fail-state
-  type: operation
-  actions:
-  - functionRef:
-      refName: intentional-fail-function
-      arguments:
-        args: echo intentional failure; exit 1
-  onErrors:
-  - error: "*"
-    transition: send-email-state
-- name: send-email-state
-  type: operation
-  actions:
-  - functionRef:
-      refName: send-email-function
-      arguments:
-        args: "echo send e-mail: ${ .workflow.name } ${ .workflow.status }"
-  transition: emo-state
-- name: emo-state
-  type: switch
-  dataConditions:
-  - condition: "${ .workflow| .status == \"Succeeded\" }"
-    transition: celebrate-state
-  - condition: "${ .workflow| .status != \"Succeeded\" }"
-    transition: cry-state
-- name: celebrate-state
-  type: operation
-  actions:
-  - functionRef:
-      refName: celebrate-cry-function
-      arguments:
-        args: echo hooray!
-  end: true
-- name: cry-state
-  type: operation
-  actions:
-  - functionRef:
-      refName: celebrate-cry-function
-      arguments:
-        args: echo boohoo!
-  end: true
+  - name: intentional-fail-state
+    type: operation
+    actions:
+      - functionRef:
+          refName: intentional-fail-function
+          arguments:
+            args: echo intentional failure; exit 1
+        nonRetryableErrors:
+          - IntentionalError
+    onErrors:
+      - errorRef: IntentionalError
+        transition: send-email-state
+    end: true
+  - name: send-email-state
+    type: operation
+    actions:
+      - functionRef:
+          refName: send-email-function
+          arguments:
+            args: 'echo send e-mail: ${ .workflow.name } ${ .workflow.status }'
+    transition: emo-state
+  - name: emo-state
+    type: switch
+    dataConditions:
+      - condition: ${ .workflow| .status == "Succeeded" }
+        transition: celebrate-state
+      - condition: ${ .workflow| .status != "Succeeded" }
+        transition: cry-state
+  - name: celebrate-state
+    type: operation
+    actions:
+      - functionRef:
+          refName: celebrate-cry-function
+          arguments:
+            args: echo hooray!
+    end: true
+  - name: cry-state
+    type: operation
+    actions:
+      - functionRef:
+          refName: celebrate-cry-function
+          arguments:
+            args: echo boohoo!
+    end: true
 ```
 
 </td>

comparisons/comparison-bpmn.md

@@ -200,42 +200,49 @@ functions:
 <td valign="top">
 
 ```yaml
+---
 id: errorwithretries
 name: Error Handling With Retries Workflow
 version: '1.0'
 specVersion: '0.7'
 start: Make Coffee
 states:
-- name: Make Coffee
-  type: operation
-  actions:
-  - functionRef: makeCoffee
-  transition: Add Milk
-- name: Add Milk
-  type: operation
-  actions:
-  - functionRef: addMilk
-  onErrors:
-  - error: D'oh! No more Milk!
-    retryRef: noMilkRetries
+  - name: Make Coffee
+    type: operation
+    actions:
+      - functionRef: makeCoffee
+    transition: Add Milk
+  - name: Add Milk
+    type: operation
+    actions:
+      - functionRef: addMilk
+        retryRef: noMilkRetries
+        retryableErrors:
+        - D'oh! No more Milk!
+    onErrors:
+      - errorRef: D'oh! No more Milk!
+        end: true
+    transition: Drink Coffee
+  - name: Drink Coffee
+    type: operation
+    actions:
+      - functionRef: drinkCoffee
     end: true
-  transition: Drink Coffee
-- name: Drink Coffee
-  type: operation
-  actions:
-  - functionRef: drinkCoffee
-  end: true
 retries:
-- name: noMilkRetries
-  delay: PT1M
-  maxAttempts: 10
+  - name: noMilkRetries
+    delay: PT1M
+    maxAttempts: 10
+errors:
+  - name: D'oh! No more Milk!
+    code: '123'
 functions:
-- name: makeCoffee
-  operation: file://myservice.json#make
-- name: addMilk
-  operation: file://myservice.json#add
-- name: drinkCoffee
-  operation: file://myservice.json#drink
+  - name: makeCoffee
+    operation: file://myservice.json#make
+  - name: addMilk
+    operation: file://myservice.json#add
+  - name: drinkCoffee
+    operation: file://myservice.json#drink
+
 ```
 
 </td>

comparisons/comparison-brigade.md

@@ -146,17 +146,22 @@ id: greetingwitherrorcheck
 name: Greeting Workflow With Error Check
 version: '1.0'
 specVersion: '0.7'
+autoRetries: true
 start: GreetingState
 events:
 - name: execEvent
   type: exec
+errors:
+- name: CommonError
+  code: '123'
 functions:
 - name: greetingFunction
   metadata:
     image: alpine:3.7
     command: echo
 - name: consoleLogFunction
-  type: console
+  metadata:
+    type: console
 states:
 - name: GreetingState
   type: event
@@ -169,18 +174,24 @@ states:
         refName: greetingFunction
         arguments:
           greeting: hello
+      nonRetryableErrors:
+      - CommonError
     - name: sayGoodbyeAction
       functionRef:
         refName: greetingFunction
         arguments:
           greeting: hello
+      nonRetryableErrors:
+      - CommonError
     - name: logDoneAction
       functionRef:
         refName: consoleLogFunction
         arguments:
           log: done
+      nonRetryableErrors:
+      - CommonError
   onErrors:
-  - error: "*"
+  - errorRef: CommonError
     transition: HandleErrorState
   end: true
 - name: HandleErrorState
@@ -190,7 +201,7 @@ states:
     functionRef:
       refName: consoleLogFunction
       arguments:
-        log: "Caught Exception ${ .exception }"
+        log: Caught Exception ${ .exception }
   end: true
 ```