Skip to content

Commit 54a17c4

Browse files
authored
Merge pull request #277 from Project-MONAI/nds-WorkflowValidationFix2
couple of small fixs, including validation on exportTasks->continditions
2 parents b85d976 + 2a4bd33 commit 54a17c4

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

deploy/helm/Gateway.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
replicaCount: 1
1515

1616
image:
17-
repository: 847264867502.dkr.ecr.eu-west-2.amazonaws.com/monai-deploy-informatics-gateway-dev
17+
repository: registry.gitlab.com/answerdigital/londonai/aide/workflow-manager-images/infomatics-gateway
1818
pullPolicy: IfNotPresent
19-
tag: latest
19+
tag: 2022-08-01
2020

2121
enviromentVariables:
2222
InformaticsGateway__messaging__publisherSettings__endpoint: "rabbitmq-monai"
23-
InformaticsGateway__messaging__publisherSettings__username: "admin"
24-
InformaticsGateway__messaging__publisherSettings__password: "admin"
23+
InformaticsGateway__messaging__publisherSettings__username: "monaideploy"
24+
InformaticsGateway__messaging__publisherSettings__password: "monaideploy"
2525
InformaticsGateway__messaging__subscriberSettings__endpoint: "rabbitmq-monai"
26-
InformaticsGateway__messaging__subscriberSettings__username: "admin"
27-
InformaticsGateway__messaging__subscriberSettings__password: "admin"
28-
InformaticsGateway__storage__settings__endpoint: "minio:9000"
29-
InformaticsGateway__storage__settings__accessKey: "minioadmin"
30-
InformaticsGateway__storage__settings__accessToken: "minioadmin"
26+
InformaticsGateway__messaging__subscriberSettings__username: "monaideploy"
27+
InformaticsGateway__messaging__subscriberSettings__password: "monaideploy"
28+
InformaticsGateway__storage__settings__endpoint: "minio.monai:9000"
29+
InformaticsGateway__storage__settings__accessKey: "rootminio"
30+
InformaticsGateway__storage__settings__accessToken: "rootminio"
3131

3232
service:
3333
type: ClusterIP

src/Contracts/Models/TaskDestination.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ namespace Monai.Deploy.WorkflowManager.Contracts.Models
2121
public class TaskDestination
2222
{
2323
[JsonProperty(PropertyName = "name")]
24+
#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
2425
public string Name { get; set; }
26+
#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
2527

2628
[JsonProperty(PropertyName = "conditions")]
27-
public string Conditions { get; set; }
29+
public string Conditions { get; set; } = "";
2830
}
2931
}

src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,13 +506,13 @@ private async Task ConfigureInputArtifactStoreForTemplates(ICollection<Template2
506506
{
507507
if (template.Dag is not null)
508508
{
509-
await ConfigureInputArtifactStore(template.Name, templates, template.Dag.Tasks.Where(p => p.Arguments is not null).SelectMany(p => p.Arguments.Artifacts), true, cancellationToken).ConfigureAwait(false);
509+
await ConfigureInputArtifactStore(template.Name, templates, template.Dag.Tasks.Where(p => p.Arguments is not null && p.Arguments.Artifacts is not null).SelectMany(p => p.Arguments.Artifacts), true, cancellationToken).ConfigureAwait(false);
510510
}
511511
else if (template.Steps is not null)
512512
{
513513
foreach (var step in template.Steps)
514514
{
515-
await ConfigureInputArtifactStore(template.Name, templates, step.Where(p => p.Arguments is not null).SelectMany(p => p.Arguments.Artifacts), true, cancellationToken).ConfigureAwait(false);
515+
await ConfigureInputArtifactStore(template.Name, templates, step.Where(p => p.Arguments is not null && p.Arguments.Artifacts is not null).SelectMany(p => p.Arguments.Artifacts), true, cancellationToken).ConfigureAwait(false);
516516
}
517517
}
518518
else if (template.Inputs is not null)

0 commit comments

Comments
 (0)