Skip to content

fix workflow validation #422

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
Sep 16, 2022
Merged

fix workflow validation #422

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
17 changes: 7 additions & 10 deletions src/WorkflowManager/PayloadListener/Extensions/WorkflowExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
*/

using Ardalis.GuardClauses;
using Monai.Deploy.WorkflowManager.Common.Extensions;
using Monai.Deploy.WorkflowManager.Contracts.Models;
using Newtonsoft.Json;

namespace Monai.Deploy.WorkflowManager.PayloadListener.Extensions
{
Expand All @@ -38,16 +36,15 @@ public static bool IsValid(this Workflow workflow, out IList<string> validationE

var valid = true;

valid &= IsNameValid(workflow.GetType().Name, workflow.Name, validationErrors);
valid &= IsDescriptionValid(workflow.Name, workflow.Description, validationErrors);
valid &= IsInformaticsGatewayValid(workflow.Name, workflow.InformaticsGateway, validationErrors);
var workflowName = string.IsNullOrWhiteSpace(workflow.Name) ? "Unnamed workflow" : workflow.Name;

Guard.Against.Null(workflow.Tasks, nameof(workflow.Tasks));
valid &= workflow.Tasks.Length > 0;
valid &= IsNameValid(workflowName, workflow.Name, validationErrors);
valid &= IsDescriptionValid(workflowName, workflow.Description, validationErrors);
valid &= IsInformaticsGatewayValid(workflowName, workflow.InformaticsGateway, validationErrors);

foreach (var task in workflow.Tasks)
foreach (var task in workflow?.Tasks)
{
valid &= IsTaskObjectValid(workflow.Name, task, validationErrors);
valid &= IsTaskObjectValid(workflowName, task, validationErrors);
}

return valid;
Expand All @@ -57,7 +54,7 @@ public static bool IsNameValid(string source, string name, IList<string> validat
{
Guard.Against.NullOrWhiteSpace(source, nameof(source));

if (!string.IsNullOrWhiteSpace(name) && name.Length <= WorkflowNameLimit) return true;
if (name is not null && name.Length <= WorkflowNameLimit) return true;

validationErrors?.Add($"'{name}' is not a valid Workflow Name (source: {source}).");

Expand Down