Added Docker Plugin in Task Manager. (#398)

* Added Docker Plugin in Task Manager. Signed-off-by: pnahar <pnahar@nvidia.com> Signed-off-by: Victor Chang <vicchang@nvidia.com>
Project-MONAI · Sep 12, 2022 · 4d9558a · 4d9558a
1 parent 01ae5e7
commit 4d9558a
Show file tree

Hide file tree

Showing 66 changed files with 7,205 additions and 441 deletions.
diff --git a/TaskManager.Dockerfile b/TaskManager.Dockerfile
@@ -39,7 +39,6 @@ RUN apt-get clean \
  && apt-get install -y --no-install-recommends \
     libssl1.1 \
     openssl \
-    sqlite3 \
    && rm -rf /var/lib/apt/lists
 
 WORKDIR /opt/monai/wm

diff --git a/WorkflowManager.Dockerfile b/WorkflowManager.Dockerfile
@@ -39,7 +39,6 @@ RUN apt-get clean \
  && apt-get install -y --no-install-recommends \
     libssl1.1 \
     openssl \
-    sqlite3 \
    && rm -rf /var/lib/apt/lists
 
 WORKDIR /opt/monai/wm

diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml
@@ -1395,38 +1395,62 @@
     :versions: []
     :when: 2022-08-16 14:46:00.000000000 +01:00
 - - :approve
-  -  Microsoft.AspNetCore.Routing
+  - Microsoft.AspNetCore.Routing
   - :who: Jack Schofield (JackSchofield23)
     :why: Apache 2.0 - https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt
     :versions: []
     :when: 2022-08-16 14:46:00.000000000 +01:00
 - - :approve
-  -  Microsoft.AspNetCore.Routing.Abstractions
+  - Microsoft.AspNetCore.Routing.Abstractions
   - :who: Jack Schofield (JackSchofield23)
     :why: Apache 2.0 - https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt
     :versions: []
     :when: 2022-08-16 14:46:00.000000000 +01:00
 - - :approve
-  -  Microsoft.Net.Http.Headers
+  - Microsoft.Net.Http.Headers
   - :who: Jack Schofield (JackSchofield23)
     :why: Apache 2.0 - https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt
     :versions: []
     :when: 2022-08-16 14:46:00.000000000 +01:00
 - - :approve
-  -  Microsoft.DotNet.PlatformAbstractions
+  - Microsoft.DotNet.PlatformAbstractions
   - :who: Jack Schofield (JackSchofield23)
     :why: Apache 2.0 - https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt
     :versions: []
     :when: 2022-08-16 14:46:00.000000000 +01:00
 - - :approve
-  -  Microsoft.Extensions.ObjectPool
+  - Microsoft.Extensions.ObjectPool
   - :who: Jack Schofield (JackSchofield23)
     :why: Apache 2.0 - https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt
     :versions: []
     :when: 2022-08-16 14:46:00.000000000 +01:00
 - - :approve
-  -  Microsoft.AspNetCore.WebUtilities
+  - Microsoft.AspNetCore.WebUtilities
   - :who: Jack Schofield (JackSchofield23)
     :why: Apache 2.0 - https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt
     :versions: []
     :when: 2022-08-16 14:46:00.000000000 +01:00
+- - :approve
+  - Docker.DotNet
+  - :who: Victor Chang (mocsharp)
+    :why: MIT - https://github.com/dotnet/Docker.DotNet/blob/master/LICENSE
+    :versions: []
+    :when: 2022-09-12 16:27:00.000000000 +01:00
+- - :approve
+  - AspNetCore.HealthChecks.MongoDb
+  - :who: Victor Chang (mocsharp)
+    :why: Apache 2.0 - https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/blob/master/LICENSE
+    :versions: []
+    :when: 2022-09-12 15:39:28.416111911 Z
+- - :approve
+  - AspNetCore.HealthChecks.Rabbitmq
+  - :who: Victor Chang (mocsharp)
+    :why: Apache 2.0 - https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/blob/master/LICENSE
+    :versions: []
+    :when: 2022-09-12 15:39:46.593579624 Z
+- - :approve
+  - Microsoft.AspNetCore.Diagnostics.HealthChecks
+  - :who: Victor Chang (mocsharp)
+    :why: Apache 2.0 - https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt
+    :versions: []
+    :when: 2022-09-12 15:40:42.030017822 Z
diff --git a/src/Monai.Deploy.WorkflowManager.sln b/src/Monai.Deploy.WorkflowManager.sln
@@ -76,6 +76,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManage
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.Authentication", "WorkflowManager\Authentication\Monai.Deploy.WorkflowManager.Authentication.csproj", "{7D64A0B1-6FDD-4393-9101-2321EE4C2270}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.TaskManager.Docker", "TaskManager\Plug-ins\Docker\Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj", "{47C31FB9-C862-4770-83B6-E2DDF260CC67}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests", "..\tests\UnitTests\TaskManager.Docker.Tests\Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests.csproj", "{BF6569A1-1A5A-4358-9C02-1A6A5F0FBFD9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -210,6 +214,14 @@ Global
 		{7D64A0B1-6FDD-4393-9101-2321EE4C2270}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7D64A0B1-6FDD-4393-9101-2321EE4C2270}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D64A0B1-6FDD-4393-9101-2321EE4C2270}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47C31FB9-C862-4770-83B6-E2DDF260CC67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47C31FB9-C862-4770-83B6-E2DDF260CC67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47C31FB9-C862-4770-83B6-E2DDF260CC67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47C31FB9-C862-4770-83B6-E2DDF260CC67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF6569A1-1A5A-4358-9C02-1A6A5F0FBFD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF6569A1-1A5A-4358-9C02-1A6A5F0FBFD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF6569A1-1A5A-4358-9C02-1A6A5F0FBFD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF6569A1-1A5A-4358-9C02-1A6A5F0FBFD9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -248,6 +260,8 @@ Global
 		{93F4FE97-120C-44DC-9B21-69FB7EAB5846} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5}
 		{EFECF826-B036-4689-B223-D791CD2C0F10} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7}
 		{7D64A0B1-6FDD-4393-9101-2321EE4C2270} = {AC5B198A-C3F2-4AD2-B532-E71B4630BDD5}
+		{47C31FB9-C862-4770-83B6-E2DDF260CC67} = {541C5347-5D7D-44B7-95D3-B6FB3D9EB955}
+		{BF6569A1-1A5A-4358-9C02-1A6A5F0FBFD9} = {71DDEE7B-E213-4E39-A7F4-4646783A27F7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC0D56C8-D8CB-45CE-B528-F3DCF86D63ED}

diff --git a/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj
@@ -28,7 +28,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0012" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.6-rc0001" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Karambolo.Extensions.Logging.File" Version="3.3.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@@ -42,8 +42,8 @@
     <None Remove="Test\**" />
   </ItemGroup>
 
-  <ItemGroup>
-    <AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/src/Shared/Configuration/packages.lock.json b/src/Shared/Configuration/packages.lock.json
@@ -49,17 +49,18 @@
       },
       "Monai.Deploy.Messaging": {
         "type": "Direct",
-        "requested": "[0.1.3-rc0012, )",
-        "resolved": "0.1.3-rc0012",
-        "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==",
+        "requested": "[0.1.6-rc0001, )",
+        "resolved": "0.1.6-rc0001",
+        "contentHash": "hQMo8/7sWrn14KnTodUN8UkuPVnCDOScgMvfG3jErx6Tm6Bpyp6h4PXwL56Q2U0Og2pVG7X7aX2N0XpY+HWQMA==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.0.1",
           "Microsoft.Extensions.Configuration": "6.0.1",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8",
           "Microsoft.Extensions.Logging": "6.0.0",
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.4.0",
           "System.ComponentModel.Annotations": "5.0.0",
-          "System.IO.Abstractions": "17.0.18"
+          "System.IO.Abstractions": "17.1.1"
         }
       },
       "Monai.Deploy.Storage": {

diff --git a/src/TaskManager/API/Extensions/TypeExtensions.cs b/src/TaskManager/API/Extensions/TypeExtensions.cs
@@ -56,7 +56,7 @@ public static Type GetType(this Type interfaceType, string typeString)
 
                           if (assembly is null)
                           {
-                              assembly = Assembly.Load($"{AppDomain.CurrentDomain.BaseDirectory}{name.FullName}.dll");
+                              assembly = Assembly.LoadFile($"{AppDomain.CurrentDomain.BaseDirectory}{name.FullName}.dll");
                           }
 
                           return assembly;

diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj
@@ -28,12 +28,12 @@
     <CodeAnalysisRuleSet>..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0012" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.6-rc0001" />
     <PackageReference Include="Monai.Deploy.Storage" Version="0.2.5" />
     <PackageReference Include="MongoDB.Bson" Version="2.17.1" />
   </ItemGroup>

diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json
@@ -4,17 +4,18 @@
     "net6.0": {
       "Monai.Deploy.Messaging": {
         "type": "Direct",
-        "requested": "[0.1.3-rc0012, )",
-        "resolved": "0.1.3-rc0012",
-        "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==",
+        "requested": "[0.1.6-rc0001, )",
+        "resolved": "0.1.6-rc0001",
+        "contentHash": "hQMo8/7sWrn14KnTodUN8UkuPVnCDOScgMvfG3jErx6Tm6Bpyp6h4PXwL56Q2U0Og2pVG7X7aX2N0XpY+HWQMA==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.0.1",
           "Microsoft.Extensions.Configuration": "6.0.1",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8",
           "Microsoft.Extensions.Logging": "6.0.0",
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.4.0",
           "System.ComponentModel.Annotations": "5.0.0",
-          "System.IO.Abstractions": "17.0.18"
+          "System.IO.Abstractions": "17.1.1"
         }
       },
       "Monai.Deploy.Storage": {

diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json
@@ -174,16 +174,17 @@
       },
       "Monai.Deploy.Messaging": {
         "type": "Transitive",
-        "resolved": "0.1.3-rc0012",
-        "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==",
+        "resolved": "0.1.6-rc0001",
+        "contentHash": "hQMo8/7sWrn14KnTodUN8UkuPVnCDOScgMvfG3jErx6Tm6Bpyp6h4PXwL56Q2U0Og2pVG7X7aX2N0XpY+HWQMA==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.0.1",
           "Microsoft.Extensions.Configuration": "6.0.1",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8",
           "Microsoft.Extensions.Logging": "6.0.0",
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.4.0",
           "System.ComponentModel.Annotations": "5.0.0",
-          "System.IO.Abstractions": "17.0.18"
+          "System.IO.Abstractions": "17.1.1"
         }
       },
       "Monai.Deploy.Storage": {
@@ -300,9 +301,9 @@
       "monai.deploy.workflowmanager.taskmanager.api": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "0.1.3-rc0012",
-          "Monai.Deploy.Storage": "0.2.5",
-          "MongoDB.Bson": "2.17.1"
+          "Monai.Deploy.Messaging": "[0.1.6-rc0001, )",
+          "Monai.Deploy.Storage": "[0.2.5, )",
+          "MongoDB.Bson": "[2.17.1, )"
         }
       }
     }

diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs b/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs
@@ -199,13 +199,15 @@ protected override void Dispose(bool disposing)
         }
 
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+
         public async ValueTask DisposeAsync()
 #pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
         {
             Dispose(disposing: false);
             GC.SuppressFinalize(this);
         }
 
-        public override Task HandleTimeout(string identity) { return Task.CompletedTask; } // not implemented
+        public override Task HandleTimeout(string identity)
+        { return Task.CompletedTask; } // not implemented
     }
 }
diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json
@@ -129,16 +129,17 @@
       },
       "Monai.Deploy.Messaging": {
         "type": "Transitive",
-        "resolved": "0.1.3-rc0012",
-        "contentHash": "cTVT2sId7/mGKTwuUvBqnoOAN7CBZmSlZK3WMXdBlmsHs3vHi5wvjho0sUP7psl7hhivd/cSP5cfZ8x2Sry3Xg==",
+        "resolved": "0.1.6-rc0001",
+        "contentHash": "hQMo8/7sWrn14KnTodUN8UkuPVnCDOScgMvfG3jErx6Tm6Bpyp6h4PXwL56Q2U0Og2pVG7X7aX2N0XpY+HWQMA==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.0.1",
           "Microsoft.Extensions.Configuration": "6.0.1",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8",
           "Microsoft.Extensions.Logging": "6.0.0",
           "Newtonsoft.Json": "13.0.1",
           "RabbitMQ.Client": "6.4.0",
           "System.ComponentModel.Annotations": "5.0.0",
-          "System.IO.Abstractions": "17.0.18"
+          "System.IO.Abstractions": "17.1.1"
         }
       },
       "Monai.Deploy.Storage": {
@@ -222,9 +223,9 @@
       "monai.deploy.workflowmanager.taskmanager.api": {
         "type": "Project",
         "dependencies": {
-          "Monai.Deploy.Messaging": "0.1.3-rc0012",
-          "Monai.Deploy.Storage": "0.2.5",
-          "MongoDB.Bson": "2.17.1"
+          "Monai.Deploy.Messaging": "[0.1.6-rc0001, )",
+          "Monai.Deploy.Storage": "[0.2.5, )",
+          "MongoDB.Bson": "[2.17.1, )"
         }
       }
     }

diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs
@@ -19,15 +19,15 @@
 using Argo;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Monai.Deploy.Messaging.Configuration;
 using Monai.Deploy.Messaging.Events;
+using Monai.Deploy.WorkflowManager.Configuration;
 using Monai.Deploy.WorkflowManager.TaskManager.API;
+using Monai.Deploy.WorkflowManager.TaskManager.API.Extensions;
 using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging;
 using Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues;
-using Monai.Deploy.WorkflowManager.TaskManager.API.Extensions;
 using Newtonsoft.Json;
-using Microsoft.Extensions.Options;
-using Monai.Deploy.WorkflowManager.Configuration;
-using Monai.Deploy.Messaging.Configuration;
 
 namespace Monai.Deploy.WorkflowManager.TaskManager.Argo
 {

diff --git a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs
@@ -53,8 +53,6 @@ public IArgoClient CreateClient(string baseUrl, string? apiToken, bool allowInse
             }
             return new ArgoClient(httpClient) { BaseUrl = baseUrl };
         }
-
-
     }
 
 #pragma warning restore CA1054 // URI-like parameters should not be strings

diff --git a/src/TaskManager/Plug-ins/Argo/AssemblyInfo.cs b/src/TaskManager/Plug-ins/Argo/AssemblyInfo.cs
@@ -16,5 +16,4 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Monai.Deploy.WorkflowManager.TaskManager.Runner")]
 [assembly: InternalsVisibleTo("Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests")]
diff --git a/src/TaskManager/Plug-ins/Argo/KubernetesProvider.cs b/src/TaskManager/Plug-ins/Argo/KubernetesProvider.cs
@@ -31,10 +31,9 @@ public KubernetesProvider(ILogger<KubernetesProvider> logger)
 
         public IKubernetes CreateClient()
         {
-
             var configuration = KubernetesClientConfiguration.BuildDefaultConfig();
             _logger.CreatingKubernetesClient(configuration.Host, configuration.Namespace);
-            
+
             return new Kubernetes(configuration);
         }
     }

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
@@ -22,8 +22,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AdditionalFiles Include="..\..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -33,7 +33,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0012" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.6-rc0001" />
     <PackageReference Include="Monai.Deploy.Storage" Version="0.2.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>