[Fix #1071] Until option if any is empty (#1072)

fjtirado · cdavernas · web-flow · commit 3e7ba14185b4 · 2025-01-22T09:46:03.000-05:00
* [Fix #1071] Until option if any is empty Fix #1071 Signed-off-by: Francisco Javier Tirado Sarti <ftirados@redhat.com> * [Fix_#1071] Incorporating comments Signed-off-by: Francisco Javier Tirado Sarti <ftirados@redhat.com> * Update dsl-reference.md Co-authored-by: Charles d'Avernas <charles.davernas@neuroglia.io> Signed-off-by: Francisco Javier Tirado Sarti <ftirados@redhat.com> --------- Signed-off-by: Francisco Javier Tirado Sarti <ftirados@redhat.com> Co-authored-by: Charles d'Avernas <charles.davernas@neuroglia.io>
diff --git a/.ci/validation/test/fixtures/invalid/listen-any-empty-no-until.yaml b/.ci/validation/test/fixtures/invalid/listen-any-empty-no-until.yaml
diff --git a/dsl-reference.md b/dsl-reference.md
@@ -1591,9 +1591,9 @@ Represents the configuration of an event consumption strategy.
 | Property | Type | Required | Description |
 |----------|:----:|:--------:|-------------|
 | all | [`eventFilter[]`](#event-filter) | `no` | Configures the workflow to wait for all defined events before resuming execution.<br>*Required if `any` and `one` have not been set.* |
-| any | [`eventFilter[]`](#event-filter) | `no` | Configures the workflow to wait for any of the defined events before resuming execution.<br>*Required if `all` and `one` have not been set.*<br>*If empty, listens to all incoming events, and requires `until` to be set.* |
+| any | [`eventFilter[]`](#event-filter) | `no` | Configures the workflow to wait for any of the defined events before resuming execution.<br>*Required if `all` and `one` have not been set.*<br>*If empty, listens to all incoming events* |
 | one | [`eventFilter`](#event-filter) | `no` | Configures the workflow to wait for the defined event before resuming execution.<br>*Required if `all` and `any` have not been set.* |
-| until | `string`<br>[`eventConsumptionStrategy`](#event-consumption-strategy) | `no` | Configures the [runtime expression](dsl.md#runtime-expressions) condition or the events that must be consumed to stop listening.<br>*Only applies if `any` has been set, otherwise ignored.* |
+| until | `string`<br>[`eventConsumptionStrategy`](#event-consumption-strategy) | `no` | Configures the [runtime expression](dsl.md#runtime-expressions) condition or the events that must be consumed to stop listening.<br>*Only applies if `any` has been set, otherwise ignored.*<br>*If not present, once any event is received, it proceeds to the next task.* |
 
 ### Event Properties
 
diff --git a/examples/listen-to-any-filter.yaml b/examples/listen-to-any-filter.yaml
@@ -0,0 +1,16 @@
+document:
+  dsl: '1.0.0-alpha5'
+  namespace: test
+  name: listen-to-any-filter
+  version: '0.1.0'
+do:
+  - callDoctor:
+      listen:
+        to:
+          any:
+          - with:
+              type: com.fake-hospital.vitals.measurements.temperature
+              data: ${ .temperature > 38 }
+          - with:
+              type: com.fake-hospital.vitals.measurements.bpm
+              data: ${ .bpm < 60 or .bpm > 100 }
diff --git a/examples/listen-to-any.yaml b/examples/listen-to-any.yaml
@@ -7,10 +7,4 @@ do:
   - callDoctor:
       listen:
         to:
-          any:
-          - with:
-              type: com.fake-hospital.vitals.measurements.temperature
-              data: ${ .temperature > 38 }
-          - with:
-              type: com.fake-hospital.vitals.measurements.bpm
-              data: ${ .bpm < 60 or .bpm > 100 }
+          any: []
diff --git a/schema/workflow.yaml b/schema/workflow.yaml
@@ -1325,47 +1325,25 @@ $defs:
               $ref: '#/$defs/eventFilter'
         required: [ all ]
       - title: AnyEventConsumptionStrategy
-        oneOf:
-          - properties:
-              any:
-                type: array
-                title: AnyEventConsumptionStrategyConfiguration
-                description: A list containing any of the events to consume.
-                items:
-                  $ref: '#/$defs/eventFilter'
-                minItems: 1
-              until:
-                oneOf:
-                  - type: string
-                    title: AnyEventUntilCondition
-                    description: A runtime expression condition evaluated after consuming an event and which determines whether or not to continue listening.
-                  - allOf:
-                      - $ref: '#/$defs/eventConsumptionStrategy'
-                        title: AnyEventUntilConsumed
-                        description: The strategy that defines the event(s) to consume to stop listening.
-                      - properties:
-                          until: false
-            required: [ any ]
-          - properties:
-              any:
-                type: array
-                title: AnyEventConsumptionStrategyConfiguration
-                description: A list containing any of the events to consume.
-                items:
-                  $ref: '#/$defs/eventFilter'
-                maxItems: 0
-              until:
-                oneOf:
-                  - type: string
-                    title: AnyEventUntilCondition
-                    description: A runtime expression condition evaluated after consuming an event and which determines whether or not to continue listening.
-                  - allOf:
-                      - $ref: '#/$defs/eventConsumptionStrategy'
-                        title: AnyEventUntilConsumed
-                        description: The strategy that defines the event(s) to consume to stop listening.
-                      - properties:
-                          until: false
-            required: [ any, until ]
+        properties:
+          any:
+              type: array
+              title: AnyEventConsumptionStrategyConfiguration
+              description: A list containing any of the events to consume.
+              items:
+                $ref: '#/$defs/eventFilter'
+          until:
+            oneOf:
+              - type: string
+                title: AnyEventUntilCondition
+                description: A runtime expression condition evaluated after consuming an event and which determines whether or not to continue listening.
+              - allOf:
+                  - $ref: '#/$defs/eventConsumptionStrategy'
+                    description: The strategy that defines the event(s) to consume to stop listening.
+                  - properties:
+                      until: false
+                title: AnyEventUntilConsumed
+        required: [ any ]
       - title: OneEventConsumptionStrategy
         properties:
           one:
