Skip to content

Commit

Permalink
Code cleanup & make PlugsRequiresPermanentAccoutns readonly
Browse files Browse the repository at this point in the history 
Victor Chang <vicchang@nvidia.com>
  • Loading branch information
@mocsharp
mocsharp committed Sep 12, 2022
1 parent b4da544 commit df8367f
Show file tree
Hide file tree
Showing 25 changed files with 468 additions and 390 deletions.
9 changes: 5 additions & 4 deletions src/Shared/Configuration/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
9 changes: 5 additions & 4 deletions src/TaskManager/API/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
13 changes: 7 additions & 6 deletions src/TaskManager/Database/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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, )"
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
13 changes: 7 additions & 6 deletions src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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, )"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 0 additions & 2 deletions src/TaskManager/Plug-ins/Argo/ArgoProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/TaskManager/Plug-ins/Argo/KubernetesProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
31 changes: 16 additions & 15 deletions src/TaskManager/Plug-ins/Argo/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,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": {
Expand Down Expand Up @@ -552,22 +553,22 @@
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
"Karambolo.Extensions.Logging.File": "3.3.1",
"Microsoft.Extensions.Configuration": "6.0.1",
"Microsoft.Extensions.Logging": "6.0.0",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.Messaging": "0.1.3-rc0012",
"Monai.Deploy.Storage": "0.2.5",
"Newtonsoft.Json": "13.0.1",
"System.IO.Abstractions": "17.1.1"
"Karambolo.Extensions.Logging.File": "[3.3.1, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )",
"Microsoft.Extensions.Logging": "[6.0.0, )",
"Microsoft.Extensions.Options": "[6.0.0, )",
"Monai.Deploy.Messaging": "[0.1.6-rc0001, )",
"Monai.Deploy.Storage": "[0.2.5, )",
"Newtonsoft.Json": "[13.0.1, )",
"System.IO.Abstractions": "[17.1.1, )"
}
},
"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, )"
}
}
}
Expand Down
Loading

0 comments on commit df8367f

Please sign in to comment.