diff --git a/src/Configuration/MessageBrokerConfigurationKeys.cs b/src/Configuration/MessageBrokerConfigurationKeys.cs index c87059f8c..ccc9afebe 100644 --- a/src/Configuration/MessageBrokerConfigurationKeys.cs +++ b/src/Configuration/MessageBrokerConfigurationKeys.cs @@ -1,8 +1,6 @@ // SPDX-FileCopyrightText: © 2022 MONAI Consortium // SPDX-License-Identifier: Apache License 2.0 -using Newtonsoft.Json; - using Microsoft.Extensions.Configuration; namespace Monai.Deploy.WorkflowManager.Configuration diff --git a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj index f2a2891b5..54050a155 100644 --- a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj +++ b/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj @@ -15,7 +15,7 @@ SPDX-License-Identifier: Apache License 2.0 - + diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json index df686efb7..70ab503a1 100644 --- a/src/Configuration/packages.lock.json +++ b/src/Configuration/packages.lock.json @@ -24,9 +24,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.0-rc0035, )", - "resolved": "0.1.0-rc0035", - "contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==", + "requested": "[0.1.0-rc0036, )", + "resolved": "0.1.0-rc0036", + "contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", diff --git a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index e5524fda3..8e6e4f7d8 100644 --- a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj +++ b/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj @@ -18,7 +18,7 @@ SPDX-License-Identifier: Apache License 2.0 - + diff --git a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj b/src/Database/Monai.Deploy.WorkflowManager.Database.csproj index b23016f8e..c95ddae26 100644 --- a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj +++ b/src/Database/Monai.Deploy.WorkflowManager.Database.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Database/packages.lock.json b/src/Database/packages.lock.json index 9de79db9c..e216297bd 100644 --- a/src/Database/packages.lock.json +++ b/src/Database/packages.lock.json @@ -29,9 +29,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.0-rc0035, )", - "resolved": "0.1.0-rc0035", - "contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==", + "requested": "[0.1.0-rc0036, )", + "resolved": "0.1.0-rc0036", + "contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -240,7 +240,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.141", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } diff --git a/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj b/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj index 518b9a5b0..0d60d833e 100644 --- a/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj +++ b/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj @@ -14,7 +14,7 @@ SPDX-License-Identifier: Apache License 2.0 - + diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj index 452fc7202..cd5dce2ab 100644 --- a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj +++ b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj @@ -23,7 +23,7 @@ SPDX-License-Identifier: Apache License 2.0 - + diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json index e66f4236c..c14d3c86d 100644 --- a/src/TaskManager/API/packages.lock.json +++ b/src/TaskManager/API/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.0-rc0035, )", - "resolved": "0.1.0-rc0035", - "contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==", + "requested": "[0.1.0-rc0036, )", + "resolved": "0.1.0-rc0036", + "contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -245,4 +245,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index d6ed56c2e..4748f0f08 100644 --- a/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -38,7 +38,7 @@ SPDX-License-Identifier: Apache License 2.0 - + diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index 1bbc8f27c..83db7f395 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -365,7 +365,6 @@ private async Task ConfigureInputArtifactStore(string templateName, ICollection< continue; } - var storageInfo = Event.Inputs.FirstOrDefault(p => p.Name.Equals(artifact.Name, StringComparison.Ordinal)); if (storageInfo is null) { @@ -401,7 +400,6 @@ private bool IsInputConfiguredInStepOrDag(ICollection templates, stri } } - return artifacts.Any(p => p.Name.Equals(referencedArtifactName, StringComparison.Ordinal)); } diff --git a/src/TaskManager/Plug-ins/Argo/ArtifactMappingNotFoundException.cs b/src/TaskManager/Plug-ins/Argo/ArtifactMappingNotFoundException.cs index 215d6161e..10d1542bd 100644 --- a/src/TaskManager/Plug-ins/Argo/ArtifactMappingNotFoundException.cs +++ b/src/TaskManager/Plug-ins/Argo/ArtifactMappingNotFoundException.cs @@ -6,7 +6,7 @@ namespace Monai.Deploy.WorkflowManager.TaskManager.Argo { [Serializable] - internal class ArtifactMappingNotFoundException : Exception + public class ArtifactMappingNotFoundException : Exception { public ArtifactMappingNotFoundException() { @@ -24,4 +24,4 @@ protected ArtifactMappingNotFoundException(SerializationInfo info, StreamingCont { } } -} \ No newline at end of file +} diff --git a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj index 6c6f67d62..308b47a3e 100644 --- a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj +++ b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj @@ -22,7 +22,7 @@ SPDX-License-Identifier: Apache License 2.0 all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/TaskManager/Plug-ins/Argo/Specs/ArgoWorkflowsAPI.json b/src/TaskManager/Plug-ins/Argo/Specs/ArgoWorkflowsAPI.json index 79566a003..3c95e5654 100644 --- a/src/TaskManager/Plug-ins/Argo/Specs/ArgoWorkflowsAPI.json +++ b/src/TaskManager/Plug-ins/Argo/Specs/ArgoWorkflowsAPI.json @@ -9357,7 +9357,7 @@ ], "properties": { "duration": { - "description": "Duration is the time between each retry, examples values are \"300ms\", \"1s\" or \"5m\". Valid time units are \"ns\", \"us\" (or \"�s\"), \"ms\", \"s\", \"m\", \"h\".", + "description": "Duration is the time between each retry, examples values are \"300ms\", \"1s\" or \"5m\". Valid time units are \"ns\", \"us\" (or \"�s\"), \"ms\", \"s\", \"m\", \"h\".", "type": "string" }, "retries": { diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 1026e96d3..39fef6fb9 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -34,9 +34,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.0-rc0035, )", - "resolved": "0.1.0-rc0035", - "contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==", + "requested": "[0.1.0-rc0036, )", + "resolved": "0.1.0-rc0036", + "contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -601,7 +601,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.141", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -612,7 +612,7 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -628,10 +628,10 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.Storage": "0.1.0-rc0019" } } } } -} \ No newline at end of file +} diff --git a/src/TaskManager/Runner/appsettings.json b/src/TaskManager/Runner/appsettings.json index 801b8df20..38cef65ac 100644 --- a/src/TaskManager/Runner/appsettings.json +++ b/src/TaskManager/Runner/appsettings.json @@ -67,4 +67,4 @@ } }, "AllowedHosts": "*" -} \ No newline at end of file +} diff --git a/src/TaskManager/packages.lock.json b/src/TaskManager/packages.lock.json index 1edbd35a4..17077ed77 100644 --- a/src/TaskManager/packages.lock.json +++ b/src/TaskManager/packages.lock.json @@ -60,9 +60,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.0-rc0035, )", - "resolved": "0.1.0-rc0035", - "contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==", + "requested": "[0.1.0-rc0036, )", + "resolved": "0.1.0-rc0036", + "contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -562,7 +562,7 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.Storage": "0.1.0-rc0019", "Newtonsoft.Json": "13.0.1", "System.IO.Abstractions": "16.1.25" @@ -573,7 +573,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.141", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -584,7 +584,7 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -600,10 +600,10 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.Storage": "0.1.0-rc0019" } } } } -} \ No newline at end of file +} diff --git a/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj b/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj index 01f88febe..769d367fa 100644 --- a/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj +++ b/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 5ffd45e16..883e9f057 100644 --- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -34,7 +34,7 @@ SPDX-License-Identifier: Apache License 2.0 - + all diff --git a/src/WorkflowManager/packages.lock.json b/src/WorkflowManager/packages.lock.json index 4cc5548bf..d9c2716f8 100644 --- a/src/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/packages.lock.json @@ -138,9 +138,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.0-rc0035, )", - "resolved": "0.1.0-rc0035", - "contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==", + "requested": "[0.1.0-rc0036, )", + "resolved": "0.1.0-rc0036", + "contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -721,7 +721,7 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.Storage": "0.1.0-rc0019", "Newtonsoft.Json": "13.0.1", "System.IO.Abstractions": "16.1.25" @@ -732,7 +732,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.141", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -743,7 +743,7 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -761,7 +761,7 @@ "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.Storage": "0.1.0-rc0019", "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", @@ -775,7 +775,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.141", "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.Storage": "0.1.0-rc0019", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", diff --git a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj index c5bfcad60..5a4e186d1 100644 --- a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj +++ b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj @@ -18,7 +18,7 @@ SPDX-License-Identifier: Apache License 2.0 runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj index 900a2085d..fb692bef8 100644 --- a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj +++ b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj @@ -18,7 +18,7 @@ SPDX-License-Identifier: Apache License 2.0 - + diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs index 840202e57..5058bab13 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs @@ -81,7 +81,7 @@ public void ArgoPlugin_ThrowsWhenMissingPluginArguments() message.TaskPluginArguments.Add(key, Guid.NewGuid().ToString()); Assert.Throws(() => new ArgoPlugin(_serviceScopeFactory.Object, _logger.Object, message)); } - message.TaskPluginArguments[Keys.RequiredParameters.Last()] = Guid.NewGuid().ToString(); + message.TaskPluginArguments[Keys.RequiredParameters[Keys.RequiredParameters.Count - 1]] = Guid.NewGuid().ToString(); Assert.Throws(() => new ArgoPlugin(_serviceScopeFactory.Object, _logger.Object, message)); message.TaskPluginArguments[Keys.BaseUrl] = "/api"; @@ -343,7 +343,7 @@ public async Task ArgoPlugin_ExecuteTask_WorkflowTemplates(string filename, int Assert.True(false); } - private void ValidateDagWithIntermediateArtifacts(TaskDispatchEvent message, Workflow workflow) + private static void ValidateDagWithIntermediateArtifacts(TaskDispatchEvent message, Workflow workflow) { var template = workflow.Spec.Templates.FirstOrDefault(p => p.Name.Equals("my-entrypoint", StringComparison.Ordinal)); Assert.NotNull(template!); @@ -367,11 +367,9 @@ private void ValidateDagWithIntermediateArtifacts(TaskDispatchEvent message, Wor Assert.Null(template!.Inputs.Artifacts.ElementAt(0).S3); Assert.Null(template.Inputs.Artifacts.ElementAt(1).S3); Assert.Equal(message.Outputs.First(p => p.Name.Equals("output")).RelativeRootPath, template.Outputs.Artifacts.First().S3.Key); - } - - private void ValidateSimpleTemplate(TaskDispatchEvent message, Workflow workflow) + private static void ValidateSimpleTemplate(TaskDispatchEvent message, Workflow workflow) { var template = workflow.Spec.Templates.FirstOrDefault(p => p.Name.Equals("my-entrypoint", StringComparison.Ordinal)); @@ -511,19 +509,19 @@ private static TaskDispatchEvent GenerateTaskDispatchEvent() ExecutionId = Guid.NewGuid().ToString(), TaskPluginType = Guid.NewGuid().ToString(), WorkflowInstanceId = Guid.NewGuid().ToString(), - TaskId = Guid.NewGuid().ToString() - }; - message.IntermediateStorage = new Messaging.Common.Storage - { - Name = Guid.NewGuid().ToString(), - Endpoint = Guid.NewGuid().ToString(), - Credentials = new Messaging.Common.Credentials + TaskId = Guid.NewGuid().ToString(), + IntermediateStorage = new Messaging.Common.Storage { - AccessKey = Guid.NewGuid().ToString(), - AccessToken = Guid.NewGuid().ToString() - }, - Bucket = Guid.NewGuid().ToString(), - RelativeRootPath = Guid.NewGuid().ToString(), + Name = Guid.NewGuid().ToString(), + Endpoint = Guid.NewGuid().ToString(), + Credentials = new Messaging.Common.Credentials + { + AccessKey = Guid.NewGuid().ToString(), + AccessToken = Guid.NewGuid().ToString() + }, + Bucket = Guid.NewGuid().ToString(), + RelativeRootPath = Guid.NewGuid().ToString(), + } }; message.Inputs.Add(new Messaging.Common.Storage { @@ -564,7 +562,7 @@ private static TaskDispatchEvent GenerateTaskDispatchEvent() return message; } - private WorkflowTemplate GenerateWorkflowTemplate(TaskDispatchEvent taskDispatchEvent) => new() + private static WorkflowTemplate GenerateWorkflowTemplate(TaskDispatchEvent taskDispatchEvent) => new() { Kind = "WorkflowTemplate", Metadata = new ObjectMeta() @@ -682,7 +680,6 @@ private static TaskDispatchEvent GenerateTaskDispatchEvent() new Artifact { Name = taskDispatchEvent.Inputs.First().Name, - } }, } @@ -737,8 +734,7 @@ private static TaskDispatchEvent GenerateTaskDispatchEvent() } }; - - private WorkflowTemplate? LoadArgoTemplate(string filename) + private static WorkflowTemplate? LoadArgoTemplate(string filename) { var templateString = File.ReadAllText($"Templates/{filename}"); diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index c3d08f692..a52d2781b 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -592,8 +592,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.0-rc0035", - "contentHash": "roJZo09Wiq8QnwzKsU6CfIYe0OB7u4wrBoHulfui6rfdj2/+pXFqIRm/paTfkXUq37ENVP0pivffHqrqL/XO8Q==", + "resolved": "0.1.0-rc0036", + "contentHash": "ONfPbkd0bsJGJHOPVn7U5z0FDNirYuvMswLauN8rxHNSat0GbhFDnObrY8iIuCFY02zfPfpoL9mywkksVwsUAA==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", @@ -1376,7 +1376,7 @@ "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Logging.Console": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", @@ -1401,7 +1401,7 @@ "dependencies": { "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.Storage": "0.1.0-rc0019", "Newtonsoft.Json": "13.0.1", "System.IO.Abstractions": "16.1.25" @@ -1412,7 +1412,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.141", "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "MongoDB.Bson": "2.15.0", "Newtonsoft.Json": "13.0.1" } @@ -1423,7 +1423,7 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", "MongoDB.Bson": "2.15.0", @@ -1441,7 +1441,7 @@ "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.Storage": "0.1.0-rc0019", "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", @@ -1455,7 +1455,7 @@ "dependencies": { "AWSSDK.SecurityToken": "3.7.1.141", "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Messaging": "0.1.0-rc0035", + "Monai.Deploy.Messaging": "0.1.0-rc0036", "Monai.Deploy.Storage": "0.1.0-rc0019", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0",