remove parameter parser (#282)

jackschofield23 · web-flow · commit 097e554d2c4e · 2022-08-03T13:53:18.000+01:00
* remove parameter parser

Signed-off-by: Jack Schofield &lt;jack.schofield@answerdigital.com&gt;
diff --git 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<ArgoPlugin> _logger;
         private int? _activeDeadlineSeconds;
         private string _namespace;
@@ -59,7 +57,6 @@ public ArgoPlugin(
 
             _kubernetesProvider = _scope.ServiceProvider.GetRequiredService<IKubernetesProvider>() ?? throw new ServiceNotFoundException(nameof(IKubernetesProvider));
             _argoProvider = _scope.ServiceProvider.GetRequiredService<IArgoProvider>() ?? throw new ServiceNotFoundException(nameof(IArgoProvider));
-            _conditionalParser = _scope.ServiceProvider.GetRequiredService<IConditionalParameterParser>() ?? throw new ServiceNotFoundException(nameof(IConditionalParameterParser));
 
             _logger = logger;
             _namespace = Strings.DefaultNamespace;
@@ -88,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];
@@ -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
@@ -40,7 +40,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\Monai.Deploy.WorkflowManager.Common.csproj" />
-    <ProjectReference Include="..\..\..\ConditionsResolver\Monai.Deploy.WorkflowManager.ConditionsResolver.csproj" />
     <ProjectReference Include="..\..\API\Monai.Deploy.WorkflowManager.TaskManager.API.csproj" />
   </ItemGroup>
 
diff --git 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<TaskManager>(p => p.GetRequiredService<TaskManager>());
-
-                    services.AddSingleton<IConditionalParameterParser, ConditionalParameterParser>(s =>
-                    {
-                        var logger = s.GetRequiredService<ILogger<ConditionalParameterParser>>();
-                        var payloadService = s.GetRequiredService<IPayloadService>();
-                        var workflowService = s.GetRequiredService<IWorkflowService>();
-                        var dicomStore = s.GetRequiredService<IDicomService>();
-                        var workflowInstanceService = s.GetRequiredService<IWorkflowInstanceService>();
-
-                        return new ConditionalParameterParser(logger, dicomStore, workflowInstanceService, payloadService, workflowService);
-                    });
                 });
     }
 }
diff --git 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
@@ -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<IArgoProvider> _argoProvider;
     private readonly Mock<IArgoClient> _argoClient;
     private readonly Mock<IKubernetes> _kubernetesClient;
-    private readonly IConditionalParameterParser _conditionalParameterParser;
     private readonly IOptions<MessageBrokerServiceConfiguration> _options;
 
     public ArgoPluginTest()
@@ -70,14 +68,6 @@ public ArgoPluginTest()
         var workflowInstanceService = new Mock<IWorkflowInstanceService>();
         var workflowService = new Mock<IWorkflowService>();
         var payloadService = new Mock<IPayloadService>();
-        var parserLogger = new Mock<ILogger<ConditionalParameterParser>>();
-
-        _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
@@ -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"
         }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`using Monai.Deploy.Messaging.Events;`
`23`	`23`	`using Monai.Deploy.WorkflowManager.Common;`
`24`	`24`	`using Monai.Deploy.WorkflowManager.Common.Extensions;`
`25`		`-using Monai.Deploy.WorkflowManager.ConditionsResolver.Parser;`
`26`	`25`	`using Monai.Deploy.WorkflowManager.TaskManager.API;`
`27`	`26`	`using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging;`
`28`	`27`	`using Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues;`
`@@ -37,7 +36,6 @@ public sealed class ArgoPlugin : TaskPluginBase, IAsyncDisposable`
`37`	`36`	`private readonly IServiceScope _scope;`
`38`	`37`	`private readonly IKubernetesProvider _kubernetesProvider;`
`39`	`38`	`private readonly IArgoProvider _argoProvider;`
`40`		`- private readonly IConditionalParameterParser _conditionalParser;`
`41`	`39`	`private readonly ILogger<ArgoPlugin> _logger;`
`42`	`40`	`private int? _activeDeadlineSeconds;`
`43`	`41`	`private string _namespace;`
`@@ -59,7 +57,6 @@ public ArgoPlugin(`
`59`	`57`
`60`	`58`	`_kubernetesProvider = _scope.ServiceProvider.GetRequiredService<IKubernetesProvider>() ?? throw new ServiceNotFoundException(nameof(IKubernetesProvider));`
`61`	`59`	`_argoProvider = _scope.ServiceProvider.GetRequiredService<IArgoProvider>() ?? throw new ServiceNotFoundException(nameof(IArgoProvider));`
`62`		`- _conditionalParser = _scope.ServiceProvider.GetRequiredService<IConditionalParameterParser>() ?? throw new ServiceNotFoundException(nameof(IConditionalParameterParser));`
`63`	`60`
`64`	`61`	`_logger = logger;`
`65`	`62`	`_namespace = Strings.DefaultNamespace;`
`@@ -88,7 +85,7 @@ private void Initialize()`
`88`	`85`
`89`	`86`	`if (Event.TaskPluginArguments.ContainsKey(Keys.AllowInsecureseUrl))`
`90`	`87`	`{`
`91`		`- _allowInsecure = string.Compare("true", Event.TaskPluginArguments[Keys.AllowInsecureseUrl], true) == 0 ? true : false;`
	`88`	`+ _allowInsecure = string.Compare("true", Event.TaskPluginArguments[Keys.AllowInsecureseUrl], true) == 0;`
`92`	`89`	`}`
`93`	`90`
`94`	`91`	`_baseUrl = Event.TaskPluginArguments[Keys.BaseUrl];`
`@@ -318,8 +315,7 @@ private void ProcessTaskPluginArguments(Workflow workflow)`
`318`	`315`	`{`
`319`	`316`	`foreach (var item in argoParameters)`
`320`	`317`	`{`
`321`		`- var value = _conditionalParser.ResolveParameters(item.Value, Event.WorkflowInstanceId);`
`322`		`- workflow.Spec.Arguments.Parameters.Add(new Parameter() { Name = item.Key, Value = value });`
	`318`	`+ workflow.Spec.Arguments.Parameters.Add(new Parameter() { Name = item.Key, Value = item.Value });`
`323`	`319`	`}`
`324`	`320`	`}`
`325`	`321`
Original file line number	Diff line number	Diff line change
`@@ -1493,7 +1493,6 @@`
`1493`	`1493`	`"Monai.Deploy.Messaging": "0.1.3-rc0010",`
`1494`	`1494`	`"Monai.Deploy.Storage": "0.2.0-rc0014",`
`1495`	`1495`	`"Monai.Deploy.WorkflowManager.Common": "1.0.0",`
`1496`		`- "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0",`
`1497`	`1496`	`"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0",`
`1498`	`1497`	`"Newtonsoft.Json": "13.0.1"`
`1499`	`1498`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1718,7 +1718,6 @@`
`1718`	`1718`	`"Monai.Deploy.Messaging": "0.1.3-rc0010",`
`1719`	`1719`	`"Monai.Deploy.Storage": "0.2.0-rc0014",`
`1720`	`1720`	`"Monai.Deploy.WorkflowManager.Common": "1.0.0",`
`1721`		`- "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0",`
`1722`	`1721`	`"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0",`
`1723`	`1722`	`"Newtonsoft.Json": "13.0.1"`
`1724`	`1723`	`}`