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

Commit

Permalink
Merge pull request #925 from Netflix/bugfix/dynamic_fork_join_task_va…
Browse files Browse the repository at this point in the history 
…lidation

support validation for FORK_JOIN_DYNAMIC workflowtype legacy fields
  • Loading branch information
@falu2010-netflix
falu2010-netflix committed Jan 2, 2019
2 parents c9e184d + 7dd22c9 commit fc0a936
Show file tree
Hide file tree
Showing 2 changed files with 122 additions and 7 deletions.
28 changes: 21 additions & 7 deletions core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java
View file
Expand Up @@ -113,16 +113,30 @@ private boolean isDynamicTaskValid(WorkflowTask workflowTask, ConstraintValidato
private boolean isDynamicForkJoinValid(WorkflowTask workflowTask, ConstraintValidatorContext context) {
boolean valid = true;

if (workflowTask.getDynamicForkTasksParam() == null) {
String message = String.format(PARAM_REQUIRED_STRING_FORMAT, "dynamicForkTasksParam", TaskType.FORK_JOIN_DYNAMIC, workflowTask.getName());
//For DYNAMIC_FORK_JOIN_TASK support dynamicForkJoinTasksParam or combination of dynamicForkTasksParam and dynamicForkTasksInputParamName.
// Both are not allowed.
if (workflowTask.getDynamicForkJoinTasksParam() != null &&
(workflowTask.getDynamicForkTasksParam() != null || workflowTask.getDynamicForkTasksInputParamName() != null)) {
String message = String.format("dynamicForkJoinTasksParam or combination of dynamicForkTasksInputParamName and dynamicForkTasksParam cam be used for taskType: %s taskName: %s", TaskType.FORK_JOIN_DYNAMIC, workflowTask.getName());
context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
valid = false;
return false;
}
if (workflowTask.getDynamicForkTasksInputParamName() == null) {
String message = String.format(PARAM_REQUIRED_STRING_FORMAT, "dynamicForkTasksInputParamName", TaskType.FORK_JOIN_DYNAMIC, workflowTask.getName());
context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
valid = false;

if (workflowTask.getDynamicForkJoinTasksParam() != null) {
return valid;
} else {
if (workflowTask.getDynamicForkTasksParam() == null) {
String message = String.format(PARAM_REQUIRED_STRING_FORMAT, "dynamicForkTasksParam", TaskType.FORK_JOIN_DYNAMIC, workflowTask.getName());
context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
valid = false;
}
if (workflowTask.getDynamicForkTasksInputParamName() == null) {
String message = String.format(PARAM_REQUIRED_STRING_FORMAT, "dynamicForkTasksInputParamName", TaskType.FORK_JOIN_DYNAMIC, workflowTask.getName());
context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
valid = false;
}
}

return valid;
}

Expand Down
101 changes: 101 additions & 0 deletions core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java
View file
Expand Up @@ -3,6 +3,7 @@
import com.netflix.conductor.common.metadata.tasks.TaskDef;
import com.netflix.conductor.common.metadata.workflow.SubWorkflowParams;
import com.netflix.conductor.common.metadata.workflow.WorkflowTask;
import com.netflix.conductor.common.validation.ValidationError;
import com.netflix.conductor.dao.MetadataDAO;
import org.hibernate.validator.HibernateValidator;
import org.hibernate.validator.HibernateValidatorConfiguration;
Expand Down Expand Up @@ -163,6 +164,106 @@ public void testWorkflowTaskTypeForJoinDynamic() {
assertTrue(validationErrors.contains("dynamicForkTasksParam field is required for taskType: FORK_JOIN_DYNAMIC taskName: encode"));
}

@Test
public void testWorkflowTaskTypeForJoinDynamicLegacy() {
WorkflowTask workflowTask = createSampleWorkflowTask();
workflowTask.setType("FORK_JOIN_DYNAMIC");
workflowTask.setDynamicForkJoinTasksParam("taskList");

ConstraintMapping mapping = config.createConstraintMapping();

mapping.type(WorkflowTask.class)
.constraint(new WorkflowTaskTypeConstraintDef());

Validator validator = config.addMapping(mapping)
.buildValidatorFactory()
.getValidator();

when(mockMetadataDao.getTaskDef(anyString())).thenReturn(new TaskDef());

Set<ConstraintViolation<WorkflowTask>> result = validator.validate(workflowTask);
assertEquals(0, result.size());
}

@Test
public void testWorkflowTaskTypeForJoinDynamicWithForJoinTaskParam() {
WorkflowTask workflowTask = createSampleWorkflowTask();
workflowTask.setType("FORK_JOIN_DYNAMIC");
workflowTask.setDynamicForkJoinTasksParam("taskList");
workflowTask.setDynamicForkTasksInputParamName("ForkTaskInputParam");

ConstraintMapping mapping = config.createConstraintMapping();

mapping.type(WorkflowTask.class)
.constraint(new WorkflowTaskTypeConstraintDef());

Validator validator = config.addMapping(mapping)
.buildValidatorFactory()
.getValidator();

when(mockMetadataDao.getTaskDef(anyString())).thenReturn(new TaskDef());

Set<ConstraintViolation<WorkflowTask>> result = validator.validate(workflowTask);
assertEquals(1, result.size());

List<String> validationErrors = new ArrayList<>();

result.forEach(e -> validationErrors.add(e.getMessage()));

assertTrue(validationErrors.contains("dynamicForkJoinTasksParam or combination of dynamicForkTasksInputParamName and dynamicForkTasksParam cam be used for taskType: FORK_JOIN_DYNAMIC taskName: encode"));
}

@Test
public void testWorkflowTaskTypeForJoinDynamicValid() {
WorkflowTask workflowTask = createSampleWorkflowTask();
workflowTask.setType("FORK_JOIN_DYNAMIC");
workflowTask.setDynamicForkTasksParam("ForkTasksParam");
workflowTask.setDynamicForkTasksInputParamName("ForkTaskInputParam");

ConstraintMapping mapping = config.createConstraintMapping();

mapping.type(WorkflowTask.class)
.constraint(new WorkflowTaskTypeConstraintDef());

Validator validator = config.addMapping(mapping)
.buildValidatorFactory()
.getValidator();

when(mockMetadataDao.getTaskDef(anyString())).thenReturn(new TaskDef());

Set<ConstraintViolation<WorkflowTask>> result = validator.validate(workflowTask);
assertEquals(0, result.size());
}

@Test
public void testWorkflowTaskTypeForJoinDynamicWithForJoinTaskParamAndInputTaskParam() {
WorkflowTask workflowTask = createSampleWorkflowTask();
workflowTask.setType("FORK_JOIN_DYNAMIC");
workflowTask.setDynamicForkJoinTasksParam("taskList");
workflowTask.setDynamicForkTasksInputParamName("ForkTaskInputParam");
workflowTask.setDynamicForkTasksParam("ForkTasksParam");

ConstraintMapping mapping = config.createConstraintMapping();

mapping.type(WorkflowTask.class)
.constraint(new WorkflowTaskTypeConstraintDef());

Validator validator = config.addMapping(mapping)
.buildValidatorFactory()
.getValidator();

when(mockMetadataDao.getTaskDef(anyString())).thenReturn(new TaskDef());

Set<ConstraintViolation<WorkflowTask>> result = validator.validate(workflowTask);
assertEquals(1, result.size());

List<String> validationErrors = new ArrayList<>();

result.forEach(e -> validationErrors.add(e.getMessage()));

assertTrue(validationErrors.contains("dynamicForkJoinTasksParam or combination of dynamicForkTasksInputParamName and dynamicForkTasksParam cam be used for taskType: FORK_JOIN_DYNAMIC taskName: encode") );
}

@Test
public void testWorkflowTaskTypeHTTP() {
WorkflowTask workflowTask = createSampleWorkflowTask();
Expand Down

0 comments on commit fc0a936

Please sign in to comment.