Merge branch 'main' of github.com:Netflix/conductor

build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0'
-        classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.2'
+        classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.3'
         classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+'
     }
 }

core/src/main/java/com/netflix/conductor/core/execution/mapper/ForkJoinDynamicTaskMapper.java

@@ -245,7 +245,6 @@ TaskModel createDynamicForkTask(
         forkDynamicTask.setTaskDefName(TaskType.TASK_TYPE_FORK);
         forkDynamicTask.setStartTime(System.currentTimeMillis());
         forkDynamicTask.setEndTime(System.currentTimeMillis());
-        forkDynamicTask.setExecuted(true);
         List<String> forkedTaskNames =
                 dynForkTasks.stream()
                         .map(WorkflowTask::getTaskReferenceName)

core/src/main/java/com/netflix/conductor/core/execution/mapper/ForkJoinTaskMapper.java

@@ -78,7 +78,6 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext)
         forkTask.setEndTime(epochMillis);
         forkTask.setInputData(taskInput);
         forkTask.setStatus(TaskModel.Status.COMPLETED);
-        forkTask.setExecuted(true);
 
         tasksToBeScheduled.add(forkTask);
         List<List<WorkflowTask>> forkTasks = workflowTask.getForkTasks();

core/src/main/java/com/netflix/conductor/core/execution/mapper/SwitchTaskMapper.java

@@ -96,8 +96,7 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
         switchTask.getInputData().put("case", evalResult);
         switchTask.getOutputData().put("evaluationResult", Collections.singletonList(evalResult));
         switchTask.setStartTime(System.currentTimeMillis());
-        switchTask.setStatus(TaskModel.Status.COMPLETED);
-        switchTask.setExecuted(true);
+        switchTask.setStatus(TaskModel.Status.IN_PROGRESS);
         tasksToBeScheduled.add(switchTask);
 
         // get the list of tasks based on the evaluated expression

core/src/test/java/com/netflix/conductor/core/execution/TestDeciderOutcomes.java

@@ -231,7 +231,7 @@ public void testWorkflowWithNoTasksWithSwitch() throws Exception {
         workflow.getTasks().addAll(outcome.tasksToBeScheduled);
         outcome = deciderService.decide(workflow);
         assertFalse(outcome.isComplete);
-        assertEquals(outcome.tasksToBeUpdated.toString(), 1, outcome.tasksToBeUpdated.size());
+        assertEquals(outcome.tasksToBeUpdated.toString(), 3, outcome.tasksToBeUpdated.size());
         assertEquals(1, outcome.tasksToBeScheduled.size());
         assertEquals("junit_task_3", outcome.tasksToBeScheduled.get(0).getTaskDefName());
     }

docs/docs/configuration/workflowdef.md

@@ -82,7 +82,7 @@ The mail_a_box workflow has 2 tasks:
  1. The first task takes the provided account number, and outputs an address.  
  2. The 2nd task takes the address info and generates a shipping label.
 
- Upon completion of the 2 tasks, the workflow outputs the trackking number generated in the 2nd task.  If the workflow fails, a second workflow named ```shipping_issues``` is run.
+ Upon completion of the 2 tasks, the workflow outputs the tracking number generated in the 2nd task.  If the workflow fails, a second workflow named ```shipping_issues``` is run.
 
 ## Fields in a Workflow
 
@@ -109,7 +109,7 @@ The mail_a_box workflow has 2 tasks:
 | taskReferenceName | Alias used to refer the task within the workflow.  MUST be unique within workflow.                                                             ||
 | type              | Type of task. SIMPLE for tasks executed by remote workers, or one of the system task types                                                     ||
 | description       | Description of the task                                                                                                                        | optional                                                                |
-| optional          | true  or false.  When set to true - workflow continues even if the task fails.  The status of the task is reflected as `COMPLETED_WITH_ERRORS` | Defaults to `false`                                                     |
+| optional          | true or false.  When set to true - workflow continues even if the task fails.  The status of the task is reflected as `COMPLETED_WITH_ERRORS` | Defaults to `false`                                                     |
 | inputParameters   | JSON template that defines the input given to the task                                                                                         | See [Wiring Inputs and Outputs](#wiring-inputs-and-outputs) for details |
 | domain            | See [Task Domains](/configuration/taskdomains.html) for more information.                                                                 | optional                                                                |
 

docs/docs/resources/contributing.md

@@ -17,7 +17,7 @@ I want to contribute!
 ------
 
 We welcome Pull Requests and already had many outstanding community contributions!
-Creating and reviewing Pull Requests take considerable time. This section helps you set up for a smooth Pull Request experience.
+Creating and reviewing Pull Requests take considerable time. This section helps you to set up a smooth Pull Request experience.
 
 The stable branch is [main](https://github.com/Netflix/conductor/tree/main).
 

polyglot-clients/README.md

@@ -1,3 +1,16 @@
 # SDKs for other languages
 
-Language specific client SDKs are maintained at a dedicated [conductor-sdk](https://github.com/conductor-sdk) repository.
+Language specific client SDKs are maintained at a dedicated [conductor-sdk](https://github.com/conductor-sdk) repository.
+
+
+Check the repository for the latest list, but there are SDK clients for:
+
+## SDK List
+* [Clojure](https://github.com/conductor-sdk/conductor-clojure)
+* [C#](https://github.com/conductor-sdk/conductor-csharp)
+* [Go](https://github.com/conductor-sdk/conductor-go)
+* [Python](https://github.com/conductor-sdk/conductor-python)
+
+
+### In progress (PRs encouraged!)
+* [JavaScript](https://github.com/conductor-sdk/conductor-javascript)