Skip to content

Fix #357 - Add OAuth Validation Test #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2024
Merged

Fix #357 - Add OAuth Validation Test #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion validation/src/main/java/io/serverlessworkflow/validation/WorkflowValidatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,8 @@ private boolean isMissingRetryDefinition(String retryName, List<RetryDefinition>
"$.start: string found, object expected",
"$.functions: array found, object expected",
"$.retries: array found, object expected",
"$.errors: array found, object expected");
"$.errors: array found, object expected",
"$.auth: array found, object expected");

private void addValidationError(String message, String type) {
if (skipMessages.contains(message)) {
Expand Down
162 changes: 112 additions & 50 deletions validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,61 +380,61 @@ void testActionDefForEach() {
public void testValidateRetry() {
WorkflowValidator workflowValidator = new WorkflowValidatorImpl();
List<ValidationError> validationErrors =
workflowValidator
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file was just formatted, isnt it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The mvn command formats it, I believe.

.setSource(
"{\n"
+ " \"id\": \"workflow_1\",\n"
+ " \"name\": \"workflow_1\",\n"
+ " \"description\": \"workflow_1\",\n"
+ " \"version\": \"1.0\",\n"
+ " \"specVersion\": \"0.8\",\n"
+ " \"start\": \"Task1\",\n"
+ " \"functions\": [\n"
+ " {\n"
+ " \"name\": \"increment\",\n"
+ " \"type\": \"custom\",\n"
+ " \"operation\": \"worker\"\n"
+ " }\n"
+ " ],\n"
+ " \"retries\": [\n"
+ " {\n"
+ " \"maxAttempts\": 3\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"testRetry\" \n"
+ " }\n"
+ " ],\n"
+ " \"states\": [\n"
+ " {\n"
+ " \"name\": \"Task1\",\n"
+ " \"type\": \"operation\",\n"
+ " \"actionMode\": \"sequential\",\n"
+ " \"actions\": [\n"
+ " {\n"
+ " \"functionRef\": {\n"
+ " \"refName\": \"increment\",\n"
+ " \"arguments\": {\n"
+ " \"input\": \"some text\"\n"
+ " }\n"
+ " },\n"
+ " \"retryRef\": \"const\",\n"
+ " \"actionDataFilter\": {\n"
+ " \"toStateData\": \"${ .result }\"\n"
+ " }\n"
+ " }\n"
+ " ],\n"
+ " \"end\": true\n"
+ " }\n"
+ " ]\n"
+ "}")
.validate();
workflowValidator
.setSource(
"{\n"
+ " \"id\": \"workflow_1\",\n"
+ " \"name\": \"workflow_1\",\n"
+ " \"description\": \"workflow_1\",\n"
+ " \"version\": \"1.0\",\n"
+ " \"specVersion\": \"0.8\",\n"
+ " \"start\": \"Task1\",\n"
+ " \"functions\": [\n"
+ " {\n"
+ " \"name\": \"increment\",\n"
+ " \"type\": \"custom\",\n"
+ " \"operation\": \"worker\"\n"
+ " }\n"
+ " ],\n"
+ " \"retries\": [\n"
+ " {\n"
+ " \"maxAttempts\": 3\n"
+ " },\n"
+ " {\n"
+ " \"name\": \"testRetry\" \n"
+ " }\n"
+ " ],\n"
+ " \"states\": [\n"
+ " {\n"
+ " \"name\": \"Task1\",\n"
+ " \"type\": \"operation\",\n"
+ " \"actionMode\": \"sequential\",\n"
+ " \"actions\": [\n"
+ " {\n"
+ " \"functionRef\": {\n"
+ " \"refName\": \"increment\",\n"
+ " \"arguments\": {\n"
+ " \"input\": \"some text\"\n"
+ " }\n"
+ " },\n"
+ " \"retryRef\": \"const\",\n"
+ " \"actionDataFilter\": {\n"
+ " \"toStateData\": \"${ .result }\"\n"
+ " }\n"
+ " }\n"
+ " ],\n"
+ " \"end\": true\n"
+ " }\n"
+ " ]\n"
+ "}")
.validate();

Assertions.assertNotNull(validationErrors);
Assertions.assertEquals(2, validationErrors.size());
Assertions.assertEquals("Retry name should not be empty", validationErrors.get(0).getMessage());
Assertions.assertEquals(
"Operation State action 'null' retryRef does not reference an existing workflow retry definition",
validationErrors.get(1).getMessage());
"Operation State action 'null' retryRef does not reference an existing workflow retry definition",
validationErrors.get(1).getMessage());
}

/**
Expand All @@ -459,4 +459,66 @@ void testErrorsArrayParsing() {
Assertions.assertTrue(
new WorkflowValidatorImpl().setSource(Workflow.toJson(workflow)).isValid());
}

/**
* @see <a href="https://github.com/serverlessworkflow/sdk-java/issues/357">Error parsing Oauth
* properties in cncf spec using java sdk</a>
*/
@Test
void testOAuthPropertiesDefinition() {
final Workflow workflow =
Workflow.fromSource(
"{\n"
+ " \"version\": \"1.0.0\",\n"
+ " \"id\": \"greeting-workflow\", \n"
+ " \"specVersion\": \"0.8\",\n"
+ " \"name\": \"greeting-workflow\",\n"
+ " \"description\": \"Greet Someone\",\n"
+ " \"start\": \"greet\",\n"
+ " \"auth\": [\n"
+ " {\n"
+ " \"name\": \"serviceCloud\",\n"
+ " \"scheme\": \"oauth2\",\n"
+ " \"properties\": {\n"
+ " \"scopes\": [\"$$$$XXXMMMMM\"],\n"
+ " \"audiences\": [\"%%%XXXXXXX\"],\n"
+ " \"clientId\": \"whatever\",\n"
+ " \"grantType\": \"password\"\n"
+ " }\n"
+ " }\n"
+ " ],\n"
+ " \"functions\": [\n"
+ " {\n"
+ " \"name\": \"greeting-function\",\n"
+ " \"type\": \"rest\",\n"
+ " \"operation\": \"file://myapis/greetingapis.json#greeting\"\n"
+ " }\n"
+ " ],\n"
+ " \"states\": [\n"
+ " {\n"
+ " \"name\": \"greet\",\n"
+ " \"type\": \"operation\",\n"
+ " \"actions\": [\n"
+ " {\n"
+ " \"name\": \"greet-action\",\n"
+ " \"functionRef\": {\n"
+ " \"refName\": \"greeting-function\",\n"
+ " \"arguments\": {\n"
+ " \"name\": \"${ .person.name }\"\n"
+ " }\n"
+ " },\n"
+ " \"actionDataFilter\": {\n"
+ " \"results\": \"${ {greeting: .greeting} }\"\n"
+ " }\n"
+ " }\n"
+ " ],\n"
+ " \"end\": true\n"
+ " }\n"
+ " ]\n"
+ "}\n");
final List<ValidationError> validationErrors =
new WorkflowValidatorImpl().setWorkflow(workflow).validate();

Assertions.assertTrue(validationErrors.isEmpty());
}
}
Loading