diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml
index 56ea892e4..3154b00f4 100755
--- a/doc/dependency_decisions.yml
+++ b/doc/dependency_decisions.yml
@@ -8,6 +8,7 @@
- 3.7.100.14
- 3.7.100.25
- 3.7.105.20
+ - 3.7.200.13
:when: 2022-10-14 23:36:39.233755632 Z
- - :approve
- AWSSDK.SecurityToken
@@ -18,6 +19,7 @@
- 3.7.100.14
- 3.7.100.25
- 3.7.101.26
+ - 3.7.201.9
:when: 2022-10-14 23:36:39.628260680 Z
- - :approve
- Ardalis.GuardClauses
@@ -25,6 +27,7 @@
:why: MIT (https://github.com/ardalis/GuardClauses.Analyzers/raw/master/LICENSE)
:versions:
- 4.0.1
+ - 4.1.1
:when: 2022-10-14 23:36:39.999308652 Z
- - :approve
- AutoFixture
@@ -399,6 +402,8 @@
:versions:
- 6.0.1
- 7.0.0
+ - 2.2.0
+ - 3.1.0
:when: 2022-10-14 23:37:00.596541774 Z
- - :approve
- Microsoft.Extensions.Configuration.Abstractions
@@ -414,6 +419,7 @@
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
:versions:
- 3.0.0
+ - 3.1.0
- 2.2.0
- 7.0.3
:when: 2022-10-14 23:37:01.366955631 Z
@@ -469,6 +475,7 @@
- :who: mocsharp
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
:versions:
+ - 3.1.0
- 6.0.0
- 6.0.1
- 2.2.0
@@ -506,6 +513,7 @@
- 6.0.12
- 6.0.14
- 6.0.15
+ - 6.0.21
:when: 2022-10-14 23:37:05.589288760 Z
- - :approve
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions
@@ -515,6 +523,7 @@
- 6.0.12
- 6.0.14
- 6.0.15
+ - 6.0.21
:when: 2022-10-14 23:37:05.963687838 Z
- - :approve
- Microsoft.Extensions.FileProviders.Abstractions
@@ -585,6 +594,8 @@
:versions:
- 6.0.0
- 7.0.0
+ - 2.2.0
+ - 3.1.0
:when: 2022-10-14 23:37:09.454044811 Z
- - :approve
- Microsoft.Extensions.Logging.Abstractions
@@ -593,6 +604,7 @@
:versions:
- 6.0.2
- 2.0.0
+ - 6.0.4
- 7.0.0
:when: 2022-10-14 23:37:09.821156462 Z
- - :approve
@@ -851,6 +863,7 @@
:versions:
- 4.0.6
- 4.0.7
+ - 5.0.0
:when: 2022-10-14 23:37:22.726827733 Z
- - :approve
- Moq
@@ -923,6 +936,7 @@
:why: BSD-3-Clause (https://github.com/App-vNext/Polly/raw/main/LICENSE.txt)
:versions:
- 7.2.3
+ - 7.2.4
:when: 2022-10-14 23:37:30.185774702 Z
- - :approve
- RabbitMQ.Client
@@ -930,6 +944,7 @@
:why: Apache-2.0 (https://github.com/rabbitmq/rabbitmq-dotnet-client/raw/main/LICENSE-APACHE2)
:versions:
- 6.4.0
+ - 6.5.0
:when: 2022-10-14 23:37:30.555988654 Z
- - :approve
- Serilog
@@ -1195,7 +1210,15 @@
:why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
:versions:
- 5.0.0
+ - 4.3.0
:when: 2022-10-14 23:37:45.155805918 Z
+- - :approve
+ - System.ComponentModel
+ - :who: nsouth
+ :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770)
+ :versions:
+ - 4.3.0
+ :when: 2023-8-18 08:53:45.155805918 Z
- - :approve
- System.Configuration.ConfigurationManager
- :who: mocsharp
@@ -1381,6 +1404,13 @@
:versions:
- 4.3.0
:when: 2022-10-14 23:37:55.295846123 Z
+- - :approve
+ - System.IO.Hashing
+ - :who: nsouth
+ :why: MIT
+ :versions:
+ - 7.0.0
+ :when: 2023-8-18 08:53:55.295846123 Z
- - :approve
- System.IdentityModel.Tokens.Jwt
- :who: mocsharp
@@ -1425,6 +1455,7 @@
:why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT)
:versions:
- 4.5.4
+ - 4.5.5
:when: 2022-10-14 23:37:58.271685148 Z
- - :approve
- System.Net.Http
@@ -1902,6 +1933,7 @@
:versions:
- 4.7.1
- 6.0.0
+ - 7.0.0
:when: 2022-10-14 23:38:26.916570960 Z
- - :approve
- System.Threading.Tasks
@@ -2336,6 +2368,7 @@
:versions:
- 0.1.21
- 0.1.23
+ - 0.1.25
:when: 2022-12-15 21:43:10.781625468 Z
- - :approve
- Monai.Deploy.Messaging.RabbitMQ
@@ -2344,6 +2377,7 @@
:versions:
- 0.1.21
- 0.1.23
+ - 0.1.25
:when: 2022-12-15 21:43:20.975488411 Z
- - :approve
- Monai.Deploy.Storage
@@ -2353,6 +2387,7 @@
- 0.2.10
- 0.2.13
- 0.2.15
+ - 0.2.18
:when: 2022-11-02 21:43:46.964761113 Z
- - :approve
- Monai.Deploy.Storage.MinIO
@@ -2362,6 +2397,7 @@
- 0.2.10
- 0.2.13
- 0.2.15
+ - 0.2.18
:when: 2022-11-02 21:43:57.620687413 Z
- - :approve
- Monai.Deploy.Storage.S3Policy
@@ -2371,6 +2407,7 @@
- 0.2.10
- 0.2.13
- 0.2.15
+ - 0.2.18
:when: 2022-11-02 21:44:06.994266372 Z
- - :approve
- MongoDB.Bson
@@ -2553,6 +2590,7 @@
:why: MIT (https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/License.md)
:versions:
- 7.1.2
+ - 8.1.0
:when: 2023-05-17 14:44:00.000000000 Z
- - :approve
- fo-dicom
@@ -2561,5 +2599,11 @@
:versions:
- 5.0.3
:when: 2023-05-17 14:44:00.000000000 Z
-
+- - :approve
+ - CommunityToolkit.HighPerformance
+ - :who: nsouth
+ :why: MIT
+ :versions:
+ - 8.1.0
+ :when: 2023-08-18 09:09:00.000000000 Z
diff --git a/guidelines/mwm-workflow-spec.md b/guidelines/mwm-workflow-spec.md
index c6cf37cf9..275d1e470 100644
--- a/guidelines/mwm-workflow-spec.md
+++ b/guidelines/mwm-workflow-spec.md
@@ -249,6 +249,7 @@ These tasks are borken down into different types:
| ---- | ------- |
| Router | A task to control the flow through a workflow |
| Export | A task to trigger the exporting of data |
+| External App | A task to trigger execution of an external app |
| `Plugin_Name` | A task which has a matching Plugin installed & enabled |
@@ -402,6 +403,11 @@ Example (output sent to another task if the patient is female, otherwise to PACS
Export destinations define an external location to which the output of the task can be sent. This will take the form of an event published to a pub/sub service notifying of an available export to a specific destination reference. Most commonly, the export location will be a PACs system and the notification will be picked up by the Monai Informatics Gateway.
+#### External App
+These are task types that allow for execution of external apps and in
+structure are identical to the Export type above.
+
+
#### Plugin
These are tasks are Named the same as the installed Pluging.
The task also requires these extra attributes:-
diff --git a/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj
index 59cff5a15..a1d8eb30a 100755
--- a/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj
+++ b/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj
@@ -31,8 +31,8 @@
-
-
+
+
diff --git a/src/Shared/Configuration/WorkflowManagerOptions.cs b/src/Shared/Configuration/WorkflowManagerOptions.cs
index 689d6cff0..9207f09c3 100755
--- a/src/Shared/Configuration/WorkflowManagerOptions.cs
+++ b/src/Shared/Configuration/WorkflowManagerOptions.cs
@@ -71,6 +71,9 @@ public class WorkflowManagerOptions : PagedOptions
[ConfigurationKeyName("dicomTagsDisallowed")]
public string DicomTagsDisallowed { get; set; } = string.Empty;
+ [ConfigurationKeyName("migExternalAppPlugins")]
+ public List MigExternalAppPlugins { get; set; }
+
public WorkflowManagerOptions()
{
Messaging = new MessageBrokerConfiguration();
diff --git a/src/Shared/Configuration/packages.lock.json b/src/Shared/Configuration/packages.lock.json
index 6bf7fe84f..a829c0d1e 100755
--- a/src/Shared/Configuration/packages.lock.json
+++ b/src/Shared/Configuration/packages.lock.json
@@ -4,67 +4,44 @@
"net6.0": {
"Monai.Deploy.Messaging": {
"type": "Direct",
- "requested": "[0.1.23, )",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "requested": "[0.1.25, )",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage": {
"type": "Direct",
- "requested": "[0.2.15, )",
- "resolved": "0.2.15",
- "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
+ "requested": "[0.2.18, )",
+ "resolved": "0.2.18",
+ "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
"dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Monai.Deploy.Storage.S3Policy": "0.2.15",
+ "AWSSDK.SecurityToken": "3.7.201.9",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18",
"System.IO.Abstractions": "17.2.3"
}
},
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"AWSSDK.Core": {
"type": "Transitive",
- "resolved": "3.7.105.20",
- "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
+ "resolved": "3.7.200.13",
+ "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
- "resolved": "3.7.101.26",
- "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
- "dependencies": {
- "AWSSDK.Core": "[3.7.105.20, 4.0.0)"
- }
- },
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
- "Microsoft.Extensions.Configuration": {
- "type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
+ "resolved": "3.7.201.9",
+ "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "AWSSDK.Core": "[3.7.200.13, 4.0.0)"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -75,15 +52,6 @@
"Microsoft.Extensions.Primitives": "6.0.0"
}
},
- "Microsoft.Extensions.DependencyInjection": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
- "dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
"resolved": "6.0.0",
@@ -91,19 +59,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -123,22 +91,10 @@
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
}
},
- "Microsoft.Extensions.Logging": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
- "dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
- }
- },
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Options": {
"type": "Transitive",
@@ -159,10 +115,10 @@
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
+ "resolved": "0.2.18",
+ "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
+ "Ardalis.GuardClauses": "4.1.1",
"Newtonsoft.Json": "13.0.3"
}
},
@@ -171,19 +127,6 @@
"resolved": "13.0.3",
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.IO.Abstractions": {
"type": "Transitive",
"resolved": "17.2.3",
diff --git a/src/Shared/Shared/ApiControllerBase.cs b/src/Shared/Shared/ApiControllerBase.cs
index 2bcf08114..e85fe25c0 100644
--- a/src/Shared/Shared/ApiControllerBase.cs
+++ b/src/Shared/Shared/ApiControllerBase.cs
@@ -69,10 +69,10 @@ public ApiControllerBase(IOptions Options)
/// Returns .
public PagedResponse> CreatePagedResponse(IEnumerable pagedData, PaginationFilter validFilter, long totalRecords, IUriService uriService, string route)
{
- Guard.Against.Null(pagedData);
- Guard.Against.Null(validFilter);
- Guard.Against.Null(route);
- Guard.Against.Null(uriService);
+ Guard.Against.Null(pagedData, nameof(pagedData));
+ Guard.Against.Null(validFilter, nameof(validFilter));
+ Guard.Against.Null(route, nameof(route));
+ Guard.Against.Null(uriService, nameof(uriService));
var pageSize = validFilter.PageSize ?? Options.Value.EndpointSettings.DefaultPageSize;
var response = new PagedResponse>(pagedData, validFilter.PageNumber, pageSize);
diff --git a/src/Shared/Shared/Monai.Deploy.WorkflowManager.Shared.csproj b/src/Shared/Shared/Monai.Deploy.WorkflowManager.Shared.csproj
index 6c76ee19d..6d9962dbc 100755
--- a/src/Shared/Shared/Monai.Deploy.WorkflowManager.Shared.csproj
+++ b/src/Shared/Shared/Monai.Deploy.WorkflowManager.Shared.csproj
@@ -47,9 +47,9 @@
-
+
-
+
diff --git a/src/Shared/Shared/ValidationConstants.cs b/src/Shared/Shared/ValidationConstants.cs
index a69e45fc8..234412e18 100644
--- a/src/Shared/Shared/ValidationConstants.cs
+++ b/src/Shared/Shared/ValidationConstants.cs
@@ -147,6 +147,11 @@ public enum NotificationValues
///
public static readonly string ExportTaskType = "export";
+ ///
+ /// Key for the export task type.
+ ///
+ public static readonly string ExternalAppTaskType = "remote_app_execution";
+
///
/// Key for the export task type.
///
diff --git a/src/Shared/Shared/packages.lock.json b/src/Shared/Shared/packages.lock.json
index 6d24d4f4f..3226da97e 100644
--- a/src/Shared/Shared/packages.lock.json
+++ b/src/Shared/Shared/packages.lock.json
@@ -4,12 +4,9 @@
"net6.0": {
"Ardalis.GuardClauses": {
"type": "Direct",
- "requested": "[4.0.1, )",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "requested": "[4.1.1, )",
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"fo-dicom": {
"type": "Direct",
@@ -30,42 +27,28 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Direct",
- "requested": "[6.0.15, )",
- "resolved": "6.0.15",
- "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg=="
+ "requested": "[6.0.21, )",
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"AWSSDK.Core": {
"type": "Transitive",
- "resolved": "3.7.105.20",
- "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
+ "resolved": "3.7.200.13",
+ "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
- "resolved": "3.7.101.26",
- "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
+ "resolved": "3.7.201.9",
+ "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
"dependencies": {
- "AWSSDK.Core": "[3.7.105.20, 4.0.0)"
+ "AWSSDK.Core": "[3.7.200.13, 4.0.0)"
}
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive",
"resolved": "1.1.1",
"contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w=="
},
- "Microsoft.Extensions.Configuration": {
- "type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
- "dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
- }
- },
"Microsoft.Extensions.Configuration.Abstractions": {
"type": "Transitive",
"resolved": "6.0.0",
@@ -76,11 +59,10 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "resolved": "2.2.0",
+ "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -90,12 +72,12 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
@@ -117,22 +99,10 @@
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
}
},
- "Microsoft.Extensions.Logging": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
- "dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
- }
- },
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Options": {
"type": "Transitive",
@@ -163,38 +133,32 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
+ "resolved": "0.2.18",
+ "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
"dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Monai.Deploy.Storage.S3Policy": "0.2.15",
+ "AWSSDK.SecurityToken": "3.7.201.9",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
+ "resolved": "0.2.18",
+ "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
+ "Ardalis.GuardClauses": "4.1.1",
"Newtonsoft.Json": "13.0.3"
}
},
@@ -208,19 +172,6 @@
"resolved": "4.5.1",
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.IO.Abstractions": {
"type": "Transitive",
"resolved": "17.2.3",
@@ -257,8 +208,8 @@
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
- "Monai.Deploy.Storage": "[0.2.15, )"
+ "Monai.Deploy.Messaging": "[0.1.25, )",
+ "Monai.Deploy.Storage": "[0.2.18, )"
}
}
}
diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj
index c1304e3c8..12a72ddc1 100755
--- a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj
+++ b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj
@@ -39,7 +39,7 @@
-
+
diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json
index aaf4e3f87..7b741d850 100755
--- a/src/TaskManager/API/packages.lock.json
+++ b/src/TaskManager/API/packages.lock.json
@@ -4,16 +4,13 @@
"net6.0": {
"Monai.Deploy.Messaging": {
"type": "Direct",
- "requested": "[0.1.23, )",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
- "dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "requested": "[0.1.25, )",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
+ "dependencies": {
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
@@ -50,22 +47,14 @@
},
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"DnsClient": {
"type": "Transitive",
"resolved": "1.4.0",
"contentHash": "CO1NG1zQdV0nEAXmr/KppLZ0S1qkaPwV0kPX5YPgmYBtrBVh1XMYHM54IXy3RBJu1k4thFtpzwo4HNHqxiuFYw=="
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"LightInject": {
"type": "Transitive",
"resolved": "5.4.0",
@@ -112,11 +101,10 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
+ "resolved": "2.2.0",
+ "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -137,11 +125,10 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "resolved": "2.2.0",
+ "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -151,19 +138,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.14",
- "contentHash": "Gl5I5/zL2MUzg5S4FzrkfpEBh/xSZGJbBrJHS5KDiwrWIKw+yfxYCjmjq7hZN+OJrKZrjWbhRVJcXiqwN9FsNg==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.14",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.14",
- "contentHash": "5QAO6QADZLRKFBDwMR34LtxPxTLmxEwG4OLFGgncvvIiTx8OjezILov4RFStCyzrqUvtlq6VJ88y9DnfgjAjNw=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -185,20 +172,19 @@
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
+ "resolved": "2.2.0",
+ "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
+ "Microsoft.Extensions.Configuration.Binder": "2.2.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Options": "2.2.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -429,11 +415,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -444,14 +425,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.1.0",
diff --git a/src/TaskManager/Database/TaskDispatchEventRepository.cs b/src/TaskManager/Database/TaskDispatchEventRepository.cs
index d5b8c79d4..277c17634 100755
--- a/src/TaskManager/Database/TaskDispatchEventRepository.cs
+++ b/src/TaskManager/Database/TaskDispatchEventRepository.cs
@@ -112,8 +112,8 @@ await _taskDispatchEventCollection.DeleteOneAsync(
public async Task UpdateTaskPluginArgsAsync(TaskDispatchEventInfo taskDispatchEventInfo, Dictionary pluginArgs)
{
- Guard.Against.Null(taskDispatchEventInfo);
- Guard.Against.Null(pluginArgs);
+ Guard.Against.Null(taskDispatchEventInfo, nameof(taskDispatchEventInfo));
+ Guard.Against.Null(pluginArgs, nameof(pluginArgs));
try
{
diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json
index 55ff9e2d3..a3d2ad102 100755
--- a/src/TaskManager/Database/packages.lock.json
+++ b/src/TaskManager/Database/packages.lock.json
@@ -16,11 +16,8 @@
},
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"AWSSDK.Core": {
"type": "Transitive",
@@ -43,11 +40,6 @@
"Microsoft.Win32.Registry": "5.0.0"
}
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"LightInject": {
"type": "Transitive",
"resolved": "5.4.0",
@@ -94,11 +86,10 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
+ "resolved": "2.2.0",
+ "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -119,11 +110,10 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "resolved": "2.2.0",
+ "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -133,19 +123,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.14",
- "contentHash": "Gl5I5/zL2MUzg5S4FzrkfpEBh/xSZGJbBrJHS5KDiwrWIKw+yfxYCjmjq7hZN+OJrKZrjWbhRVJcXiqwN9FsNg==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.14",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.14",
- "contentHash": "5QAO6QADZLRKFBDwMR34LtxPxTLmxEwG4OLFGgncvvIiTx8OjezILov4RFStCyzrqUvtlq6VJ88y9DnfgjAjNw=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -167,20 +157,19 @@
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
+ "resolved": "2.2.0",
+ "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
+ "Microsoft.Extensions.Configuration.Binder": "2.2.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Options": "2.2.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -258,15 +247,12 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
@@ -459,11 +445,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -474,14 +455,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.1.0",
@@ -705,7 +678,7 @@
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
+ "Monai.Deploy.Messaging": "[0.1.25, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Repositories/AideClinicalReviewMetadataRepository.cs b/src/TaskManager/Plug-ins/AideClinicalReview/Repositories/AideClinicalReviewMetadataRepository.cs
index 004019eb1..dc46b139a 100644
--- a/src/TaskManager/Plug-ins/AideClinicalReview/Repositories/AideClinicalReviewMetadataRepository.cs
+++ b/src/TaskManager/Plug-ins/AideClinicalReview/Repositories/AideClinicalReviewMetadataRepository.cs
@@ -50,12 +50,12 @@ public AideClinicalReviewMetadataRepository(
private void Validate()
{
- Guard.Against.Null(DispatchEvent);
- Guard.Against.Null(CallbackEvent);
+ Guard.Against.Null(DispatchEvent, nameof(DispatchEvent));
+ Guard.Against.Null(CallbackEvent, nameof(CallbackEvent));
- Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId);
- Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId);
- Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId);
+ Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId, nameof(DispatchEvent.WorkflowInstanceId));
+ Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId, nameof(DispatchEvent.ExecutionId));
+ Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId, nameof(DispatchEvent.PayloadId));
}
public override Task> RetrieveMetadata(CancellationToken cancellationToken = default)
diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json
index 4d2dfb878..e0430d0d1 100644
--- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json
+++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json
@@ -4,23 +4,20 @@
"net6.0": {
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"AWSSDK.Core": {
"type": "Transitive",
- "resolved": "3.7.105.20",
- "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
+ "resolved": "3.7.200.13",
+ "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
- "resolved": "3.7.101.26",
- "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
+ "resolved": "3.7.201.9",
+ "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
"dependencies": {
- "AWSSDK.Core": "[3.7.105.20, 4.0.0)"
+ "AWSSDK.Core": "[3.7.200.13, 4.0.0)"
}
},
"DnsClient": {
@@ -44,11 +41,6 @@
"System.Threading.Channels": "6.0.0"
}
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"LightInject": {
"type": "Transitive",
"resolved": "5.4.0",
@@ -100,11 +92,10 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
+ "resolved": "2.2.0",
+ "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -125,11 +116,10 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "resolved": "2.2.0",
+ "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -139,19 +129,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -173,20 +163,19 @@
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
+ "resolved": "2.2.0",
+ "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
+ "Microsoft.Extensions.Configuration.Binder": "2.2.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Options": "2.2.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -260,38 +249,32 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
+ "resolved": "0.2.18",
+ "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
"dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Monai.Deploy.Storage.S3Policy": "0.2.15",
+ "AWSSDK.SecurityToken": "3.7.201.9",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
+ "resolved": "0.2.18",
+ "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
+ "Ardalis.GuardClauses": "4.1.1",
"Newtonsoft.Json": "13.0.3"
}
},
@@ -488,11 +471,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -503,14 +481,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.1.0",
@@ -733,15 +703,15 @@
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "0.1.23",
- "Monai.Deploy.Storage": "0.2.15"
+ "Monai.Deploy.Messaging": "[0.1.25, )",
+ "Monai.Deploy.Storage": "[0.2.18, )"
}
},
"monai.deploy.workflowmanager.shared": {
"type": "Project",
"dependencies": {
- "Ardalis.GuardClauses": "[4.0.1, )",
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )",
+ "Ardalis.GuardClauses": "[4.1.1, )",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )",
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"fo-dicom": "[5.0.3, )"
}
@@ -749,11 +719,11 @@
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "0.1.23",
- "Mongo.Migration": "3.1.4",
- "MongoDB.Bson": "2.19.0"
+ "Monai.Deploy.Messaging": "[0.1.25, )",
+ "Mongo.Migration": "[3.1.4, )",
+ "MongoDB.Bson": "[2.19.0, )"
}
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs
index b802a9134..75b99a00a 100755
--- a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs
+++ b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs
@@ -28,8 +28,8 @@ public ArgoClient(HttpClient httpClient) : base(httpClient) { }
public async Task Argo_CreateWorkflowAsync(string argoNamespace, WorkflowCreateRequest body, CancellationToken cancellationToken)
{
- Guard.Against.NullOrWhiteSpace(argoNamespace);
- Guard.Against.Null(body);
+ Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
+ Guard.Against.Null(body, nameof(body));
var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}");
@@ -42,8 +42,8 @@ public async Task Argo_CreateWorkflowAsync(string argoNamespace, Workf
public async Task Argo_GetWorkflowAsync(string argoNamespace, string name, string getOptions_resourceVersion, string fields, CancellationToken cancellationToken)
{
- Guard.Against.NullOrWhiteSpace(argoNamespace);
- Guard.Against.Null(name);
+ Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
+ Guard.Against.Null(name, nameof(name));
var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}?");
@@ -64,9 +64,9 @@ public async Task Argo_GetWorkflowAsync(string argoNamespace, string n
public async Task Argo_StopWorkflowAsync(string argoNamespace, string name, WorkflowStopRequest body)
{
- Guard.Against.NullOrWhiteSpace(argoNamespace);
- Guard.Against.NullOrWhiteSpace(name);
- Guard.Against.Null(body);
+ Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
+ Guard.Against.NullOrWhiteSpace(name, nameof(name));
+ Guard.Against.Null(body, nameof(body));
var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/stop");
@@ -79,9 +79,9 @@ public async Task Argo_StopWorkflowAsync(string argoNamespace, string
public async Task Argo_TerminateWorkflowAsync(string argoNamespace, string name, WorkflowTerminateRequest body)
{
- Guard.Against.NullOrWhiteSpace(argoNamespace);
- Guard.Against.NullOrWhiteSpace(name);
- Guard.Against.Null(body);
+ Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
+ Guard.Against.NullOrWhiteSpace(name, nameof(name));
+ Guard.Against.Null(body, nameof(body));
var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/terminate");
@@ -93,8 +93,8 @@ public async Task Argo_TerminateWorkflowAsync(string argoNamespace, st
public async Task Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string getOptions_resourceVersion)
{
- Guard.Against.NullOrWhiteSpace(argoNamespace);
- Guard.Against.Null(name);
+ Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
+ Guard.Against.Null(name, nameof(name));
var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflow-templates/{argoNamespace}/{name}?");
@@ -118,8 +118,8 @@ public async Task Argo_GetWorkflowTemplateAsync(string argoNam
public async Task Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string podName, string logOptions_container)
{
- Guard.Against.NullOrWhiteSpace(argoNamespace);
- Guard.Against.Null(name);
+ Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
+ Guard.Against.Null(name, nameof(name));
var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/log?");
@@ -142,8 +142,8 @@ public async Task Argo_GetWorkflowTemplateAsync(string argoNam
/// A server side error occurred.
public virtual async Task Argo_CreateWorkflowTemplateAsync(string argoNamespace, WorkflowTemplateCreateRequest body, CancellationToken cancellationToken)
{
- Guard.Against.NullOrWhiteSpace(argoNamespace);
- Guard.Against.Null(body.Template);
+ Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
+ Guard.Against.Null(body.Template, nameof(body.Template));
var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflow-templates/{argoNamespace}");
@@ -162,7 +162,7 @@ public virtual async Task Argo_CreateWorkflowTemplateAsync(str
/// A server side error occurred.
public virtual async Task Argo_DeleteWorkflowTemplateAsync(string argoNamespace, string templateName, CancellationToken cancellationToken)
{
- Guard.Against.NullOrWhiteSpace(argoNamespace);
+ Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflow-templates/{argoNamespace}/{templateName}");
diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs
index 5b08b0339..b69291226 100755
--- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs
+++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs
@@ -305,7 +305,7 @@ public override async Task GetStatus(string identity, TaskCallb
private Dictionary GetExecutuionStats(Workflow workflow)
{
- Guard.Against.Null(workflow);
+ Guard.Against.Null(workflow, nameof(workflow));
TimeSpan? duration = null;
if (workflow.Status?.StartedAt is not null && workflow.Status?.FinishedAt is not null)
@@ -431,7 +431,7 @@ private async Task BuildWorkflowWrapper(CancellationToken cancellation
///
private void ProcessTaskPluginArguments(Workflow workflow)
{
- Guard.Against.Null(workflow);
+ Guard.Against.Null(workflow, nameof(workflow));
var priorityClassName = Event.GetTaskPluginArgumentsParameter(Keys.TaskPriorityClassName) ?? "standard";
foreach (var template in workflow.Spec.Templates)
@@ -446,8 +446,8 @@ private void ProcessTaskPluginArguments(Workflow workflow)
private void AddLimit(Template2 template, ResourcesKey key)
{
- Guard.Against.Null(template);
- Guard.Against.Null(key);
+ Guard.Against.Null(template, nameof(template));
+ Guard.Against.Null(key, nameof(key));
if (template.Container is null || !Event.TaskPluginArguments.TryGetValue(key.TaskKey, out var value) || string.IsNullOrWhiteSpace(value))
{
return;
diff --git a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs
index b91f7df8b..6a89f5de5 100644
--- a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs
+++ b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs
@@ -15,7 +15,6 @@
*/
using Ardalis.GuardClauses;
-using Argo;
using IdentityModel.Client;
using Microsoft.Extensions.Logging;
using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging;
@@ -45,7 +44,7 @@ public IArgoClient CreateClient(string baseUrl, string? apiToken, bool allowInse
var httpClient = _httpClientFactory.CreateClient(ClientName);
- Guard.Against.Null(httpClient);
+ Guard.Against.Null(httpClient, nameof(httpClient));
if (apiToken is not null)
{
diff --git a/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs b/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs
index 2430df884..7bf0a0e14 100644
--- a/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs
+++ b/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs
@@ -52,12 +52,12 @@ public ArgoMetadataRepository(
private void Validate()
{
- Guard.Against.Null(DispatchEvent);
- Guard.Against.Null(CallbackEvent);
+ Guard.Against.Null(DispatchEvent, nameof(DispatchEvent));
+ Guard.Against.Null(CallbackEvent, nameof(CallbackEvent));
- Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId);
- Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId);
- Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId);
+ Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId, nameof(DispatchEvent.WorkflowInstanceId));
+ Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId, nameof(DispatchEvent.ExecutionId));
+ Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId, nameof(DispatchEvent.PayloadId));
}
public override async Task> RetrieveMetadata(CancellationToken cancellationToken = default)
diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json
index 8760538cd..93e734b73 100644
--- a/src/TaskManager/Plug-ins/Argo/packages.lock.json
+++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json
@@ -46,23 +46,20 @@
},
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"AWSSDK.Core": {
"type": "Transitive",
- "resolved": "3.7.105.20",
- "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
+ "resolved": "3.7.200.13",
+ "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
- "resolved": "3.7.101.26",
- "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
+ "resolved": "3.7.201.9",
+ "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
"dependencies": {
- "AWSSDK.Core": "[3.7.105.20, 4.0.0)"
+ "AWSSDK.Core": "[3.7.200.13, 4.0.0)"
}
},
"DnsClient": {
@@ -105,11 +102,6 @@
"Microsoft.Extensions.Logging": "6.0.0"
}
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"KubernetesClient.Basic": {
"type": "Transitive",
"resolved": "10.1.4",
@@ -306,11 +298,10 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
+ "resolved": "2.2.0",
+ "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -357,19 +348,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -413,8 +404,8 @@
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -536,38 +527,32 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
+ "resolved": "0.2.18",
+ "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
"dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Monai.Deploy.Storage.S3Policy": "0.2.15",
+ "AWSSDK.SecurityToken": "3.7.201.9",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
+ "resolved": "0.2.18",
+ "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
+ "Ardalis.GuardClauses": "4.1.1",
"Newtonsoft.Json": "13.0.3"
}
},
@@ -790,11 +775,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1203,15 +1183,15 @@
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "0.1.23",
- "Monai.Deploy.Storage": "0.2.15"
+ "Monai.Deploy.Messaging": "[0.1.25, )",
+ "Monai.Deploy.Storage": "[0.2.18, )"
}
},
"monai.deploy.workflowmanager.shared": {
"type": "Project",
"dependencies": {
- "Ardalis.GuardClauses": "[4.0.1, )",
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )",
+ "Ardalis.GuardClauses": "[4.1.1, )",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )",
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"fo-dicom": "[5.0.3, )"
}
@@ -1219,11 +1199,11 @@
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "0.1.23",
- "Mongo.Migration": "3.1.4",
- "MongoDB.Bson": "2.19.0"
+ "Monai.Deploy.Messaging": "[0.1.25, )",
+ "Mongo.Migration": "[3.1.4, )",
+ "MongoDB.Bson": "[2.19.0, )"
}
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/TaskManager/Plug-ins/Email/EmailPlugin.cs b/src/TaskManager/Plug-ins/Email/EmailPlugin.cs
index c29215111..07d863293 100644
--- a/src/TaskManager/Plug-ins/Email/EmailPlugin.cs
+++ b/src/TaskManager/Plug-ins/Email/EmailPlugin.cs
@@ -57,7 +57,7 @@ public EmailPlugin(
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
_options = options ?? throw new ArgumentNullException(nameof(options));
- Guard.Against.Null(serviceScopeFactory);
+ Guard.Against.Null(serviceScopeFactory, nameof(serviceScopeFactory));
_scope = serviceScopeFactory.CreateScope();
_messageBrokerPublisherService = _scope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IMessageBrokerPublisherService));
@@ -167,8 +167,8 @@ private async Task>> AddRawMetaFromFile(Dictiona
foreach (var file in allFiles)
{
if (file.FilePath.EndsWith(".json", StringComparison.InvariantCultureIgnoreCase)) continue;
- Guard.Against.NullOrWhiteSpace(bucketName);
- Guard.Against.NullOrWhiteSpace(path);
+ Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName));
+ Guard.Against.NullOrWhiteSpace(path, nameof(path));
// load file from Minio !
var fileStream = await _storageService.GetObjectAsync(bucketName, $"{file.FilePath}");
diff --git a/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs b/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs
index 3a10a30f6..44ca990cf 100644
--- a/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs
+++ b/src/TaskManager/Plug-ins/TestPlugin/Repositories/TestPluginRepository.cs
@@ -40,12 +40,12 @@ public TestPluginRepository(
private void Validate()
{
- Guard.Against.Null(DispatchEvent);
- Guard.Against.Null(CallbackEvent);
+ Guard.Against.Null(DispatchEvent, nameof(DispatchEvent));
+ Guard.Against.Null(CallbackEvent, nameof(CallbackEvent));
- Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId);
- Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId);
- Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId);
+ Guard.Against.NullOrWhiteSpace(DispatchEvent.WorkflowInstanceId, nameof(DispatchEvent.WorkflowInstanceId));
+ Guard.Against.NullOrWhiteSpace(DispatchEvent.ExecutionId, nameof(DispatchEvent.ExecutionId));
+ Guard.Against.NullOrWhiteSpace(DispatchEvent.PayloadId, nameof(DispatchEvent.PayloadId));
}
public override async Task> RetrieveMetadata(CancellationToken cancellationToken = default)
diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj
index 8ff9362b0..332f64c39 100755
--- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj
+++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj
@@ -61,10 +61,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs b/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs
index 49579a4fe..1ff14ec53 100644
--- a/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs
+++ b/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs
@@ -71,8 +71,8 @@ public TaskDispatchEventService(ITaskDispatchEventRepository taskDispatchEventRe
public async Task UpdateTaskPluginArgsAsync(TaskDispatchEventInfo taskDispatchEvent, Dictionary pluginArgs)
{
- Guard.Against.Null(taskDispatchEvent);
- Guard.Against.Null(pluginArgs);
+ Guard.Against.Null(taskDispatchEvent, nameof(taskDispatchEvent));
+ Guard.Against.Null(pluginArgs, nameof(pluginArgs));
try
{
diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json
index e9ba4d952..4c52e800b 100644
--- a/src/TaskManager/TaskManager/packages.lock.json
+++ b/src/TaskManager/TaskManager/packages.lock.json
@@ -74,29 +74,25 @@
},
"Monai.Deploy.Messaging": {
"type": "Direct",
- "requested": "[0.1.23, )",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "requested": "[0.1.25, )",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Messaging.RabbitMQ": {
"type": "Direct",
- "requested": "[0.1.23, )",
- "resolved": "0.1.23",
- "contentHash": "+Y1eLKz9FtPbASOVtTaM1ktyUqOxmyIjksNukZ8dUhtDJrT3CF9ISw6BGajxwJfq2jUjacli3jNSc1OAnLJRcQ==",
+ "requested": "[0.1.25, )",
+ "resolved": "0.1.25",
+ "contentHash": "p/Si1XzNUiTdN1gYFKxYy9w/bVzOYooK9DEW7JJs8D8Sghzkvh0GyWV3vUO9dVkEcU0oT5HmZ4x+nz8BzAkz6g==",
"dependencies": {
- "Monai.Deploy.Messaging": "0.1.23",
- "Polly": "7.2.3",
- "RabbitMQ.Client": "6.4.0",
- "System.Collections.Concurrent": "4.3.0"
+ "Monai.Deploy.Messaging": "0.1.25",
+ "Polly": "7.2.4",
+ "RabbitMQ.Client": "6.5.0"
}
},
"Monai.Deploy.Security": {
@@ -116,32 +112,25 @@
},
"Monai.Deploy.Storage": {
"type": "Direct",
- "requested": "[0.2.15, )",
- "resolved": "0.2.15",
- "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
+ "requested": "[0.2.18, )",
+ "resolved": "0.2.18",
+ "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
"dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Monai.Deploy.Storage.S3Policy": "0.2.15",
+ "AWSSDK.SecurityToken": "3.7.201.9",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage.MinIO": {
"type": "Direct",
- "requested": "[0.2.15, )",
- "resolved": "0.2.15",
- "contentHash": "hyN7GuTp80y5cpY01IqbzkRCc0QB3y2v7Sppzarsnw6l6FgLJ1ZUgvMN4VDBwVyMNJytBeEKWfgn/FdidGNYaw==",
+ "requested": "[0.2.18, )",
+ "resolved": "0.2.18",
+ "contentHash": "0sHLiT0qU2Fg5O+AF8UDqzsJEYztUAFZeOPh4kOLC4bckhb+wSsuv7VcAXWtR3BOY6TxaMVVUJ+EK/o5mCp3tQ==",
"dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "Minio": "4.0.7",
- "Monai.Deploy.Storage": "0.2.15",
- "Monai.Deploy.Storage.S3Policy": "0.2.15"
+ "Minio": "5.0.0",
+ "Monai.Deploy.Storage": "0.2.18",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18"
}
},
"Mongo.Migration": {
@@ -201,32 +190,26 @@
},
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"AWSSDK.Core": {
"type": "Transitive",
- "resolved": "3.7.105.20",
- "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
+ "resolved": "3.7.200.13",
+ "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
- "resolved": "3.7.101.26",
- "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
+ "resolved": "3.7.201.9",
+ "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
"dependencies": {
- "AWSSDK.Core": "[3.7.105.20, 4.0.0)"
+ "AWSSDK.Core": "[3.7.200.13, 4.0.0)"
}
},
- "Crc32.NET": {
+ "CommunityToolkit.HighPerformance": {
"type": "Transitive",
- "resolved": "1.2.0",
- "contentHash": "wNW/huzolu8MNKUnwCVKxjfAlCFpeI8AZVfF46iAWJ1+P6bTU1AZct7VAkDDEjgeeTJCVTkGZaD6jSd/fOiUkA==",
- "dependencies": {
- "NETStandard.Library": "2.0.0"
- }
+ "resolved": "8.1.0",
+ "contentHash": "kgDi65k02hrgnHy3N0xENecsr0spW13RdIA1tipovi9t16gKziI7uZIu3qkxz0GctCHNM4hfeqXYg//6wHJ6Kw=="
},
"DnsClient": {
"type": "Transitive",
@@ -281,11 +264,6 @@
"Microsoft.Extensions.Logging": "6.0.0"
}
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"KubernetesClient": {
"type": "Transitive",
"resolved": "10.1.4",
@@ -633,19 +611,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -704,8 +682,8 @@
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -864,8 +842,8 @@
},
"Microsoft.NETCore.Targets": {
"type": "Transitive",
- "resolved": "1.1.3",
- "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ=="
+ "resolved": "1.1.0",
+ "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
},
"Microsoft.OpenApi": {
"type": "Transitive",
@@ -888,24 +866,20 @@
},
"Minio": {
"type": "Transitive",
- "resolved": "4.0.7",
- "contentHash": "gmd+B4YHaE+cz8TCPIzkhov3t30VovGfyf6vMxqXd/iF/cziKmXKJJXv2E9kcHvbGwVHhMWtvk7fXWOzHcU4uw==",
+ "resolved": "5.0.0",
+ "contentHash": "7tZj90WEuuH60RAP4wBYexjMuJOhCnK7I46hCiX3CtZPackHisLZ8aAJmn3KlwbUX22dBDphwemD+h37vet8Qw==",
"dependencies": {
- "Crc32.NET": "1.2.0",
- "Microsoft.CSharp": "4.7.0",
- "Newtonsoft.Json": "13.0.1",
- "System.Net.Http": "4.3.4",
- "System.Net.Primitives": "4.3.1",
- "System.Reactive.Linq": "5.0.0",
- "System.ValueTuple": "4.4.0"
+ "CommunityToolkit.HighPerformance": "8.1.0",
+ "System.IO.Hashing": "7.0.0",
+ "System.Reactive.Linq": "5.0.0"
}
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
+ "resolved": "0.2.18",
+ "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
+ "Ardalis.GuardClauses": "4.1.1",
"Newtonsoft.Json": "13.0.3"
}
},
@@ -949,14 +923,6 @@
"resolved": "1.7.0",
"contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q=="
},
- "NETStandard.Library": {
- "type": "Transitive",
- "resolved": "2.0.0",
- "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0"
- }
- },
"Newtonsoft.Json": {
"type": "Transitive",
"resolved": "13.0.3",
@@ -982,8 +948,8 @@
},
"Polly": {
"type": "Transitive",
- "resolved": "7.2.3",
- "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ=="
+ "resolved": "7.2.4",
+ "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
},
"prometheus-net": {
"type": "Transitive",
@@ -996,111 +962,22 @@
},
"RabbitMQ.Client": {
"type": "Transitive",
- "resolved": "6.4.0",
- "contentHash": "1znR1gGU+xYVSpO5z8nQolcUKA/yydnxQn7Ug9+RUXxTSLMm/eE58VKGwahPBjELXvDnX0k/kBrAitFLRjx9LA==",
+ "resolved": "6.5.0",
+ "contentHash": "9hY5HiWPtCla1/l0WmXmLnqoX7iKE3neBQUWnetIJrRpOvTbO//XQfQDh++xgHCshL40Kv/6bR0HDkmJz46twg==",
"dependencies": {
- "System.Memory": "4.5.4",
- "System.Threading.Channels": "4.7.1"
+ "System.Memory": "4.5.5",
+ "System.Threading.Channels": "7.0.0"
}
},
- "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g=="
- },
- "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw=="
- },
- "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg=="
- },
"runtime.native.System": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0"
- }
- },
- "runtime.native.System.Net.Http": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0"
- }
- },
- "runtime.native.System.Security.Cryptography.Apple": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==",
- "dependencies": {
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0"
- }
- },
- "runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==",
+ "resolved": "4.0.0",
+ "contentHash": "QfS/nQI7k/BLgmLrw7qm7YBoULEvgWnPI+cYsbfCVFTW8Aj+i8JhccxcFMu1RWms0YZzF+UHguNBK4Qn89e2Sg==",
"dependencies": {
- "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2"
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.1"
}
},
- "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ=="
- },
- "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA=="
- },
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ=="
- },
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w=="
- },
- "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg=="
- },
- "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw=="
- },
- "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w=="
- },
- "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg=="
- },
"Serilog": {
"type": "Transitive",
"resolved": "2.8.0",
@@ -1221,29 +1098,29 @@
},
"System.Collections": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==",
+ "resolved": "4.0.11",
+ "contentHash": "YUJGz6eFKqS0V//mLt25vFGrrCvOnsXjlvFQs+KimpwNxug9x0Pzy4PlFMU3Q2IzqAa9G2L4LsK3+9vCBK7oTg==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.1",
+ "System.Runtime": "4.1.0"
}
},
"System.Collections.Concurrent": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==",
+ "resolved": "4.0.12",
+ "contentHash": "2gBcbb3drMLgxlI0fBfxMA31ec6AEyYCHygGse4vxceJan8mRIWeKJ24BFzN7+bi/NFTgdIgufzb94LWO5EERQ==",
"dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Diagnostics.Tracing": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
+ "System.Collections": "4.0.11",
+ "System.Diagnostics.Debug": "4.0.11",
+ "System.Diagnostics.Tracing": "4.1.0",
+ "System.Globalization": "4.0.11",
+ "System.Reflection": "4.1.0",
+ "System.Resources.ResourceManager": "4.0.1",
+ "System.Runtime": "4.1.0",
+ "System.Runtime.Extensions": "4.1.0",
+ "System.Threading": "4.0.11",
+ "System.Threading.Tasks": "4.0.11"
}
},
"System.Collections.NonGeneric": {
@@ -1259,11 +1136,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1289,12 +1161,12 @@
},
"System.Diagnostics.Tracing": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==",
+ "resolved": "4.1.0",
+ "contentHash": "vDN1PoMZCkkdNjvZLql592oYJZgS7URcJzJ7bxeBgGtx5UtR5leNm49VmfHGqIffX4FKacHbI3H6UyNSHQknBg==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.1",
+ "System.Runtime": "4.1.0"
}
},
"System.Dynamic.Runtime": {
@@ -1329,30 +1201,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Globalization.Calendars": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Globalization": "4.3.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Globalization.Extensions": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "System.Globalization": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0"
- }
- },
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
"resolved": "6.27.0",
@@ -1381,37 +1229,42 @@
},
"System.IO.FileSystem": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==",
+ "resolved": "4.0.1",
+ "contentHash": "IBErlVq5jOggAD69bg1t0pJcHaDbJbWNUZTPI96fkYWzwYbN6D9wRHMULLDd9dHsl7C2YsxXL31LMfPI1SWt8w==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.IO": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.1",
+ "System.IO": "4.1.0",
+ "System.IO.FileSystem.Primitives": "4.0.1",
+ "System.Runtime": "4.1.0",
+ "System.Runtime.Handles": "4.0.1",
+ "System.Text.Encoding": "4.0.11",
+ "System.Threading.Tasks": "4.0.11"
}
},
"System.IO.FileSystem.Primitives": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==",
+ "resolved": "4.0.1",
+ "contentHash": "kWkKD203JJKxJeE74p8aF8y4Qc9r9WQx4C0cHzHPrY3fv/L/IhWnyCHaFJ3H1QPOH6A93whlQ2vG5nHlBDvzWQ==",
"dependencies": {
- "System.Runtime": "4.3.0"
+ "System.Runtime": "4.1.0"
}
},
+ "System.IO.Hashing": {
+ "type": "Transitive",
+ "resolved": "7.0.0",
+ "contentHash": "sDnWM0N3AMCa86LrKTWeF3BZLD2sgWyYUc7HL6z4+xyDZNQRwzmxbo4qP2rX2MqC+Sy1/gOSRDah5ltxY5jPxw=="
+ },
"System.Linq": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==",
+ "resolved": "4.1.0",
+ "contentHash": "bQ0iYFOQI0nuTnt+NQADns6ucV4DUvMdwN6CbkB1yj8i7arTGiTN5eok1kQwdnnNWSDZfIUySQY+J3d5KjWn0g==",
"dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0"
+ "System.Collections": "4.0.11",
+ "System.Diagnostics.Debug": "4.0.11",
+ "System.Resources.ResourceManager": "4.0.1",
+ "System.Runtime": "4.1.0",
+ "System.Runtime.Extensions": "4.1.0"
}
},
"System.Linq.Expressions": {
@@ -1440,52 +1293,8 @@
},
"System.Memory": {
"type": "Transitive",
- "resolved": "4.5.4",
- "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw=="
- },
- "System.Net.Http": {
- "type": "Transitive",
- "resolved": "4.3.4",
- "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.1",
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Diagnostics.DiagnosticSource": "4.3.0",
- "System.Diagnostics.Tracing": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.Globalization.Extensions": "4.3.0",
- "System.IO": "4.3.0",
- "System.IO.FileSystem": "4.3.0",
- "System.Net.Primitives": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.OpenSsl": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Security.Cryptography.X509Certificates": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0",
- "runtime.native.System": "4.3.0",
- "runtime.native.System.Net.Http": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2"
- }
- },
- "System.Net.Primitives": {
- "type": "Transitive",
- "resolved": "4.3.1",
- "contentHash": "OHzPhSme78BbmLe9UBxHM69ZYjClS5URuhce6Ta4ikiLgaUGiG/X84fZpI6zy7CsUH5R9cYzI2tv9dWPqdTkUg==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.1",
- "Microsoft.NETCore.Targets": "1.1.3",
- "System.Runtime": "4.3.1",
- "System.Runtime.Handles": "4.3.0"
- }
+ "resolved": "4.5.5",
+ "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
},
"System.ObjectModel": {
"type": "Transitive",
@@ -1602,11 +1411,11 @@
},
"System.Runtime": {
"type": "Transitive",
- "resolved": "4.3.1",
- "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==",
+ "resolved": "4.3.0",
+ "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.1",
- "Microsoft.NETCore.Targets": "1.1.3"
+ "Microsoft.NETCore.Platforms": "1.1.0",
+ "Microsoft.NETCore.Targets": "1.1.0"
}
},
"System.Runtime.CompilerServices.Unsafe": {
@@ -1626,25 +1435,25 @@
},
"System.Runtime.Handles": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==",
+ "resolved": "4.0.1",
+ "contentHash": "nCJvEKguXEvk2ymk1gqj625vVnlK3/xdGzx0vOKicQkoquaTBJTP13AIYkocSUwHCLNBwUbXTqTWGDxBTWpt7g==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.1",
+ "System.Runtime": "4.1.0"
}
},
"System.Runtime.InteropServices": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==",
+ "resolved": "4.1.0",
+ "contentHash": "16eu3kjHS633yYdkjwShDHZLRNMKVi/s0bY8ODiqJ2RfMhDMAwxZaUaWVnZ2P71kr/or+X9o/xFWtNqz8ivieQ==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Reflection": "4.3.0",
- "System.Reflection.Primitives": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Handles": "4.3.0"
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.1",
+ "System.Reflection": "4.1.0",
+ "System.Reflection.Primitives": "4.0.1",
+ "System.Runtime": "4.1.0",
+ "System.Runtime.Handles": "4.0.1"
}
},
"System.Runtime.InteropServices.RuntimeInformation": {
@@ -1661,17 +1470,6 @@
"runtime.native.System": "4.0.0"
}
},
- "System.Runtime.Numerics": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==",
- "dependencies": {
- "System.Globalization": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0"
- }
- },
"System.Security.AccessControl": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -1681,137 +1479,11 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "System.Security.Cryptography.Algorithms": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "System.Collections": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.Numerics": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "runtime.native.System.Security.Cryptography.Apple": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
"System.Security.Cryptography.Cng": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A=="
},
- "System.Security.Cryptography.Csp": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "System.IO": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0"
- }
- },
- "System.Security.Cryptography.Encoding": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "System.Collections": "4.3.0",
- "System.Collections.Concurrent": "4.3.0",
- "System.Linq": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
- "System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==",
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.Numerics": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
- "System.Security.Cryptography.Primitives": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==",
- "dependencies": {
- "System.Diagnostics.Debug": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
- "System.Security.Cryptography.X509Certificates": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.Globalization.Calendars": "4.3.0",
- "System.IO": "4.3.0",
- "System.IO.FileSystem": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.Numerics": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Cng": "4.3.0",
- "System.Security.Cryptography.Csp": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.OpenSsl": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0",
- "runtime.native.System": "4.3.0",
- "runtime.native.System.Net.Http": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -1874,8 +1546,8 @@
},
"System.Threading.Channels": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q=="
+ "resolved": "7.0.0",
+ "contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA=="
},
"System.Threading.Tasks": {
"type": "Transitive",
@@ -1920,15 +1592,15 @@
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "0.1.23",
- "Monai.Deploy.Storage": "0.2.15"
+ "Monai.Deploy.Messaging": "[0.1.25, )",
+ "Monai.Deploy.Storage": "[0.2.18, )"
}
},
"monai.deploy.workflowmanager.shared": {
"type": "Project",
"dependencies": {
- "Ardalis.GuardClauses": "[4.0.1, )",
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.15, )",
+ "Ardalis.GuardClauses": "[4.1.1, )",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )",
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"fo-dicom": "[5.0.3, )"
}
@@ -1944,7 +1616,7 @@
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
+ "Monai.Deploy.Messaging": "[0.1.25, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
@@ -1969,18 +1641,9 @@
"monai.deploy.workflowmanager.taskmanager.docker": {
"type": "Project",
"dependencies": {
- "Docker.DotNet": "3.125.13",
- "Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
- "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0"
- }
- },
- "monai.deploy.workflowmanager.taskmanager.email": {
- "type": "Project",
- "dependencies": {
- "Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
- "Monai.Deploy.WorkflowManager.Shared": "1.0.0",
- "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0",
- "fo-dicom": "5.0.3"
+ "Docker.DotNet": "[3.125.13, )",
+ "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )"
}
},
"monai.deploy.workflowmanager.taskmanager.email": {
@@ -1994,4 +1657,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/WorkflowManager/Common/Extensions/CollectionExtensions.cs b/src/WorkflowManager/Common/Extensions/CollectionExtensions.cs
index f66f3974b..25c3e7f9c 100644
--- a/src/WorkflowManager/Common/Extensions/CollectionExtensions.cs
+++ b/src/WorkflowManager/Common/Extensions/CollectionExtensions.cs
@@ -42,7 +42,7 @@ public static bool IsNullOrEmpty(this ICollection array)
///
public static void Append(this Dictionary array, Dictionary otherArray) where TKey : notnull
{
- Guard.Against.Null(array);
+ Guard.Against.Null(array, nameof(array));
if (otherArray.IsNullOrEmpty())
{
return;
diff --git a/src/WorkflowManager/Common/Services/PayloadService.cs b/src/WorkflowManager/Common/Services/PayloadService.cs
index e1873fcbd..d98287105 100644
--- a/src/WorkflowManager/Common/Services/PayloadService.cs
+++ b/src/WorkflowManager/Common/Services/PayloadService.cs
@@ -60,7 +60,7 @@ public PayloadService(
public async Task CreateAsync(WorkflowRequestEvent eventPayload)
{
- Guard.Against.Null(eventPayload);
+ Guard.Against.Null(eventPayload, nameof(eventPayload));
try
{
@@ -109,7 +109,7 @@ public PayloadService(
public async Task GetByIdAsync(string payloadId)
{
- Guard.Against.NullOrWhiteSpace(payloadId);
+ Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
return await _payloadRepository.GetByIdAsync(payloadId);
}
@@ -164,7 +164,7 @@ private async Task> CreatePayloadsDto(IList payloads)
public async Task DeletePayloadFromStorageAsync(string payloadId)
{
- Guard.Against.NullOrWhiteSpace(payloadId);
+ Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
var payload = await GetByIdAsync(payloadId);
diff --git a/src/WorkflowManager/Common/Services/WorkflowInstanceService.cs b/src/WorkflowManager/Common/Services/WorkflowInstanceService.cs
index df2131918..535c28d1e 100644
--- a/src/WorkflowManager/Common/Services/WorkflowInstanceService.cs
+++ b/src/WorkflowManager/Common/Services/WorkflowInstanceService.cs
@@ -38,15 +38,15 @@ public WorkflowInstanceService(IWorkflowInstanceRepository workflowInstanceRepos
public async Task GetByIdAsync(string id)
{
- Guard.Against.NullOrWhiteSpace(id);
+ Guard.Against.NullOrWhiteSpace(id, nameof(id));
return await _workflowInstanceRepository.GetByWorkflowInstanceIdAsync(id);
}
public async Task AcknowledgeTaskError(string workflowInstanceId, string executionId)
{
- Guard.Against.NullOrWhiteSpace(workflowInstanceId);
- Guard.Against.NullOrWhiteSpace(executionId);
+ Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId));
+ Guard.Against.NullOrWhiteSpace(executionId, nameof(executionId));
var workflowInstance = await _workflowInstanceRepository.GetByWorkflowInstanceIdAsync(workflowInstanceId);
@@ -79,8 +79,8 @@ public async Task AcknowledgeTaskError(string workflowInstance
public async Task UpdateExportCompleteMetadataAsync(string workflowInstanceId, string executionId, Dictionary fileStatuses)
{
- Guard.Against.NullOrWhiteSpace(workflowInstanceId);
- Guard.Against.NullOrWhiteSpace(executionId);
+ Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId));
+ Guard.Against.NullOrWhiteSpace(executionId, nameof(executionId));
var resultMetadata = fileStatuses.ToDictionary(f => f.Key, f => f.Value.ToString() as object);
diff --git a/src/WorkflowManager/Common/Services/WorkflowService.cs b/src/WorkflowManager/Common/Services/WorkflowService.cs
index 788e1a98b..1e61b1977 100644
--- a/src/WorkflowManager/Common/Services/WorkflowService.cs
+++ b/src/WorkflowManager/Common/Services/WorkflowService.cs
@@ -36,7 +36,7 @@ public WorkflowService(IWorkflowRepository workflowRepository, ILogger GetAsync(string id)
{
- Guard.Against.NullOrWhiteSpace(id);
+ Guard.Against.NullOrWhiteSpace(id, nameof(id));
var workflow = await _workflowRepository.GetByWorkflowIdAsync(id);
@@ -45,14 +45,14 @@ public async Task GetAsync(string id)
public async Task GetByNameAsync(string name)
{
- Guard.Against.NullOrWhiteSpace(name);
+ Guard.Against.NullOrWhiteSpace(name, nameof(name));
return await _workflowRepository.GetByWorkflowNameAsync(name);
}
public async Task CreateAsync(Workflow workflow)
{
- Guard.Against.Null(workflow);
+ Guard.Against.Null(workflow, nameof(workflow));
var id = await _workflowRepository.CreateAsync(workflow);
_logger.WorkflowCreated(id, workflow.Name);
@@ -61,8 +61,8 @@ public async Task CreateAsync(Workflow workflow)
public async Task UpdateAsync(Workflow workflow, string id, bool isUpdateToWorkflowName = false)
{
- Guard.Against.Null(workflow);
- Guard.Against.NullOrWhiteSpace(id);
+ Guard.Against.Null(workflow, nameof(workflow));
+ Guard.Against.NullOrWhiteSpace(id, nameof(id));
var existingWorkflow = await _workflowRepository.GetByWorkflowIdAsync(id);
@@ -78,7 +78,7 @@ public async Task CreateAsync(Workflow workflow)
public Task DeleteWorkflowAsync(WorkflowRevision workflow)
{
- Guard.Against.Null(workflow);
+ Guard.Against.Null(workflow, nameof(workflow));
var result = _workflowRepository.SoftDeleteWorkflow(workflow);
_logger.WorkflowDeleted(workflow.WorkflowId, workflow.Id, workflow.Workflow?.Name);
return result;
diff --git a/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs b/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs
index 188ef092e..abcd5bdda 100644
--- a/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs
+++ b/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs
@@ -97,8 +97,8 @@ private set
public bool TryParse(string[] conditions, WorkflowInstance workflowInstance, out string resolvedConditional)
{
- Guard.Against.NullOrEmpty(conditions);
- Guard.Against.Null(workflowInstance);
+ Guard.Against.NullOrEmpty(conditions, nameof(conditions));
+ Guard.Against.Null(workflowInstance, nameof(workflowInstance));
var joinedConditions = conditions.CombineConditionString();
return TryParse(joinedConditions, workflowInstance, out resolvedConditional);
@@ -106,8 +106,8 @@ public bool TryParse(string[] conditions, WorkflowInstance workflowInstance, out
public bool TryParse(string conditions, WorkflowInstance workflowInstance, out string resolvedConditional)
{
- Guard.Against.NullOrEmpty(conditions);
- Guard.Against.Null(workflowInstance);
+ Guard.Against.NullOrEmpty(conditions, nameof(conditions));
+ Guard.Against.Null(workflowInstance, nameof(workflowInstance));
resolvedConditional = string.Empty;
try
@@ -127,8 +127,8 @@ public bool TryParse(string conditions, WorkflowInstance workflowInstance, out s
public string ResolveParameters(string conditions, WorkflowInstance workflowInstance)
{
- Guard.Against.NullOrEmpty(conditions);
- Guard.Against.Null(workflowInstance);
+ Guard.Against.NullOrEmpty(conditions, nameof(conditions));
+ Guard.Against.Null(workflowInstance, nameof(workflowInstance));
WorkflowInstance = workflowInstance;
return ResolveParameters(conditions, workflowInstance.Id);
@@ -222,7 +222,7 @@ private void ClearWorkflowParser()
///
private (string? Result, ParameterContext Context) ResolveMatch(string value)
{
- Guard.Against.NullOrWhiteSpace(value);
+ Guard.Against.NullOrWhiteSpace(value, nameof(value));
value = value.Substring(2, value.Length - 4).Trim();
@@ -252,8 +252,8 @@ private void ClearWorkflowParser()
private (string? Result, ParameterContext Context) ResolveDicom(string value)
{
- Guard.Against.NullOrWhiteSpace(value);
- Guard.Against.Null(WorkflowInstance);
+ Guard.Against.NullOrWhiteSpace(value, nameof(value));
+ Guard.Against.Null(WorkflowInstance, nameof(WorkflowInstance));
var subValue = value.Trim().Substring(ContextDicomSeries.Length, value.Length - ContextDicomSeries.Length);
var valueArr = subValue.Split('\'');
diff --git a/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs b/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs
index 70b7dd4f3..6fb6e3182 100644
--- a/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs
+++ b/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs
@@ -82,7 +82,7 @@ public void Set(string left, string right, Keyword? keyword)
public void Parse(string input, int groupedLogicalParent = 0)
{
- Guard.Against.NullOrEmpty(input);
+ Guard.Against.NullOrEmpty(input, nameof(input));
var foundOpenBrackets = FindBrackets.Matches(input);
var foundClosingBrackets = FindCloseBrackets.Matches(input);
@@ -127,7 +127,7 @@ public void Parse(string input, int groupedLogicalParent = 0)
public void ParseBrackets(string input)
{
- Guard.Against.NullOrWhiteSpace(input);
+ Guard.Against.NullOrWhiteSpace(input, nameof(input));
var foundAnds = FindAnds.Matches(input);
var foundOrs = FindOrs.Matches(input);
@@ -169,7 +169,7 @@ public void ParseBrackets(string input)
private void ParseComplex(string input)
{
- Guard.Against.NullOrWhiteSpace(input);
+ Guard.Against.NullOrWhiteSpace(input, nameof(input));
var foundBrackets = FindBrackets.Matches(input);
@@ -299,7 +299,7 @@ private bool EvaluteAndsLogicalGroups()
public static ConditionalGroup Create(string input, int groupedLogicalParent = 0)
{
- Guard.Against.NullOrEmpty(input);
+ Guard.Against.NullOrEmpty(input, nameof(input));
var conditionalGroup = new ConditionalGroup();
if (groupedLogicalParent == 0)
{
diff --git a/src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs b/src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs
index 0be64fdfa..49520b317 100644
--- a/src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs
+++ b/src/WorkflowManager/Contracts/Constants/TaskTypeConstants.cs
@@ -21,5 +21,8 @@ public static class TaskTypeConstants
public const string RouterTask = "router";
public const string ExportTask = "export";
+
+ public const string ExternalAppTask = "remote_app_execution";
+
}
}
diff --git a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj
index 1126257f2..a44456706 100755
--- a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj
+++ b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj
@@ -38,7 +38,7 @@
-
+
diff --git a/src/WorkflowManager/Database/Repositories/PayloadRepository.cs b/src/WorkflowManager/Database/Repositories/PayloadRepository.cs
index 3fc10ce8a..75ffe04ba 100755
--- a/src/WorkflowManager/Database/Repositories/PayloadRepository.cs
+++ b/src/WorkflowManager/Database/Repositories/PayloadRepository.cs
@@ -91,7 +91,7 @@ public async Task> GetAllAsync(int? skip = null, int? limit = nul
public async Task GetByIdAsync(string payloadId)
{
- Guard.Against.NullOrWhiteSpace(payloadId);
+ Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
var payload = await _payloadCollection
.Find(x => x.PayloadId == payloadId)
@@ -120,8 +120,8 @@ public async Task UpdateAsync(Payload payload)
public async Task UpdateAssociatedWorkflowInstancesAsync(string payloadId, IEnumerable workflowInstances)
{
- Guard.Against.NullOrEmpty(workflowInstances);
- Guard.Against.NullOrWhiteSpace(payloadId);
+ Guard.Against.NullOrEmpty(workflowInstances, nameof(WorkflowInstance));
+ Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
try
{
diff --git a/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs b/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs
index c8fe0b574..8acb50806 100755
--- a/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs
+++ b/src/WorkflowManager/Database/Repositories/WorkflowRepository.cs
@@ -201,8 +201,8 @@ public async Task> GetWorkflowsByAeTitleAsync(List> GetWorkflowsForWorkflowRequestAsync(string calledAeTitle, string callingAeTitle)
{
- Guard.Against.NullOrEmpty(calledAeTitle);
- Guard.Against.NullOrEmpty(callingAeTitle);
+ Guard.Against.NullOrEmpty(calledAeTitle, nameof(calledAeTitle));
+ Guard.Against.NullOrEmpty(callingAeTitle, nameof(callingAeTitle));
var wfs = await _workflowCollection
.Find(x =>
@@ -221,7 +221,7 @@ public async Task> GetWorkflowsForWorkflowRequestAsync(s
public async Task CreateAsync(Workflow workflow)
{
- Guard.Against.Null(workflow);
+ Guard.Against.Null(workflow, nameof(workflow));
var workflowRevision = new WorkflowRevision
{
@@ -258,7 +258,7 @@ public async Task UpdateAsync(Workflow workflow, WorkflowRevision existi
public async Task SoftDeleteWorkflow(WorkflowRevision workflow)
{
- Guard.Against.Null(workflow);
+ Guard.Against.Null(workflow, nameof(workflow));
var deletedTimeStamp = DateTime.UtcNow;
diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json
index 24de264cf..0d40b9c17 100755
--- a/src/WorkflowManager/Database/packages.lock.json
+++ b/src/WorkflowManager/Database/packages.lock.json
@@ -38,11 +38,8 @@
},
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"AWSSDK.Core": {
"type": "Transitive",
@@ -65,11 +62,6 @@
"Microsoft.Win32.Registry": "5.0.0"
}
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"LightInject": {
"type": "Transitive",
"resolved": "5.4.0",
@@ -116,11 +108,10 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
+ "resolved": "2.2.0",
+ "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -141,11 +132,10 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "resolved": "2.2.0",
+ "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -155,19 +145,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.14",
- "contentHash": "Gl5I5/zL2MUzg5S4FzrkfpEBh/xSZGJbBrJHS5KDiwrWIKw+yfxYCjmjq7hZN+OJrKZrjWbhRVJcXiqwN9FsNg==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.14",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.14",
- "contentHash": "5QAO6QADZLRKFBDwMR34LtxPxTLmxEwG4OLFGgncvvIiTx8OjezILov4RFStCyzrqUvtlq6VJ88y9DnfgjAjNw=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -189,20 +179,19 @@
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
+ "resolved": "2.2.0",
+ "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
+ "Microsoft.Extensions.Configuration.Binder": "2.2.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Options": "2.2.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -280,15 +269,12 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
@@ -460,11 +446,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -475,14 +456,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.1.0",
@@ -706,7 +679,7 @@
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
+ "Monai.Deploy.Messaging": "[0.1.25, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json
index 04721f81c..95b73263e 100755
--- a/src/WorkflowManager/Logging/packages.lock.json
+++ b/src/WorkflowManager/Logging/packages.lock.json
@@ -4,22 +4,14 @@
"net6.0": {
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"DnsClient": {
"type": "Transitive",
"resolved": "1.4.0",
"contentHash": "CO1NG1zQdV0nEAXmr/KppLZ0S1qkaPwV0kPX5YPgmYBtrBVh1XMYHM54IXy3RBJu1k4thFtpzwo4HNHqxiuFYw=="
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"LightInject": {
"type": "Transitive",
"resolved": "5.4.0",
@@ -66,11 +58,10 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
+ "resolved": "2.2.0",
+ "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -91,11 +82,10 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "resolved": "2.2.0",
+ "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -105,19 +95,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.14",
- "contentHash": "Gl5I5/zL2MUzg5S4FzrkfpEBh/xSZGJbBrJHS5KDiwrWIKw+yfxYCjmjq7hZN+OJrKZrjWbhRVJcXiqwN9FsNg==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.14",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.14",
- "contentHash": "5QAO6QADZLRKFBDwMR34LtxPxTLmxEwG4OLFGgncvvIiTx8OjezILov4RFStCyzrqUvtlq6VJ88y9DnfgjAjNw=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -139,20 +129,19 @@
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
+ "resolved": "2.2.0",
+ "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
+ "Microsoft.Extensions.Configuration.Binder": "2.2.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Options": "2.2.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -221,15 +210,12 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
@@ -426,11 +412,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -441,14 +422,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.1.0",
@@ -662,7 +635,7 @@
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
+ "Monai.Deploy.Messaging": "[0.1.25, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
diff --git a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json b/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json
index 8c034592d..871d66306 100644
--- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json
+++ b/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json
@@ -15,23 +15,20 @@
},
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"AWSSDK.Core": {
"type": "Transitive",
- "resolved": "3.7.105.20",
- "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
+ "resolved": "3.7.200.13",
+ "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
- "resolved": "3.7.101.26",
- "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
+ "resolved": "3.7.201.9",
+ "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
"dependencies": {
- "AWSSDK.Core": "[3.7.105.20, 4.0.0)"
+ "AWSSDK.Core": "[3.7.200.13, 4.0.0)"
}
},
"DnsClient": {
@@ -42,11 +39,6 @@
"Microsoft.Win32.Registry": "5.0.0"
}
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"LightInject": {
"type": "Transitive",
"resolved": "5.4.0",
@@ -93,11 +85,10 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
+ "resolved": "3.1.0",
+ "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -110,19 +101,18 @@
},
"Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive",
- "resolved": "2.2.0",
- "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+ "resolved": "3.1.0",
+ "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
"dependencies": {
- "Microsoft.Extensions.Configuration": "2.2.0"
+ "Microsoft.Extensions.Configuration": "3.1.0"
}
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "resolved": "3.1.0",
+ "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -132,19 +122,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -166,20 +156,19 @@
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
+ "resolved": "3.1.0",
+ "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
+ "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+ "Microsoft.Extensions.DependencyInjection": "3.1.0",
+ "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+ "Microsoft.Extensions.Options": "3.1.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -257,38 +246,32 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
+ "resolved": "0.2.18",
+ "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
"dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Monai.Deploy.Storage.S3Policy": "0.2.15",
+ "AWSSDK.SecurityToken": "3.7.201.9",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
+ "resolved": "0.2.18",
+ "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
+ "Ardalis.GuardClauses": "4.1.1",
"Newtonsoft.Json": "13.0.3"
}
},
@@ -492,11 +475,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -507,14 +485,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.1.0",
@@ -746,14 +716,14 @@
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
- "Monai.Deploy.Storage": "[0.2.15, )"
+ "Monai.Deploy.Messaging": "[0.1.25, )",
+ "Monai.Deploy.Storage": "[0.2.18, )"
}
},
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
+ "Monai.Deploy.Messaging": "[0.1.25, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
@@ -776,7 +746,7 @@
"monai.deploy.workflowmanager.storage": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Storage": "[0.2.15, )",
+ "Monai.Deploy.Storage": "[0.2.18, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )"
}
diff --git a/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs b/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs
index 4b0130229..0e203a79a 100644
--- a/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs
+++ b/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs
@@ -96,67 +96,61 @@ public Task StopAsync(CancellationToken cancellationToken)
private void SetupPolling()
{
- _messageSubscriber.Subscribe(WorkflowRequestRoutingKey, WorkflowRequestRoutingKey, OnWorkflowRequestReceivedCallback);
+ _messageSubscriber.SubscribeAsync(WorkflowRequestRoutingKey, WorkflowRequestRoutingKey, OnWorkflowRequestReceivedCallbackAsync);
_logger.EventSubscription(ServiceName, WorkflowRequestRoutingKey);
- _messageSubscriber.Subscribe(TaskStatusUpdateRoutingKey, TaskStatusUpdateRoutingKey, OnTaskUpdateStatusReceivedCallback);
+ _messageSubscriber.SubscribeAsync(TaskStatusUpdateRoutingKey, TaskStatusUpdateRoutingKey, OnTaskUpdateStatusReceivedCallback);
_logger.EventSubscription(ServiceName, TaskStatusUpdateRoutingKey);
- _messageSubscriber.Subscribe(ExportCompleteRoutingKey, ExportCompleteRoutingKey, OnExportCompleteReceivedCallback);
+ _messageSubscriber.SubscribeAsync(ExportCompleteRoutingKey, ExportCompleteRoutingKey, OnExportCompleteReceivedCallback);
_logger.EventSubscription(ServiceName, ExportCompleteRoutingKey);
}
- private void OnWorkflowRequestReceivedCallback(MessageReceivedEventArgs eventArgs)
+ private async Task OnWorkflowRequestReceivedCallbackAsync(MessageReceivedEventArgs eventArgs)
{
- Task.Run(async () =>
+
+ using var loggerScope = _logger.BeginScope(new Dictionary
{
- using var loggerScope = _logger.BeginScope(new Dictionary
- {
- ["correlationId"] = eventArgs.Message.CorrelationId,
- ["source"] = eventArgs.Message.ApplicationId,
- ["messageId"] = eventArgs.Message.MessageId,
- ["messageDescription"] = eventArgs.Message.MessageDescription,
- });
-
- _logger.WorkflowRequestReceived();
- await _eventPayloadListenerService.ReceiveWorkflowPayload(eventArgs);
- }).ConfigureAwait(false);
+ ["correlationId"] = eventArgs.Message.CorrelationId,
+ ["source"] = eventArgs.Message.ApplicationId,
+ ["messageId"] = eventArgs.Message.MessageId,
+ ["messageDescription"] = eventArgs.Message.MessageDescription,
+ });
+
+ _logger.WorkflowRequestReceived();
+ await _eventPayloadListenerService.ReceiveWorkflowPayload(eventArgs);
}
- private void OnTaskUpdateStatusReceivedCallback(MessageReceivedEventArgs eventArgs)
+ private async Task OnTaskUpdateStatusReceivedCallback(MessageReceivedEventArgs eventArgs)
{
- Task.Run(async () =>
+ using var loggerScope = _logger.BeginScope(new Dictionary
{
- using var loggerScope = _logger.BeginScope(new Dictionary
- {
- ["correlationId"] = eventArgs.Message.CorrelationId,
- ["source"] = eventArgs.Message.ApplicationId,
- ["messageId"] = eventArgs.Message.MessageId,
- ["messageDescription"] = eventArgs.Message.MessageDescription,
- });
-
- _logger.TaskUpdateReceived();
- await _eventPayloadListenerService.TaskUpdatePayload(eventArgs);
- }).ConfigureAwait(false);
+ ["correlationId"] = eventArgs.Message.CorrelationId,
+ ["source"] = eventArgs.Message.ApplicationId,
+ ["messageId"] = eventArgs.Message.MessageId,
+ ["messageDescription"] = eventArgs.Message.MessageDescription,
+ });
+
+ _logger.TaskUpdateReceived();
+ await _eventPayloadListenerService.TaskUpdatePayload(eventArgs);
}
- private void OnExportCompleteReceivedCallback(MessageReceivedEventArgs eventArgs)
+ private async Task OnExportCompleteReceivedCallback(MessageReceivedEventArgs eventArgs)
{
- Task.Run(async () =>
+ using var loggerScope = _logger.BeginScope(new Dictionary
{
- using var loggerScope = _logger.BeginScope(new Dictionary
- {
- ["correlationId"] = eventArgs.Message.CorrelationId,
- ["source"] = eventArgs.Message.ApplicationId,
- ["messageId"] = eventArgs.Message.MessageId,
- ["messageDescription"] = eventArgs.Message.MessageDescription,
- });
-
- _logger.ExportCompleteReceived();
- await _eventPayloadListenerService.ExportCompletePayload(eventArgs);
- }).ConfigureAwait(false);
+ ["correlationId"] = eventArgs.Message.CorrelationId,
+ ["source"] = eventArgs.Message.ApplicationId,
+ ["messageId"] = eventArgs.Message.MessageId,
+ ["messageDescription"] = eventArgs.Message.MessageDescription,
+ });
+
+ _logger.ExportCompleteReceived();
+ await _eventPayloadListenerService.ExportCompletePayload(eventArgs);
+
}
+
protected virtual void Dispose(bool disposing)
{
if (!_disposedValue)
diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json
index 51a3849c5..f4852353d 100644
--- a/src/WorkflowManager/PayloadListener/packages.lock.json
+++ b/src/WorkflowManager/PayloadListener/packages.lock.json
@@ -4,23 +4,20 @@
"net6.0": {
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"AWSSDK.Core": {
"type": "Transitive",
- "resolved": "3.7.105.20",
- "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
+ "resolved": "3.7.200.13",
+ "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
- "resolved": "3.7.101.26",
- "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
+ "resolved": "3.7.201.9",
+ "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
"dependencies": {
- "AWSSDK.Core": "[3.7.105.20, 4.0.0)"
+ "AWSSDK.Core": "[3.7.200.13, 4.0.0)"
}
},
"DnsClient": {
@@ -47,11 +44,6 @@
"System.Threading.Channels": "6.0.0"
}
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"LightInject": {
"type": "Transitive",
"resolved": "5.4.0",
@@ -103,11 +95,10 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
+ "resolved": "2.2.0",
+ "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -128,11 +119,10 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "resolved": "2.2.0",
+ "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -142,19 +132,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -176,20 +166,19 @@
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
+ "resolved": "2.2.0",
+ "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
+ "Microsoft.Extensions.Configuration.Binder": "2.2.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Options": "2.2.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -272,38 +261,32 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
+ "resolved": "0.2.18",
+ "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
"dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Monai.Deploy.Storage.S3Policy": "0.2.15",
+ "AWSSDK.SecurityToken": "3.7.201.9",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
+ "resolved": "0.2.18",
+ "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
+ "Ardalis.GuardClauses": "4.1.1",
"Newtonsoft.Json": "13.0.3"
}
},
@@ -507,11 +490,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -522,14 +500,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.1.0",
@@ -771,31 +741,31 @@
"monai.deploy.workflowmanager.common": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
- "Monai.Deploy.WorkflowManager.Database": "1.0.0",
- "Monai.Deploy.WorkflowManager.Storage": "1.0.0"
+ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )"
}
},
"monai.deploy.workflowmanager.conditionsresolver": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.WorkflowManager.Common": "1.0.0",
- "Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
- "Monai.Deploy.WorkflowManager.Database": "1.0.0",
- "Monai.Deploy.WorkflowManager.Storage": "1.0.0"
+ "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )"
}
},
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
- "Monai.Deploy.Storage": "[0.2.15, )"
+ "Monai.Deploy.Messaging": "[0.1.25, )",
+ "Monai.Deploy.Storage": "[0.2.18, )"
}
},
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
+ "Monai.Deploy.Messaging": "[0.1.25, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
@@ -803,46 +773,46 @@
"monai.deploy.workflowmanager.database": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
- "Monai.Deploy.WorkflowManager.Logging": "1.0.0",
- "Mongo.Migration": "3.1.4",
- "MongoDB.Driver": "2.19.0"
+ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )",
+ "Mongo.Migration": "[3.1.4, )",
+ "MongoDB.Driver": "[2.19.0, )"
}
},
"monai.deploy.workflowmanager.logging": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.WorkflowManager.Contracts": "1.0.0"
+ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )"
}
},
"monai.deploy.workflowmanager.shared": {
"type": "Project",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
- "Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
- "fo-dicom": "5.0.3"
+ "Ardalis.GuardClauses": "[4.1.1, )",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )",
+ "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
+ "fo-dicom": "[5.0.3, )"
}
},
"monai.deploy.workflowmanager.storage": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Storage": "0.2.15",
- "Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
- "Monai.Deploy.WorkflowManager.Logging": "1.0.0"
+ "Monai.Deploy.Storage": "[0.2.18, )",
+ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )"
}
},
"monai.deploy.workloadmanager.workfowexecuter": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.WorkflowManager.Common": "1.0.0",
- "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0",
- "Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
- "Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
- "Monai.Deploy.WorkflowManager.Database": "1.0.0",
- "Monai.Deploy.WorkflowManager.Logging": "1.0.0",
- "Monai.Deploy.WorkflowManager.Shared": "1.0.0",
- "Monai.Deploy.WorkflowManager.Storage": "1.0.0"
+ "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Shared": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )"
}
}
}
diff --git a/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj b/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj
index 82b9a5072..67afef829 100755
--- a/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj
+++ b/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj
@@ -37,7 +37,7 @@
-
+
diff --git a/src/WorkflowManager/Storage/Services/DicomService.cs b/src/WorkflowManager/Storage/Services/DicomService.cs
index c47c2fc65..0c0f7c919 100644
--- a/src/WorkflowManager/Storage/Services/DicomService.cs
+++ b/src/WorkflowManager/Storage/Services/DicomService.cs
@@ -66,8 +66,8 @@ public DicomService(IStorageService storageService, ILogger logger
public async Task GetPayloadPatientDetailsAsync(string payloadId, string bucketName)
{
- Guard.Against.NullOrWhiteSpace(bucketName);
- Guard.Against.NullOrWhiteSpace(payloadId);
+ Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName));
+ Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
var items = await _storageService.ListObjectsAsync(bucketName, $"{payloadId}/dcm", true);
@@ -92,9 +92,9 @@ public async Task GetPayloadPatientDetailsAsync(string payloadId
public async Task GetFirstValueAsync(IList items, string payloadId, string bucketId, string keyId)
{
- Guard.Against.NullOrWhiteSpace(bucketId);
- Guard.Against.NullOrWhiteSpace(payloadId);
- Guard.Against.NullOrWhiteSpace(keyId);
+ Guard.Against.NullOrWhiteSpace(bucketId, nameof(bucketId));
+ Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
+ Guard.Against.NullOrWhiteSpace(keyId, nameof(keyId));
try
{
@@ -134,8 +134,8 @@ public async Task GetPayloadPatientDetailsAsync(string payloadId
public async Task> GetDicomPathsForTaskAsync(string outputDirectory, string bucketName)
{
- Guard.Against.NullOrWhiteSpace(outputDirectory);
- Guard.Against.NullOrWhiteSpace(bucketName);
+ Guard.Against.NullOrWhiteSpace(outputDirectory, nameof(outputDirectory));
+ Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName));
var files = await _storageService.ListObjectsAsync(bucketName, outputDirectory, true);
@@ -146,9 +146,9 @@ public async Task> GetDicomPathsForTaskAsync(string outputDi
public async Task GetAnyValueAsync(string keyId, string payloadId, string bucketId)
{
- Guard.Against.NullOrWhiteSpace(keyId);
- Guard.Against.NullOrWhiteSpace(payloadId);
- Guard.Against.NullOrWhiteSpace(bucketId);
+ Guard.Against.NullOrWhiteSpace(keyId, nameof(keyId));
+ Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
+ Guard.Against.NullOrWhiteSpace(bucketId, nameof(bucketId));
var path = $"{payloadId}/dcm";
var listOfFiles = await _storageService.ListObjectsAsync(bucketId, path, true);
@@ -170,9 +170,9 @@ public async Task GetAnyValueAsync(string keyId, string payloadId, strin
public async Task GetAllValueAsync(string keyId, string payloadId, string bucketId)
{
- Guard.Against.NullOrWhiteSpace(keyId);
- Guard.Against.NullOrWhiteSpace(payloadId);
- Guard.Against.NullOrWhiteSpace(bucketId);
+ Guard.Against.NullOrWhiteSpace(keyId, nameof(keyId));
+ Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
+ Guard.Against.NullOrWhiteSpace(bucketId, nameof(bucketId));
var path = $"{payloadId}/dcm";
var listOfFiles = await _storageService.ListObjectsAsync(bucketId, path, true);
@@ -209,10 +209,10 @@ public async Task GetDcmJsonFileValueAtIndexAsync(int index,
string keyId,
List items)
{
- Guard.Against.NullOrWhiteSpace(bucketId);
- Guard.Against.NullOrWhiteSpace(path);
- Guard.Against.NullOrWhiteSpace(keyId);
- Guard.Against.Null(items);
+ Guard.Against.NullOrWhiteSpace(bucketId, nameof(bucketId));
+ Guard.Against.NullOrWhiteSpace(path, nameof(path));
+ Guard.Against.NullOrWhiteSpace(keyId, nameof(keyId));
+ Guard.Against.Null(items, nameof(items));
if (index > items.Count)
{
diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json
index e9da6dc7c..19d41bf81 100755
--- a/src/WorkflowManager/Storage/packages.lock.json
+++ b/src/WorkflowManager/Storage/packages.lock.json
@@ -4,38 +4,32 @@
"net6.0": {
"Monai.Deploy.Storage": {
"type": "Direct",
- "requested": "[0.2.15, )",
- "resolved": "0.2.15",
- "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
- "dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Monai.Deploy.Storage.S3Policy": "0.2.15",
+ "requested": "[0.2.18, )",
+ "resolved": "0.2.18",
+ "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
+ "dependencies": {
+ "AWSSDK.SecurityToken": "3.7.201.9",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18",
"System.IO.Abstractions": "17.2.3"
}
},
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"AWSSDK.Core": {
"type": "Transitive",
- "resolved": "3.7.105.20",
- "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
+ "resolved": "3.7.200.13",
+ "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
- "resolved": "3.7.101.26",
- "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
+ "resolved": "3.7.201.9",
+ "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
"dependencies": {
- "AWSSDK.Core": "[3.7.105.20, 4.0.0)"
+ "AWSSDK.Core": "[3.7.200.13, 4.0.0)"
}
},
"DnsClient": {
@@ -43,11 +37,6 @@
"resolved": "1.4.0",
"contentHash": "CO1NG1zQdV0nEAXmr/KppLZ0S1qkaPwV0kPX5YPgmYBtrBVh1XMYHM54IXy3RBJu1k4thFtpzwo4HNHqxiuFYw=="
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"LightInject": {
"type": "Transitive",
"resolved": "5.4.0",
@@ -94,11 +83,10 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
+ "resolved": "2.2.0",
+ "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -119,11 +107,10 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "resolved": "2.2.0",
+ "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -133,19 +120,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -167,20 +154,19 @@
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
+ "resolved": "2.2.0",
+ "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
+ "Microsoft.Extensions.Configuration.Binder": "2.2.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Options": "2.2.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -249,24 +235,21 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
+ "resolved": "0.2.18",
+ "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
+ "Ardalis.GuardClauses": "4.1.1",
"Newtonsoft.Json": "13.0.3"
}
},
@@ -463,11 +446,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -478,14 +456,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.1.0",
@@ -699,7 +669,7 @@
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
+ "Monai.Deploy.Messaging": "[0.1.25, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
diff --git a/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs
index 70e08e3e0..96ae835c9 100755
--- a/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs
+++ b/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs
@@ -75,16 +75,16 @@ public bool TryConvertArtifactVariablesToPath(Artifact[] artifacts, string paylo
public async Task> ConvertArtifactVariablesToPath(Artifact[] artifacts, string payloadId, string workflowInstanceId, string bucketId, bool shouldExistYet = true)
{
- Guard.Against.Null(artifacts);
- Guard.Against.NullOrWhiteSpace(payloadId);
- Guard.Against.NullOrWhiteSpace(workflowInstanceId);
+ Guard.Against.Null(artifacts, nameof(artifacts));
+ Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
+ Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId));
var artifactPathDictionary = new Dictionary();
foreach (var artifact in artifacts)
{
- Guard.Against.NullOrWhiteSpace(artifact.Value);
- Guard.Against.NullOrWhiteSpace(artifact.Name);
+ Guard.Against.NullOrWhiteSpace(artifact.Value, nameof(artifact.Value));
+ Guard.Against.NullOrWhiteSpace(artifact.Name, nameof(artifact.Name));
if (!TrimArtifactVariable(artifact.Value, out var variableString))
{
diff --git a/src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs
index b00199b6f..e65b10c69 100644
--- a/src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs
+++ b/src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs
@@ -170,15 +170,16 @@ public static TaskDispatchEvent ToTaskDispatchEvent(TaskExecution task,
};
}
- public static ExportRequestEvent ToExportRequestEvent(IList dicomImages, string[] exportDestinations, string taskId, string workflowInstanceId, string correlationId)
+ public static ExportRequestEvent ToExportRequestEvent(IList dicomImages, string[] exportDestinations, string taskId, string workflowInstanceId, string correlationId, List? plugins = null)
{
Guard.Against.NullOrWhiteSpace(taskId, nameof(taskId));
Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId));
Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId));
Guard.Against.NullOrEmpty(dicomImages, nameof(dicomImages));
Guard.Against.NullOrEmpty(exportDestinations, nameof(exportDestinations));
+ plugins ??= new List();
- return new ExportRequestEvent
+ var Event = new ExportRequestEvent
{
WorkflowInstanceId = workflowInstanceId,
ExportTaskId = taskId,
@@ -186,6 +187,8 @@ public static ExportRequestEvent ToExportRequestEvent(IList dicomImages,
Files = dicomImages,
Destinations = exportDestinations
};
+ Event.PluginAssemblies.AddRange(plugins);
+ return Event;
}
}
}
diff --git a/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs b/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs
index b50d95e41..28dcd5273 100644
--- a/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs
+++ b/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs
@@ -23,8 +23,8 @@ public static class TaskExecutionStatusExtensions
{
public static bool IsTaskExecutionStatusUpdateValid(this TaskExecutionStatus newStatus, TaskExecutionStatus oldStatus)
{
- Guard.Against.Null(newStatus);
- Guard.Against.Null(oldStatus);
+ Guard.Against.Null(newStatus, nameof(newStatus));
+ Guard.Against.Null(oldStatus, nameof(oldStatus));
return newStatus switch
{
diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs
index 3813b2234..0a605a493 100755
--- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs
+++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs
@@ -15,6 +15,8 @@
*/
using System.Globalization;
+using System.Reflection.Metadata.Ecma335;
+using System.Threading.Tasks;
using Ardalis.GuardClauses;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
@@ -48,6 +50,7 @@ public class WorkflowExecuterService : IWorkflowExecuterService
private readonly IMessageBrokerPublisherService _messageBrokerPublisherService;
private readonly IConditionalParameterParser _conditionalParameterParser;
private readonly ITaskExecutionStatsRepository _taskExecutionStatsRepository;
+ private readonly List _migExternalAppPlugins;
private readonly IArtifactMapper _artifactMapper;
private readonly IStorageService _storageService;
private readonly IPayloadService _payloadService;
@@ -88,6 +91,7 @@ public WorkflowExecuterService(
_defaultPerTaskTypeTimeoutMinutes = configuration.Value.PerTaskTypeTimeoutMinutes;
TaskDispatchRoutingKey = configuration.Value.Messaging.Topics.TaskDispatchRequest;
TaskTimeoutRoutingKey = configuration.Value.Messaging.Topics.AideClinicalReviewCancelation;
+ _migExternalAppPlugins = configuration.Value.MigExternalAppPlugins;
ExportRequestRoutingKey = $"{configuration.Value.Messaging.Topics.ExportRequestPrefix}.{configuration.Value.Messaging.DicomAgents.ScuAgentName}";
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -107,6 +111,23 @@ public async Task ProcessPayload(WorkflowRequestEvent message, Payload pay
Guard.Against.Null(message, nameof(message));
using var loggerScope = _logger.BeginScope($"correlationId={message.CorrelationId}, payloadId={payload.PayloadId}");
+
+ // for external App executions then workflowInstanceId will be supplied and we can continue the workflow from that task.
+ if (string.IsNullOrWhiteSpace(message.WorkflowInstanceId) is false)
+ {
+ var instance = await _workflowInstanceRepository.GetByWorkflowInstanceIdAsync(message.WorkflowInstanceId);
+ if (instance is not null)
+ {
+ var task = instance.Tasks.First(t => t.TaskId == message.TaskId);
+ if (task is not null)
+ {
+ var workflow = await _workflowRepository.GetByWorkflowIdAsync(instance.WorkflowId);
+ await HandleTaskDestinations(instance, workflow, task, message.CorrelationId);
+ return true;
+ }
+ }
+ }
+
var processed = true;
List? workflows;
@@ -199,6 +220,13 @@ public async Task ProcessFirstWorkflowTask(WorkflowInstance workflowInstance, st
return;
}
+ if (string.Equals(task.TaskType, TaskTypeConstants.ExternalAppTask, StringComparison.InvariantCultureIgnoreCase))
+ {
+ await HandleExternalAppAsync(workflow, workflowInstance, task, correlationId);
+
+ return;
+ }
+
if (task.Status != TaskExecutionStatus.Created)
{
_logger.TaskPreviouslyDispatched(workflowInstance.PayloadId, task.TaskId);
@@ -245,8 +273,8 @@ public void AttachPatientMetaData(TaskExecution task, PatientDetails patientDeta
public async Task ProcessTaskUpdate(TaskUpdateEvent message)
{
- Guard.Against.Null(message);
- Guard.Against.Null(message.WorkflowInstanceId);
+ Guard.Against.Null(message, nameof(message));
+ Guard.Against.Null(message.WorkflowInstanceId, nameof(message.WorkflowInstanceId));
var workflowInstance = await _workflowInstanceRepository.GetByWorkflowInstanceIdAsync(message.WorkflowInstanceId);
@@ -393,7 +421,10 @@ public async Task ProcessExportComplete(ExportCompleteEvent message, strin
return false;
}
- return await HandleTaskDestinations(workflowInstance, workflow, task, correlationId);
+ if (string.Compare(task.TaskType, ValidationConstants.ExportTaskType, true) == 0)
+ {
+ return await HandleTaskDestinations(workflowInstance, workflow, task, correlationId);
+ }
}
if ((message.Status.Equals(ExportStatus.Failure) || message.Status.Equals(ExportStatus.PartialFailure)) &&
@@ -454,8 +485,14 @@ private async Task UpdateWorkflowInstanceStatus(WorkflowInstance workflowI
return true;
}
- private async Task HandleDicomExportAsync(WorkflowRevision workflow, WorkflowInstance workflowInstance, TaskExecution task, string correlationId)
+ private async Task HandleExternalAppAsync(WorkflowRevision workflow, WorkflowInstance workflowInstance, TaskExecution task, string correlationId)
+ {
+ var plugins = _migExternalAppPlugins;
+ await HandleDicomExportAsync(workflow, workflowInstance, task, correlationId, plugins).ConfigureAwait(false);
+ }
+ private async Task HandleDicomExportAsync(WorkflowRevision workflow, WorkflowInstance workflowInstance, TaskExecution task, string correlationId, List? plugins = null)
{
+ plugins ??= new List();
var exportList = workflow.Workflow?.Tasks?.FirstOrDefault(t => t.Id == task.TaskId)?.ExportDestinations.Select(e => e.Name).ToArray();
var artifactValues = GetDicomExports(workflow, task, exportList);
@@ -490,7 +527,7 @@ private async Task HandleDicomExportAsync(WorkflowRevision workflow, WorkflowIns
return;
}
- await DispatchDicomExport(workflowInstance, task, exportList, artifactValues, correlationId);
+ await DispatchDicomExport(workflowInstance, task, exportList, artifactValues, correlationId, plugins);
}
private string[] GetDicomExports(WorkflowRevision workflow, TaskExecution task, string[]? exportDestinations)
@@ -521,14 +558,14 @@ private string[] GetDicomExports(WorkflowRevision workflow, TaskExecution task,
return new List(task.InputArtifacts.Values).ToArray();
}
- private async Task DispatchDicomExport(WorkflowInstance workflowInstance, TaskExecution task, string[]? exportDestinations, string[] artifactValues, string correlationId)
+ private async Task DispatchDicomExport(WorkflowInstance workflowInstance, TaskExecution task, string[]? exportDestinations, string[] artifactValues, string correlationId, List plugins)
{
if (exportDestinations is null || !exportDestinations.Any())
{
return false;
}
- await ExportRequest(workflowInstance, task, exportDestinations, artifactValues, correlationId);
+ await ExportRequest(workflowInstance, task, exportDestinations, artifactValues, correlationId, plugins);
return await _workflowInstanceRepository.UpdateTaskStatusAsync(workflowInstance.Id, task.TaskId, TaskExecutionStatus.Dispatched);
}
@@ -613,6 +650,13 @@ private async Task DispatchTaskDestinations(WorkflowInstance workflowInsta
continue;
}
+ if (string.Equals(taskExec!.TaskType, TaskTypeConstants.ExternalAppTask, StringComparison.InvariantCultureIgnoreCase))
+ {
+ await HandleExternalAppAsync(workflow, workflowInstance, taskExec!, correlationId);
+
+ continue;
+ }
+
processed &= await DispatchTask(workflowInstance, workflow, taskExec!, correlationId);
if (processed is false)
@@ -756,9 +800,9 @@ private async Task DispatchTask(WorkflowInstance workflowInstance, Workflo
}
}
- private async Task ExportRequest(WorkflowInstance workflowInstance, TaskExecution taskExec, string[] exportDestinations, IList dicomImages, string correlationId)
+ private async Task ExportRequest(WorkflowInstance workflowInstance, TaskExecution taskExec, string[] exportDestinations, IList dicomImages, string correlationId, List plugins)
{
- var exportRequestEvent = EventMapper.ToExportRequestEvent(dicomImages, exportDestinations, taskExec.TaskId, workflowInstance.Id, correlationId);
+ var exportRequestEvent = EventMapper.ToExportRequestEvent(dicomImages, exportDestinations, taskExec.TaskId, workflowInstance.Id, correlationId, plugins);
var jsonMesssage = new JsonMessage(exportRequestEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, exportRequestEvent.CorrelationId, Guid.NewGuid().ToString());
await _messageBrokerPublisherService.Publish(ExportRequestRoutingKey, jsonMesssage.ToMessage());
@@ -825,7 +869,7 @@ public async Task CreateTaskExecutionAsync(TaskObject task,
string? payloadId = null,
string? previousTaskId = null)
{
- Guard.Against.Null(workflowInstance);
+ Guard.Against.Null(workflowInstance, nameof(workflowInstance));
var workflowInstanceId = workflowInstance.Id;
@@ -833,12 +877,12 @@ public async Task CreateTaskExecutionAsync(TaskObject task,
payloadId ??= workflowInstance.PayloadId;
- Guard.Against.Null(task);
- Guard.Against.NullOrWhiteSpace(task.Type);
- Guard.Against.NullOrWhiteSpace(task.Id);
- Guard.Against.NullOrWhiteSpace(workflowInstanceId);
- Guard.Against.NullOrWhiteSpace(bucketName);
- Guard.Against.NullOrWhiteSpace(payloadId);
+ Guard.Against.Null(task, nameof(task));
+ Guard.Against.NullOrWhiteSpace(task.Type, nameof(task.Type));
+ Guard.Against.NullOrWhiteSpace(task.Id, nameof(task.Id));
+ Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId));
+ Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName));
+ Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
var executionId = Guid.NewGuid().ToString();
var newTaskArgs = GetTaskArgs(task, workflowInstance);
diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json
index 6da93086c..63b5a4c52 100644
--- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json
+++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json
@@ -4,23 +4,20 @@
"net6.0": {
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"AWSSDK.Core": {
"type": "Transitive",
- "resolved": "3.7.105.20",
- "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
+ "resolved": "3.7.200.13",
+ "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
- "resolved": "3.7.101.26",
- "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
+ "resolved": "3.7.201.9",
+ "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
"dependencies": {
- "AWSSDK.Core": "[3.7.105.20, 4.0.0)"
+ "AWSSDK.Core": "[3.7.200.13, 4.0.0)"
}
},
"DnsClient": {
@@ -47,11 +44,6 @@
"System.Threading.Channels": "6.0.0"
}
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"LightInject": {
"type": "Transitive",
"resolved": "5.4.0",
@@ -103,11 +95,10 @@
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
- "resolved": "6.0.1",
- "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==",
+ "resolved": "2.2.0",
+ "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
"dependencies": {
- "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
- "Microsoft.Extensions.Primitives": "6.0.0"
+ "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
@@ -128,11 +119,10 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==",
+ "resolved": "2.2.0",
+ "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
@@ -142,19 +132,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -176,20 +166,19 @@
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==",
+ "resolved": "2.2.0",
+ "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
"dependencies": {
- "Microsoft.Extensions.DependencyInjection": "6.0.0",
- "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "System.Diagnostics.DiagnosticSource": "6.0.0"
+ "Microsoft.Extensions.Configuration.Binder": "2.2.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
+ "Microsoft.Extensions.Options": "2.2.0"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -272,38 +261,32 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
+ "resolved": "0.2.18",
+ "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
"dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Monai.Deploy.Storage.S3Policy": "0.2.15",
+ "AWSSDK.SecurityToken": "3.7.201.9",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
+ "resolved": "0.2.18",
+ "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
+ "Ardalis.GuardClauses": "4.1.1",
"Newtonsoft.Json": "13.0.3"
}
},
@@ -507,11 +490,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -522,14 +500,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.1.0",
@@ -771,31 +741,31 @@
"monai.deploy.workflowmanager.common": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
- "Monai.Deploy.WorkflowManager.Database": "1.0.0",
- "Monai.Deploy.WorkflowManager.Storage": "1.0.0"
+ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )"
}
},
"monai.deploy.workflowmanager.conditionsresolver": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.WorkflowManager.Common": "1.0.0",
- "Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
- "Monai.Deploy.WorkflowManager.Database": "1.0.0",
- "Monai.Deploy.WorkflowManager.Storage": "1.0.0"
+ "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )"
}
},
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
- "Monai.Deploy.Storage": "[0.2.15, )"
+ "Monai.Deploy.Messaging": "[0.1.25, )",
+ "Monai.Deploy.Storage": "[0.2.18, )"
}
},
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
+ "Monai.Deploy.Messaging": "[0.1.25, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
@@ -803,33 +773,33 @@
"monai.deploy.workflowmanager.database": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
- "Monai.Deploy.WorkflowManager.Logging": "1.0.0",
- "Mongo.Migration": "3.1.4",
- "MongoDB.Driver": "2.19.0"
+ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )",
+ "Mongo.Migration": "[3.1.4, )",
+ "MongoDB.Driver": "[2.19.0, )"
}
},
"monai.deploy.workflowmanager.logging": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.WorkflowManager.Contracts": "1.0.0"
+ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )"
}
},
"monai.deploy.workflowmanager.shared": {
"type": "Project",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
- "Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
- "fo-dicom": "5.0.3"
+ "Ardalis.GuardClauses": "[4.1.1, )",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )",
+ "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
+ "fo-dicom": "[5.0.3, )"
}
},
"monai.deploy.workflowmanager.storage": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Storage": "0.2.15",
- "Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
- "Monai.Deploy.WorkflowManager.Logging": "1.0.0"
+ "Monai.Deploy.Storage": "[0.2.18, )",
+ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
+ "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )"
}
}
}
diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj
index 3115e5070..ae90fa9d2 100755
--- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj
+++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj
@@ -45,11 +45,11 @@
-
+
-
-
-
+
+
+
diff --git a/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs b/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs
index 4b4bc51db..7299b8128 100644
--- a/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs
+++ b/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs
@@ -1,18 +1,18 @@
/*
- * Copyright 2022 MONAI Consortium
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* Copyright 2022 MONAI Consortium
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
using System;
using System.Collections.Generic;
@@ -144,9 +144,9 @@ private void ValidateTasks(Workflow workflow, string firstTaskId)
var destinations = new List();
foreach (var task in workflow.Tasks)
{
- ValidateTaskArtifacts(task);
+ ValidateTaskOutputArtifacts(task);
- TaskTypeSpecificValidation(workflow.Tasks, task);
+ TaskTypeSpecificValidation(workflow, task);
if (task.TaskDestinations.Any(td => td.Name == firstTaskId))
{
@@ -179,6 +179,24 @@ private void ValidateTasks(Workflow workflow, string firstTaskId)
}
}
+ private void CheckDestinationInMigDestinations(TaskObject task, InformaticsGateway gateway)
+ {
+ var taskDestinationNames = task.ExportDestinations.Select(td => td.Name);
+ if (taskDestinationNames.Any() && (gateway?.ExportDestinations?.IsNullOrEmpty() ?? true))
+ {
+ Errors.Add("InformaticsGateway ExportDestinations destinations can not be null with an Export Task.");
+ }
+
+ var diff = taskDestinationNames.Except(gateway?.ExportDestinations).ToList();
+ if (!diff.IsNullOrEmpty())
+ {
+ foreach (var missingDestination in diff)
+ {
+ Errors.Add($"Task: '{task.Id}' export_destination: '{missingDestination}' must be registered in the informatics_gateway object.");
+ }
+ }
+ }
+
private void ValidateExportDestinations(Workflow workflow)
{
if (workflow.Tasks.Any() is false)
@@ -188,21 +206,7 @@ private void ValidateExportDestinations(Workflow workflow)
foreach (var task in workflow.Tasks.Where(task => task.ExportDestinations.IsNullOrEmpty() is false))
{
- var taskExportDestinationNames = task.ExportDestinations.Select(td => td.Name);
- if (taskExportDestinationNames.Any() && (workflow.InformaticsGateway?.ExportDestinations?.IsNullOrEmpty() ?? true))
- {
- Errors.Add("InformaticsGateway ExportDestinations destinations can not be null with an Export Task.");
- return;
- }
-
- var diff = taskExportDestinationNames.Except(workflow.InformaticsGateway?.ExportDestinations).ToList();
- if (!diff.IsNullOrEmpty())
- {
- foreach (var missingDestination in diff)
- {
- Errors.Add($"Task: '{task.Id}' export_destination: '{missingDestination}' must be registered in the informatics_gateway object.");
- }
- }
+ CheckDestinationInMigDestinations(task, workflow.InformaticsGateway);
}
}
@@ -293,7 +297,7 @@ private async Task ValidateInformaticsGateaway(InformaticsGateway informaticsGat
}
}
- private void ValidateTaskArtifacts(TaskObject currentTask)
+ private void ValidateTaskOutputArtifacts(TaskObject currentTask)
{
if (currentTask.Artifacts != null && currentTask.Artifacts.Output.IsNullOrEmpty() is false)
{
@@ -307,8 +311,9 @@ private void ValidateTaskArtifacts(TaskObject currentTask)
}
}
- private void TaskTypeSpecificValidation(TaskObject[] tasks, TaskObject currentTask)
+ private void TaskTypeSpecificValidation(Workflow workflow, TaskObject currentTask)
{
+ var tasks = workflow.Tasks;
if (ValidTaskTypes.Contains(currentTask.Type.ToLower()) is false)
{
Errors.Add($"Task: '{currentTask.Id}' has an invalid type{Comma}please specify: {string.Join(Comma, ValidTaskTypes)}");
@@ -317,6 +322,16 @@ private void TaskTypeSpecificValidation(TaskObject[] tasks, TaskObject currentTa
ValidateInputs(currentTask);
+ if (currentTask.Type.Equals(ExportTaskType, StringComparison.OrdinalIgnoreCase) is true)
+ {
+ ValidateExportTask(workflow, currentTask);
+ }
+
+ if (currentTask.Type.Equals(ExternalAppTaskType, StringComparison.OrdinalIgnoreCase) is true)
+ {
+ ValidateExternalAppTask(workflow, currentTask);
+ }
+
if (currentTask.Type.Equals(ArgoTaskType, StringComparison.OrdinalIgnoreCase) is true)
{
ValidateArgoTask(currentTask);
@@ -457,7 +472,7 @@ private void ValidateEmailTask(TaskObject currentTask)
if (emailsSpecified)
{
var emails = currentTask.Args[RecipientEmails] ?? string.Empty;
- var formattedEmails = emails.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+ var formattedEmails = emails.Split(',').Where(e => !string.IsNullOrWhiteSpace(e.Trim()));
if (!formattedEmails.Any())
{
@@ -498,7 +513,7 @@ private void ValidateEmailTask(TaskObject currentTask)
if (rolesSpecified)
{
var roles = currentTask.Args[RecipientRoles] ?? string.Empty;
- var formattedRoles = roles.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+ var formattedRoles = roles.Split(',').Where(r => !string.IsNullOrWhiteSpace(r.Trim()));
if (!formattedRoles.Any())
{
@@ -514,7 +529,7 @@ private void ValidateEmailTask(TaskObject currentTask)
}
var metadataValues = currentTask.Args[MetadataValues] ?? string.Empty;
- var formattedMetadataValues = metadataValues.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+ var formattedMetadataValues = metadataValues.Split(',').Where(m => !string.IsNullOrWhiteSpace(m.Trim()));
if (!formattedMetadataValues.Any())
{
@@ -522,7 +537,7 @@ private void ValidateEmailTask(TaskObject currentTask)
return;
}
- var disallowedTags = _options.Value.DicomTagsDisallowed.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+ var disallowedTags = _options.Value.DicomTagsDisallowed.Split(',').Select(t => t.Trim());
var intersect = formattedMetadataValues.Intersect(disallowedTags);
if (intersect.Any())
@@ -584,5 +599,46 @@ private void ValidateClinicalReviewRequiredFields(TaskObject[] tasks, TaskObject
Errors.Add($"Task: '{currentTask.Id}' reviewed_task_id: '{currentTask.Args[ReviewedTaskId]}' does not reference an Argo task.");
}
}
+
+ private void ValidateExportTask(Workflow workflow, TaskObject currentTask)
+ {
+ if (currentTask.ExportDestinations.Any() is false)
+ {
+ Errors.Add($"Task: '{currentTask.Id}' does not contain a destination.");
+ }
+
+ CheckDestinationInMigDestinations(currentTask, workflow.InformaticsGateway);
+
+ if (currentTask.ExportDestinations.Count() != currentTask.ExportDestinations.Select(t => t.Name).Distinct().Count())
+ {
+ Errors.Add($"Task: '{currentTask.Id}' contains duplicate destinations.");
+ }
+
+ ValidateInputs(currentTask);
+ }
+
+ private void ValidateExternalAppTask(Workflow workflow, TaskObject currentTask)
+ {
+ if (currentTask.ExportDestinations.Any() is false)
+ {
+ Errors.Add($"Task: '{currentTask.Id}' does not contain a destination.");
+ }
+
+ CheckDestinationInMigDestinations(currentTask, workflow.InformaticsGateway);
+
+ if (currentTask.ExportDestinations.Count() != currentTask.ExportDestinations.Select(t => t.Name).Distinct().Count())
+ {
+ Errors.Add($"Task: '{currentTask.Id}' contains duplicate destinations.");
+ }
+
+ ValidateTaskOutputArtifacts(currentTask);
+
+ if (currentTask.Artifacts == null
+ || currentTask.Artifacts.Output.IsNullOrEmpty()
+ || (currentTask.Artifacts.Output.Select(a => a.Name).Any() is false))
+ {
+ Errors.Add($"Task: '{currentTask.Id}' must contain at lease a single output.");
+ }
+ }
}
}
diff --git a/src/WorkflowManager/WorkflowManager/appsettings.json b/src/WorkflowManager/WorkflowManager/appsettings.json
index 1dfe8f86d..8346de9be 100755
--- a/src/WorkflowManager/WorkflowManager/appsettings.json
+++ b/src/WorkflowManager/WorkflowManager/appsettings.json
@@ -101,7 +101,8 @@
"serviceName": "test"
}
},
- "dicomTagsDisallowed": "PatientName,PatientID,IssuerOfPatientID,TypeOfPatientID,IssuerOfPatientIDQualifiersSequence,SourcePatientGroupIdentificationSequence,GroupOfPatientsIdentificationSequence,SubjectRelativePositionInImage,PatientBirthDate,PatientBirthTime,PatientBirthDateInAlternativeCalendar,PatientDeathDateInAlternativeCalendar,PatientAlternativeCalendar,PatientSex,PatientInsurancePlanCodeSequence,PatientPrimaryLanguageCodeSequence,PatientPrimaryLanguageModifierCodeSequence,QualityControlSubject,QualityControlSubjectTypeCodeSequence,StrainDescription,StrainNomenclature,StrainStockNumber,StrainSourceRegistryCodeSequence,StrainStockSequence,StrainSource,StrainAdditionalInformation,StrainCodeSequence,GeneticModificationsSequence,GeneticModificationsDescription,GeneticModificationsNomenclature,GeneticModificationsCodeSequence,OtherPatientIDsRETIRED,OtherPatientNames,OtherPatientIDsSequence,PatientBirthName,PatientAge,PatientSize,PatientSizeCodeSequence,PatientBodyMassIndex,MeasuredAPDimension,MeasuredLateralDimension,PatientWeight,PatientAddress,InsurancePlanIdentificationRETIRED,PatientMotherBirthName,MilitaryRank,BranchOfService,MedicalRecordLocatorRETIRED,ReferencedPatientPhotoSequence,MedicalAlerts,Allergies,CountryOfResidence,RegionOfResidence,PatientTelephoneNumbers,PatientTelecomInformation,EthnicGroup,Occupation,SmokingStatus,AdditionalPatientHistory,PregnancyStatus,LastMenstrualDate,PatientReligiousPreference,PatientSpeciesDescription,PatientSpeciesCodeSequence,PatientSexNeutered,AnatomicalOrientationType,PatientBreedDescription,PatientBreedCodeSequence,BreedRegistrationSequence,BreedRegistrationNumber,BreedRegistryCodeSequence,ResponsiblePerson,ResponsiblePersonRole,ResponsibleOrganization,PatientComments,ExaminedBodyThickness"
+ "dicomTagsDisallowed": "PatientName,PatientID,IssuerOfPatientID,TypeOfPatientID,IssuerOfPatientIDQualifiersSequence,SourcePatientGroupIdentificationSequence,GroupOfPatientsIdentificationSequence,SubjectRelativePositionInImage,PatientBirthDate,PatientBirthTime,PatientBirthDateInAlternativeCalendar,PatientDeathDateInAlternativeCalendar,PatientAlternativeCalendar,PatientSex,PatientInsurancePlanCodeSequence,PatientPrimaryLanguageCodeSequence,PatientPrimaryLanguageModifierCodeSequence,QualityControlSubject,QualityControlSubjectTypeCodeSequence,StrainDescription,StrainNomenclature,StrainStockNumber,StrainSourceRegistryCodeSequence,StrainStockSequence,StrainSource,StrainAdditionalInformation,StrainCodeSequence,GeneticModificationsSequence,GeneticModificationsDescription,GeneticModificationsNomenclature,GeneticModificationsCodeSequence,OtherPatientIDsRETIRED,OtherPatientNames,OtherPatientIDsSequence,PatientBirthName,PatientAge,PatientSize,PatientSizeCodeSequence,PatientBodyMassIndex,MeasuredAPDimension,MeasuredLateralDimension,PatientWeight,PatientAddress,InsurancePlanIdentificationRETIRED,PatientMotherBirthName,MilitaryRank,BranchOfService,MedicalRecordLocatorRETIRED,ReferencedPatientPhotoSequence,MedicalAlerts,Allergies,CountryOfResidence,RegionOfResidence,PatientTelephoneNumbers,PatientTelecomInformation,EthnicGroup,Occupation,SmokingStatus,AdditionalPatientHistory,PregnancyStatus,LastMenstrualDate,PatientReligiousPreference,PatientSpeciesDescription,PatientSpeciesCodeSequence,PatientSexNeutered,AnatomicalOrientationType,PatientBreedDescription,PatientBreedCodeSequence,BreedRegistrationSequence,BreedRegistrationNumber,BreedRegistryCodeSequence,ResponsiblePerson,ResponsiblePersonRole,ResponsibleOrganization,PatientComments,ExaminedBodyThickness",
+ "migExternalAppPlugins": "Monai.Deploy.InformaticsGateway.ExecutionPlugins.ExternalAppOutgoing, Monai.Deploy.InformaticsGateway, Version=0.0.0.0"
},
"InformaticsGateway": {
"apiHost": "http://localhost:5010",
diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json
index 054bbc0d2..0b83c5f87 100755
--- a/src/WorkflowManager/WorkflowManager/packages.lock.json
+++ b/src/WorkflowManager/WorkflowManager/packages.lock.json
@@ -70,29 +70,25 @@
},
"Monai.Deploy.Messaging": {
"type": "Direct",
- "requested": "[0.1.23, )",
- "resolved": "0.1.23",
- "contentHash": "wz93Hk2kq5cKR/8kJlCEA8DHACrPFo+lVEjWv3nvLbPhJ4N0aDzbcQoqA4P/duSWXFi0jhUzXsSwBX3rt4l7Xw==",
+ "requested": "[0.1.25, )",
+ "resolved": "0.1.25",
+ "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.14",
- "Microsoft.Extensions.Logging": "6.0.0",
+ "Ardalis.GuardClauses": "4.1.1",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
"Newtonsoft.Json": "13.0.3",
- "System.ComponentModel.Annotations": "5.0.0",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Messaging.RabbitMQ": {
"type": "Direct",
- "requested": "[0.1.23, )",
- "resolved": "0.1.23",
- "contentHash": "+Y1eLKz9FtPbASOVtTaM1ktyUqOxmyIjksNukZ8dUhtDJrT3CF9ISw6BGajxwJfq2jUjacli3jNSc1OAnLJRcQ==",
+ "requested": "[0.1.25, )",
+ "resolved": "0.1.25",
+ "contentHash": "p/Si1XzNUiTdN1gYFKxYy9w/bVzOYooK9DEW7JJs8D8Sghzkvh0GyWV3vUO9dVkEcU0oT5HmZ4x+nz8BzAkz6g==",
"dependencies": {
- "Monai.Deploy.Messaging": "0.1.23",
- "Polly": "7.2.3",
- "RabbitMQ.Client": "6.4.0",
- "System.Collections.Concurrent": "4.3.0"
+ "Monai.Deploy.Messaging": "0.1.25",
+ "Polly": "7.2.4",
+ "RabbitMQ.Client": "6.5.0"
}
},
"Monai.Deploy.Security": {
@@ -112,32 +108,25 @@
},
"Monai.Deploy.Storage": {
"type": "Direct",
- "requested": "[0.2.15, )",
- "resolved": "0.2.15",
- "contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
+ "requested": "[0.2.18, )",
+ "resolved": "0.2.18",
+ "contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
"dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Configuration": "6.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Monai.Deploy.Storage.S3Policy": "0.2.15",
+ "AWSSDK.SecurityToken": "3.7.201.9",
+ "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18",
"System.IO.Abstractions": "17.2.3"
}
},
"Monai.Deploy.Storage.MinIO": {
"type": "Direct",
- "requested": "[0.2.15, )",
- "resolved": "0.2.15",
- "contentHash": "hyN7GuTp80y5cpY01IqbzkRCc0QB3y2v7Sppzarsnw6l6FgLJ1ZUgvMN4VDBwVyMNJytBeEKWfgn/FdidGNYaw==",
+ "requested": "[0.2.18, )",
+ "resolved": "0.2.18",
+ "contentHash": "0sHLiT0qU2Fg5O+AF8UDqzsJEYztUAFZeOPh4kOLC4bckhb+wSsuv7VcAXWtR3BOY6TxaMVVUJ+EK/o5mCp3tQ==",
"dependencies": {
- "AWSSDK.SecurityToken": "3.7.101.26",
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Logging": "6.0.0",
- "Microsoft.Extensions.Options": "6.0.0",
- "Minio": "4.0.7",
- "Monai.Deploy.Storage": "0.2.15",
- "Monai.Deploy.Storage.S3Policy": "0.2.15"
+ "Minio": "5.0.0",
+ "Monai.Deploy.Storage": "0.2.18",
+ "Monai.Deploy.Storage.S3Policy": "0.2.18"
}
},
"Mongo.Migration": {
@@ -203,32 +192,26 @@
},
"Ardalis.GuardClauses": {
"type": "Transitive",
- "resolved": "4.0.1",
- "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==",
- "dependencies": {
- "JetBrains.Annotations": "2021.3.0"
- }
+ "resolved": "4.1.1",
+ "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
},
"AWSSDK.Core": {
"type": "Transitive",
- "resolved": "3.7.105.20",
- "contentHash": "ZHuTxP1J8g91+YSV0YLzm5te5lG+zkiUH/+NDHFpLf1cBD6iw2kUo5AkYEVxfEur1OTdYJxEZ5jDuOBE4pubkg=="
+ "resolved": "3.7.200.13",
+ "contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
},
"AWSSDK.SecurityToken": {
"type": "Transitive",
- "resolved": "3.7.101.26",
- "contentHash": "/y64ogftqwGa07HNOj2Dh08oqYIgbIyfJFncneHy+fzC54VFhEIN5+pSOHS4Also1SSb9Erk/Knuf3L6jrTVEg==",
+ "resolved": "3.7.201.9",
+ "contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
"dependencies": {
- "AWSSDK.Core": "[3.7.105.20, 4.0.0)"
+ "AWSSDK.Core": "[3.7.200.13, 4.0.0)"
}
},
- "Crc32.NET": {
+ "CommunityToolkit.HighPerformance": {
"type": "Transitive",
- "resolved": "1.2.0",
- "contentHash": "wNW/huzolu8MNKUnwCVKxjfAlCFpeI8AZVfF46iAWJ1+P6bTU1AZct7VAkDDEjgeeTJCVTkGZaD6jSd/fOiUkA==",
- "dependencies": {
- "NETStandard.Library": "2.0.0"
- }
+ "resolved": "8.1.0",
+ "contentHash": "kgDi65k02hrgnHy3N0xENecsr0spW13RdIA1tipovi9t16gKziI7uZIu3qkxz0GctCHNM4hfeqXYg//6wHJ6Kw=="
},
"DnsClient": {
"type": "Transitive",
@@ -254,11 +237,6 @@
"System.Threading.Channels": "6.0.0"
}
},
- "JetBrains.Annotations": {
- "type": "Transitive",
- "resolved": "2021.3.0",
- "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
- },
"LightInject": {
"type": "Transitive",
"resolved": "5.4.0",
@@ -424,19 +402,19 @@
},
"Microsoft.Extensions.Diagnostics.HealthChecks": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "crR/15PKDgVIQmH9uGJuQVg4RGbaxwG3cseRRMisPG/2LkiQV71EkNRGPV4cI61Waywc1Wn5sYXE8bo2qCf+/Q==",
+ "resolved": "6.0.21",
+ "contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
"dependencies": {
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.3",
+ "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
"Microsoft.Extensions.Options": "6.0.0"
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.15",
- "contentHash": "LmB5kbbc0Sr+XvnYj8tReZzubS50h1g463zpbnnjqT/k6fM8/od9hFCBj52dorXfp/DDfm5+rUdKaPRUsX70Jg=="
+ "resolved": "6.0.21",
+ "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
@@ -495,8 +473,8 @@
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.3",
- "contentHash": "SUpStcdjeBbdKjPKe53hVVLkFjylX0yIXY8K+xWa47+o1d+REDyOMZjHZa+chsQI1K9qZeiHWk9jos0TFU7vGg=="
+ "resolved": "6.0.4",
+ "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
@@ -630,8 +608,8 @@
},
"Microsoft.NETCore.Targets": {
"type": "Transitive",
- "resolved": "1.1.3",
- "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ=="
+ "resolved": "1.1.0",
+ "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
},
"Microsoft.OpenApi": {
"type": "Transitive",
@@ -654,24 +632,20 @@
},
"Minio": {
"type": "Transitive",
- "resolved": "4.0.7",
- "contentHash": "gmd+B4YHaE+cz8TCPIzkhov3t30VovGfyf6vMxqXd/iF/cziKmXKJJXv2E9kcHvbGwVHhMWtvk7fXWOzHcU4uw==",
+ "resolved": "5.0.0",
+ "contentHash": "7tZj90WEuuH60RAP4wBYexjMuJOhCnK7I46hCiX3CtZPackHisLZ8aAJmn3KlwbUX22dBDphwemD+h37vet8Qw==",
"dependencies": {
- "Crc32.NET": "1.2.0",
- "Microsoft.CSharp": "4.7.0",
- "Newtonsoft.Json": "13.0.1",
- "System.Net.Http": "4.3.4",
- "System.Net.Primitives": "4.3.1",
- "System.Reactive.Linq": "5.0.0",
- "System.ValueTuple": "4.4.0"
+ "CommunityToolkit.HighPerformance": "8.1.0",
+ "System.IO.Hashing": "7.0.0",
+ "System.Reactive.Linq": "5.0.0"
}
},
"Monai.Deploy.Storage.S3Policy": {
"type": "Transitive",
- "resolved": "0.2.15",
- "contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
+ "resolved": "0.2.18",
+ "contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
+ "Ardalis.GuardClauses": "4.1.1",
"Newtonsoft.Json": "13.0.3"
}
},
@@ -715,14 +689,6 @@
"resolved": "1.7.0",
"contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q=="
},
- "NETStandard.Library": {
- "type": "Transitive",
- "resolved": "2.0.0",
- "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0"
- }
- },
"Newtonsoft.Json.Bson": {
"type": "Transitive",
"resolved": "1.0.2",
@@ -743,116 +709,18 @@
},
"Polly": {
"type": "Transitive",
- "resolved": "7.2.3",
- "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ=="
+ "resolved": "7.2.4",
+ "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
},
"RabbitMQ.Client": {
"type": "Transitive",
- "resolved": "6.4.0",
- "contentHash": "1znR1gGU+xYVSpO5z8nQolcUKA/yydnxQn7Ug9+RUXxTSLMm/eE58VKGwahPBjELXvDnX0k/kBrAitFLRjx9LA==",
- "dependencies": {
- "System.Memory": "4.5.4",
- "System.Threading.Channels": "4.7.1"
- }
- },
- "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g=="
- },
- "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw=="
- },
- "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg=="
- },
- "runtime.native.System": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0"
- }
- },
- "runtime.native.System.Net.Http": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0"
- }
- },
- "runtime.native.System.Security.Cryptography.Apple": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==",
- "dependencies": {
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0"
- }
- },
- "runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==",
+ "resolved": "6.5.0",
+ "contentHash": "9hY5HiWPtCla1/l0WmXmLnqoX7iKE3neBQUWnetIJrRpOvTbO//XQfQDh++xgHCshL40Kv/6bR0HDkmJz46twg==",
"dependencies": {
- "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2",
- "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2"
+ "System.Memory": "4.5.5",
+ "System.Threading.Channels": "7.0.0"
}
},
- "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ=="
- },
- "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA=="
- },
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ=="
- },
- "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w=="
- },
- "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg=="
- },
- "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw=="
- },
- "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w=="
- },
- "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.2",
- "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg=="
- },
"Serilog": {
"type": "Transitive",
"resolved": "2.8.0",
@@ -965,29 +833,29 @@
},
"System.Collections": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==",
+ "resolved": "4.0.11",
+ "contentHash": "YUJGz6eFKqS0V//mLt25vFGrrCvOnsXjlvFQs+KimpwNxug9x0Pzy4PlFMU3Q2IzqAa9G2L4LsK3+9vCBK7oTg==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.1",
+ "System.Runtime": "4.1.0"
}
},
"System.Collections.Concurrent": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==",
+ "resolved": "4.0.12",
+ "contentHash": "2gBcbb3drMLgxlI0fBfxMA31ec6AEyYCHygGse4vxceJan8mRIWeKJ24BFzN7+bi/NFTgdIgufzb94LWO5EERQ==",
"dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Diagnostics.Tracing": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
+ "System.Collections": "4.0.11",
+ "System.Diagnostics.Debug": "4.0.11",
+ "System.Diagnostics.Tracing": "4.1.0",
+ "System.Globalization": "4.0.11",
+ "System.Reflection": "4.1.0",
+ "System.Resources.ResourceManager": "4.0.1",
+ "System.Runtime": "4.1.0",
+ "System.Runtime.Extensions": "4.1.0",
+ "System.Threading": "4.0.11",
+ "System.Threading.Tasks": "4.0.11"
}
},
"System.Collections.NonGeneric": {
@@ -1003,11 +871,6 @@
"System.Threading": "4.3.0"
}
},
- "System.ComponentModel.Annotations": {
- "type": "Transitive",
- "resolved": "5.0.0",
- "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg=="
- },
"System.Diagnostics.Debug": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1033,12 +896,12 @@
},
"System.Diagnostics.Tracing": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==",
+ "resolved": "4.1.0",
+ "contentHash": "vDN1PoMZCkkdNjvZLql592oYJZgS7URcJzJ7bxeBgGtx5UtR5leNm49VmfHGqIffX4FKacHbI3H6UyNSHQknBg==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.1",
+ "System.Runtime": "4.1.0"
}
},
"System.Globalization": {
@@ -1051,30 +914,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Globalization.Calendars": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Globalization": "4.3.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Globalization.Extensions": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "System.Globalization": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0"
- }
- },
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
"resolved": "6.10.0",
@@ -1103,87 +942,36 @@
},
"System.IO.FileSystem": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==",
+ "resolved": "4.0.1",
+ "contentHash": "IBErlVq5jOggAD69bg1t0pJcHaDbJbWNUZTPI96fkYWzwYbN6D9wRHMULLDd9dHsl7C2YsxXL31LMfPI1SWt8w==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.IO": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.1",
+ "System.IO": "4.1.0",
+ "System.IO.FileSystem.Primitives": "4.0.1",
+ "System.Runtime": "4.1.0",
+ "System.Runtime.Handles": "4.0.1",
+ "System.Text.Encoding": "4.0.11",
+ "System.Threading.Tasks": "4.0.11"
}
},
"System.IO.FileSystem.Primitives": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==",
+ "resolved": "4.0.1",
+ "contentHash": "kWkKD203JJKxJeE74p8aF8y4Qc9r9WQx4C0cHzHPrY3fv/L/IhWnyCHaFJ3H1QPOH6A93whlQ2vG5nHlBDvzWQ==",
"dependencies": {
- "System.Runtime": "4.3.0"
+ "System.Runtime": "4.1.0"
}
},
- "System.Linq": {
+ "System.IO.Hashing": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==",
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0"
- }
+ "resolved": "7.0.0",
+ "contentHash": "sDnWM0N3AMCa86LrKTWeF3BZLD2sgWyYUc7HL6z4+xyDZNQRwzmxbo4qP2rX2MqC+Sy1/gOSRDah5ltxY5jPxw=="
},
"System.Memory": {
"type": "Transitive",
- "resolved": "4.5.4",
- "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw=="
- },
- "System.Net.Http": {
- "type": "Transitive",
- "resolved": "4.3.4",
- "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.1",
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Diagnostics.DiagnosticSource": "4.3.0",
- "System.Diagnostics.Tracing": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.Globalization.Extensions": "4.3.0",
- "System.IO": "4.3.0",
- "System.IO.FileSystem": "4.3.0",
- "System.Net.Primitives": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.OpenSsl": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Security.Cryptography.X509Certificates": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0",
- "runtime.native.System": "4.3.0",
- "runtime.native.System.Net.Http": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2"
- }
- },
- "System.Net.Primitives": {
- "type": "Transitive",
- "resolved": "4.3.1",
- "contentHash": "OHzPhSme78BbmLe9UBxHM69ZYjClS5URuhce6Ta4ikiLgaUGiG/X84fZpI6zy7CsUH5R9cYzI2tv9dWPqdTkUg==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.1",
- "Microsoft.NETCore.Targets": "1.1.3",
- "System.Runtime": "4.3.1",
- "System.Runtime.Handles": "4.3.0"
- }
+ "resolved": "4.5.5",
+ "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
},
"System.Reactive": {
"type": "Transitive",
@@ -1235,11 +1023,11 @@
},
"System.Runtime": {
"type": "Transitive",
- "resolved": "4.3.1",
- "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==",
+ "resolved": "4.3.0",
+ "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.1",
- "Microsoft.NETCore.Targets": "1.1.3"
+ "Microsoft.NETCore.Platforms": "1.1.0",
+ "Microsoft.NETCore.Targets": "1.1.0"
}
},
"System.Runtime.CompilerServices.Unsafe": {
@@ -1259,36 +1047,25 @@
},
"System.Runtime.Handles": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==",
+ "resolved": "4.0.1",
+ "contentHash": "nCJvEKguXEvk2ymk1gqj625vVnlK3/xdGzx0vOKicQkoquaTBJTP13AIYkocSUwHCLNBwUbXTqTWGDxBTWpt7g==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Runtime": "4.3.0"
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.1",
+ "System.Runtime": "4.1.0"
}
},
"System.Runtime.InteropServices": {
"type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0",
- "System.Reflection": "4.3.0",
- "System.Reflection.Primitives": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Handles": "4.3.0"
- }
- },
- "System.Runtime.Numerics": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==",
+ "resolved": "4.1.0",
+ "contentHash": "16eu3kjHS633yYdkjwShDHZLRNMKVi/s0bY8ODiqJ2RfMhDMAwxZaUaWVnZ2P71kr/or+X9o/xFWtNqz8ivieQ==",
"dependencies": {
- "System.Globalization": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0"
+ "Microsoft.NETCore.Platforms": "1.0.1",
+ "Microsoft.NETCore.Targets": "1.0.1",
+ "System.Reflection": "4.1.0",
+ "System.Reflection.Primitives": "4.0.1",
+ "System.Runtime": "4.1.0",
+ "System.Runtime.Handles": "4.0.1"
}
},
"System.Security.AccessControl": {
@@ -1300,137 +1077,11 @@
"System.Security.Principal.Windows": "5.0.0"
}
},
- "System.Security.Cryptography.Algorithms": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "System.Collections": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.Numerics": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "runtime.native.System.Security.Cryptography.Apple": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
"System.Security.Cryptography.Cng": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A=="
},
- "System.Security.Cryptography.Csp": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "System.IO": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0"
- }
- },
- "System.Security.Cryptography.Encoding": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "System.Collections": "4.3.0",
- "System.Collections.Concurrent": "4.3.0",
- "System.Linq": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
- "System.Security.Cryptography.OpenSsl": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==",
- "dependencies": {
- "System.Collections": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.Numerics": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
- "System.Security.Cryptography.Primitives": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==",
- "dependencies": {
- "System.Diagnostics.Debug": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
- "System.Security.Cryptography.X509Certificates": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.Globalization": "4.3.0",
- "System.Globalization.Calendars": "4.3.0",
- "System.IO": "4.3.0",
- "System.IO.FileSystem": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Runtime.Numerics": "4.3.0",
- "System.Security.Cryptography.Algorithms": "4.3.0",
- "System.Security.Cryptography.Cng": "4.3.0",
- "System.Security.Cryptography.Csp": "4.3.0",
- "System.Security.Cryptography.Encoding": "4.3.0",
- "System.Security.Cryptography.OpenSsl": "4.3.0",
- "System.Security.Cryptography.Primitives": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0",
- "runtime.native.System": "4.3.0",
- "runtime.native.System.Net.Http": "4.3.0",
- "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
- }
- },
"System.Security.Principal.Windows": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -1493,8 +1144,8 @@
},
"System.Threading.Channels": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q=="
+ "resolved": "7.0.0",
+ "contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA=="
},
"System.Threading.Tasks": {
"type": "Transitive",
@@ -1551,14 +1202,14 @@
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
- "Monai.Deploy.Storage": "[0.2.15, )"
+ "Monai.Deploy.Messaging": "[0.1.25, )",
+ "Monai.Deploy.Storage": "[0.2.18, )"
}
},
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Messaging": "[0.1.23, )",
+ "Monai.Deploy.Messaging": "[0.1.25, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.19.0, )"
}
@@ -1607,16 +1258,16 @@
"monai.deploy.workflowmanager.shared": {
"type": "Project",
"dependencies": {
- "Ardalis.GuardClauses": "4.0.1",
- "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.15",
- "Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
- "fo-dicom": "5.0.3"
+ "Ardalis.GuardClauses": "[4.1.1, )",
+ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )",
+ "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
+ "fo-dicom": "[5.0.3, )"
}
},
"monai.deploy.workflowmanager.storage": {
"type": "Project",
"dependencies": {
- "Monai.Deploy.Storage": "[0.2.15, )",
+ "Monai.Deploy.Storage": "[0.2.18, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )"
}
diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs
index 1770e27bb..e1b5d5d34 100755
--- a/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs
+++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs
@@ -16,6 +16,7 @@
using Microsoft.AspNetCore.Mvc.Testing;
using Microsoft.Extensions.Configuration;
+using Monai.Deploy.Common.TaskManager.IntegrationTests.Support;
using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.POCO;
using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.Support;
using Polly;
diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj
index 484b2924f..86671c6b9 100755
--- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj
+++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj
@@ -1,4 +1,4 @@
-