Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions src/main/java/com/apiflows/parser/OpenAPIWorkflowValidator.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ public OpenAPIWorkflowValidatorResult validate(OpenAPIWorkflow openAPIWorkflow)
if (workflow.getWorkflowId() == null || workflow.getWorkflowId().isEmpty()) {
result.addError("'Workflow[" + i + "] workflowId' is undefined");
}

if (!isValidWorkflowId(workflow.getWorkflowId())) {
result.addError("'Workflow[" + i + "] workflowId' format is invalid (should match regex " + getWorkflowIdRegularExpression() + ")");
}

if (workflow.getSteps() == null) {
result.addError("'Workflow " + workflow.getWorkflowId() + "' no Steps are undefined");
}
Expand Down Expand Up @@ -162,6 +167,10 @@ public OpenAPIWorkflowValidatorResult validate(OpenAPIWorkflow openAPIWorkflow)
return result;
}

boolean isValidWorkflowId(String workflowId) {
return Pattern.matches(getWorkflowIdRegularExpression(), workflowId);
}

boolean isValidStepId(String stepId) {
return Pattern.matches(getStepIdRegularExpression(), stepId);
}
Expand All @@ -170,6 +179,9 @@ String getStepIdRegularExpression() {
return "[A-Za-z0-9_\\-]+";
}

String getWorkflowIdRegularExpression() {
return "[A-Za-z0-9_\\\\-]++";
}
boolean isValidOutputsKey(String key) {
return Pattern.matches(getOutputsKeyRegularExpression(), key);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ void parseFromFile() {

@Test
void parseFromUrl() {
final String WORKFLOWS_SPEC_FILE = "https://raw.githubusercontent.com/OAI/sig-workflows/main/examples/1.0.0/pet-coupons.workflow.yaml";
final String WORKFLOWS_SPEC_FILE = "https://raw.githubusercontent.com/API-Flows/openapi-workflow-parser/main/src/test/resources/1.0.0/pet-coupons.workflow.yaml";

OpenAPIWorkflowParserResult result = parser.parse(WORKFLOWS_SPEC_FILE);
assertNotNull(result.getOpenAPIWorkflow());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,14 @@ void validate() {
assertFalse(result.getErrors().isEmpty());
assertEquals("'workflowsSpec' is undefined", result.getErrors().get(0));
}

@Test
void validWorkflowId() {
assertTrue(new OpenAPIWorkflowValidator().isValidWorkflowId("idOfTheWorkflow_1"));
}

@Test
void invalidWorkflowId() {
assertFalse(new OpenAPIWorkflowValidator().isValidWorkflowId("workflow id"));
}
}