Skip to content

Commit 03b8b46

Browse files
Revert "refactor: replace compete with competitively"
This reverts commit 33488a5. Signed-off-by: Matthias Pichler <[email protected]>
1 parent acad3d7 commit 03b8b46

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

ctk/features/composite.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Feature: Composite Task
3838
namespace: default
3939
name: composite-sequential
4040
do:
41-
competitively:
41+
compete:
4242
- setRed:
4343
set:
4444
colors: ${ .colors + ["red"] }

dsl-reference.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
+ [gRPC](#grpc-call)
1515
+ [HTTP](#http-call)
1616
+ [OpenAPI](#openapi-call)
17-
- [Sequentially](#sequentially)
18-
- [Concurrently](#concurrently)
19-
- [Competitively](#competitively)
17+
- [Sequential](#sequential)
18+
- [Concurrent](#concurrent)
19+
- [Compete](#compete)
2020
- [Emit](#emit)
2121
- [For](#for)
2222
- [Listen](#listen)
@@ -218,9 +218,9 @@ By breaking down the [workflow](#workflow) into manageable [tasks](#task), organ
218218
The Serverless Workflow DSL defines a list of [tasks](#task) that **must be** supported by all runtimes:
219219

220220
- [Call](#call), used to call services and/or functions.
221-
- [Sequentially](#sequentially), used to define a minimum of two subtasks to perform sequentially.
222-
- [Concurrently](#concurrently), used to define a minimum of two subtasks to perform concurrently.
223-
- [competitively](#competitively), used to define a minimum of two subtasks to perform concurrently, with a single possible winner.
221+
- [Sequential](#sequential), used to define a minimum of two subtasks to perform sequentially.
222+
- [Concurrent](#concurrent), used to define a minimum of two subtasks to perform concurrently.
223+
- [Compete](#compete), used to define a minimum of two subtasks to perform concurrently, with a single possible winner.
224224
- [Emit](#emit), used to emit [events](#event).
225225
- [For](#for), used to iterate over a collection of items, and conditionally perform a task for each of them.
226226
- [Listen](#listen), used to listen for an [event](#event) or more.
@@ -407,7 +407,7 @@ do:
407407
status: available
408408
```
409409

410-
#### Sequentially
410+
#### Sequential
411411

412412
Serves as a pivotal orchestrator within workflow systems, enabling the seamless integration and execution of multiple subtasks one after the other to accomplish complex operations. By encapsulating and coordinating various subtasks, this task type facilitates the efficient execution of intricate workflows.
413413

@@ -462,7 +462,7 @@ do:
462462
country: Portugal
463463
```
464464

465-
#### Concurrently
465+
#### Concurrent
466466

467467
Serves as a pivotal orchestrator within workflow systems, enabling the seamless integration and parallel execution of multiple subtasks to accomplish complex operations and increase performace. By encapsulating and coordinating various subtasks, this task type facilitates the efficient execution of intricate workflows.
468468

@@ -500,15 +500,15 @@ do:
500500
room: ${ .room.number }
501501
```
502502

503-
#### Competitively
503+
#### Compete
504504

505505
Races multiple tasks against each other, with a single possible winner, which sets the task's output. This task type is instrumental in handling scenarios where multiple tasks are competing to achieve a common goal, and only one task is needed to succeed.
506506

507507
##### Properties
508508

509509
| Name | Type | Required | Description|
510510
|:--|:---:|:---:|:---|
511-
| competitively | [`map[string, task][]`](#task) | `yes` | The tasks to perform concurrently. *Must contain **at least** two [`tasks`](#task).* |
511+
| compete | [`map[string, task][]`](#task) | `yes` | The tasks to perform concurrently. *Must contain **at least** two [`tasks`](#task).* |
512512

513513
##### Examples
514514

@@ -519,7 +519,7 @@ document:
519519
name: sample-workflow
520520
version: '0.1.0'
521521
do:
522-
competitively:
522+
compete:
523523
- callNurse:
524524
call: http
525525
with:
@@ -1212,7 +1212,7 @@ Extensions enable the execution of tasks prior to those they extend, offering th
12121212

12131213
| Property | Type | Required | Description |
12141214
|----------|:----:|:--------:|-------------|
1215-
| extend | `string` | `yes` | The type of task to extend<br>Supported values are: `call`, `sequentially`, `concurrently`, `competitively`, `emit`, `extension`, `for`, `listen`, `raise`, `run`, `set`, `switch`, `try`, `wait` and `all` |
1215+
| extend | `string` | `yes` | The type of task to extend<br>Supported values are: `call`, `sequentially`, `concurrently`, `compete`, `emit`, `extension`, `for`, `listen`, `raise`, `run`, `set`, `switch`, `try`, `wait` and `all` |
12161216
| when | `string` | `no` | A runtime expression used to determine whether or not the extension should apply in the specified context |
12171217
| before | [`task`](#task) | `no` | The task to execute, if any, before the extended task |
12181218
| after | [`task`](#task) | `no` | The task to execute, if any, after the extended task |

dsl.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ Serverless Workflow DSL allows for defining reusable components that can be refe
101101
The Serverless Workflow DSL defines several default [task](dsl-reference.md#tasks) types that runtimes **must** implement:
102102

103103
- [Call](dsl-reference.md#call), used to call services and/or functions.
104-
- [Sequentially](dsl-reference.md#sequentially), used to define a minimum of two subtasks to perform sequentially.
105-
- [Concurrently](dsl-reference.md#concurrently), used to define a minimum of two subtasks to perform concurrently.
106-
- [Competitively](dsl-reference.md#competitively), used to define a minimum of two subtasks to perform concurrently, and to continue with the first one that completes.
104+
- [Sequential](dsl-reference.md#sequential), used to define a minimum of two subtasks to perform sequentially.
105+
- [Concurrent](dsl-reference.md#concurrent), used to define a minimum of two subtasks to perform concurrently.
106+
- [Compete](dsl-reference.md#compete), used to define a minimum of two subtasks to perform concurrently, and to continue with the first one that completes.
107107
- [Emit](dsl-reference.md#emit), used to emit [events](dsl-reference.md#event).
108108
- [For](dsl-reference.md#for), used to iterate over a collection of items, and conditionally perform a task for each of them.
109109
- [Listen](dsl-reference.md#listen), used to listen for an [event](dsl-reference.md#event) or more.

schema/workflow.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ $defs:
306306
competingTask:
307307
type: object
308308
properties:
309-
competitively:
309+
compete:
310310
type: array
311311
minItems: 2
312312
items:
@@ -318,7 +318,7 @@ $defs:
318318
description: |
319319
A list of the tasks to perform concurrently and race against each
320320
other, with a single possible winner, which sets the task's output.
321-
required: [ competitively ]
321+
required: [ compete ]
322322
emitTask:
323323
type: object
324324
properties:
@@ -780,7 +780,7 @@ $defs:
780780
properties:
781781
extend:
782782
type: string
783-
enum: [ call, competitively, sequentially, concurrently, emit, for, listen, raise, run, set, switch, try, wait, all ]
783+
enum: [ call, compete, sequentially, concurrently, emit, for, listen, raise, run, set, switch, try, wait, all ]
784784
description: The type of task to extend.
785785
when:
786786
type: string

0 commit comments

Comments
 (0)