Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Misc enhancements #3593

Merged
merged 3 commits into from
May 16, 2023
Merged

Misc enhancements #3593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
368e6db
inherit task to domains if not specified
v1r3n Apr 23, 2023
31f9a7e
allow terminated as a valid status
v1r3n Apr 23, 2023
7f1f1e0
update the constraints for the wait task
v1r3n Apr 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions core/src/main/java/com/netflix/conductor/core/execution/tasks/StartWorkflow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*/
package com.netflix.conductor.core.execution.tasks;

import java.util.HashMap;
import java.util.Map;

import javax.validation.Validator;
Expand Down Expand Up @@ -65,6 +66,13 @@ public void start(
return;
}

if (request.getTaskToDomain() == null || request.getTaskToDomain().isEmpty()) {
Map<String, String> workflowTaskToDomainMap = workflow.getTaskToDomain();
if (workflowTaskToDomainMap != null) {
request.setTaskToDomain(new HashMap<>(workflowTaskToDomainMap));
}
}

// set the correlation id of starter workflow, if its empty in the StartWorkflowRequest
request.setCorrelationId(
StringUtils.defaultIfBlank(
Expand Down
7 changes: 4 additions & 3 deletions core/src/main/java/com/netflix/conductor/core/execution/tasks/Terminate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
import com.netflix.conductor.model.WorkflowModel;

import static com.netflix.conductor.common.metadata.tasks.TaskType.TASK_TYPE_TERMINATE;
import static com.netflix.conductor.common.run.Workflow.WorkflowStatus.COMPLETED;
import static com.netflix.conductor.common.run.Workflow.WorkflowStatus.FAILED;
import static com.netflix.conductor.common.run.Workflow.WorkflowStatus.*;

/**
* Task that can terminate a workflow with a given status and modify the workflow's output with a
Expand Down Expand Up @@ -94,7 +93,9 @@ public static String getTerminationWorkflowOutputParameter() {
}

public static Boolean validateInputStatus(String status) {
return COMPLETED.name().equals(status) || FAILED.name().equals(status);
return COMPLETED.name().equals(status)
|| FAILED.name().equals(status)
|| TERMINATED.name().equals(status);
}

@SuppressWarnings("unchecked")
Expand Down
6 changes: 2 additions & 4 deletions core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,9 @@ private boolean isWaitTaskValid(
}

try {
if (StringUtils.isNotBlank(duration)
&& !(duration.startsWith("${") && duration.endsWith("}"))) {
if (StringUtils.isNotBlank(duration) && !(duration.startsWith("${"))) {
DateTimeUtils.parseDuration(duration);
} else if (StringUtils.isNotBlank(until)
&& !(until.startsWith("${") && until.endsWith("}"))) {
} else if (StringUtils.isNotBlank(until) && !(until.startsWith("${"))) {
DateTimeUtils.parseDate(until);
}
} catch (DateTimeParseException e) {
Expand Down