move stuff around, added tests

Signed-off-by: Neil South <neil.south@answerdigital.com>

Author: neildsouth

src/TaskManager/API/PlugInAttribute.cs renamed to src/Shared/Shared/PlugInAttribute.cs

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Monai.Deploy.WorkflowManager.TaskManager.API
+namespace Monai.Deploy.WorkflowManager.Shared
 {
     [AttributeUsage(AttributeTargets.Assembly)]
     public class PlugInAttribute : Attribute

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

@@ -25,6 +25,7 @@
 using Monai.Deploy.Messaging.Events;
 using Monai.Deploy.TaskManager.API;
 using Monai.Deploy.WorkflowManager.Configuration;
+using Monai.Deploy.WorkflowManager.Shared;
 using Monai.Deploy.WorkflowManager.TaskManager.API;
 using Monai.Deploy.WorkflowManager.TaskManager.API.Extensions;
 using Monai.Deploy.WorkflowManager.TaskManager.API.Models;
@@ -945,7 +946,6 @@ public override async Task HandleTimeout(string identity)
 
         public async Task<WorkflowTemplate> CreateArgoTemplate(string template)
         {
-            template = "{\"namespace\":\"argo\",\"template\":{\"metadata\":{},\"spec\":{}}}";
             try
             {
                 WorkflowTemplateCreateRequest? templateCreateRequest = null;
@@ -960,8 +960,7 @@ public async Task<WorkflowTemplate> CreateArgoTemplate(string template)
                     var mess = ex.Message;
                     throw new InvalidOperationException(mess);
                 }
-                if (templateCreateRequest is null)
-                { throw new ArgumentNullException(); }
+
                 return await client.Argo_CreateWorkflowTemplateAsync(_namespace, templateCreateRequest, new CancellationToken()).ConfigureAwait(false);
             }
             catch (Exception ex)

src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj

@@ -42,6 +42,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Shared\Configuration\Monai.Deploy.WorkflowManager.Configuration.csproj" />
+    <ProjectReference Include="..\..\..\Shared\Shared\Monai.Deploy.WorkflowManager.Shared.csproj" />
     <ProjectReference Include="..\..\API\Monai.Deploy.WorkflowManager.TaskManager.API.csproj" />
   </ItemGroup>
 

src/TaskManager/Plug-ins/Argo/packages.lock.json

@@ -1177,6 +1177,13 @@
           "Monai.Deploy.Storage": "[0.2.15, )"
         }
       },
+      "monai.deploy.workflowmanager.shared": {
+        "type": "Project",
+        "dependencies": {
+          "Ardalis.GuardClauses": "[4.0.1, )",
+          "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )"
+        }
+      },
       "monai.deploy.workflowmanager.taskmanager.api": {
         "type": "Project",
         "dependencies": {

src/TaskManager/TaskManager/packages.lock.json

@@ -1919,6 +1919,7 @@
           "KubernetesClient": "[10.1.4, )",
           "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )",
           "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
+          "Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )",
           "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )"
         }
       },

tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs

@@ -785,6 +785,42 @@ public async Task ArgoPlugin_Ensures_podGC_is_removed()
         Assert.Equal(TaskExecutionStatus.Accepted, result.Status);
         Assert.Null(_submittedArgoTemplate?.Spec.PodGC);
     }
+    [Fact]
+    public async Task ArgoPlugin_CreateArgoTemplate_Invalid_json_Throws_JsonSerializationException()
+    {
+        var template = "\"name\":\"fred\"";
+
+        var runner = new ArgoPlugin(_serviceScopeFactory.Object, _logger.Object, _options, new Messaging.Events.TaskDispatchEvent());
+
+        await Assert.ThrowsAsync<JsonSerializationException>(async () => await runner.CreateArgoTemplate(template).ConfigureAwait(false));
+    }
+
+    [Fact]
+    public async Task ArgoPlugin_CreateArgoTemplate_Invalid_Object_Throws()
+    {
+        var template = "@";
+
+        var runner = new ArgoPlugin(_serviceScopeFactory.Object, _logger.Object, _options, new Messaging.Events.TaskDispatchEvent());
+
+        await Assert.ThrowsAsync<InvalidOperationException>(async () => await runner.CreateArgoTemplate(template).ConfigureAwait(false));
+    }
+
+    [Fact]
+    public async Task ArgoPlugin_CreateArgoTemplate_Valid_json_Calls_Client()
+    {
+        _argoClient.Setup(a =>
+        a.Argo_CreateWorkflowTemplateAsync(It.IsAny<string>(), It.IsAny<WorkflowTemplateCreateRequest>(), It.IsAny<CancellationToken>()))
+            .Returns(Task.FromResult(new WorkflowTemplate()));
+
+        var template = "{\"name\":\"fred\"}";
+
+        var runner = new ArgoPlugin(_serviceScopeFactory.Object, _logger.Object, _options, new Messaging.Events.TaskDispatchEvent());
+        await runner.CreateArgoTemplate(template).ConfigureAwait(false);
+
+        _argoClient.Verify(a =>
+            a.Argo_CreateWorkflowTemplateAsync(It.IsAny<string>(), It.IsAny<WorkflowTemplateCreateRequest>(), It.IsAny<CancellationToken>()),
+            Times.Once);
+    }
 
     private void SetUpSimpleArgoWorkFlow(WorkflowTemplate argoTemplate)
     {