From a6d39d98cb0da2fcd8f179ca4ec59a6c3913acc4 Mon Sep 17 00:00:00 2001 From: Jack Schofield Date: Wed, 3 Aug 2022 10:59:16 +0100 Subject: [PATCH 1/2] remove parameter parser Signed-off-by: Jack Schofield --- src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 6 +----- ...i.Deploy.WorkflowManager.TaskManager.Argo.csproj | 1 - src/TaskManager/Runner/Program.cs | 12 ------------ src/WorkflowManager/packages.lock.json | 1 - .../TaskManager.Argo.Tests/ArgoPluginTest.cs | 13 ------------- .../WorkflowManager.Tests/packages.lock.json | 1 - 6 files changed, 1 insertion(+), 33 deletions(-) diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index 2924b226e..02f4cab93 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -22,7 +22,6 @@ using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Common; using Monai.Deploy.WorkflowManager.Common.Extensions; -using Monai.Deploy.WorkflowManager.ConditionsResolver.Parser; using Monai.Deploy.WorkflowManager.TaskManager.API; using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging; using Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues; @@ -37,7 +36,6 @@ public sealed class ArgoPlugin : TaskPluginBase, IAsyncDisposable private readonly IServiceScope _scope; private readonly IKubernetesProvider _kubernetesProvider; private readonly IArgoProvider _argoProvider; - private readonly IConditionalParameterParser _conditionalParser; private readonly ILogger _logger; private int? _activeDeadlineSeconds; private string _namespace; @@ -59,7 +57,6 @@ public ArgoPlugin( _kubernetesProvider = _scope.ServiceProvider.GetRequiredService() ?? throw new ServiceNotFoundException(nameof(IKubernetesProvider)); _argoProvider = _scope.ServiceProvider.GetRequiredService() ?? throw new ServiceNotFoundException(nameof(IArgoProvider)); - _conditionalParser = _scope.ServiceProvider.GetRequiredService() ?? throw new ServiceNotFoundException(nameof(IConditionalParameterParser)); _logger = logger; _namespace = Strings.DefaultNamespace; @@ -318,8 +315,7 @@ private void ProcessTaskPluginArguments(Workflow workflow) { foreach (var item in argoParameters) { - var value = _conditionalParser.ResolveParameters(item.Value, Event.WorkflowInstanceId); - workflow.Spec.Arguments.Parameters.Add(new Parameter() { Name = item.Key, Value = value }); + workflow.Spec.Arguments.Parameters.Add(new Parameter() { Name = item.Key, Value = item.Value }); } } 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 b3638c1d3..c33441c2f 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 @@ -40,7 +40,6 @@ - diff --git a/src/TaskManager/Runner/Program.cs b/src/TaskManager/Runner/Program.cs index 7f33755a1..8ec9949df 100644 --- a/src/TaskManager/Runner/Program.cs +++ b/src/TaskManager/Runner/Program.cs @@ -33,7 +33,6 @@ using Monai.Deploy.WorkflowManager.Common; using Monai.Deploy.WorkflowManager.Common.Interfaces; using Monai.Deploy.WorkflowManager.Common.Services; -using Monai.Deploy.WorkflowManager.ConditionsResolver.Parser; using Monai.Deploy.WorkflowManager.Configuration; using Monai.Deploy.WorkflowManager.Database.Interfaces; using Monai.Deploy.WorkflowManager.Database.Options; @@ -226,17 +225,6 @@ public static IHostBuilder CreateHostBuilder(string[] args) => }); services.AddHostedService(p => p.GetRequiredService()); - - services.AddSingleton(s => - { - var logger = s.GetRequiredService>(); - var payloadService = s.GetRequiredService(); - var workflowService = s.GetRequiredService(); - var dicomStore = s.GetRequiredService(); - var workflowInstanceService = s.GetRequiredService(); - - return new ConditionalParameterParser(logger, dicomStore, workflowInstanceService, payloadService, workflowService); - }); }); } } diff --git a/src/WorkflowManager/packages.lock.json b/src/WorkflowManager/packages.lock.json index e69b7199d..4faac74d6 100644 --- a/src/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/packages.lock.json @@ -1493,7 +1493,6 @@ "Monai.Deploy.Messaging": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.2.0-rc0014", "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", "Newtonsoft.Json": "13.0.1" } diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs index 21a272c14..66dd66412 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs @@ -31,7 +31,6 @@ using Monai.Deploy.Messaging.Configuration; using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Common.Interfaces; -using Monai.Deploy.WorkflowManager.ConditionsResolver.Parser; using Monai.Deploy.WorkflowManager.SharedTest; using Monai.Deploy.WorkflowManager.Storage.Services; using Monai.Deploy.WorkflowManager.TaskManager.API; @@ -53,7 +52,6 @@ public class ArgoPluginTest private readonly Mock _argoProvider; private readonly Mock _argoClient; private readonly Mock _kubernetesClient; - private readonly IConditionalParameterParser _conditionalParameterParser; private readonly IOptions _options; public ArgoPluginTest() @@ -70,14 +68,6 @@ public ArgoPluginTest() var workflowInstanceService = new Mock(); var workflowService = new Mock(); var payloadService = new Mock(); - var parserLogger = new Mock>(); - - _conditionalParameterParser = new ConditionalParameterParser( - parserLogger.Object, - dicomService.Object, - workflowInstanceService.Object, - payloadService.Object, - workflowService.Object); _options = Options.Create(new MessageBrokerServiceConfiguration()); _options.Value.PublisherSettings.Add("username", "username"); @@ -95,9 +85,6 @@ public ArgoPluginTest() serviceProvider .Setup(x => x.GetService(typeof(IArgoProvider))) .Returns(_argoProvider.Object); - serviceProvider - .Setup(x => x.GetService(typeof(IConditionalParameterParser))) - .Returns(_conditionalParameterParser); _serviceScope.Setup(x => x.ServiceProvider).Returns(serviceProvider.Object); diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 379beb446..72ef63431 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -1718,7 +1718,6 @@ "Monai.Deploy.Messaging": "0.1.3-rc0010", "Monai.Deploy.Storage": "0.2.0-rc0014", "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", "Newtonsoft.Json": "13.0.1" } From c03c6139715e03745f8d0acebca180819f0838c4 Mon Sep 17 00:00:00 2001 From: Jack Schofield Date: Wed, 3 Aug 2022 13:06:15 +0100 Subject: [PATCH 2/2] fix code smell Signed-off-by: Jack Schofield --- src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index 02f4cab93..c4c3c29c4 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -85,7 +85,7 @@ private void Initialize() if (Event.TaskPluginArguments.ContainsKey(Keys.AllowInsecureseUrl)) { - _allowInsecure = string.Compare("true", Event.TaskPluginArguments[Keys.AllowInsecureseUrl], true) == 0 ? true : false; + _allowInsecure = string.Compare("true", Event.TaskPluginArguments[Keys.AllowInsecureseUrl], true) == 0; } _baseUrl = Event.TaskPluginArguments[Keys.BaseUrl];