From 34dc1f222bd7ab222d398b117aa2bba0047593b5 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 29 Aug 2023 13:53:45 +0100 Subject: [PATCH 01/18] update to version 1.0.0 of the messaging lib Signed-off-by: Neil South --- ...orkflowManager.Common.Configuration.csproj | 2 +- src/Common/Configuration/packages.lock.json | 6 +- src/Common/Miscellaneous/packages.lock.json | 8 +- ...loy.WorkflowManager.TaskManager.API.csproj | 2 +- src/TaskManager/API/packages.lock.json | 6 +- src/TaskManager/Database/packages.lock.json | 6 +- .../AideClinicalReview/packages.lock.json | 12 +-- .../Plug-ins/Argo/packages.lock.json | 12 +-- ....Deploy.WorkflowManager.TaskManager.csproj | 4 +- .../TaskManager/packages.lock.json | 22 +++--- .../Common/Services/PayloadService.cs | 3 +- .../Migrations/M003_Payload_addDataTrigger.cs | 52 +++++++++++++ .../Contracts/Models/Payload.cs | 15 ++-- .../Contracts/Models/PayloadDto.cs | 3 +- ...ai.Deploy.WorkflowManager.Contracts.csproj | 2 +- .../Database/packages.lock.json | 6 +- .../Logging/packages.lock.json | 6 +- .../packages.lock.json | 6 +- .../Extensions/ValidationExtensions.cs | 4 +- .../PayloadListener/packages.lock.json | 30 ++++---- .../Services/packages.lock.json | 20 ++--- .../Storage/packages.lock.json | 6 +- .../Services/WorkflowExecuterService.cs | 2 +- .../WorkflowExecuter/packages.lock.json | 28 +++---- .../Monai.Deploy.WorkflowManager.csproj | 4 +- .../WorkflowManager/packages.lock.json | 44 +++++------ ...anager.TaskManager.IntegrationTests.csproj | 4 +- .../WorkflowRequestMessage.cs | 12 +-- ...r.WorkflowExecutor.IntegrationTests.csproj | 4 +- .../Support/Assertions.cs | 4 +- .../TestData/PayloadTestData.cs | 51 +++++-------- .../TestData/WorkflowRequestTestData.cs | 76 +++++++------------ .../Services/PayloadServiceTests.cs | 27 +++---- .../Validators/EventPayloadValidatorTests.cs | 19 +++-- .../PayloadListener.Tests/packages.lock.json | 30 ++++---- .../Services/WorkflowExecuterServiceTests.cs | 27 +++---- .../WorkflowManager.Tests/packages.lock.json | 18 ++--- 37 files changed, 288 insertions(+), 295 deletions(-) create mode 100644 src/WorkflowManager/Contracts/Migrations/M003_Payload_addDataTrigger.cs diff --git a/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj index a1d8eb30a..274efb480 100644 --- a/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj +++ b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/Common/Configuration/packages.lock.json b/src/Common/Configuration/packages.lock.json index a829c0d1e..959a37076 100644 --- a/src/Common/Configuration/packages.lock.json +++ b/src/Common/Configuration/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", diff --git a/src/Common/Miscellaneous/packages.lock.json b/src/Common/Miscellaneous/packages.lock.json index 02fb527c5..53f4d5126 100644 --- a/src/Common/Miscellaneous/packages.lock.json +++ b/src/Common/Miscellaneous/packages.lock.json @@ -133,8 +133,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -205,10 +205,10 @@ "resolved": "6.0.0", "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "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 12a72ddc1..4d4309a42 100644 --- 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 7b741d850..6ff7fd3ac 100755 --- a/src/TaskManager/API/packages.lock.json +++ b/src/TaskManager/API/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json index a3d2ad102..4596d1753 100755 --- a/src/TaskManager/Database/packages.lock.json +++ b/src/TaskManager/Database/packages.lock.json @@ -247,8 +247,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -678,7 +678,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json index f2c9f58dd..b83cfbc24 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -249,8 +249,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -700,14 +700,14 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -719,7 +719,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 9e57e4d5a..1fc92b79e 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -527,8 +527,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -1180,14 +1180,14 @@ "resolved": "13.0.1", "contentHash": "E1e/xFXB+Cbn7pLVlr+8E3nemEitIReVgmAMMMveADvZvXGuSGHP+1Cg6oA+SUfwXHfaXLQn4STCaPKtdIJkWA==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -1199,7 +1199,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index fd9ead51b..e196d84ff 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -62,9 +62,9 @@ - + - + diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index 2fc1b6ac7..104933168 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -74,9 +74,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -86,11 +86,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "p/Si1XzNUiTdN1gYFKxYy9w/bVzOYooK9DEW7JJs8D8Sghzkvh0GyWV3vUO9dVkEcU0oT5HmZ4x+nz8BzAkz6g==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "1UiWYO+EjNZSFrL/SUElqmBo3TktG+XiCXm8oyXheEWz/CuZS2hhepYB4BDz7XAohUqt2/Hv7wpLiaauiaIFZg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.25", + "Monai.Deploy.Messaging": "1.0.0", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1589,14 +1589,14 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -1616,7 +1616,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/Common/Services/PayloadService.cs b/src/WorkflowManager/Common/Services/PayloadService.cs index 53bd57f08..68b990b0a 100644 --- a/src/WorkflowManager/Common/Services/PayloadService.cs +++ b/src/WorkflowManager/Common/Services/PayloadService.cs @@ -82,8 +82,7 @@ public PayloadService( FileCount = eventPayload.FileCount, CorrelationId = eventPayload.CorrelationId, Bucket = eventPayload.Bucket, - CalledAeTitle = eventPayload.CalledAeTitle, - CallingAeTitle = eventPayload.CallingAeTitle, + DataTrigger = eventPayload.DataTrigger, Timestamp = eventPayload.Timestamp, PatientDetails = patientDetails, PayloadDeleted = PayloadDeleted.No diff --git a/src/WorkflowManager/Contracts/Migrations/M003_Payload_addDataTrigger.cs b/src/WorkflowManager/Contracts/Migrations/M003_Payload_addDataTrigger.cs new file mode 100644 index 000000000..ea2f482c0 --- /dev/null +++ b/src/WorkflowManager/Contracts/Migrations/M003_Payload_addDataTrigger.cs @@ -0,0 +1,52 @@ +// +// Copyright 2023 Guy’s and St Thomas’ NHS Foundation Trust +// +// 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 Monai.Deploy.Messaging.Events; +using Monai.Deploy.WorkflowManager.Common.Contracts.Models; +using Mongo.Migration.Migrations.Document; +using MongoDB.Bson; +using MongoDB.Bson.Serialization; + +namespace Monai.Deploy.WorkflowManager.Common.Contracts.Migrations +{ + public class M003_Payload_addDataTrigger : DocumentMigration + { + public M003_Payload_addDataTrigger() : base("1.0.3") { } + + public override void Up(BsonDocument document) + { + var calling = document.GetValue("CallingAeTitle").AsString; + var called = document.GetValue("CalledAeTitle").AsString; + document.Remove("CallingAeTitle"); + document.Remove("CalledAeTitle"); + var trigger = new DataOrigin { DataService = DataService.DIMSE, Source = calling, Destination = called }; + document.Add("DataTrigger", trigger.ToJson(), true); + } + + public override void Down(BsonDocument document) + { + try + { + var trigger = BsonSerializer.Deserialize(document.GetValue("DataTrigger").ToBson()); + document.Remove("DataTrigger"); + document.Add("CallingAeTitle", trigger.Source); + document.Add("CalledAeTitle", trigger.Destination); + } + catch + { // can ignore we dont want failures stopping startup ! + } + } + } +} diff --git a/src/WorkflowManager/Contracts/Models/Payload.cs b/src/WorkflowManager/Contracts/Models/Payload.cs index c46dbd222..72b3b6b15 100755 --- a/src/WorkflowManager/Contracts/Models/Payload.cs +++ b/src/WorkflowManager/Contracts/Models/Payload.cs @@ -17,6 +17,7 @@ using System; using System.Collections.Generic; using Monai.Deploy.Messaging.Common; +using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Common.Contracts.Migrations; using Mongo.Migration.Documents; using Mongo.Migration.Documents.Attributes; @@ -26,11 +27,11 @@ namespace Monai.Deploy.WorkflowManager.Common.Contracts.Models { - [CollectionLocation("Payloads"), RuntimeVersion("1.0.1")] + [CollectionLocation("Payloads"), RuntimeVersion("1.0.3")] public class Payload : IDocument { [JsonConverter(typeof(DocumentVersionConvert)), BsonSerializer(typeof(DocumentVersionConverBson))] - public DocumentVersion Version { get; set; } = new DocumentVersion(1, 0, 1); + public DocumentVersion Version { get; set; } = new DocumentVersion(1, 0, 3); [JsonProperty(PropertyName = "id")] public string Id { get; set; } = string.Empty; @@ -53,11 +54,11 @@ public class Payload : IDocument [JsonProperty(PropertyName = "bucket")] public string Bucket { get; set; } = string.Empty; - [JsonProperty(PropertyName = "calling_aetitle")] - public string CallingAeTitle { get; set; } = string.Empty; + //[JsonProperty(PropertyName = "calling_aetitle")] + //public string CallingAeTitle { get; set; } = string.Empty; - [JsonProperty(PropertyName = "called_aetitle")] - public string CalledAeTitle { get; set; } = string.Empty; + //[JsonProperty(PropertyName = "called_aetitle")] + //public string CalledAeTitle { get; set; } = string.Empty; [JsonProperty(PropertyName = "timestamp")] public DateTime Timestamp { get; set; } @@ -70,6 +71,8 @@ public class Payload : IDocument [JsonProperty(PropertyName = "patient_details")] public PatientDetails PatientDetails { get; set; } = new PatientDetails(); + + public DataOrigin DataTrigger { get; set; } = new DataOrigin { DataService = DataService.DIMSE }; } public enum PayloadDeleted diff --git a/src/WorkflowManager/Contracts/Models/PayloadDto.cs b/src/WorkflowManager/Contracts/Models/PayloadDto.cs index 5988e9fa2..0f7ca2733 100644 --- a/src/WorkflowManager/Contracts/Models/PayloadDto.cs +++ b/src/WorkflowManager/Contracts/Models/PayloadDto.cs @@ -31,8 +31,7 @@ public PayloadDto(Payload payload) FileCount = payload.FileCount; CorrelationId = payload.CorrelationId; Bucket = payload.Bucket; - CallingAeTitle = payload.CallingAeTitle; - CalledAeTitle = payload.CalledAeTitle; + DataTrigger = payload.DataTrigger; Timestamp = payload.Timestamp; Files = payload.Files; PatientDetails = payload.PatientDetails; diff --git a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index a44456706..a235082ed 100644 --- 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/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index 0d40b9c17..d37568330 100755 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -269,8 +269,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -679,7 +679,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "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 95b73263e..3dc0373e1 100755 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -210,8 +210,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -635,7 +635,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "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 d5185dcdb..bf40ee3d4 100644 --- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json +++ b/src/WorkflowManager/Monai.Deploy.WorkflowManager.Services/packages.lock.json @@ -713,11 +713,11 @@ "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, - "monai.deploy.workflowmanager.common.configuration": { + "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", - "Monai.Deploy.Storage": "[0.2.18, )" + "Monai.Deploy.Messaging": "[0.1.23, )", + "Monai.Deploy.Storage": "[0.2.15, )" } }, "monai.deploy.workflowmanager.contracts": { diff --git a/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs b/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs index 0e1ba99ab..a0a2b29a6 100644 --- a/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs +++ b/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs @@ -30,8 +30,8 @@ public static bool IsValid(this WorkflowRequestEvent workflowRequestMessage, out var valid = true; - valid &= IsAeTitleValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.CallingAeTitle, validationErrors); - valid &= IsAeTitleValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.CalledAeTitle, validationErrors); + valid &= IsAeTitleValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.DataTrigger.Source, validationErrors); + valid &= IsAeTitleValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.DataTrigger.Destination, validationErrors); valid &= IsBucketValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.Bucket, validationErrors); valid &= IsCorrelationIdValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.CorrelationId, validationErrors); valid &= IsPayloadIdValid(workflowRequestMessage.GetType().Name, workflowRequestMessage.PayloadId.ToString(), validationErrors); diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index 39bd70d80..08522a2d7 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -261,8 +261,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -738,14 +738,22 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "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.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -754,14 +762,6 @@ "fo-dicom": "[5.0.3, )" } }, - "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.conditionsresolver": { "type": "Project", "dependencies": { @@ -774,7 +774,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } @@ -805,9 +805,9 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", diff --git a/src/WorkflowManager/Services/packages.lock.json b/src/WorkflowManager/Services/packages.lock.json index 95972abad..abbd3085f 100644 --- a/src/WorkflowManager/Services/packages.lock.json +++ b/src/WorkflowManager/Services/packages.lock.json @@ -246,8 +246,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -705,13 +705,6 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { - "type": "Project", - "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", - "Monai.Deploy.Storage": "[0.2.18, )" - } - }, "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { @@ -720,10 +713,17 @@ "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, + "monai.deploy.workflowmanager.common.configuration": { + "type": "Project", + "dependencies": { + "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Storage": "[0.2.18, )" + } + }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index 19d41bf81..e898b1551 100755 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -235,8 +235,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -669,7 +669,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 3be6d0a6c..78f290ea5 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -135,7 +135,7 @@ public async Task ProcessPayload(WorkflowRequestEvent message, Payload pay } else { - var result = await _workflowRepository.GetWorkflowsForWorkflowRequestAsync(message.CalledAeTitle, message.CallingAeTitle); + var result = await _workflowRepository.GetWorkflowsForWorkflowRequestAsync(message.DataTrigger.Destination, message.DataTrigger.Source); workflows = new List(result); } diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index dd2cb8f1a..9d5cfe7db 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -261,8 +261,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -738,14 +738,22 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "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.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -754,14 +762,6 @@ "fo-dicom": "[5.0.3, )" } }, - "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.conditionsresolver": { "type": "Project", "dependencies": { @@ -774,7 +774,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index d4aaf8047..eb93f2588 100644 --- 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/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 3a74206e6..38e87bf7b 100755 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -70,9 +70,9 @@ }, "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -82,11 +82,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.25, )", - "resolved": "0.1.25", - "contentHash": "p/Si1XzNUiTdN1gYFKxYy9w/bVzOYooK9DEW7JJs8D8Sghzkvh0GyWV3vUO9dVkEcU0oT5HmZ4x+nz8BzAkz6g==", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "1UiWYO+EjNZSFrL/SUElqmBo3TktG+XiCXm8oyXheEWz/CuZS2hhepYB4BDz7XAohUqt2/Hv7wpLiaauiaIFZg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.25", + "Monai.Deploy.Messaging": "1.0.0", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1182,14 +1182,22 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "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.configuration": { + "type": "Project", + "dependencies": { + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -1198,14 +1206,6 @@ "fo-dicom": "[5.0.3, )" } }, - "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.conditionsresolver": { "type": "Project", "dependencies": { @@ -1218,7 +1218,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } @@ -1259,8 +1259,8 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Http": "[3.1.0, )", - "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )" + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { @@ -1274,9 +1274,9 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", 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 86671c6b9..63c8f7718 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs index 47f7c2c3b..69535e639 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs @@ -14,7 +14,9 @@ * limitations under the License. */ +using System.Text.Json.Serialization; using Newtonsoft.Json; +using Monai.Deploy.Messaging.Events; namespace Monai.Deploy.WorkflowManager.Common.IntegrationTests.Models { @@ -34,12 +36,10 @@ public class WorkflowRequestMessage [JsonProperty(PropertyName = "bucket")] public string Bucket { get; set; } = default!; - - [JsonProperty(PropertyName = "calling_aetitle")] - public string CallingAeTitle { get; set; } = default!; - - [JsonProperty(PropertyName = "called_aetitle")] - public string CalledAeTitle { get; set; } = default!; + + [JsonProperty(PropertyName = "trigger")] + [JsonPropertyName("trigger")] + public DataOrigin DataTrigger { get; set; } [JsonProperty(PropertyName = "timestamp")] public DateTime Timestamp { get; set; } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj index 0bb20bae2..854e410c0 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj @@ -34,8 +34,8 @@ - - + + diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs index a93c9e974..86f379a0f 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs @@ -300,8 +300,8 @@ public void AssertPayloadCollection(Payload payloadCollection, PatientDetails pa { payloadCollection.PayloadId.Should().Be(workflowRequestMessage.PayloadId.ToString()); payloadCollection.Bucket.Should().Be(workflowRequestMessage.Bucket); - payloadCollection.CallingAeTitle.Should().Be(workflowRequestMessage.CallingAeTitle); - payloadCollection.CalledAeTitle.Should().Be(workflowRequestMessage.CalledAeTitle); + payloadCollection.DataTrigger.Source.Should().Be(workflowRequestMessage.DataTrigger.Source); + payloadCollection.DataTrigger.Destination.Should().Be(workflowRequestMessage.DataTrigger.Destination); payloadCollection.CorrelationId.Should().Be(workflowRequestMessage.CorrelationId); payloadCollection.Timestamp.Should().BeCloseTo(DateTime.UtcNow, precision: TimeSpan.FromMinutes(1)); payloadCollection.PatientDetails.Should().BeEquivalentTo(patientDetails, options => options.Excluding(x => x.PatientDob)); diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs index 975f7556f..61bc1e16c 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs @@ -37,8 +37,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "c5c3636b-81dd-44a9-8c4b-71adec7d47b2", Workflows = new List { Guid.NewGuid().ToString() }, @@ -60,8 +59,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "86c0f117-4021-412e-b163-0dc621df672a", Workflows = new List { Guid.NewGuid().ToString() }, @@ -83,8 +81,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_2", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "30a8e0c6-e6c4-458f-aa4d-b224b493d3c0", Workflows = new List { Guid.NewGuid().ToString() }, @@ -106,8 +103,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -129,8 +125,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -152,8 +147,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -175,8 +169,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -198,8 +191,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -221,8 +213,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -244,8 +235,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -267,8 +257,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -290,8 +279,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "c5c3636b-81dd-44a9-8c4b-71adec7d47b2", Workflows = new List { Guid.NewGuid().ToString() }, @@ -313,8 +301,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "c5c3635b-81dd-44a9-8c3b-71adec7d47c6", Workflows = new List { Guid.NewGuid().ToString() }, @@ -337,8 +324,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "d5c3633b-41de-44a9-8c3a-71adec3d47c1", Workflows = new List { Guid.NewGuid().ToString() }, @@ -361,8 +347,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "a5c3633b-31dd-44c9-8a1a-71adec3d47c1", Workflows = new List { Guid.NewGuid().ToString() }, @@ -385,8 +370,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "a5c3633b-31dd-44c9-8a1a-71adec3d47c2", Workflows = new List { Guid.NewGuid().ToString() }, @@ -409,8 +393,7 @@ public static class PayloadsTestData Id = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Bucket = "bucket_1", - CalledAeTitle = "MIG", - CallingAeTitle = "Basic_AE", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "MIG", Destination = "Basic_AE" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = "a5c3633b-31dd-44c9-8a1a-71adec3d47c3", Workflows = new List { Guid.NewGuid().ToString() }, diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs index 409ccb772..aa9c01090 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs @@ -39,8 +39,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MONAI", - CallingAeTitle = "PACS", + DataTrigger = new Messaging.Events.DataOrigin{ Source = "PACS", Destination = "MONAI" }, } }, new WorkflowRequestTestData @@ -53,8 +52,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_1").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "No_AE", - CallingAeTitle = "MWM", + DataTrigger= new Messaging.Events.DataOrigin{Destination = "No_AE" ,Source = "MWM" }, } }, new WorkflowRequestTestData @@ -67,8 +65,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_1").WorkflowRevision.WorkflowId, Helper.GetWorkflowByName("Basic_Workflow_2").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "No_AE", - CallingAeTitle = "MWM", + DataTrigger= new Messaging.Events.DataOrigin{Destination = "No_AE" ,Source = "MWM" }, } }, new WorkflowRequestTestData @@ -81,8 +78,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_1").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Basic_AE_3", - CallingAeTitle = "Basic_AE", + DataTrigger= new Messaging.Events.DataOrigin{Destination = "Basic_AE_3" ,Source = "Basic_AE" }, } }, new WorkflowRequestTestData @@ -95,8 +91,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MONAI_2", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MONAI_2" ,Source = "MWM" }, } }, new WorkflowRequestTestData @@ -109,8 +104,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Multi_Rev_Old", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Multi_Rev_Old", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -123,8 +117,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_Multiple_Revisions_2").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "No_AE", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "No_AE", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -136,8 +129,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_3").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Basic_AE_3", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Basic_AE_3" ,Source = "MWM" }, } }, new WorkflowRequestTestData @@ -149,8 +141,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_3").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Basic_AE_3", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Basic_AE_3", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -162,8 +153,7 @@ public static class WorkflowRequestsTestData PayloadId = Guid.NewGuid(), Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_3").WorkflowRevision.WorkflowId }, Timestamp = DateTime.UtcNow, - CalledAeTitle = "Basic_AE_3", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Basic_AE_3", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -176,7 +166,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_3").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Basic_AE_3", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Basic_AE_3" }, } }, new WorkflowRequestTestData @@ -189,7 +179,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { Helper.GetWorkflowByName("Basic_Workflow_3").WorkflowRevision.WorkflowId }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Source = "MWM" } } }, new WorkflowRequestTestData @@ -202,8 +192,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Multi_Created", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Multi_Created", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -216,8 +205,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MWM", - CallingAeTitle = "Multi_Dispatch", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MWM" ,Source = "Multi_Dispatch" }, } }, new WorkflowRequestTestData @@ -230,8 +218,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MWM", - CallingAeTitle = "Complete_Dispatch", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MWM", Source = "Complete_Dispatch" }, } }, new WorkflowRequestTestData @@ -244,8 +231,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Same_Ae", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Same_Ae", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -258,8 +244,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MONAI", - CallingAeTitle = "PACS", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MONAI", Source = "PACS" }, } }, new WorkflowRequestTestData @@ -272,8 +257,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MONAI", - CallingAeTitle = "PACS", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MONAI", Source = "PACS" }, } }, new WorkflowRequestTestData @@ -286,8 +270,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "MONAI", - CallingAeTitle = "PACS", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "MONAI", Source = "PACS" }, } }, new WorkflowRequestTestData @@ -300,8 +283,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Non_Existant_AE", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Non_Existant_AE", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -314,8 +296,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Router_1", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Router_1", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -328,8 +309,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Artifact_AE", - CallingAeTitle = "MWM", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Artifact_AE", Source = "MWM" }, } }, new WorkflowRequestTestData @@ -342,8 +322,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "Non_Existent_Called_AE", - CallingAeTitle = "Non_Existent_Calling_AE", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "Non_Existent_Called_AE", Source = "Non_Existent_Calling_AE" }, } }, new WorkflowRequestTestData @@ -356,8 +335,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "AIDE", - CallingAeTitle = "TEST", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "AIDE", Source = "TEST" }, } }, new WorkflowRequestTestData @@ -370,8 +348,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "AIDE", - CallingAeTitle = "PACS1", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "AIDE", Source = "PACS1" }, } }, new WorkflowRequestTestData @@ -384,8 +361,7 @@ public static class WorkflowRequestsTestData Workflows = new List() { }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "AIDE", - CallingAeTitle = "PACS2", + DataTrigger = new Messaging.Events.DataOrigin { Destination = "AIDE", Source = "PACS2" }, } }, }; diff --git a/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs b/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs index 1021ede64..dcc1ed626 100644 --- a/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs +++ b/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs @@ -75,8 +75,7 @@ public async Task CreateAsync_ValidWorkflowAndDicom_ReturnsTrue() { Timestamp = DateTime.UtcNow, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -96,8 +95,7 @@ public async Task CreateAsync_ValidWorkflowAndDicom_ReturnsTrue() Timestamp = workflowRequest.Timestamp, Bucket = workflowRequest.Bucket, FileCount = workflowRequest.FileCount, - CalledAeTitle = workflowRequest.CalledAeTitle, - CallingAeTitle = workflowRequest.CallingAeTitle, + DataTrigger = workflowRequest.DataTrigger, CorrelationId = workflowRequest.CorrelationId, PayloadId = workflowRequest.PayloadId.ToString(), PatientDetails = patientDetails, @@ -121,8 +119,7 @@ public async Task CreateAsync_ValidWorkflowPayloadExists_ReturnsExisting() { Timestamp = DateTime.UtcNow, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -142,8 +139,7 @@ public async Task CreateAsync_ValidWorkflowPayloadExists_ReturnsExisting() Timestamp = workflowRequest.Timestamp, Bucket = workflowRequest.Bucket, FileCount = workflowRequest.FileCount, - CalledAeTitle = workflowRequest.CalledAeTitle, - CallingAeTitle = workflowRequest.CallingAeTitle, + DataTrigger = workflowRequest.DataTrigger, CorrelationId = workflowRequest.CorrelationId, PayloadId = workflowRequest.PayloadId.ToString(), PatientDetails = patientDetails, @@ -178,8 +174,7 @@ public async Task GetByIdAsync_ValidId_ReturnsPayload() Timestamp = DateTime.UtcNow, PatientDetails = patientDetails, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() }, @@ -214,8 +209,7 @@ public async Task GetAll_ReturnsCompletedPayloads() Timestamp = DateTime.UtcNow, PatientDetails = patientDetails, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() } @@ -258,8 +252,7 @@ public async Task GetAll_ReturnsPayloads() Timestamp = DateTime.UtcNow, PatientDetails = patientDetails, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() } @@ -270,8 +263,7 @@ public async Task GetAll_ReturnsPayloads() Timestamp = DateTime.UtcNow, PatientDetails = patientDetails, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() } @@ -282,8 +274,7 @@ public async Task GetAll_ReturnsPayloads() Timestamp = DateTime.UtcNow, PatientDetails = patientDetails, Bucket = "bucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), PayloadId = Guid.NewGuid().ToString(), Workflows = new List { Guid.NewGuid().ToString() } diff --git a/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs b/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs index a58a45b26..3edab7a06 100644 --- a/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs +++ b/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs @@ -49,7 +49,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessage_ThrowsArgumentNullExc public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsMoreThan15Charchaters_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = "abcdefghijklmnop"; + message.DataTrigger.Destination = "abcdefghijklmnop"; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -59,7 +59,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsMo public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsNull_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = string.Empty; + message.DataTrigger.Destination = string.Empty; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -69,7 +69,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsNu public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsWhiteSpace_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = " "; + message.DataTrigger.Destination = " "; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -79,7 +79,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsWh public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsEmptyString_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = String.Empty; + message.DataTrigger.Destination = String.Empty; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -89,7 +89,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCallingAETitleIsEm public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsMoreThan15Charchaters_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = "abcdefghijklmnop"; + message.DataTrigger.Destination = "abcdefghijklmnop"; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -99,7 +99,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsMor public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsNull_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = string.Empty; + message.DataTrigger.Destination = string.Empty; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -109,7 +109,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsNul public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsWhiteSpace_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = " "; + message.DataTrigger.Destination = " "; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -119,7 +119,7 @@ public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsWhi public void ValidateWorkflowRequest_WorkflowRequestMessageWithCalledAETitleIsEmptyString_ReturnsValidatonFalse() { var message = CreateWorkflowRequestMessageWithNoWorkFlow(); - message.CalledAeTitle = " "; + message.DataTrigger.Destination = " "; var result = _eventPayloadValidator!.ValidateWorkflowRequest(message); Assert.IsFalse(result); @@ -247,8 +247,7 @@ private static WorkflowRequestEvent CreateWorkflowRequestMessageWithNoWorkFlow() FileCount = 2, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, - CalledAeTitle = "AeTitle", - CallingAeTitle = "CallingAeTitle", + DataTrigger = new Messaging.Events.DataOrigin { Source = "AeTitle", Destination = "CallingAeTitle" }, }; } } diff --git a/tests/UnitTests/PayloadListener.Tests/packages.lock.json b/tests/UnitTests/PayloadListener.Tests/packages.lock.json index 835cbf018..0f5defbad 100644 --- a/tests/UnitTests/PayloadListener.Tests/packages.lock.json +++ b/tests/UnitTests/PayloadListener.Tests/packages.lock.json @@ -332,8 +332,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -832,14 +832,22 @@ "resolved": "0.6.2", "contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw==" }, - "Monai.Deploy.WorkflowManager.Common.configuration": { + "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.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, - "Monai.Deploy.WorkflowManager.Common.miscellaneous": { + "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.1.1, )", @@ -848,14 +856,6 @@ "fo-dicom": "[5.0.3, )" } }, - "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.conditionsresolver": { "type": "Project", "dependencies": { @@ -868,7 +868,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } @@ -909,9 +909,9 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs index dc101406c..b810adeea 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs @@ -175,8 +175,7 @@ public async Task ProcessPayload_ValidAeTitleWorkflowRequest_ReturnesTrue() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow }; @@ -231,8 +230,7 @@ public async Task ProcessPayload_ValidWorkflowIdRequest_ReturnesTrue() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -317,8 +315,7 @@ public async Task ProcessPayload_ValidWorkflowIdRequestWithArtifacts_ReturnesTru var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -413,8 +410,7 @@ public async Task ProcessPayload_RouterTaskWithMultipleDestinations_DispatchesMu var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -496,8 +492,7 @@ public async Task ProcessPayload_WithExportTask_DispatchesExport() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -586,8 +581,7 @@ public async Task ProcessPayload_WithInvalidExportTask_DoesNotDispatchExport() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -659,8 +653,7 @@ public async Task ProcessPayload_FileNotFound_FailsWorkflow() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List @@ -745,8 +738,7 @@ public async Task ProcessPayload_WorkflowAlreadyStarted_TaskNotDispatched() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, PayloadId = Guid.NewGuid(), @@ -2467,8 +2459,7 @@ public async Task ProcessPayload_WithExternalAppTask_Dispatches() var workflowRequest = new WorkflowRequestEvent { Bucket = "testbucket", - CalledAeTitle = "aetitle", - CallingAeTitle = "aetitle", + DataTrigger = new DataOrigin { Source = "aetitle", Destination = "aetitle" }, CorrelationId = Guid.NewGuid().ToString(), Timestamp = DateTime.UtcNow, Workflows = new List diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 7882ef8c4..300bab6a7 100755 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -634,8 +634,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "CllF1ANCwDV0ACbTU63SGxPPmgsivWP8dxgstAHvwo29w5TUs6PDCc8GcyVDTUO5Yl7/vsifdwcs3P/cYBe69w==", + "resolved": "1.0.0", + "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -645,10 +645,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "0.1.25", - "contentHash": "p/Si1XzNUiTdN1gYFKxYy9w/bVzOYooK9DEW7JJs8D8Sghzkvh0GyWV3vUO9dVkEcU0oT5HmZ4x+nz8BzAkz6g==", + "resolved": "1.0.0", + "contentHash": "1UiWYO+EjNZSFrL/SUElqmBo3TktG+XiCXm8oyXheEWz/CuZS2hhepYB4BDz7XAohUqt2/Hv7wpLiaauiaIFZg==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.25", + "Monai.Deploy.Messaging": "1.0.0", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1990,8 +1990,8 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "[7.0.0, )", "Microsoft.Extensions.Hosting": "[6.0.1, )", "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.25, )", - "Monai.Deploy.Messaging.RabbitMQ": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.0, )", "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage": "[0.2.18, )", "Monai.Deploy.Storage.MinIO": "[0.2.18, )", @@ -2021,7 +2021,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -2046,7 +2046,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.25, )", + "Monai.Deploy.Messaging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.19.0, )" } From 8216e2fac3533f5b2c7690a5030ee09c4f064d0e Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 29 Aug 2023 14:06:26 +0100 Subject: [PATCH 02/18] forgot licensing file Signed-off-by: Neil South --- doc/dependency_decisions.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 027801285..ab8029e95 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -2364,22 +2364,24 @@ :when: 2022-10-21 05:32:02.785856125 Z - - :approve - Monai.Deploy.Messaging - - :who: samrooke + - :who: neildsouth :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - 0.1.21 - 0.1.23 - 0.1.25 - :when: 2022-12-15 21:43:10.781625468 Z + - 1.0.0 + :when: 2023-29-08 21:43:10.781625468 Z - - :approve - Monai.Deploy.Messaging.RabbitMQ - - :who: samrooke + - :who: neildsouth :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - 0.1.21 - 0.1.23 - 0.1.25 - :when: 2022-12-15 21:43:20.975488411 Z + - 1.0.0 + :when: 2023-29-08 21:43:20.975488411 Z - - :approve - Monai.Deploy.Storage - :who: neildsouth From 22f776fae8c43ef32962cb52ffd67ccdc5623699 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 29 Aug 2023 14:19:20 +0100 Subject: [PATCH 03/18] small fixes Signed-off-by: Neil South --- src/WorkflowManager/Contracts/Models/Payload.cs | 6 ------ .../Models/InformaticsGateway/WorkflowRequestMessage.cs | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/WorkflowManager/Contracts/Models/Payload.cs b/src/WorkflowManager/Contracts/Models/Payload.cs index 72b3b6b15..4164ed9a3 100755 --- a/src/WorkflowManager/Contracts/Models/Payload.cs +++ b/src/WorkflowManager/Contracts/Models/Payload.cs @@ -54,12 +54,6 @@ public class Payload : IDocument [JsonProperty(PropertyName = "bucket")] public string Bucket { get; set; } = string.Empty; - //[JsonProperty(PropertyName = "calling_aetitle")] - //public string CallingAeTitle { get; set; } = string.Empty; - - //[JsonProperty(PropertyName = "called_aetitle")] - //public string CalledAeTitle { get; set; } = string.Empty; - [JsonProperty(PropertyName = "timestamp")] public DateTime Timestamp { get; set; } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs index 69535e639..95b4440a7 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs @@ -39,7 +39,7 @@ public class WorkflowRequestMessage [JsonProperty(PropertyName = "trigger")] [JsonPropertyName("trigger")] - public DataOrigin DataTrigger { get; set; } + public DataOrigin DataTrigger { get; set; } = new DataOrigin { DataService = DataService.DIMSE }; [JsonProperty(PropertyName = "timestamp")] public DateTime Timestamp { get; set; } From 51261de8f66068e7a71652d803c9467b4963289a Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 5 Sep 2023 09:14:11 +0100 Subject: [PATCH 04/18] adding better logging Signed-off-by: Neil South --- .../Configuration/WorkflowManagerOptions.cs | 2 +- .../Logging/Log.200000.Workflow.cs | 6 +++ .../Services/WorkflowExecuterService.cs | 6 ++- .../WorkflowManager/appsettings.Local.json | 39 ++++++++++--------- .../WorkflowManager/appsettings.json | 2 +- .../Services/WorkflowExecuterServiceTests.cs | 4 +- 6 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/Common/Configuration/WorkflowManagerOptions.cs b/src/Common/Configuration/WorkflowManagerOptions.cs index b3f375a83..4ed820a4a 100644 --- a/src/Common/Configuration/WorkflowManagerOptions.cs +++ b/src/Common/Configuration/WorkflowManagerOptions.cs @@ -72,7 +72,7 @@ public class WorkflowManagerOptions : PagedOptions public string DicomTagsDisallowed { get; set; } = string.Empty; [ConfigurationKeyName("migExternalAppPlugins")] - public List MigExternalAppPlugins { get; set; } + public string[] MigExternalAppPlugins { get; set; } public WorkflowManagerOptions() { diff --git a/src/WorkflowManager/Logging/Log.200000.Workflow.cs b/src/WorkflowManager/Logging/Log.200000.Workflow.cs index f0a236fff..8c9a73571 100644 --- a/src/WorkflowManager/Logging/Log.200000.Workflow.cs +++ b/src/WorkflowManager/Logging/Log.200000.Workflow.cs @@ -102,5 +102,11 @@ public static partial class Log [LoggerMessage(EventId = 210006, Level = LogLevel.Information, Message = "Attached PatientMetadata {metadata}.")] public static partial void AttachedPatientMetadataToTaskExec(this ILogger logger, string metadata); + + [LoggerMessage(EventId = 210007, Level = LogLevel.Information, Message = "Exporting to MIG task Id {taskid}, export destination {destination} number of files {fileCount} Mig data plugins {plugins}.")] + public static partial void LogMigExport(this ILogger logger, string taskid, string destination, int fileCount, string plugins); + + [LoggerMessage(EventId = 210008, Level = LogLevel.Information, Message = "Request canceld due to timeout taskId{taskid}.")] + public static partial void TaskTimedOut(this ILogger logger, string taskid); } } diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 78f290ea5..f9e114457 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -89,7 +89,7 @@ public WorkflowExecuterService( _defaultPerTaskTypeTimeoutMinutes = configuration.Value.PerTaskTypeTimeoutMinutes; TaskDispatchRoutingKey = configuration.Value.Messaging.Topics.TaskDispatchRequest; TaskTimeoutRoutingKey = configuration.Value.Messaging.Topics.AideClinicalReviewCancelation; - _migExternalAppPlugins = configuration.Value.MigExternalAppPlugins; + _migExternalAppPlugins = configuration.Value.MigExternalAppPlugins.ToList(); ExportRequestRoutingKey = $"{configuration.Value.Messaging.Topics.ExportRequestPrefix}.{configuration.Value.Messaging.DicomAgents.ScuAgentName}"; _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -482,6 +482,7 @@ private async Task UpdateWorkflowInstanceStatus(WorkflowInstance workflowI return true; } + private async Task HandleExternalAppAsync(WorkflowRevision workflow, WorkflowInstance workflowInstance, TaskExecution task, string correlationId) { var plugins = _migExternalAppPlugins; @@ -524,7 +525,6 @@ private async Task HandleDicomExportAsync(WorkflowRevision workflow, WorkflowIns return; } - await DispatchDicomExport(workflowInstance, task, exportList, artifactValues, correlationId, plugins); } @@ -563,6 +563,7 @@ private async Task DispatchDicomExport(WorkflowInstance workflowInstance, return false; } + _logger.LogMigExport(task.TaskId, string.Join(",", exportDestinations), artifactValues.Length, string.Join(",", plugins)); await ExportRequest(workflowInstance, task, exportDestinations, artifactValues, correlationId, plugins); return await _workflowInstanceRepository.UpdateTaskStatusAsync(workflowInstance.Id, task.TaskId, TaskExecutionStatus.Dispatched); } @@ -812,6 +813,7 @@ private async Task TimeOutEvent(WorkflowInstance workflowInstance, TaskExe var exportRequestEvent = EventMapper.GenerateTaskCancellationEvent("", taskExec.ExecutionId, workflowInstance.Id, taskExec.TaskId, FailureReason.TimedOut, "Timed out"); var jsonMesssage = new JsonMessage(exportRequestEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, correlationId, Guid.NewGuid().ToString()); + _logger.TaskTimedOut(taskExec.TaskId); await _messageBrokerPublisherService.Publish(TaskTimeoutRoutingKey, jsonMesssage.ToMessage()); return true; } diff --git a/src/WorkflowManager/WorkflowManager/appsettings.Local.json b/src/WorkflowManager/WorkflowManager/appsettings.Local.json index 432bc588c..773a8c22e 100755 --- a/src/WorkflowManager/WorkflowManager/appsettings.Local.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.Local.json @@ -96,22 +96,25 @@ "scuAgentName": "monaiscu" } }, - "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" - }, - "InformaticsGateway": { - "apiHost": "http://localhost:5010", - "username": "aide", - "password": "example" - }, - "Kestrel": { - "EndPoints": { - "Http": { - "Url": "http://localhost:5000" - } + "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.PlugIns.RemoteAppExecution.DicomDeidentifier, Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution, Version=0.0.0.0" + ], + "InformaticsGateway": { + "apiHost": "http://localhost:5010", + "username": "aide", + "password": "example" }, - "LogHttpRequestQuery": false, - "LogHttpRequestBody": false, - "LogHttpResponseBody": true - }, - "AllowedHosts": "*" -} + "Kestrel": { + "EndPoints": { + "Http": { + "Url": "http://localhost:5000" + } + }, + "LogHttpRequestQuery": false, + "LogHttpRequestBody": false, + "LogHttpResponseBody": true + }, + "AllowedHosts": "*" + } +} \ No newline at end of file diff --git a/src/WorkflowManager/WorkflowManager/appsettings.json b/src/WorkflowManager/WorkflowManager/appsettings.json index 8346de9be..555e34085 100755 --- a/src/WorkflowManager/WorkflowManager/appsettings.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.json @@ -102,7 +102,7 @@ } }, "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" + "migExternalAppPlugins": [ "Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution.DicomDeidentifier, Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution, Version=0.0.0.0" ] }, "InformaticsGateway": { "apiHost": "http://localhost:5010", diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs index b810adeea..6d318ff17 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs @@ -87,8 +87,8 @@ public WorkflowExecuterServiceTests() Topics = new MessageBrokerConfigurationKeys { TaskDispatchRequest = "md.task.dispatch", ExportRequestPrefix = "md.export.request" }, DicomAgents = new DicomAgentConfiguration { DicomWebAgentName = "monaidicomweb" } }, - MigExternalAppPlugins = new List { { "examplePlugin" } } - }); + MigExternalAppPlugins = new List { { "examplePlugin" } }.ToArray() + }) ; _storageConfiguration = Options.Create(new StorageServiceConfiguration() { Settings = new Dictionary { { "bucket", "testbucket" }, { "endpoint", "localhost" }, { "securedConnection", "False" } } }); From ab9eb1053205ed0588cdbd8a85b60e0794a64fc8 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 5 Sep 2023 09:31:36 +0100 Subject: [PATCH 05/18] fixup dupe logging Signed-off-by: Neil South --- src/WorkflowManager/Logging/Log.200000.Workflow.cs | 3 --- .../WorkflowExecuter/Services/WorkflowExecuterService.cs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/WorkflowManager/Logging/Log.200000.Workflow.cs b/src/WorkflowManager/Logging/Log.200000.Workflow.cs index 8c9a73571..637062c9f 100644 --- a/src/WorkflowManager/Logging/Log.200000.Workflow.cs +++ b/src/WorkflowManager/Logging/Log.200000.Workflow.cs @@ -105,8 +105,5 @@ public static partial class Log [LoggerMessage(EventId = 210007, Level = LogLevel.Information, Message = "Exporting to MIG task Id {taskid}, export destination {destination} number of files {fileCount} Mig data plugins {plugins}.")] public static partial void LogMigExport(this ILogger logger, string taskid, string destination, int fileCount, string plugins); - - [LoggerMessage(EventId = 210008, Level = LogLevel.Information, Message = "Request canceld due to timeout taskId{taskid}.")] - public static partial void TaskTimedOut(this ILogger logger, string taskid); } } diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index f9e114457..920728d5d 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -813,7 +813,7 @@ private async Task TimeOutEvent(WorkflowInstance workflowInstance, TaskExe var exportRequestEvent = EventMapper.GenerateTaskCancellationEvent("", taskExec.ExecutionId, workflowInstance.Id, taskExec.TaskId, FailureReason.TimedOut, "Timed out"); var jsonMesssage = new JsonMessage(exportRequestEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, correlationId, Guid.NewGuid().ToString()); - _logger.TaskTimedOut(taskExec.TaskId); + _logger.TaskTimedOut(taskExec.TaskId, workflowInstance.Id, taskExec.Timeout); await _messageBrokerPublisherService.Publish(TaskTimeoutRoutingKey, jsonMesssage.ToMessage()); return true; } From 0aca28d52dd9adefe9156013c757473ab06bbe4d Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Tue, 5 Sep 2023 10:09:02 -0700 Subject: [PATCH 06/18] Fix allowed Argo parameter list and logging scope data not being rendered correctly (#870) * Fix argo parameter validation keys. Fix to correctly serialize logger scope values. Signed-off-by: Victor Chang * Fix unit tests Change argo pod date time to use the universal full ("U") format specifier Signed-off-by: Victor Chang --- .../Configuration/ArgoParameters.cs} | 62 ++++++++++++++- .../Miscellaneous/LoggingDataDictionary.cs | 40 ++++++++++ .../Miscellaneous/ValidationConstants.cs | 33 -------- .../AideClinicalReviewPlugin.cs | 2 +- src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 77 +++++++++---------- .../Plug-ins/Argo/ExitHookTemplate.cs | 11 ++- .../Argo/StaticValues/ResourcesKey.cs | 24 ------ .../Argo/StaticValues/ResourcesKeys.cs | 29 ------- .../Plug-ins/Docker/DockerPlugin.cs | 3 +- ....WorkflowManager.TaskManager.Docker.csproj | 1 + src/TaskManager/Plug-ins/Email/EmailPlugin.cs | 2 +- src/TaskManager/TaskManager/TaskManager.cs | 8 +- .../TaskManager/packages.lock.json | 1 + .../Services/EventPayloadRecieverService.cs | 6 +- .../Services/PayloadListenerService.cs | 6 +- .../Validators/EventPayloadValidator.cs | 6 +- .../WorkflowExecuter/Common/ArtifactMapper.cs | 3 +- .../Services/WorkflowExecuterService.cs | 10 +-- .../Controllers/WorkflowInstanceController.cs | 5 +- .../Validators/WorkflowValidator.cs | 24 +++--- .../TaskManager.Argo.Tests/ArgoPluginTest.cs | 30 ++++---- .../Validators/WorkflowValidatorTests.cs | 2 +- 22 files changed, 195 insertions(+), 190 deletions(-) rename src/{TaskManager/Plug-ins/Argo/StaticValues/Keys.cs => Common/Configuration/ArgoParameters.cs} (65%) create mode 100644 src/Common/Miscellaneous/LoggingDataDictionary.cs delete mode 100644 src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKey.cs delete mode 100644 src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs diff --git a/src/TaskManager/Plug-ins/Argo/StaticValues/Keys.cs b/src/Common/Configuration/ArgoParameters.cs similarity index 65% rename from src/TaskManager/Plug-ins/Argo/StaticValues/Keys.cs rename to src/Common/Configuration/ArgoParameters.cs index 5e78c2f15..b816994ed 100644 --- a/src/TaskManager/Plug-ins/Argo/StaticValues/Keys.cs +++ b/src/Common/Configuration/ArgoParameters.cs @@ -14,10 +14,25 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues +using System.Collections.Generic; + +namespace Monai.Deploy.WorkflowManager.Common.Configuration { - internal static class Keys + public static class ArgoParameters { + public struct ResourcesKey + { + public string TaskKey { get; set; } + public string ArgoKey { get; set; } + } + public static class ResourcesKeys + { + public static readonly ResourcesKey GpuLimit = new() { TaskKey = GpuRequired, ArgoKey = "nvidia.com/gpu" }; + + public static readonly ResourcesKey MemoryLimit = new() { TaskKey = Memory, ArgoKey = "memory" }; + + public static readonly ResourcesKey CpuLimit = new() { TaskKey = Cpu, ArgoKey = "cpu" }; + } /// /// Key for the namespace where the Argo workflows are stored and executed. /// @@ -76,18 +91,33 @@ internal static class Keys /// /// Key for resource limitations /// - public static readonly string ArgoResource = "resources"; + public static readonly string Resources = "resources"; /// /// Key for resource limitations /// - public static readonly string ArgoParameters = "parameters"; + public static readonly string Parameters = "parameters"; /// /// Key for priority classnames on task plugin arguments side /// public static readonly string TaskPriorityClassName = "priority"; + /// + /// Key for the CPU. + /// + public static readonly string Cpu = "cpu"; + + /// + /// Key for the memory. + /// + public static readonly string Memory = "memory"; + + /// + /// Key for the GPU. + /// + public static readonly string GpuRequired = "gpu_required"; + /// /// Required arguments to run the Argo workflow. /// @@ -96,6 +126,30 @@ internal static class Keys WorkflowTemplateName }; + /// + /// Required arguments to run the Argo workflow. + /// + public static readonly IReadOnlyList VaildParameters = + new List { + Namespace, + BaseUrl, + AllowInsecureseUrl, + WorkflowTemplateName, + TimeoutSeconds, + ArgoApiToken, + MessagingEndpoint, + MessagingUsername, + MessagingPassword, + MessagingExchange, + MessagingVhost, + Resources, + Parameters, + TaskPriorityClassName, + Cpu, + Memory, + GpuRequired, + }; + /// /// Required settings to run the Argo workflow. /// diff --git a/src/Common/Miscellaneous/LoggingDataDictionary.cs b/src/Common/Miscellaneous/LoggingDataDictionary.cs new file mode 100644 index 000000000..9048a9640 --- /dev/null +++ b/src/Common/Miscellaneous/LoggingDataDictionary.cs @@ -0,0 +1,40 @@ +/* + * Copyright 2021-2023 MONAI Consortium + * Copyright 2021 NVIDIA Corporation + * + * 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.Globalization; +using System.Runtime.Serialization; + +namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous +{ + [Serializable] + public class LoggingDataDictionary : Dictionary where TKey : notnull + { + public LoggingDataDictionary() + { + } + + protected LoggingDataDictionary(SerializationInfo info, StreamingContext context) : base(info, context) + { + } + + public override string ToString() + { + var pairs = this.Select(x => string.Format(CultureInfo.InvariantCulture, "{0}={1}", x.Key, x.Value)); + return string.Join(", ", pairs); + } + } +} diff --git a/src/Common/Miscellaneous/ValidationConstants.cs b/src/Common/Miscellaneous/ValidationConstants.cs index 1429ac56e..727ab8b56 100644 --- a/src/Common/Miscellaneous/ValidationConstants.cs +++ b/src/Common/Miscellaneous/ValidationConstants.cs @@ -53,21 +53,6 @@ public static class ValidationConstants /// public static readonly string Notifications = "notifications"; - /// - /// Key for the CPU. - /// - public static readonly string Cpu = "cpu"; - - /// - /// Key for the memory. - /// - public static readonly string Memory = "memory"; - - /// - /// Key for the GPU. - /// - public static readonly string GpuRequired = "gpu_required"; - /// /// Key for recipient emails. /// @@ -107,24 +92,6 @@ public enum NotificationValues Mode }; - /// - /// Key for the endpoint where the Argo server is running. - /// - public static readonly string BaseUrl = "server_url"; - - /// - /// Key for the name of the main 'WorkflowTemplate' stored on the targeted Argo server. - /// - public static readonly string WorkflowTemplateName = "workflow_template_name"; - - /// - /// Required arguments to run the Argo task args. - /// - public static readonly IReadOnlyList ArgoRequiredParameters = - new List { - BaseUrl, - WorkflowTemplateName - }; /// diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs b/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs index 0af719ecd..e6e37063b 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs +++ b/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs @@ -189,7 +189,7 @@ private void ValidateEventAndInit() public override async Task ExecuteTask(CancellationToken cancellationToken = default) { - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["correlationId"] = Event.CorrelationId, ["workflowInstanceId"] = Event.WorkflowInstanceId, diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index 2aa6c20b9..fdafd7232 100755 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -29,7 +29,6 @@ using Monai.Deploy.WorkflowManager.TaskManager.API.Extensions; using Monai.Deploy.WorkflowManager.TaskManager.API.Models; using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging; -using Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues; using Newtonsoft.Json; [assembly: PlugIn()] @@ -84,7 +83,7 @@ public ArgoPlugin( private void Initialize() { - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["correlationId"] = Event.CorrelationId, ["workflowInstanceId"] = Event.WorkflowInstanceId, @@ -93,54 +92,54 @@ private void Initialize() ["payloadId"] = Event.PayloadId }); - if (Event.TaskPluginArguments.ContainsKey(Keys.TimeoutSeconds) && - !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[Keys.TimeoutSeconds]) && - int.TryParse(Event.TaskPluginArguments[Keys.TimeoutSeconds], out var result)) + if (Event.TaskPluginArguments.ContainsKey(ArgoParameters.TimeoutSeconds) && + !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[ArgoParameters.TimeoutSeconds]) && + int.TryParse(Event.TaskPluginArguments[ArgoParameters.TimeoutSeconds], out var result)) { _activeDeadlineSeconds = result; } - if (Event.TaskPluginArguments.ContainsKey(Keys.ArgoApiToken) && - !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[Keys.ArgoApiToken])) + if (Event.TaskPluginArguments.ContainsKey(ArgoParameters.ArgoApiToken) && + !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[ArgoParameters.ArgoApiToken])) { - _apiToken = Event.TaskPluginArguments[Keys.ArgoApiToken]; + _apiToken = Event.TaskPluginArguments[ArgoParameters.ArgoApiToken]; } bool updateEvent = false; - if (Event.TaskPluginArguments.ContainsKey(Keys.Namespace) && - !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[Keys.Namespace])) + if (Event.TaskPluginArguments.ContainsKey(ArgoParameters.Namespace) && + !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[ArgoParameters.Namespace])) { - _namespace = Event.TaskPluginArguments[Keys.Namespace]; + _namespace = Event.TaskPluginArguments[ArgoParameters.Namespace]; } else { _namespace = Strings.DefaultNamespace; - Event.TaskPluginArguments.Add(Keys.Namespace, _namespace); + Event.TaskPluginArguments.Add(ArgoParameters.Namespace, _namespace); updateEvent = true; } - if (Event.TaskPluginArguments.ContainsKey(Keys.AllowInsecureseUrl) && - !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[Keys.AllowInsecureseUrl])) + if (Event.TaskPluginArguments.ContainsKey(ArgoParameters.AllowInsecureseUrl) && + !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[ArgoParameters.AllowInsecureseUrl])) { - _allowInsecure = string.Compare("true", Event.TaskPluginArguments[Keys.AllowInsecureseUrl], true) == 0; + _allowInsecure = string.Compare("true", Event.TaskPluginArguments[ArgoParameters.AllowInsecureseUrl], true) == 0; } else { _allowInsecure = true; - Event.TaskPluginArguments.Add(Keys.AllowInsecureseUrl, "true"); + Event.TaskPluginArguments.Add(ArgoParameters.AllowInsecureseUrl, "true"); updateEvent = true; } - if (Event.TaskPluginArguments.ContainsKey(Keys.BaseUrl) && - !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[Keys.BaseUrl])) + if (Event.TaskPluginArguments.ContainsKey(ArgoParameters.BaseUrl) && + !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[ArgoParameters.BaseUrl])) { - _baseUrl = Event.TaskPluginArguments[Keys.BaseUrl]; + _baseUrl = Event.TaskPluginArguments[ArgoParameters.BaseUrl]; } else { _baseUrl = _options.Value.TaskManager.ArgoPluginArguments.ServerUrl; - Event.TaskPluginArguments.Add(Keys.BaseUrl, _baseUrl); + Event.TaskPluginArguments.Add(ArgoParameters.BaseUrl, _baseUrl); updateEvent = true; } @@ -161,10 +160,10 @@ private void ValidateEvent() { if (Event.TaskPluginArguments is null || Event.TaskPluginArguments.Count == 0) { - throw new InvalidTaskException($"Required parameters to execute Argo workflow are missing: {string.Join(',', Keys.RequiredParameters)}"); + throw new InvalidTaskException($"Required parameters to execute Argo workflow are missing: {string.Join(',', ArgoParameters.RequiredParameters)}"); } - foreach (var key in Keys.RequiredParameters) + foreach (var key in ArgoParameters.RequiredParameters) { if (!Event.TaskPluginArguments.ContainsKey(key) && string.IsNullOrWhiteSpace(Event.TaskPluginArguments[key])) @@ -173,7 +172,7 @@ private void ValidateEvent() } } - foreach (var key in Keys.RequiredSettings) + foreach (var key in ArgoParameters.RequiredSettings) { if (!_options.Value.Messaging.PublisherSettings.ContainsKey(key)) { @@ -181,16 +180,16 @@ private void ValidateEvent() } } - if (Event.TaskPluginArguments.ContainsKey(Keys.BaseUrl) && - !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[Keys.BaseUrl]) && !Uri.IsWellFormedUriString(Event.TaskPluginArguments[Keys.BaseUrl], UriKind.Absolute)) + if (Event.TaskPluginArguments.ContainsKey(ArgoParameters.BaseUrl) && + !string.IsNullOrWhiteSpace(Event.TaskPluginArguments[ArgoParameters.BaseUrl]) && !Uri.IsWellFormedUriString(Event.TaskPluginArguments[ArgoParameters.BaseUrl], UriKind.Absolute)) { - throw new InvalidTaskException($"The value '{Event.TaskPluginArguments[Keys.BaseUrl]}' provided for '{Keys.BaseUrl}' is not a valid URI."); + throw new InvalidTaskException($"The value '{Event.TaskPluginArguments[ArgoParameters.BaseUrl]}' provided for '{ArgoParameters.BaseUrl}' is not a valid URI."); } } public override async Task ExecuteTask(CancellationToken cancellationToken = default) { - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["correlationId"] = Event.CorrelationId, ["workflowInstanceId"] = Event.WorkflowInstanceId, @@ -348,8 +347,8 @@ private Dictionary GetExecutuionStats(Workflow workflow) preprend = Strings.ExitHookTemplateSendTemplateName; } #pragma warning disable CS8604 // Possible null reference argument. - stats.Add($"{preprend}podStartTime{podcount}", item.Value.StartedAt is not null ? item.Value.StartedAt.ToString() : ""); - stats.Add($"{preprend}podFinishTime{podcount++}", item.Value.FinishedAt is not null ? item.Value.FinishedAt.ToString() : ""); + stats.Add($"{preprend}podStartTime{podcount}", item.Value.StartedAt?.UtcDateTime.ToString("u") ?? string.Empty); + stats.Add($"{preprend}podFinishTime{podcount++}", item.Value.FinishedAt?.UtcDateTime.ToString("u") ?? string.Empty); #pragma warning restore CS8604 // Possible null reference argument. } } @@ -386,7 +385,7 @@ private async Task BuildWorkflowWrapper(CancellationToken cancellation Kind = Strings.KindWorkflow, Metadata = new ObjectMeta() { - GenerateName = $"md-{Event.TaskPluginArguments![Keys.WorkflowTemplateName]}-", + GenerateName = $"md-{Event.TaskPluginArguments![ArgoParameters.WorkflowTemplateName]}-", Labels = new Dictionary { { Strings.TaskIdLabelSelectorName, Event.TaskId! }, @@ -417,7 +416,7 @@ private async Task BuildWorkflowWrapper(CancellationToken cancellation _logger.ArgoWorkflowTemplateGenerated(workflow.Metadata.GenerateName); var workflowJson = JsonConvert.SerializeObject(workflow, Formatting.Indented); - workflowJson = workflowJson.Replace(_options.Value.Messaging.PublisherSettings[Keys.MessagingPassword], "*****"); + workflowJson = workflowJson.Replace(_options.Value.Messaging.PublisherSettings[ArgoParameters.MessagingPassword], "*****"); _logger.ArgoWorkflowTemplateJson(workflow.Metadata.GenerateName, workflowJson); @@ -433,19 +432,19 @@ private async Task BuildWorkflowWrapper(CancellationToken cancellation private void ProcessTaskPluginArguments(Workflow workflow) { Guard.Against.Null(workflow, nameof(workflow)); - var priorityClassName = Event.GetTaskPluginArgumentsParameter(Keys.TaskPriorityClassName) ?? "standard"; + var priorityClassName = Event.GetTaskPluginArgumentsParameter(ArgoParameters.TaskPriorityClassName) ?? "standard"; foreach (var template in workflow.Spec.Templates) { - AddLimit(template, ResourcesKeys.CpuLimit); - AddLimit(template, ResourcesKeys.MemoryLimit); - AddLimit(template, ResourcesKeys.GpuLimit); + AddLimit(template, ArgoParameters.ResourcesKeys.CpuLimit); + AddLimit(template, ArgoParameters.ResourcesKeys.MemoryLimit); + AddLimit(template, ArgoParameters.ResourcesKeys.GpuLimit); template.PriorityClassName = priorityClassName; } workflow.Spec.PodPriorityClassName = priorityClassName; } - private void AddLimit(Template2 template, ResourcesKey key) + private void AddLimit(Template2 template, ArgoParameters.ResourcesKey key) { Guard.Against.Null(template, nameof(template)); Guard.Against.Null(key, nameof(key)); @@ -463,7 +462,7 @@ private void AddLimit(Template2 template, ResourcesKey key) } // Convert true / false value to 0 or 1 for number of GPU - if (key.TaskKey == ResourcesKeys.GpuLimit.TaskKey) + if (key.TaskKey == ArgoParameters.ResourcesKeys.GpuLimit.TaskKey) { value = bool.TryParse(value, out bool gpuRequired) && gpuRequired ? "1" : "0"; } @@ -475,11 +474,11 @@ private async Task AddMainWorkflowTemplate(Workflow workflow, CancellationToken { Guard.Against.Null(workflow, nameof(workflow)); - var workflowTemplate = await LoadWorkflowTemplate(Event.TaskPluginArguments![Keys.WorkflowTemplateName]).ConfigureAwait(false); + var workflowTemplate = await LoadWorkflowTemplate(Event.TaskPluginArguments![ArgoParameters.WorkflowTemplateName]).ConfigureAwait(false); if (workflowTemplate is null) { - throw new TemplateNotFoundException(Event.TaskPluginArguments![Keys.WorkflowTemplateName]); + throw new TemplateNotFoundException(Event.TaskPluginArguments![ArgoParameters.WorkflowTemplateName]); } var mainTemplateSteps = new Template2() { diff --git a/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs b/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs index 87b018d45..5c6a6b74f 100755 --- a/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs +++ b/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs @@ -17,7 +17,6 @@ using Argo; using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Common.Configuration; -using Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues; using Newtonsoft.Json; namespace Monai.Deploy.WorkflowManager.TaskManager.Argo @@ -42,13 +41,13 @@ public ExitHookTemplate(WorkflowManagerOptions options, TaskDispatchEvent taskDi _messagingEndpoint = options.Messaging.ArgoCallback.ArgoCallbackOverrideEnabled ? options.Messaging.ArgoCallback.ArgoRabbitOverrideEndpoint : - options.Messaging.PublisherSettings[Keys.MessagingEndpoint]; + options.Messaging.PublisherSettings[ArgoParameters.MessagingEndpoint]; - _messagingUsername = options.Messaging.PublisherSettings[Keys.MessagingUsername]; - _messagingPassword = options.Messaging.PublisherSettings[Keys.MessagingPassword]; + _messagingUsername = options.Messaging.PublisherSettings[ArgoParameters.MessagingUsername]; + _messagingPassword = options.Messaging.PublisherSettings[ArgoParameters.MessagingPassword]; _messagingTopic = options.Messaging.Topics.TaskCallbackRequest; - _messagingExchange = options.Messaging.PublisherSettings[Keys.MessagingExchange]; - _messagingVhost = options.Messaging.PublisherSettings[Keys.MessagingVhost]; + _messagingExchange = options.Messaging.PublisherSettings[ArgoParameters.MessagingExchange]; + _messagingVhost = options.Messaging.PublisherSettings[ArgoParameters.MessagingVhost]; _messageId = Guid.NewGuid(); _messageFileName = $"{_messageId}.json"; } diff --git a/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKey.cs b/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKey.cs deleted file mode 100644 index 350dd052d..000000000 --- a/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKey.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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. - */ - -namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues -{ - public struct ResourcesKey - { - public string TaskKey { get; set; } - public string ArgoKey { get; set; } - } -} diff --git a/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs b/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs deleted file mode 100644 index 52fcfd174..000000000 --- a/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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 static Monai.Deploy.WorkflowManager.Common.Miscellaneous.ValidationConstants; - -namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues -{ - public static class ResourcesKeys - { - public static readonly ResourcesKey GpuLimit = new() { TaskKey = GpuRequired, ArgoKey = "nvidia.com/gpu" }; - - public static readonly ResourcesKey MemoryLimit = new() { TaskKey = Memory, ArgoKey = "memory" }; - - public static readonly ResourcesKey CpuLimit = new() { TaskKey = Cpu, ArgoKey = "cpu" }; - } -} diff --git a/src/TaskManager/Plug-ins/Docker/DockerPlugin.cs b/src/TaskManager/Plug-ins/Docker/DockerPlugin.cs index b10d746fd..c75e1eb10 100644 --- a/src/TaskManager/Plug-ins/Docker/DockerPlugin.cs +++ b/src/TaskManager/Plug-ins/Docker/DockerPlugin.cs @@ -22,6 +22,7 @@ using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Events; using Monai.Deploy.Storage.API; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; using Monai.Deploy.WorkflowManager.TaskManager.API; using Monai.Deploy.WorkflowManager.TaskManager.Docker.Logging; @@ -109,7 +110,7 @@ public override async Task ExecuteTask(CancellationToken cancel ContainerVolumeMount intermediateVolumeMount; List outputVolumeMounts; - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["correlationId"] = Event.CorrelationId, ["workflowInstanceId"] = Event.WorkflowInstanceId, diff --git a/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj b/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj index 99d94b012..03b04f619 100644 --- a/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj +++ b/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj @@ -38,6 +38,7 @@ + diff --git a/src/TaskManager/Plug-ins/Email/EmailPlugin.cs b/src/TaskManager/Plug-ins/Email/EmailPlugin.cs index e0b582fcf..6a1a53d13 100644 --- a/src/TaskManager/Plug-ins/Email/EmailPlugin.cs +++ b/src/TaskManager/Plug-ins/Email/EmailPlugin.cs @@ -113,7 +113,7 @@ private void ValidateEventAndInit() public override async Task ExecuteTask(CancellationToken cancellationToken = default) { - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["correlationId"] = Event.CorrelationId, ["workflowInstanceId"] = Event.WorkflowInstanceId, diff --git a/src/TaskManager/TaskManager/TaskManager.cs b/src/TaskManager/TaskManager/TaskManager.cs index 0e29af285..7cdfe9453 100644 --- a/src/TaskManager/TaskManager/TaskManager.cs +++ b/src/TaskManager/TaskManager/TaskManager.cs @@ -196,7 +196,7 @@ private async Task TaskCallBackGeneric(MessageReceivedEventArgs args, Func + using var loggingScope = _logger.BeginScope(new Common.Miscellaneous.LoggingDataDictionary { ["correlationId"] = args.Message.CorrelationId, ["messageId"] = args.Message.MessageId, @@ -288,7 +288,7 @@ private async Task HandleTaskCallback(JsonMessage message) ITaskPlugin? taskRunner = null; - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new Common.Miscellaneous.LoggingDataDictionary { ["durationSoFar"] = (DateTime.UtcNow - taskExecution.Started).TotalMilliseconds, ["correlationId"] = taskExecution.Event.CorrelationId, @@ -404,7 +404,7 @@ private async Task HandleDispatchTask(JsonMessage message) var eventInfo = new API.Models.TaskDispatchEventInfo(message.Body); try { - using var messageLoggingScope = _logger.BeginScope(new Dictionary + using var messageLoggingScope = _logger.BeginScope(new Common.Miscellaneous.LoggingDataDictionary { ["workflowInstanceId"] = eventInfo.Event.WorkflowInstanceId, ["taskId"] = eventInfo.Event.TaskId, @@ -631,7 +631,7 @@ private async Task HandleMessageException(MessageBase message, string workflowIn return; } - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new Common.Miscellaneous.LoggingDataDictionary { ["correlationId"] = message.CorrelationId, ["workflowInstanceId"] = workflowInstanceId, diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index 104933168..79d9b4cf9 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -1643,6 +1643,7 @@ "dependencies": { "Docker.DotNet": "[3.125.13, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )" } }, diff --git a/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs index 67d781124..dcc7dbcc8 100644 --- a/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs +++ b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs @@ -57,7 +57,7 @@ public async Task ReceiveWorkflowPayload(MessageReceivedEventArgs message) { var requestEvent = message.Message.ConvertTo(); - using var loggingScope = (Logger.BeginScope(new Dictionary + using var loggingScope = (Logger.BeginScope(new LoggingDataDictionary { ["correlationId"] = requestEvent.CorrelationId, ["workflowId"] = requestEvent.Workflows.FirstOrDefault() @@ -105,7 +105,7 @@ public async Task TaskUpdatePayload(MessageReceivedEventArgs message) { var payload = message.Message.ConvertTo(); - using var loggerScope = Logger.BeginScope(new Dictionary + using var loggerScope = Logger.BeginScope(new LoggingDataDictionary { ["correlationId"] = payload.CorrelationId, ["workflowInstanceId"] = payload.WorkflowInstanceId, @@ -143,7 +143,7 @@ public async Task ExportCompletePayload(MessageReceivedEventArgs message) { var payload = message.Message.ConvertTo(); - using var loggerScope = Logger.BeginScope(new Dictionary { ["workflowInstanceId"] = payload.WorkflowInstanceId }); + using var loggerScope = Logger.BeginScope(new LoggingDataDictionary { ["workflowInstanceId"] = payload.WorkflowInstanceId }); if (!PayloadValidator.ValidateExportComplete(payload)) { diff --git a/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs b/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs index 62a39607a..74490f57f 100644 --- a/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs +++ b/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs @@ -108,7 +108,7 @@ private void SetupPolling() private async Task OnWorkflowRequestReceivedCallbackAsync(MessageReceivedEventArgs eventArgs) { - using var loggerScope = _logger.BeginScope(new Dictionary + using var loggerScope = _logger.BeginScope(new Common.Miscellaneous.LoggingDataDictionary { ["correlationId"] = eventArgs.Message.CorrelationId, ["source"] = eventArgs.Message.ApplicationId, @@ -122,7 +122,7 @@ private async Task OnWorkflowRequestReceivedCallbackAsync(MessageReceivedEventAr private async Task OnTaskUpdateStatusReceivedCallback(MessageReceivedEventArgs eventArgs) { - using var loggerScope = _logger.BeginScope(new Dictionary + using var loggerScope = _logger.BeginScope(new Common.Miscellaneous.LoggingDataDictionary { ["correlationId"] = eventArgs.Message.CorrelationId, ["source"] = eventArgs.Message.ApplicationId, @@ -136,7 +136,7 @@ private async Task OnTaskUpdateStatusReceivedCallback(MessageReceivedEventArgs e private async Task OnExportCompleteReceivedCallback(MessageReceivedEventArgs eventArgs) { - using var loggerScope = _logger.BeginScope(new Dictionary + using var loggerScope = _logger.BeginScope(new Common.Miscellaneous.LoggingDataDictionary { ["correlationId"] = eventArgs.Message.CorrelationId, ["source"] = eventArgs.Message.ApplicationId, diff --git a/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs b/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs index e1c2f5682..c188d9388 100644 --- a/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs +++ b/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs @@ -36,7 +36,7 @@ public bool ValidateWorkflowRequest(WorkflowRequestEvent payload) { Guard.Against.Null(payload, nameof(payload)); - using var loggingScope = Logger.BeginScope(new Dictionary + using var loggingScope = Logger.BeginScope(new LoggingDataDictionary { ["correlationId"] = payload.CorrelationId, ["payloadId"] = payload.PayloadId, @@ -71,7 +71,7 @@ public bool ValidateTaskUpdate(TaskUpdateEvent payload) { Guard.Against.Null(payload, nameof(payload)); - using var loggingScope = Logger.BeginScope(new Dictionary + using var loggingScope = Logger.BeginScope(new LoggingDataDictionary { ["correlationId"] = payload.CorrelationId, ["executionId"] = payload.ExecutionId, @@ -95,7 +95,7 @@ public bool ValidateExportComplete(ExportCompleteEvent payload) { Guard.Against.Null(payload, nameof(payload)); - using var loggingScope = Logger.BeginScope(new Dictionary + using var loggingScope = Logger.BeginScope(new LoggingDataDictionary { ["workflowInstanceId"] = payload.WorkflowInstanceId, ["exportTaskId"] = payload.ExportTaskId, diff --git a/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs index f3b773776..731942445 100755 --- a/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs +++ b/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs @@ -20,6 +20,7 @@ using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Monai.Deploy.WorkflowManager.Common.Database.Interfaces; using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common { @@ -41,7 +42,7 @@ public ArtifactMapper( public bool TryConvertArtifactVariablesToPath(Artifact[] artifacts, string payloadId, string workflowInstanceId, string bucketId, bool shouldExistYet, out Dictionary artifactPaths) { - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["payloadId"] = payloadId, ["workflowInstanceId"] = workflowInstanceId, diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 78f290ea5..12e41525a 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -197,7 +197,7 @@ public async Task ProcessFirstWorkflowTask(WorkflowInstance workflowInstance, st return; } - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["workflowInstanceId"] = workflowInstance.Id, ["durationSoFar"] = (DateTime.UtcNow - workflowInstance.StartTime).TotalMilliseconds, @@ -285,7 +285,7 @@ public async Task ProcessTaskUpdate(TaskUpdateEvent message) var currentTask = workflowInstance.Tasks.FirstOrDefault(t => t.TaskId == message.TaskId); - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["workflowInstanceId"] = workflowInstance.Id, ["taskStatus"] = message.Status, @@ -393,7 +393,7 @@ public async Task ProcessExportComplete(ExportCompleteEvent message, strin return false; } - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["workflowInstanceId"] = workflowInstance.Id, ["durationSoFar"] = (DateTime.UtcNow - workflowInstance.StartTime).TotalMilliseconds, @@ -627,7 +627,7 @@ private async Task DispatchTaskDestinations(WorkflowInstance workflowInsta foreach (var taskExec in taskExecutions) { - using var loggingScope = _logger.BeginScope(new Dictionary { ["executionId"] = taskExec?.ExecutionId ?? "" }); + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["executionId"] = taskExec?.ExecutionId ?? "" }); if (taskExec is null) { @@ -745,7 +745,7 @@ private async Task DispatchTask(WorkflowInstance workflowInstance, Workflo return false; } - using (_logger.BeginScope(new Dictionary { ["correlationId"] = correlationId, ["taskId"] = task.Id, ["executionId"] = taskExec.ExecutionId })) + using (_logger.BeginScope(new LoggingDataDictionary { ["correlationId"] = correlationId, ["taskId"] = task.Id, ["executionId"] = taskExec.ExecutionId })) { var outputArtifacts = task.Artifacts?.Output; diff --git a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs index 98703c9e7..9e3b30546 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs @@ -25,6 +25,7 @@ using Monai.Deploy.WorkflowManager.Common.Configuration; using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Monai.Deploy.WorkflowManager.Common.Logging; +using Monai.Deploy.WorkflowManager.Common.Miscellaneous; using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Exceptions; using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter; using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; @@ -141,7 +142,7 @@ public async Task GetByIdAsync([FromRoute] string id) return Problem($"Failed to validate {nameof(id)}, not a valid GUID", $"{ENDPOINT}{id}", BadRequest); } - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["workflowId"] = id, }); @@ -219,7 +220,7 @@ public async Task AcknowledgeTaskError([FromRoute] string id, [Fr return Problem($"Failed to validate {nameof(executionId)}, not a valid GUID", $"/workflows/{id}/executions/{executionId}/acknowledge", BadRequest); } - using var loggingScope = _logger.BeginScope(new Dictionary + using var loggingScope = _logger.BeginScope(new LoggingDataDictionary { ["workflowId"] = id, ["executionId"] = executionId, diff --git a/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs b/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs index 52e21ae62..335828560 100644 --- a/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs +++ b/src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs @@ -44,11 +44,6 @@ public class WorkflowValidator /// public static readonly string Separator = ";"; - /// - /// the name of the class for priority. - /// - public static readonly string TaskPriorityClassName = "priority"; - private const string Comma = ", "; private readonly ILogger _logger; private readonly IOptions _options; @@ -385,22 +380,21 @@ private void ValidateInputs(TaskObject currentTask) private void ValidateArgoTask(TaskObject currentTask) { - if (!currentTask.Args.ContainsKey(WorkflowTemplateName)) + if (!currentTask.Args.ContainsKey(ArgoParameters.WorkflowTemplateName)) { Errors.Add($"Task: '{currentTask.Id}' workflow_template_name must be specified{Comma}this corresponds to an Argo template name."); } - var validKeys = new string[] { WorkflowTemplateName, TaskPriorityClassName, Cpu, Memory, GpuRequired }; - var invalidKeys = currentTask.Args.Keys.Where(k => !validKeys.Contains(k)); + var invalidKeys = currentTask.Args.Keys.Where(k => !ArgoParameters.VaildParameters.Contains(k)); if (invalidKeys.Count() > 0) { - Errors.Add($"Task: '{currentTask.Id}' args has invalid keys: {string.Join(", ", invalidKeys)}. Please only specify keys from the following list: {string.Join(", ", validKeys)}."); + Errors.Add($"Task: '{currentTask.Id}' args has invalid keys: {string.Join(", ", invalidKeys)}. Please only specify keys from the following list: {string.Join(", ", ArgoParameters.VaildParameters)}."); return; } - if (currentTask.Args.ContainsKey(TaskPriorityClassName)) + if (currentTask.Args.ContainsKey(ArgoParameters.TaskPriorityClassName)) { - switch (currentTask.Args[TaskPriorityClassName].ToLower()) + switch (currentTask.Args[ArgoParameters.TaskPriorityClassName].ToLower()) { case "high" or "standard" or "low": break; @@ -411,18 +405,18 @@ private void ValidateArgoTask(TaskObject currentTask) } if ( - currentTask.Args.TryGetValue(Cpu, out var val) && + currentTask.Args.TryGetValue(ArgoParameters.Cpu, out var val) && (string.IsNullOrEmpty(val) || (double.TryParse(val, out double parsedVal) && (parsedVal < 1 || Math.Truncate(parsedVal) != parsedVal)))) { - Errors.Add($"Task: '{currentTask.Id}' value '{val}' provided for argument '{Cpu}' is not valid. The value needs to be a whole number greater than 0."); + Errors.Add($"Task: '{currentTask.Id}' value '{val}' provided for argument '{ArgoParameters.Cpu}' is not valid. The value needs to be a whole number greater than 0."); } if ( - currentTask.Args.TryGetValue(GpuRequired, out var gpuRequired) && + currentTask.Args.TryGetValue(ArgoParameters.GpuRequired, out var gpuRequired) && (string.IsNullOrEmpty(gpuRequired) || !bool.TryParse(gpuRequired, out var _))) { - Errors.Add($"Task: '{currentTask.Id}' value '{gpuRequired}' provided for argument '{GpuRequired}' is not valid. The value needs to be 'true' or 'false'."); + Errors.Add($"Task: '{currentTask.Id}' value '{gpuRequired}' provided for argument '{ArgoParameters.GpuRequired}' is not valid. The value needs to be 'true' or 'false'."); } } diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs index 7c3d6154e..f54dc8153 100755 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs @@ -28,9 +28,9 @@ using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Configuration; using Monai.Deploy.Messaging.Events; +using Monai.Deploy.WorkflowManager.Common.Configuration; using Monai.Deploy.WorkflowManager.Common.SharedTest; using Monai.Deploy.WorkflowManager.TaskManager.API; -using Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues; using Moq; using Moq.Language.Flow; using Newtonsoft.Json; @@ -67,12 +67,12 @@ public void ArgoPlugin_ThrowsWhenMissingRequiredSettings() Options.Value.Messaging.PublisherSettings.Remove("password"); Assert.Throws(() => new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message)); - foreach (var key in Keys.RequiredSettings.Take(Keys.RequiredSettings.Count - 1)) + foreach (var key in ArgoParameters.RequiredSettings.Take(ArgoParameters.RequiredSettings.Count - 1)) { message.TaskPluginArguments.Add(key, Guid.NewGuid().ToString()); Assert.Throws(() => new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message)); } - message.TaskPluginArguments[Keys.RequiredSettings[Keys.RequiredSettings.Count - 1]] = Guid.NewGuid().ToString(); + message.TaskPluginArguments[ArgoParameters.RequiredSettings[ArgoParameters.RequiredSettings.Count - 1]] = Guid.NewGuid().ToString(); Assert.Throws(() => new ArgoPlugin(ServiceScopeFactory.Object, _logger.Object, Options, message)); } @@ -236,7 +236,7 @@ public async Task ArgoPlugin_ExecuteTask_ReturnsExecutionStatusWhenFailedToLocat Assert.Equal(TaskExecutionStatus.Failed, result.Status); Assert.Equal(FailureReason.PluginError, result.FailureReason); - Assert.Equal($"Template '{argoTemplate.Spec.Entrypoint}' cannot be found in the referenced WorkflowTmplate '{message.TaskPluginArguments[Keys.WorkflowTemplateName]}'.", result.Errors); + Assert.Equal($"Template '{argoTemplate.Spec.Entrypoint}' cannot be found in the referenced WorkflowTmplate '{message.TaskPluginArguments[ArgoParameters.WorkflowTemplateName]}'.", result.Errors); ArgoClient.Verify(p => p.Argo_CreateWorkflowAsync(It.IsAny(), It.IsAny(), It.IsAny()), Times.Never()); K8sCoreOperations.Verify(p => p.CreateNamespacedSecretWithHttpMessagesAsync( @@ -506,9 +506,9 @@ public async Task ArgoPlugin_GetStatus_Argregates_stats() Message = Strings.ArgoPhaseSucceeded, Nodes = new Dictionary { - { "first", new NodeStatus { Id = "firstId" ,Type="Pod" ,Name="", StartedAt = new DateTime(2023,3,3) , FinishedAt = new DateTime(2023,3,3,8,0,32)} }, - { "second", new NodeStatus { Id = "secondId",Type="Pod" ,Name = $"node-{Strings.ExitHookTemplateSendTemplateName}" , StartedAt = new DateTime(2023,3,4) , FinishedAt = new DateTime(2023,3,4,8,0,32)} }, - { "third", new NodeStatus { Id = "thirdId" ,Type="Pod" ,Name="", StartedAt = new DateTime(2023,3,4) , FinishedAt = new DateTime(2023,3,4,8,0,32)} }, + { "first", new NodeStatus { Id = "firstId" ,Type="Pod" ,Name="", StartedAt = DateTime.SpecifyKind(new DateTime(2023,3,3), DateTimeKind.Utc) , FinishedAt = DateTime.SpecifyKind(new DateTime(2023,3,3,8,0,32), DateTimeKind.Utc)} }, + { "second", new NodeStatus { Id = "secondId",Type="Pod" ,Name = $"node-{Strings.ExitHookTemplateSendTemplateName}" , StartedAt = DateTime.SpecifyKind(new DateTime(2023,3,4), DateTimeKind.Utc) , FinishedAt = DateTime.SpecifyKind(new DateTime(2023,3,4,8,0,32), DateTimeKind.Utc)} }, + { "third", new NodeStatus { Id = "thirdId" ,Type="Pod" ,Name="", StartedAt = DateTime.SpecifyKind(new DateTime(2023,3,4) , DateTimeKind.Utc), FinishedAt = DateTime.SpecifyKind(new DateTime(2023,3,4,8,0,32), DateTimeKind.Utc)} }, } } }; @@ -528,7 +528,7 @@ public async Task ArgoPlugin_GetStatus_Argregates_stats() Assert.True(nodeInfo.ContainsKey("podStartTime0")); Assert.True(nodeInfo.ContainsKey("podFinishTime0")); Assert.True(nodeInfo.ContainsKey("send-messagepodFinishTime1")); - Assert.Equal("03/03/2023 08:00:32 +00:00", nodeInfo["podFinishTime0"]); + Assert.Equal("2023-03-03 08:00:32Z", nodeInfo["podFinishTime0"]); ArgoClient.Verify(p => p.Argo_GetWorkflowAsync(It.Is(p => p.Equals("namespace", StringComparison.OrdinalIgnoreCase)), It.Is(p => p.Equals("identity", StringComparison.OrdinalIgnoreCase)), It.IsAny(), It.IsAny(), It.IsAny()), Times.Exactly(3)); } @@ -893,15 +893,15 @@ private void SetUpSimpleArgoWorkFlow(WorkflowTemplate argoTemplate) private static TaskDispatchEvent GenerateTaskDispatchEventWithValidArguments(bool withoutDefaultProperties = false) { var message = GenerateTaskDispatchEvent(); - message.TaskPluginArguments[Keys.WorkflowTemplateName] = "workflowTemplate"; - message.TaskPluginArguments[Keys.TimeoutSeconds] = "50"; - message.TaskPluginArguments[Keys.ArgoApiToken] = "token"; + message.TaskPluginArguments[ArgoParameters.WorkflowTemplateName] = "workflowTemplate"; + message.TaskPluginArguments[ArgoParameters.TimeoutSeconds] = "50"; + message.TaskPluginArguments[ArgoParameters.ArgoApiToken] = "token"; if (withoutDefaultProperties is false) { - message.TaskPluginArguments[Keys.BaseUrl] = "http://api-endpoint/"; - message.TaskPluginArguments[Keys.Namespace] = "namespace"; - message.TaskPluginArguments[Keys.AllowInsecureseUrl] = "true"; + message.TaskPluginArguments[ArgoParameters.BaseUrl] = "http://api-endpoint/"; + message.TaskPluginArguments[ArgoParameters.Namespace] = "namespace"; + message.TaskPluginArguments[ArgoParameters.AllowInsecureseUrl] = "true"; } return message; @@ -973,7 +973,7 @@ private static TaskDispatchEvent GenerateTaskDispatchEvent() Kind = "WorkflowTemplate", Metadata = new ObjectMeta() { - Name = taskDispatchEvent.TaskPluginArguments[Keys.WorkflowTemplateName], + Name = taskDispatchEvent.TaskPluginArguments[ArgoParameters.WorkflowTemplateName], }, Spec = new WorkflowSpec { diff --git a/tests/UnitTests/WorkflowManager.Tests/Validators/WorkflowValidatorTests.cs b/tests/UnitTests/WorkflowManager.Tests/Validators/WorkflowValidatorTests.cs index 5072a4d15..422a52ce3 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Validators/WorkflowValidatorTests.cs +++ b/tests/UnitTests/WorkflowManager.Tests/Validators/WorkflowValidatorTests.cs @@ -670,7 +670,7 @@ public async Task ValidateWorkflow_ValidatesAWorkflow_ReturnsErrorsAndHasCorrect var invalidSourceName = "Data origin invalid_origin does not exists. Please review sources configuration management."; Assert.Contains(invalidSourceName, errors); - var invalidArgoKey = $"Task: 'invalid-key-argo-task' args has invalid keys: invalid_key. Please only specify keys from the following list: workflow_template_name, priority, cpu, memory, gpu_required."; + var invalidArgoKey = $"Task: 'invalid-key-argo-task' args has invalid keys: invalid_key. Please only specify keys from the following list: {string.Join(", ", ArgoParameters.VaildParameters)}."; Assert.Contains(invalidArgoKey, errors); var emailMissingEmailAndRolesArgs = "No recipients arguments specified for task EmailTask_MissingEmailAndRolesArgs. Email tasks must specify at least one of the following properties: recipient_emails, recipient_roles"; From 195cccd884298b9f67fcd210bfe243bf7510aba5 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Wed, 6 Sep 2023 09:30:48 -0700 Subject: [PATCH 07/18] Read TaskPriorityClass from config (#872) * Read TaskPriorityClass from config Signed-off-by: Victor Chang --- src/Common/Configuration/TaskManagerConfiguration.cs | 3 +++ src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 2 +- src/TaskManager/TaskManager/appsettings.json | 3 ++- tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTestBase.cs | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Common/Configuration/TaskManagerConfiguration.cs b/src/Common/Configuration/TaskManagerConfiguration.cs index 352dee455..7ab02046a 100644 --- a/src/Common/Configuration/TaskManagerConfiguration.cs +++ b/src/Common/Configuration/TaskManagerConfiguration.cs @@ -74,5 +74,8 @@ public class ArgoPluginArguments [ConfigurationKeyName("messageSenderContainerMemoryLimit")] public string MessageSenderContainerMemoryLimit { get; set; } = "500Mi"; + + [ConfigurationKeyName("taskPriorityClass")] + public string TaskPriorityClass { get; set; } = string.Empty; } } diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index fdafd7232..579378c86 100755 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -432,7 +432,7 @@ private async Task BuildWorkflowWrapper(CancellationToken cancellation private void ProcessTaskPluginArguments(Workflow workflow) { Guard.Against.Null(workflow, nameof(workflow)); - var priorityClassName = Event.GetTaskPluginArgumentsParameter(ArgoParameters.TaskPriorityClassName) ?? "standard"; + var priorityClassName = Event.GetTaskPluginArgumentsParameter(ArgoParameters.TaskPriorityClassName) ?? _options.Value.TaskManager.ArgoPluginArguments.TaskPriorityClass; foreach (var template in workflow.Spec.Templates) { diff --git a/src/TaskManager/TaskManager/appsettings.json b/src/TaskManager/TaskManager/appsettings.json index 684258a85..9353ca939 100755 --- a/src/TaskManager/TaskManager/appsettings.json +++ b/src/TaskManager/TaskManager/appsettings.json @@ -59,7 +59,8 @@ "messageGeneratorContainerCpuLimit": "1", "messageGeneratorContainerMemoryLimit": "500Mi", "messageSenderContainerCpuLimit": "1", - "messageSenderContainerMemoryLimit": "500Mi" + "messageSenderContainerMemoryLimit": "500Mi", + "taskPriorityClass": "" }, "argoExitHookSendMessageContainerImage": "ghcr.io/project-monai/monai-deploy-task-manager-callback:0.2.0-beta.211" }, diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTestBase.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTestBase.cs index 0e93c3b39..93e8037e0 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTestBase.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTestBase.cs @@ -100,6 +100,7 @@ public ArgoPluginTestBase() Options.Value.TaskManager.ArgoPluginArguments.MessageGeneratorContainerMemoryLimit = MessageGeneratorContainerMemoryLimit; Options.Value.TaskManager.ArgoPluginArguments.MessageSenderContainerCpuLimit = MessageSenderContainerCpuLimit; Options.Value.TaskManager.ArgoPluginArguments.MessageSenderContainerMemoryLimit = MessageSenderContainerMemoryLimit; + Options.Value.TaskManager.ArgoPluginArguments.TaskPriorityClass = "standard"; } } } From bf94fe8cb1a9609ed2f53283d15d4e033a030c3d Mon Sep 17 00:00:00 2001 From: Lillie Dae <61380713+lillie-dae@users.noreply.github.com> Date: Fri, 8 Sep 2023 16:50:28 +0100 Subject: [PATCH 08/18] minor fixes (#873) * minor fixes Signed-off-by: Lillie Dae --------- Signed-off-by: Lillie Dae --- src/Common/Miscellaneous/ApiControllerBase.cs | 4 +- src/TaskManager/Plug-ins/Argo/ArgoClient.cs | 76 ++++++++++--------- src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 1 + src/TaskManager/Plug-ins/Argo/ArgoProvider.cs | 4 +- src/TaskManager/Plug-ins/Argo/IArgoClient.cs | 6 +- .../Common/Services/PayloadService.cs | 4 +- .../Parser/ConditionalParameterParser.cs | 2 +- .../Resovler/Conditional.cs | 6 +- .../Resovler/ConditionalGroup.cs | 2 +- .../ConditionsResolver/Resovler/Keyword.cs | 2 +- .../ITaskExecutionStatsRepository.cs | 10 +-- .../TaskExecutionStatsRepository.cs | 32 ++++---- .../Logging/Log.500000.Messaging.cs | 2 +- .../Logging/Log.900000.General.cs | 16 ++-- .../Logging/Log.400000.cs | 4 +- .../MonaiBackgroundService/Worker.cs | 6 +- .../Extensions/ValidationExtensions.cs | 2 +- .../Services/EventPayloadRecieverService.cs | 10 +-- .../Services/IEventPayloadRecieverService.cs | 2 +- .../Services/PayloadListenerService.cs | 6 +- .../Validators/EventPayloadValidator.cs | 14 ++-- .../Validators/IEventPayloadValidator.cs | 2 +- .../Controllers/WorkflowInstanceController.cs | 1 + .../Extentions/WorkflowExecutorExtensions.cs | 4 +- .../TaskStatusUpdateStepDefinitions.cs | 10 +-- .../WorkflowInstancesApiStepDefinitions.cs | 10 +-- .../WorkflowTaskArtifactStepDefinitions.cs | 14 ++-- .../Support/Assertions.cs | 40 +++++----- .../Support/MongoClientUtil.cs | 12 +-- .../Resolver/ConditionalGroupTests.cs | 18 ++--- .../Resolver/ConditionalTests.cs | 6 +- .../TaskExecutionStatsRepositoryTests.cs | 30 ++++---- .../EventPayloadRecieverServiceTests.cs | 4 +- .../Validators/EventPayloadValidatorTests.cs | 2 +- .../ArgoPluginTestBase.cs | 1 + .../TaskManager.Tests/TaskManagerTest.cs | 13 ++-- .../TaskExecutionStatsControllerTests.cs | 10 +-- 37 files changed, 201 insertions(+), 187 deletions(-) diff --git a/src/Common/Miscellaneous/ApiControllerBase.cs b/src/Common/Miscellaneous/ApiControllerBase.cs index 86b3efdc4..931495994 100644 --- a/src/Common/Miscellaneous/ApiControllerBase.cs +++ b/src/Common/Miscellaneous/ApiControllerBase.cs @@ -37,9 +37,9 @@ public class ApiControllerBase : ControllerBase /// Initializes a new instance of the class. /// /// Workflow manager options. - public ApiControllerBase(IOptions Options) + public ApiControllerBase(IOptions options) { - this.Options = Options ?? throw new ArgumentNullException(nameof(Options)); + Options = options ?? throw new ArgumentNullException(nameof(options)); } /// diff --git a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs index 5224afbbe..af3e2a467 100755 --- a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs @@ -34,13 +34,17 @@ public async Task Argo_CreateWorkflowAsync(string argoNamespace, Workf var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}"); - var Method = "POST"; + var method = "POST"; var content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body)); - return await SendRequest(content, urlBuilder, Method, cancellationToken).ConfigureAwait(false); + return await SendRequest(content, urlBuilder, method, cancellationToken).ConfigureAwait(false); } - public async Task Argo_GetWorkflowAsync(string argoNamespace, string name, string? getOptions_resourceVersion, string? fields, CancellationToken cancellationToken) + public async Task Argo_GetWorkflowAsync(string argoNamespace, + string name, + string? getOptionsResourceVersion, + string? fields, + CancellationToken cancellationToken) { Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace)); Guard.Against.Null(name, nameof(name)); @@ -48,9 +52,9 @@ public async Task Argo_CreateWorkflowAsync(string argoNamespace, Workf var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}?"); - if (getOptions_resourceVersion != null) + if (getOptionsResourceVersion != null) { - urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptions_resourceVersion, CultureInfo.InvariantCulture))).Append('&'); + urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptionsResourceVersion, CultureInfo.InvariantCulture))).Append('&'); } if (fields != null) { @@ -71,9 +75,9 @@ public async Task Argo_StopWorkflowAsync(string argoNamespace, string var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/stop"); - var Method = "PUT"; + const string method = "PUT"; var content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body)); - return await SendRequest(content, urlBuilder, Method, new CancellationToken()).ConfigureAwait(false); + return await SendRequest(content, urlBuilder, method, new CancellationToken()).ConfigureAwait(false); } @@ -86,12 +90,12 @@ public async Task Argo_TerminateWorkflowAsync(string argoNamespace, st var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/terminate"); - var Method = "PUT"; + const string method = "PUT"; var content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body)); - return await SendRequest(content, urlBuilder, Method, new CancellationToken()).ConfigureAwait(false); + return await SendRequest(content, urlBuilder, method, new CancellationToken()).ConfigureAwait(false); } - public async Task Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptions_resourceVersion) + public async Task Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptionsResourceVersion) { Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace)); Guard.Against.Null(name, nameof(name)); @@ -99,9 +103,9 @@ public async Task Argo_TerminateWorkflowAsync(string argoNamespace, st var urlBuilder = new StringBuilder(); urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflow-templates/{argoNamespace}/{name}?"); - if (getOptions_resourceVersion != null) + if (getOptionsResourceVersion != null) { - urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptions_resourceVersion, CultureInfo.InvariantCulture))).Append('&'); + urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptionsResourceVersion, CultureInfo.InvariantCulture))).Append('&'); } urlBuilder.Length--; @@ -116,7 +120,7 @@ public async Task Argo_TerminateWorkflowAsync(string argoNamespace, st return await GetRequest(urlBuilder).ConfigureAwait(false); } - public async Task Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptions_container) + public async Task Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptionsContainer) { Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace)); Guard.Against.Null(name, nameof(name)); @@ -128,9 +132,9 @@ public async Task Argo_TerminateWorkflowAsync(string argoNamespace, st { urlBuilder.Append(Uri.EscapeDataString("podName") + "=").Append(Uri.EscapeDataString(ConvertToString(podName, CultureInfo.InvariantCulture))).Append('&'); } - if (logOptions_container != null) + if (logOptionsContainer != null) { - urlBuilder.Append(Uri.EscapeDataString("logOptions.container") + "=").Append(Uri.EscapeDataString(ConvertToString(logOptions_container, CultureInfo.InvariantCulture))).Append('&'); + urlBuilder.Append(Uri.EscapeDataString("logOptions.container") + "=").Append(Uri.EscapeDataString(ConvertToString(logOptionsContainer, CultureInfo.InvariantCulture))).Append('&'); } urlBuilder.Length--; @@ -152,8 +156,8 @@ public virtual async Task Argo_CreateWorkflowTemplateAsync(str var stringBody = Newtonsoft.Json.JsonConvert.SerializeObject(body); var content = new StringContent(stringBody); - var _logger = NLog.LogManager.GetCurrentClassLogger(); - _logger.Debug($"Sending content to Argo :{stringBody}"); + var logger = NLog.LogManager.GetCurrentClassLogger(); + logger.Debug($"Sending content to Argo :{stringBody.Replace(Environment.NewLine, "")}"); return await SendRequest(content, urlBuilder, method, cancellationToken).ConfigureAwait(false); } @@ -250,22 +254,22 @@ protected async Task SendRequest(StringContent stringContent, StringBuilde try { - var headers = Enumerable.ToDictionary(response.Headers, h_ => h_.Key, h_ => h_.Value); + var headers = Enumerable.ToDictionary(response.Headers, h => h.Key, h => h.Value); if (response.Content != null && response.Content.Headers != null) { - foreach (var item_ in response.Content.Headers) - headers[item_.Key] = item_.Value; + foreach (var item in response.Content.Headers) + headers[item.Key] = item.Value; } var status = (int)response.StatusCode; if (status == 200) { - var objectResponse_ = await ReadObjectResponseAsync(response, headers).ConfigureAwait(false); - if (objectResponse_.Object == null) + var objectResponse = await ReadObjectResponseAsync(response, headers).ConfigureAwait(false); + if (objectResponse.Object == null) { - throw new ApiException("Response was null which was not expected.", status, objectResponse_.Text, headers, null); + throw new ApiException("Response was null which was not expected.", status, objectResponse.Text, headers, null); } - return objectResponse_.Object; + return objectResponse.Object; } else { @@ -296,34 +300,34 @@ protected async Task SendRequest(StringContent stringContent, StringBuilde var response = await HttpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false); try { - var headers_ = Enumerable.ToDictionary(response.Headers, h_ => h_.Key, h_ => h_.Value); + var headers = Enumerable.ToDictionary(response.Headers, h => h.Key, h => h.Value); if (response.Content != null && response.Content.Headers != null) { - foreach (var item_ in response.Content.Headers) - headers_[item_.Key] = item_.Value; + foreach (var item in response.Content.Headers) + headers[item.Key] = item.Value; } var status = (int)response.StatusCode; if (status == 200) { - ObjectResponseResult objectResponse_; + ObjectResponseResult objectResponse; - objectResponse_ = await ReadObjectResponseAsync(response, headers_, isLogs).ConfigureAwait(false); + objectResponse = await ReadObjectResponseAsync(response, headers, isLogs).ConfigureAwait(false); - if (objectResponse_.Object == null) + if (objectResponse.Object == null) { - throw new ApiException("Response was null which was not expected.", status, objectResponse_.Text, headers_, null); + throw new ApiException("Response was null which was not expected.", status, objectResponse.Text, headers, null); } - return objectResponse_.Object; + return objectResponse.Object; } else { - var objectResponse_ = await ReadObjectResponseAsync(response, headers_, false).ConfigureAwait(false); - if (objectResponse_.Object == null) + var objectResponse = await ReadObjectResponseAsync(response, headers, false).ConfigureAwait(false); + if (objectResponse.Object == null) { - throw new ApiException("Response was null which was not expected.", status, objectResponse_.Text, headers_, null); + throw new ApiException("Response was null which was not expected.", status, objectResponse.Text, headers, null); } - throw new ApiException("An unexpected error response.", status, objectResponse_.Text, headers_, objectResponse_.Object, null); + throw new ApiException("An unexpected error response.", status, objectResponse.Text, headers, objectResponse.Object, null); } } finally diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index 579378c86..d276c1f70 100755 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -818,6 +818,7 @@ private async Task CopyTemplateSteps(ICollection steps, WorkflowT } } + // ReSharper disable once InconsistentNaming private async Task GenerateK8sSecretFrom(Messaging.Common.Storage storage, CancellationToken cancellationToken) { Guard.Against.Null(storage, nameof(storage)); diff --git a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs index 6a89f5de5..e4a2181dc 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs @@ -40,9 +40,9 @@ public IArgoClient CreateClient(string baseUrl, string? apiToken, bool allowInse _logger.CreatingArgoClient(baseUrl); - var ClientName = allowInsecure is true ? "Argo-Insecure" : "Argo"; + var clientName = allowInsecure ? "Argo-Insecure" : "Argo"; - var httpClient = _httpClientFactory.CreateClient(ClientName); + var httpClient = _httpClientFactory.CreateClient(clientName); Guard.Against.Null(httpClient, nameof(httpClient)); diff --git a/src/TaskManager/Plug-ins/Argo/IArgoClient.cs b/src/TaskManager/Plug-ins/Argo/IArgoClient.cs index ded53f890..b2c342328 100644 --- a/src/TaskManager/Plug-ins/Argo/IArgoClient.cs +++ b/src/TaskManager/Plug-ins/Argo/IArgoClient.cs @@ -23,9 +23,9 @@ public interface IArgoClient { Task Argo_CreateWorkflowAsync(string argoNamespace, WorkflowCreateRequest body, CancellationToken cancellationToken); - Task Argo_GetWorkflowAsync(string argoNamespace, string name, string? getOptions_resourceVersion, string? fields, CancellationToken cancellationToken); + Task Argo_GetWorkflowAsync(string argoNamespace, string name, string? getOptionsResourceVersion, string? fields, CancellationToken cancellationToken); - Task Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptions_resourceVersion); + Task Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptionsResourceVersion); Task Argo_StopWorkflowAsync(string argoNamespace, string name, WorkflowStopRequest body); @@ -33,7 +33,7 @@ public interface IArgoClient Task Argo_GetVersionAsync(); - Task Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptions_container); + Task Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptionsContainer); Task Argo_CreateWorkflowTemplateAsync(string argoNamespace, WorkflowTemplateCreateRequest body, CancellationToken cancellationToken); diff --git a/src/WorkflowManager/Common/Services/PayloadService.cs b/src/WorkflowManager/Common/Services/PayloadService.cs index 68b990b0a..72eb342f5 100644 --- a/src/WorkflowManager/Common/Services/PayloadService.cs +++ b/src/WorkflowManager/Common/Services/PayloadService.cs @@ -52,8 +52,8 @@ public PayloadService( _dicomService = dicomService ?? throw new ArgumentNullException(nameof(dicomService)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); - var _serviceScopeFactory = serviceScopeFactory ?? throw new ArgumentNullException(nameof(serviceScopeFactory)); - var scope = _serviceScopeFactory.CreateScope(); + var scopeFactory = serviceScopeFactory ?? throw new ArgumentNullException(nameof(serviceScopeFactory)); + var scope = scopeFactory.CreateScope(); _storageService = scope.ServiceProvider.GetService() ?? throw new ArgumentNullException(nameof(IStorageService)); } diff --git a/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs b/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs index da89cbf5e..78b56fb91 100644 --- a/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs +++ b/src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs @@ -21,10 +21,10 @@ using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Constants; using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Extensions; -using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver; using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Monai.Deploy.WorkflowManager.Common.Logging; using Monai.Deploy.WorkflowManager.Common.Storage.Services; +using Monai.Deploy.WorkflowManager.ConditionsResolver.Resovler; namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Parser { diff --git a/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs b/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs index 73d03c8c4..9580ec77e 100644 --- a/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs +++ b/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs @@ -17,7 +17,9 @@ using System.Globalization; using System.Text.RegularExpressions; -namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver +// ReSharper disable InconsistentNaming + +namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Resovler { public sealed class Conditional { @@ -314,7 +316,7 @@ private bool ContainsEvaluate() return arr.Any(p => CleanString(p).Equals(compare)); } - private static string CleanString(string p) => p.Trim().Trim('\"').Trim('\'').Trim('“').Trim('”'); + private static string CleanString(string p) => p.Trim().Trim('\"').Trim('\'').Trim('�').Trim('�'); private static bool EqualsNullOrDefined(string str) => str.Trim().Equals(NULL, StringComparison.InvariantCultureIgnoreCase) diff --git a/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs b/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs index 389a0975b..bab6f251b 100644 --- a/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs +++ b/src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs @@ -18,7 +18,7 @@ using Ardalis.GuardClauses; using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Extensions; -namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver +namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Resovler { public class ConditionalGroup { diff --git a/src/WorkflowManager/ConditionsResolver/Resovler/Keyword.cs b/src/WorkflowManager/ConditionsResolver/Resovler/Keyword.cs index 9bd77f3dd..d10acea9a 100644 --- a/src/WorkflowManager/ConditionsResolver/Resovler/Keyword.cs +++ b/src/WorkflowManager/ConditionsResolver/Resovler/Keyword.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver +namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Resovler { /// /// Group Keywords or Operators diff --git a/src/WorkflowManager/Database/Interfaces/ITaskExecutionStatsRepository.cs b/src/WorkflowManager/Database/Interfaces/ITaskExecutionStatsRepository.cs index 16f51022d..998f52eff 100644 --- a/src/WorkflowManager/Database/Interfaces/ITaskExecutionStatsRepository.cs +++ b/src/WorkflowManager/Database/Interfaces/ITaskExecutionStatsRepository.cs @@ -28,11 +28,11 @@ public interface ITaskExecutionStatsRepository /// /// Creates a task dispatch event in the database. /// - /// + /// /// workflow id. /// task id. /// - Task CreateAsync(TaskExecution TaskExecutionInfo, string workflowId, string correlationId); + Task CreateAsync(TaskExecution taskExecutionInfo, string workflowId, string correlationId); /// /// Updates status of a task dispatch event in the database. @@ -57,12 +57,12 @@ public interface ITaskExecutionStatsRepository /// /// start of the range. /// end of the range. - /// - /// + /// + /// /// optional workflow id. /// optional task id. /// a collections of stats - Task> GetStatsAsync(DateTime startTime, DateTime endTime, int PageSize = 10, int PageNumber = 1, string workflowId = "", string taskId = ""); + Task> GetStatsAsync(DateTime startTime, DateTime endTime, int pageSize = 10, int pageNumber = 1, string workflowId = "", string taskId = ""); /// /// Return the count of the entries with this status, or all if no status given. diff --git a/src/WorkflowManager/Database/Repositories/TaskExecutionStatsRepository.cs b/src/WorkflowManager/Database/Repositories/TaskExecutionStatsRepository.cs index b8c0c7690..4d272785f 100644 --- a/src/WorkflowManager/Database/Repositories/TaskExecutionStatsRepository.cs +++ b/src/WorkflowManager/Database/Repositories/TaskExecutionStatsRepository.cs @@ -51,12 +51,12 @@ public TaskExecutionStatsRepository( EnsureIndex(_taskExecutionStatsCollection).GetAwaiter().GetResult(); } - private static async Task EnsureIndex(IMongoCollection TaskExecutionStatsCollection) + private static async Task EnsureIndex(IMongoCollection taskExecutionStatsCollection) { - Guard.Against.Null(TaskExecutionStatsCollection, "TaskExecutionStatsCollection"); + Guard.Against.Null(taskExecutionStatsCollection, "TaskExecutionStatsCollection"); - var asyncCursor = (await TaskExecutionStatsCollection.Indexes.ListAsync()); - var bsonDocuments = (await asyncCursor.ToListAsync()); + var asyncCursor = await taskExecutionStatsCollection.Indexes.ListAsync(); + var bsonDocuments = await asyncCursor.ToListAsync(); var indexes = bsonDocuments.Select(_ => _.GetElement("name").Value.ToString()).ToList(); // If index not present create it else skip. @@ -73,17 +73,17 @@ private static async Task EnsureIndex(IMongoCollection TaskExecu options ); - await TaskExecutionStatsCollection.Indexes.CreateOneAsync(model); + await taskExecutionStatsCollection.Indexes.CreateOneAsync(model); } } - public async Task CreateAsync(TaskExecution TaskExecutionInfo, string workflowId, string correlationId) + public async Task CreateAsync(TaskExecution taskExecutionInfo, string workflowId, string correlationId) { - Guard.Against.Null(TaskExecutionInfo, "taskDispatchEventInfo"); + Guard.Against.Null(taskExecutionInfo, "taskDispatchEventInfo"); try { - var insertMe = new ExecutionStats(TaskExecutionInfo, workflowId, correlationId); + var insertMe = new ExecutionStats(taskExecutionInfo, workflowId, correlationId); await _taskExecutionStatsCollection.ReplaceOneAsync(doc => doc.ExecutionId == insertMe.ExecutionId, @@ -149,15 +149,15 @@ await _taskExecutionStatsCollection.UpdateOneAsync(o => } } - public async Task> GetStatsAsync(DateTime startTime, DateTime endTime, int PageSize = 10, int PageNumber = 1, string workflowId = "", string taskId = "") + public async Task> GetStatsAsync(DateTime startTime, DateTime endTime, int pageSize = 10, int pageNumber = 1, string workflowId = "", string taskId = "") { CreateFilter(startTime, endTime, workflowId, taskId, out var builder, out var filter); filter &= builder.Where(GetExecutedTasksFilter()); var result = await _taskExecutionStatsCollection.Find(filter) - .Limit(PageSize) - .Skip((PageNumber - 1) * PageSize) + .Limit(pageSize) + .Skip((pageNumber - 1) * pageSize) .ToListAsync(); return result; } @@ -183,7 +183,7 @@ private static ExecutionStats ExposeExecutionStats(ExecutionStats taskExecutionS } /// - /// Calculates and sets ExecutionStats ExecutionTimeSeconds + /// Calculates and sets ExecutionStats ExecutionTimeSeconds /// /// /// @@ -196,11 +196,11 @@ private static void CalculatePodExecutionTime(ExecutionStats taskExecutionStats, { if (statKey.Contains("StartTime") && DateTime.TryParse(taskUpdateEvent.ExecutionStats[statKey], out var startTime)) { - start = (startTime < start ? startTime : start); + start = startTime < start ? startTime : start; } else if (DateTime.TryParse(taskUpdateEvent.ExecutionStats[statKey], out var endTime)) { - end = (endTime > end ? endTime : start); + end = endTime > end ? endTime : start; } } taskExecutionStats.ExecutionTimeSeconds = (end - start).TotalMilliseconds / 1000; @@ -286,8 +286,8 @@ public async Task GetStatsStatusFailedCountAsync(DateTime startTime, DateT .Match(filter) .Group(g => new { g.Version }, r => new { - avgTotalExecution = r.Average(x => (x.DurationSeconds)), - avgArgoExecution = r.Average(x => (x.ExecutionTimeSeconds)) + avgTotalExecution = r.Average(x => x.DurationSeconds), + avgArgoExecution = r.Average(x => x.ExecutionTimeSeconds) }).ToListAsync(); var firstResult = test.FirstOrDefault() ?? new { avgTotalExecution = 0.0, avgArgoExecution = 0.0 }; diff --git a/src/WorkflowManager/Logging/Log.500000.Messaging.cs b/src/WorkflowManager/Logging/Log.500000.Messaging.cs index a79eed69e..dcadc5bf2 100644 --- a/src/WorkflowManager/Logging/Log.500000.Messaging.cs +++ b/src/WorkflowManager/Logging/Log.500000.Messaging.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Logging; -namespace Monai.Deploy.WorkflowManager.Common.Logging +namespace Monai.Deploy.WorkflowManager.Logging { public static partial class Log { diff --git a/src/WorkflowManager/Logging/Log.900000.General.cs b/src/WorkflowManager/Logging/Log.900000.General.cs index ef474dffa..f176f4f25 100644 --- a/src/WorkflowManager/Logging/Log.900000.General.cs +++ b/src/WorkflowManager/Logging/Log.900000.General.cs @@ -20,26 +20,26 @@ namespace Monai.Deploy.WorkflowManager.Common.Logging { public static partial class Log { - [LoggerMessage(EventId = 900000, Level = LogLevel.Trace, Message = "{ServiceName} started.")] + [LoggerMessage(EventId = 900000, Level = LogLevel.Trace, Message = "{serviceName} started.")] public static partial void ServiceStarted(this ILogger logger, string serviceName); - [LoggerMessage(EventId = 900001, Level = LogLevel.Trace, Message = "{ServiceName} starting.")] + [LoggerMessage(EventId = 900001, Level = LogLevel.Trace, Message = "{serviceName} starting.")] public static partial void ServiceStarting(this ILogger logger, string serviceName); - [LoggerMessage(EventId = 900002, Level = LogLevel.Trace, Message = "{ServiceName} is stopping.")] + [LoggerMessage(EventId = 900002, Level = LogLevel.Trace, Message = "{serviceName} is stopping.")] public static partial void ServiceStopping(this ILogger logger, string serviceName); - [LoggerMessage(EventId = 900003, Level = LogLevel.Information, Message = "Waiting for {ServiceName} to stop.")] + [LoggerMessage(EventId = 900003, Level = LogLevel.Information, Message = "Waiting for {serviceName} to stop.")] public static partial void ServiceStopPending(this ILogger logger, string serviceName); - [LoggerMessage(EventId = 900004, Level = LogLevel.Warning, Message = "{ServiceName} canceled.")] + [LoggerMessage(EventId = 900004, Level = LogLevel.Warning, Message = "{serviceName} canceled.")] public static partial void ServiceCancelled(this ILogger logger, string serviceName); - [LoggerMessage(EventId = 900005, Level = LogLevel.Warning, Message = "{ServiceName} canceled.")] + [LoggerMessage(EventId = 900005, Level = LogLevel.Warning, Message = "{serviceName} canceled.")] public static partial void ServiceCancelledWithException(this ILogger logger, string serviceName, Exception ex); - [LoggerMessage(EventId = 900006, Level = LogLevel.Trace, Message = "{ServiceName} Worker completed in: {Elapsed_millis} milliseconds.")] - public static partial void ServiceCompleted(this ILogger logger, string serviceName, int elapsed_millis); + [LoggerMessage(EventId = 900006, Level = LogLevel.Trace, Message = "{serviceName} Worker completed in: {elapsedMillis} milliseconds.")] + public static partial void ServiceCompleted(this ILogger logger, string serviceName, int elapsedMillis); [LoggerMessage(EventId = 900007, Level = LogLevel.Error, Message = "Recovering connection to storage service: {reason}.")] public static partial void MessagingServiceErrorRecover(this ILogger logger, string reason); diff --git a/src/WorkflowManager/MonaiBackgroundService/Logging/Log.400000.cs b/src/WorkflowManager/MonaiBackgroundService/Logging/Log.400000.cs index b068ceca1..c3b68ff51 100644 --- a/src/WorkflowManager/MonaiBackgroundService/Logging/Log.400000.cs +++ b/src/WorkflowManager/MonaiBackgroundService/Logging/Log.400000.cs @@ -14,7 +14,9 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.Common.MonaiBackgroundService.Logging +using Microsoft.Extensions.Logging; + +namespace Monai.Deploy.WorkflowManager.MonaiBackgroundService.Logging { public static partial class Log { diff --git a/src/WorkflowManager/MonaiBackgroundService/Worker.cs b/src/WorkflowManager/MonaiBackgroundService/Worker.cs index 1e1c26eec..a786f587d 100644 --- a/src/WorkflowManager/MonaiBackgroundService/Worker.cs +++ b/src/WorkflowManager/MonaiBackgroundService/Worker.cs @@ -21,8 +21,8 @@ using Monai.Deploy.WorkflowManager.Common.Configuration; using Monai.Deploy.WorkflowManager.Common.Contracts.Models; using Monai.Deploy.WorkflowManager.Common.Logging; -using Monai.Deploy.WorkflowManager.Common.MonaiBackgroundService.Logging; using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common; +using Monai.Deploy.WorkflowManager.MonaiBackgroundService.Logging; namespace Monai.Deploy.WorkflowManager.Common.MonaiBackgroundService { @@ -71,8 +71,8 @@ public async Task DoWork() { try { - var (Tasks, _) = await _tasksService.GetAllAsync(); - foreach (var task in Tasks.Where(t => t.TimeoutInterval != 0 && t.Timeout < DateTime.UtcNow)) + var (tasks, _) = await _tasksService.GetAllAsync(); + foreach (var task in tasks.Where(t => t.TimeoutInterval != 0 && t.Timeout < DateTime.UtcNow)) { task.ResultMetadata.TryGetValue(JobIdentity, out var identity); diff --git a/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs b/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs index a0a2b29a6..2745d712c 100644 --- a/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs +++ b/src/WorkflowManager/PayloadListener/Extensions/ValidationExtensions.cs @@ -18,7 +18,7 @@ using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Extensions +namespace Monai.Deploy.WorkflowManager.PayloadListener.Extensions { public static class ValidationExtensions { diff --git a/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs index dcc7dbcc8..21deaadbf 100644 --- a/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs +++ b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs @@ -19,11 +19,11 @@ using Monai.Deploy.Messaging.Common; using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; -using Monai.Deploy.WorkflowManager.Common.Logging; -using Monai.Deploy.WorkflowManager.Common.PayloadListener.Validators; using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services; +using Monai.Deploy.WorkflowManager.Logging; +using Monai.Deploy.WorkflowManager.PayloadListener.Validators; -namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Services +namespace Monai.Deploy.WorkflowManager.PayloadListener.Services { public class EventPayloadReceiverService : IEventPayloadReceiverService { @@ -57,11 +57,11 @@ public async Task ReceiveWorkflowPayload(MessageReceivedEventArgs message) { var requestEvent = message.Message.ConvertTo(); - using var loggingScope = (Logger.BeginScope(new LoggingDataDictionary + using var loggingScope = Logger.BeginScope(new LoggingDataDictionary { ["correlationId"] = requestEvent.CorrelationId, ["workflowId"] = requestEvent.Workflows.FirstOrDefault() - })); + }); var validation = PayloadValidator.ValidateWorkflowRequest(requestEvent); diff --git a/src/WorkflowManager/PayloadListener/Services/IEventPayloadRecieverService.cs b/src/WorkflowManager/PayloadListener/Services/IEventPayloadRecieverService.cs index 2772687f6..cd30ec036 100644 --- a/src/WorkflowManager/PayloadListener/Services/IEventPayloadRecieverService.cs +++ b/src/WorkflowManager/PayloadListener/Services/IEventPayloadRecieverService.cs @@ -16,7 +16,7 @@ using Monai.Deploy.Messaging.Common; -namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Services +namespace Monai.Deploy.WorkflowManager.PayloadListener.Services { public interface IEventPayloadReceiverService { diff --git a/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs b/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs index 74490f57f..be8a0fafe 100644 --- a/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs +++ b/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs @@ -23,8 +23,9 @@ using Monai.Deploy.WorkflowManager.Common.Configuration; using Monai.Deploy.WorkflowManager.Common.Logging; using Monai.Deploy.WorkflowManager.Common.Miscellaneous; +using Monai.Deploy.WorkflowManager.Logging; -namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Services +namespace Monai.Deploy.WorkflowManager.PayloadListener.Services { public class PayloadListenerService : IHostedService, IMonaiService, IDisposable { @@ -103,8 +104,7 @@ private void SetupPolling() _logger.EventSubscription(ServiceName, TaskStatusUpdateRoutingKey); _messageSubscriber.SubscribeAsync(ExportCompleteRoutingKey, ExportCompleteRoutingKey, OnExportCompleteReceivedCallback); - _logger.EventSubscription(ServiceName, ExportCompleteRoutingKey); - } + _logger.EventSubscription(ServiceName, ExportCompleteRoutingKey); } private async Task OnWorkflowRequestReceivedCallbackAsync(MessageReceivedEventArgs eventArgs) { diff --git a/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs b/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs index c188d9388..38a4471c9 100644 --- a/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs +++ b/src/WorkflowManager/PayloadListener/Validators/EventPayloadValidator.cs @@ -18,10 +18,10 @@ using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Common; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Common.Logging; -using Monai.Deploy.WorkflowManager.Common.PayloadListener.Extensions; +using Monai.Deploy.WorkflowManager.PayloadListener.Extensions; +using Log = Monai.Deploy.WorkflowManager.Logging.Log; -namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Validators +namespace Monai.Deploy.WorkflowManager.PayloadListener.Validators { public class EventPayloadValidator : IEventPayloadValidator { @@ -47,7 +47,7 @@ public bool ValidateWorkflowRequest(WorkflowRequestEvent payload) if (!payloadValid) { - Logger.FailedToValidateWorkflowRequestEvent(string.Join(Environment.NewLine, validationErrors)); + Log.FailedToValidateWorkflowRequestEvent(Logger, string.Join(Environment.NewLine, validationErrors)); } valid &= payloadValid; @@ -58,7 +58,7 @@ public bool ValidateWorkflowRequest(WorkflowRequestEvent payload) if (!workflowValid) { - Logger.FailedToValidateWorkflowRequestEvent("Workflow id is empty string"); + Log.FailedToValidateWorkflowRequestEvent(Logger, "Workflow id is empty string"); } valid &= workflowValid; @@ -84,7 +84,7 @@ public bool ValidateTaskUpdate(TaskUpdateEvent payload) } catch (MessageValidationException e) { - Logger.FailedToValidateTaskUpdateEvent(e); + Log.FailedToValidateTaskUpdateEvent(Logger, e); return false; } @@ -107,7 +107,7 @@ public bool ValidateExportComplete(ExportCompleteEvent payload) } catch (MessageValidationException e) { - Logger.FailedToValidateExportCompleteEvent(e); + Log.FailedToValidateExportCompleteEvent(Logger, e); return false; } diff --git a/src/WorkflowManager/PayloadListener/Validators/IEventPayloadValidator.cs b/src/WorkflowManager/PayloadListener/Validators/IEventPayloadValidator.cs index e8835e77b..77e4f7856 100644 --- a/src/WorkflowManager/PayloadListener/Validators/IEventPayloadValidator.cs +++ b/src/WorkflowManager/PayloadListener/Validators/IEventPayloadValidator.cs @@ -16,7 +16,7 @@ using Monai.Deploy.Messaging.Events; -namespace Monai.Deploy.WorkflowManager.Common.PayloadListener.Validators +namespace Monai.Deploy.WorkflowManager.PayloadListener.Validators { public interface IEventPayloadValidator { diff --git a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs index 9e3b30546..1afae227e 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs @@ -40,6 +40,7 @@ namespace Monai.Deploy.WorkflowManager.Common.ControllersShared [Route("workflowinstances")] public class WorkflowInstanceController : AuthenticatedApiControllerBase { + // ReSharper disable once InconsistentNaming private const string ENDPOINT = "/workflowinstances/"; private readonly IOptions _options; private readonly IWorkflowInstanceService _workflowInstanceService; diff --git a/src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs b/src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs index 80d89d24a..2d94ec7e5 100644 --- a/src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs +++ b/src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs @@ -22,12 +22,12 @@ using Monai.Deploy.WorkflowManager.Common.Miscellaneous; using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services; -using Monai.Deploy.WorkflowManager.Common.PayloadListener.Services; -using Monai.Deploy.WorkflowManager.Common.PayloadListener.Validators; using Monai.Deploy.WorkflowManager.Common.Services.InformaticsGateway; using Monai.Deploy.WorkflowManager.Common.Storage.Services; using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common; using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services; +using Monai.Deploy.WorkflowManager.PayloadListener.Services; +using Monai.Deploy.WorkflowManager.PayloadListener.Validators; namespace Monai.Deploy.WorkflowManager.Common.Extensions { diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskStatusUpdateStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskStatusUpdateStepDefinitions.cs index 2bc636546..4997462bb 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskStatusUpdateStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskStatusUpdateStepDefinitions.cs @@ -238,8 +238,8 @@ public void ThenICanSeeTheStatusOfTheTaskIsSucceeded(string taskId, string taskS _outputHelper.WriteLine($"Retrieving workflow instance by id={workflowInstanceId}"); var updatedWorkflowInstance = MongoClient.GetWorkflowInstanceById(workflowInstanceId); _outputHelper.WriteLine("Retrieved workflow instance"); - TaskExecutionStatus ExecutionStatus; - ExecutionStatus = taskStatus.ToLower() switch + TaskExecutionStatus executionStatus; + executionStatus = taskStatus.ToLower() switch { "accepted" => TaskExecutionStatus.Accepted, "succeeded" => TaskExecutionStatus.Succeeded, @@ -252,14 +252,14 @@ public void ThenICanSeeTheStatusOfTheTaskIsSucceeded(string taskId, string taskS RetryPolicy.Execute(() => { - if (updatedWorkflowInstance.Tasks.FirstOrDefault(x => x.TaskId == taskId)?.Status != ExecutionStatus) + if (updatedWorkflowInstance.Tasks.FirstOrDefault(x => x.TaskId == taskId)?.Status != executionStatus) { updatedWorkflowInstance = MongoClient.GetWorkflowInstanceById(workflowInstanceId); - throw new Exception($"Task Update Status for the task is {updatedWorkflowInstance.Tasks.FirstOrDefault(x => x.TaskId == taskId)?.Status} and it should be {ExecutionStatus}"); + throw new Exception($"Task Update Status for the task is {updatedWorkflowInstance.Tasks.FirstOrDefault(x => x.TaskId == taskId)?.Status} and it should be {executionStatus}"); } }); - updatedWorkflowInstance.Tasks.FirstOrDefault(x => x.TaskId == taskId)?.Status.Should().Be(ExecutionStatus); + updatedWorkflowInstance.Tasks.FirstOrDefault(x => x.TaskId == taskId)?.Status.Should().Be(executionStatus); } [Then(@"I can see the Metadata is copied to the workflow instance")] diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowInstancesApiStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowInstancesApiStepDefinitions.cs index 785cb6762..a44b4fcd0 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowInstancesApiStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowInstancesApiStepDefinitions.cs @@ -80,19 +80,19 @@ public void ThenPaginationIsWorkingCorrectlyForTheWorkflowInstance(int count) } [Then(@"All results have correct (.*) and (.*)")] - public void AllResultsHaveExpectedStatusOrPayloadId(int? expected_status, string? expected_payloadId) + public void AllResultsHaveExpectedStatusOrPayloadId(int? expectedStatus, string? expectedPayloadId) { var result = ApiHelper.Response.Content.ReadAsStringAsync().Result; var deserializedResult = JsonConvert.DeserializeObject>>(result); Action func = wi => { }; - if (string.IsNullOrWhiteSpace(expected_payloadId) is false) + if (string.IsNullOrWhiteSpace(expectedPayloadId) is false) { - func += wi => wi.PayloadId.Should().Be(expected_payloadId); + func += wi => wi.PayloadId.Should().Be(expectedPayloadId); } - if (expected_status is not null) + if (expectedStatus is not null) { - func += wi => wi.Status.Should().Be((Status)expected_status); + func += wi => wi.Status.Should().Be((Status)expectedStatus); } deserializedResult.Should().NotBeNull(); diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowTaskArtifactStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowTaskArtifactStepDefinitions.cs index d7e927eba..58e7ac930 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowTaskArtifactStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowTaskArtifactStepDefinitions.cs @@ -37,24 +37,24 @@ public WorkflowTaskArtifactStepDefinitions(ObjectContainer objectContainer, Scen [Then(@"Input artifacts are mapped")] public void ThenInputArtifactsAreMapped() { - string PayloadId; + string payloadId; if (DataHelper.SeededWorkflowInstances == null) { - PayloadId = DataHelper.WorkflowRequestMessage.PayloadId.ToString(); + payloadId = DataHelper.WorkflowRequestMessage.PayloadId.ToString(); } else { - PayloadId = DataHelper.WorkflowInstances[0].PayloadId; + payloadId = DataHelper.WorkflowInstances[0].PayloadId; } - _outputHelper.WriteLine($"Retrieving updated workflow instance using the payloadid={PayloadId}"); + _outputHelper.WriteLine($"Retrieving updated workflow instance using the payloadid={payloadId}"); - var workflowInstances = DataHelper.GetWorkflowInstances(1, PayloadId); + var workflowInstances = DataHelper.GetWorkflowInstances(1, payloadId); if (workflowInstances == null) { - throw new Exception($"WorkflowInstance not found for payloadId {PayloadId}"); + throw new Exception($"WorkflowInstance not found for payloadId {payloadId}"); } _outputHelper.WriteLine("Retrieved workflow instance"); @@ -75,7 +75,7 @@ public void ThenInputArtifactsAreMapped() var workflowTask = workflowRevision.Workflow.Tasks.First(x => x.Id.Equals(task.TaskId)); #pragma warning restore CS8602 // Dereference of a possibly null reference. - Assertions.AssertInputArtifactsForWorkflowInstance(workflowTask, PayloadId, task); + Assertions.AssertInputArtifactsForWorkflowInstance(workflowTask, payloadId, task); } } } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs index 86f379a0f..5e66fa743 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs @@ -321,10 +321,10 @@ public void AssertWorkflowIstanceMatchesExpectedTaskStatusUpdate(WorkflowInstanc updatedWorkflowInstance.Tasks[0].Status.Should().Be(taskExecutionStatus); } - public static void AssertSearch(int count, string? queries, T? Response) + public static void AssertSearch(int count, string? queries, T? response) { - var responseType = Response?.GetType(); - GetPropertyValues(Response, responseType, out var data, out var totalPages, out var pageSize, out var totalRecords, out var pageNumber); + var responseType = response?.GetType(); + GetPropertyValues(response, responseType, out var data, out var totalPages, out var pageSize, out var totalRecords, out var pageNumber); if (string.IsNullOrWhiteSpace(queries) is false) { var splitQuery = queries?.Split("&") ?? Array.Empty(); @@ -361,10 +361,10 @@ public static void AssertSearch(int count, string? queries, T? Response) data.Count.Should().Be(count); } - public static void AssertPagination(int count, string? queries, T? Response) + public static void AssertPagination(int count, string? queries, T? response) { - var responseType = Response?.GetType(); - GetPropertyValues(Response, responseType, out var data, out var totalPages, out var pageSize, out var totalRecords, out var pageNumber); + var responseType = response?.GetType(); + GetPropertyValues(response, responseType, out var data, out var totalPages, out var pageSize, out var totalRecords, out var pageNumber); var pageNumberQuery = 1; var pageSizeQuery = 10; @@ -399,15 +399,15 @@ public static void AssertPagination(int count, string? queries, T? Response) pageSize.Should().Be(pageSizeQuery); } - private static void GetPropertyValues(T? Response, Type? responseType, out ICollection data, out object? totalPages, out object? pageSize, out object? totalRecords, out object? pageNumber) + private static void GetPropertyValues(T? response, Type? responseType, out ICollection data, out object? totalPages, out object? pageSize, out object? totalRecords, out object? pageNumber) { #pragma warning disable CS8601 // Possible null reference assignment. - data = responseType?.GetProperty("Data")?.GetValue(Response, null) as ICollection; + data = responseType?.GetProperty("Data")?.GetValue(response, null) as ICollection; #pragma warning restore CS8601 // Possible null reference assignment. - totalPages = responseType?.GetProperty("TotalPages")?.GetValue(Response, null); - pageSize = responseType?.GetProperty("PageSize")?.GetValue(Response, null); - totalRecords = responseType?.GetProperty("TotalRecords")?.GetValue(Response, null); - pageNumber = responseType?.GetProperty("PageNumber")?.GetValue(Response, null); + totalPages = responseType?.GetProperty("TotalPages")?.GetValue(response, null); + pageSize = responseType?.GetProperty("PageSize")?.GetValue(response, null); + totalRecords = responseType?.GetProperty("TotalRecords")?.GetValue(response, null); + pageNumber = responseType?.GetProperty("PageNumber")?.GetValue(response, null); } public void WorkflowInstanceIncludesTaskDetails(List taskDispatchEvents, WorkflowInstance workflowInstance, WorkflowRevision workflowRevision) @@ -484,38 +484,38 @@ public void AssertWorkflowInstance(List expectedWorkflowInstan #pragma warning restore CS8602 // Dereference of a possibly null reference. } - private static void AssertDataCount(ICollection Data, int pageNumberQuery, int pageSizeQuery, int count) + private static void AssertDataCount(ICollection data, int pageNumberQuery, int pageSizeQuery, int count) { if ((pageNumberQuery * pageSizeQuery) > count) { - Data?.Count.Should().Be(Math.Max(count - ((pageNumberQuery - 1) * pageSizeQuery), 0)); + data?.Count.Should().Be(Math.Max(count - ((pageNumberQuery - 1) * pageSizeQuery), 0)); } else if ((pageNumberQuery * pageSizeQuery) < count) { - Data?.Count.Should().Be(pageSizeQuery); + data?.Count.Should().Be(pageSizeQuery); } else if (pageNumberQuery > 1) { - Data?.Count.Should().Be(Math.Max(count - (pageSizeQuery * (pageNumberQuery - 1)), 0)); + data?.Count.Should().Be(Math.Max(count - (pageSizeQuery * (pageNumberQuery - 1)), 0)); } else { - Data?.Count.Should().Be(count); + data?.Count.Should().Be(count); } } - private static void AssertTotalPages(object? TotalPages, int count, int pageSizeQuery) + private static void AssertTotalPages(object? totalPages, int count, int pageSizeQuery) { int remainder; int quotient = Math.DivRem(count, pageSizeQuery, out remainder); if (remainder == 0) { - TotalPages.Should().Be(quotient); + totalPages.Should().Be(quotient); } else { - TotalPages.Should().Be(quotient + 1); + totalPages.Should().Be(quotient + 1); } } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MongoClientUtil.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MongoClientUtil.cs index f959a3c6c..f19c11a63 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MongoClientUtil.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MongoClientUtil.cs @@ -120,14 +120,14 @@ public WorkflowInstance GetWorkflowInstance(string payloadId) return WorkflowInstanceCollection.Find(x => x.PayloadId == payloadId).FirstOrDefault(); } - public WorkflowInstance GetWorkflowInstanceById(string Id) + public WorkflowInstance GetWorkflowInstanceById(string id) { - return WorkflowInstanceCollection.Find(x => x.Id == Id).FirstOrDefault(); + return WorkflowInstanceCollection.Find(x => x.Id == id).FirstOrDefault(); } - public WorkflowInstance GetWorkflowInstanceByWorkflowId(string Id) + public WorkflowInstance GetWorkflowInstanceByWorkflowId(string id) { - return WorkflowInstanceCollection.Find(x => x.WorkflowId == Id).FirstOrDefault(); + return WorkflowInstanceCollection.Find(x => x.WorkflowId == id).FirstOrDefault(); } public List GetWorkflowInstancesByPayloadId(string payloadId) @@ -237,11 +237,11 @@ internal void DeleteAllExecutionStats() }); } - public void CreateExecutionStats(ExecutionStats ExecutionStats) + public void CreateExecutionStats(ExecutionStats executionStats) { RetryMongo.Execute(() => { - ExecutionStatsCollection.InsertOne(ExecutionStats); + ExecutionStatsCollection.InsertOne(executionStats); }); } diff --git a/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalGroupTests.cs b/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalGroupTests.cs index ac96eca6e..343e248e4 100644 --- a/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalGroupTests.cs +++ b/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalGroupTests.cs @@ -15,7 +15,7 @@ */ using System; -using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver; +using Monai.Deploy.WorkflowManager.ConditionsResolver.Resovler; using Xunit; namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Tests.Resolver @@ -40,7 +40,7 @@ public class ConditionalGroupTests [InlineData("'F' == 'F' AND 'F' == 'leg' OR 'F' == 'F' AND 'F' == 'F' OR 'F' == 'F'")] [InlineData("'F' == 'F' AND 'F' == 'leg' OR 'F' == 'F' OR 'F' == 'F' AND 'F' == 'F'")] [InlineData("'AND' == 'OR' AND 'F' == 'leg' OR 'F' == 'F' OR 'F' == 'F' AND 'F' == 'F'")] - [InlineData("'Donkey' CONTAINS [“Donkey”, “Alpaca”, “Zebra”] AND 'F' == 'F'")] + [InlineData("'Donkey' CONTAINS [�Donkey�, �Alpaca�, �Zebra�] AND 'F' == 'F'")] public void ConditionalGroup_WhenProvidedCorrectInput_ShouldCreateAndHaveLeftAndRightGroups(string input) { var conditionalGroup = ConditionalGroup.Create(input); @@ -51,13 +51,13 @@ public void ConditionalGroup_WhenProvidedCorrectInput_ShouldCreateAndHaveLeftAnd [Theory] [InlineData(true, "'F' == 'F'")] [InlineData(false, "'F' == 'leg'")] - [InlineData(true, "'Donkey' CONTAINS [“Donkey”, “Alpaca”, “Zebra”]")] - [InlineData(true, "'lillie' contains [“jack”, “lillie”, “neil”]")] - [InlineData(false, "'Donkey' CONTAINS [“aDonkeya”, “Alpaca”, “Zebra”]")] - [InlineData(true, "[“Donkey”, “Alpaca”, “Zebra”] CONTAINS 'Donkey'")] - [InlineData(false, "[“Donkey”, “Alpaca”, “Zebra”] CONTAINS 'Betty'")] - [InlineData(false, "'Donkey' NOT_CONTAINS [“Donkey”, “Alpaca”, “Zebra”]")] - [InlineData(false, "'Donkey' not_contains [“Donkey”, “Alpaca”, “Zebra”]")] + [InlineData(true, "'Donkey' CONTAINS [�Donkey�, �Alpaca�, �Zebra�]")] + [InlineData(true, "'lillie' contains [�jack�, �lillie�, �neil�]")] + [InlineData(false, "'Donkey' CONTAINS [�aDonkeya�, �Alpaca�, �Zebra�]")] + [InlineData(true, "[�Donkey�, �Alpaca�, �Zebra�] CONTAINS 'Donkey'")] + [InlineData(false, "[�Donkey�, �Alpaca�, �Zebra�] CONTAINS 'Betty'")] + [InlineData(false, "'Donkey' NOT_CONTAINS [�Donkey�, �Alpaca�, �Zebra�]")] + [InlineData(false, "'Donkey' not_contains [�Donkey�, �Alpaca�, �Zebra�]")] [InlineData(true, "'' == NULL")] [InlineData(true, "'Lillie' == 'lillie '")] [InlineData(true, "'Lillie' == 'lillie'")] diff --git a/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalTests.cs b/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalTests.cs index 01dd73525..9162f5a82 100644 --- a/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalTests.cs +++ b/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalTests.cs @@ -15,10 +15,10 @@ */ using System; -using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver; +using Monai.Deploy.WorkflowManager.ConditionsResolver.Resovler; using Xunit; -namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Tests.Resolver +namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.Resolver { public class ConditionalTests { @@ -27,7 +27,7 @@ public class ConditionalTests [InlineData("{{context.executions.body_part_identifier.result.body_part}}", "leg", "{{context.executions.body_part_identifier.result.body_part}} == 'leg'")] [InlineData("F", "F", "'F' == 'F'")] [InlineData("F", "{{context.dicom.tags[('0010','0040')]}}", "'F' == {{context.dicom.tags[('0010','0040')]}}")] - [InlineData("{{context.dicom.tags[('0010','0040')]}}", "“Donkey”, “Alpaca”, “Zebra”", "{{context.dicom.tags[('0010','0040')]}} CONTAINS [“Donkey”, “Alpaca”, “Zebra”]")] + [InlineData("{{context.dicom.tags[('0010','0040')]}}", "�Donkey�, �Alpaca�, �Zebra�", "{{context.dicom.tags[('0010','0040')]}} CONTAINS [�Donkey�, �Alpaca�, �Zebra�]")] public void Conditional_CreatesAndEvaluates(string expectedLeftParam, string expectedRightParam, string input) { var conditional = Conditional.Create(input); diff --git a/tests/UnitTests/Database.Tests/TaskExecutionStatsRepositoryTests.cs b/tests/UnitTests/Database.Tests/TaskExecutionStatsRepositoryTests.cs index 25103a74e..9813526ee 100644 --- a/tests/UnitTests/Database.Tests/TaskExecutionStatsRepositoryTests.cs +++ b/tests/UnitTests/Database.Tests/TaskExecutionStatsRepositoryTests.cs @@ -47,8 +47,10 @@ public TaskExecutionStatsRepositoryTests() _dbase = new Mock(); _collection = new Mock>(); - var IndexDoc = new BsonDocument(new Dictionary { { "name", "ExecutionStatsIndex" } }); - var indexList = Task.FromResult(new List() { IndexDoc }); + var indexDoc = new BsonDocument(new Dictionary { { "name", "ExecutionStatsIndex" } }); + var indexList = Task.FromResult(new List { indexDoc }); + + Assert.NotNull(indexList); var cursor = new Mock>(); @@ -63,7 +65,7 @@ public TaskExecutionStatsRepositoryTests() public void ExecutionStats_Should_Contain_All_Fields() { const string workflowId = nameof(workflowId); - const string WorkflowInstanceId = nameof(WorkflowInstanceId); + const string workflowInstanceId = nameof(workflowInstanceId); const string correlationId = nameof(correlationId); const string taskId = nameof(taskId); const string executionId = nameof(executionId); @@ -73,7 +75,7 @@ public void ExecutionStats_Should_Contain_All_Fields() { TaskId = taskId, ExecutionId = executionId, - WorkflowInstanceId = WorkflowInstanceId + WorkflowInstanceId = workflowInstanceId }; testObj.TaskStartTime = started; @@ -82,7 +84,7 @@ public void ExecutionStats_Should_Contain_All_Fields() Assert.Equal(started, output.StartedUTC); Assert.Equal(executionId, output.ExecutionId); - Assert.Equal(WorkflowInstanceId, output.WorkflowInstanceId); + Assert.Equal(workflowInstanceId, output.WorkflowInstanceId); Assert.Equal(workflowId, output.WorkflowId); Assert.Equal(correlationId, output.CorrelationId); Assert.Equal(taskId, output.TaskId); @@ -255,24 +257,24 @@ public async Task ExecutionStats_Get_Stats_Should_Filter() public void ExecutionStats_New_TaskCancellationEvent_Should_initialize() { var collerationId = "colleration"; - var WorkflowInstanceId = "WorkflowInstanceId"; - var TaskId = "TaskId"; - var ExecutionId = "ExecutionId"; + var workflowInstanceId = "WorkflowInstanceId"; + var taskId = "TaskId"; + var executionId = "ExecutionId"; var workflowId = "workflowId"; var stats = new ExecutionStats( new TaskCancellationEvent { - WorkflowInstanceId = WorkflowInstanceId, - TaskId = TaskId, - ExecutionId = ExecutionId, + WorkflowInstanceId = workflowInstanceId, + TaskId = taskId, + ExecutionId = executionId, }, workflowId, collerationId); Assert.Equal(collerationId, stats.CorrelationId); - Assert.Equal(WorkflowInstanceId, stats.WorkflowInstanceId); - Assert.Equal(TaskId, stats.TaskId); - Assert.Equal(ExecutionId, stats.ExecutionId); + Assert.Equal(workflowInstanceId, stats.WorkflowInstanceId); + Assert.Equal(taskId, stats.TaskId); + Assert.Equal(executionId, stats.ExecutionId); Assert.Equal(TaskExecutionStatus.Failed.ToString(), stats.Status); } diff --git a/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs b/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs index cee281576..e3659da61 100644 --- a/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs +++ b/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs @@ -24,9 +24,9 @@ using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces; using Monai.Deploy.WorkflowManager.Common.Configuration; using Monai.Deploy.WorkflowManager.Common.Contracts.Models; -using Monai.Deploy.WorkflowManager.Common.PayloadListener.Services; -using Monai.Deploy.WorkflowManager.Common.PayloadListener.Validators; using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services; +using Monai.Deploy.WorkflowManager.PayloadListener.Services; +using Monai.Deploy.WorkflowManager.PayloadListener.Validators; using Moq; using NUnit.Framework; diff --git a/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs b/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs index 3edab7a06..127c36d10 100644 --- a/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs +++ b/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs @@ -18,7 +18,7 @@ using System.Collections.Generic; using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Events; -using Monai.Deploy.WorkflowManager.Common.PayloadListener.Validators; +using Monai.Deploy.WorkflowManager.PayloadListener.Validators; using Moq; using NUnit.Framework; diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTestBase.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTestBase.cs index 93e8037e0..91c45e9ec 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTestBase.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTestBase.cs @@ -36,6 +36,7 @@ public class ArgoPluginTestBase protected readonly Mock KubernetesClient; protected readonly Mock TaskDispatchEventService; protected readonly IOptions Options; + // ReSharper disable once InconsistentNaming protected readonly Mock K8sCoreOperations; protected readonly Mock ArgoProvider; protected readonly int ArgoTtlStatergySeconds = 360; diff --git a/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs b/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs index 658e5319c..bad008dbb 100644 --- a/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs +++ b/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs @@ -124,6 +124,7 @@ public override Task> RetrieveMetadata(CancellationTo public class TaskManagerTest { + // ReSharper disable once InconsistentNaming private const string NOT_ARGO = "notArgo"; private readonly Mock> _logger; @@ -615,7 +616,7 @@ public async Task TaskManager_TaskCallbackEvent_ExceptionGettingStatus() await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(taskDispatchEventMessage))).ConfigureAwait(false); }); - var TaskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); + var taskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); _messageBrokerSubscriberService.Setup( p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskCallbackRequest, StringComparison.OrdinalIgnoreCase)), It.IsAny(), @@ -627,7 +628,7 @@ public async Task TaskManager_TaskCallbackEvent_ExceptionGettingStatus() resetEvent.Reset(2); await Task.Run(() => { - messageReceivedCallback(CreateMessageReceivedEventArgs(TaskCallbackEventMessage)); + messageReceivedCallback(CreateMessageReceivedEventArgs(taskCallbackEventMessage)); }).ConfigureAwait(false); }); @@ -645,7 +646,7 @@ await Task.Run(() => _testRunnerCallback.Verify(p => p.GenerateGetStatusResult(), Times.Once()); _messageBrokerSubscriberService.Verify(p => p.Acknowledge(It.Is(m => m.MessageId == taskDispatchEventMessage.MessageId)), Times.Once()); _messageBrokerPublisherService.Verify(p => p.Publish(It.Is(m => m == _options.Value.Messaging.Topics.TaskUpdateRequest), It.IsAny()), Times.Exactly(2)); - _messageBrokerSubscriberService.Verify(p => p.Reject(It.Is(m => m.MessageId == TaskCallbackEventMessage.MessageId), It.Is(b => !b)), Times.Once()); + _messageBrokerSubscriberService.Verify(p => p.Reject(It.Is(m => m.MessageId == taskCallbackEventMessage.MessageId), It.Is(b => !b)), Times.Once()); } [Fact(DisplayName = "Task Manager - TaskCallbackEvent completes workflow")] @@ -773,7 +774,7 @@ await Task.Run(() => }).ConfigureAwait(false); }); - var TaskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); + var taskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); _messageBrokerSubscriberService.Setup( p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskCallbackRequest, StringComparison.OrdinalIgnoreCase)), It.IsAny(), @@ -785,7 +786,7 @@ await Task.Run(() => resetEvent.Reset(2); await Task.Run(() => { - messageReceivedCallback(CreateMessageReceivedEventArgs(TaskCallbackEventMessage)); + messageReceivedCallback(CreateMessageReceivedEventArgs(taskCallbackEventMessage)); }).ConfigureAwait(false); }); _messageBrokerSubscriberService @@ -810,7 +811,7 @@ await Task.Run(() => _testRunnerCallback.Verify(p => p.GenerateExecuteTaskResult(), Times.Once()); _testRunnerCallback.Verify(p => p.GenerateGetStatusResult(), Times.Once()); _messageBrokerSubscriberService.Verify(p => p.Acknowledge(It.Is(m => m.MessageId == taskDispatchEventMessage.MessageId)), Times.Once()); - _messageBrokerSubscriberService.Verify(p => p.Acknowledge(It.Is(m => m.MessageId == TaskCallbackEventMessage.MessageId)), Times.Once()); + _messageBrokerSubscriberService.Verify(p => p.Acknowledge(It.Is(m => m.MessageId == taskCallbackEventMessage.MessageId)), Times.Once()); _messageBrokerPublisherService.Verify(p => p.Publish(It.Is(m => m == _options.Value.Messaging.Topics.TaskUpdateRequest), It.IsAny()), Times.Exactly(2)); } diff --git a/tests/UnitTests/WorkflowManager.Tests/Controllers/TaskExecutionStatsControllerTests.cs b/tests/UnitTests/WorkflowManager.Tests/Controllers/TaskExecutionStatsControllerTests.cs index 53ed0a088..3a6f1ca50 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Controllers/TaskExecutionStatsControllerTests.cs +++ b/tests/UnitTests/WorkflowManager.Tests/Controllers/TaskExecutionStatsControllerTests.cs @@ -126,16 +126,16 @@ public async Task GetStatsAsync_Pass_All_Arguments_To_GetStatsAsync_In_Repo() { var startTime = new DateTime(2023, 4, 4); var endTime = new DateTime(2023, 4, 5); - var PageNumber = 15; - var PageSize = 9; + const int pageNumber = 15; + const int pageSize = 9; - var result = await StatsController.GetStatsAsync(new TimeFilter { StartTime = startTime, EndTime = endTime, PageNumber = PageNumber, PageSize = PageSize }, "workflow", "task"); + var result = await StatsController.GetStatsAsync(new TimeFilter { StartTime = startTime, EndTime = endTime, PageNumber = pageNumber, PageSize = pageSize }, "workflow", "task"); _repo.Verify(v => v.GetStatsAsync( It.Is(d => d.Equals(startTime)), It.Is(d => d.Equals(endTime)), - It.Is(i => i.Equals(PageSize)), - It.Is(i => i.Equals(PageNumber)), + It.Is(i => i.Equals(pageSize)), + It.Is(i => i.Equals(pageNumber)), It.Is(s => s.Equals("workflow")), It.Is(s => s.Equals("task"))) ); From 387803fb6d432d032c212a03d3c27ad1f027c443 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Wed, 13 Sep 2023 10:05:48 -0700 Subject: [PATCH 09/18] Update dependencies (#874) * Update dependencies * Remove unused references * Fix NLog warnings * Update nlog console layout * Fix log event IDs Signed-off-by: Victor Chang --- .github/workflows/build.yml | 13 +- doc/dependency_decisions.yml | 1739 +++++------------ ...orkflowManager.Common.Configuration.csproj | 2 +- src/Common/Configuration/packages.lock.json | 6 +- ...orkflowManager.Common.Miscellaneous.csproj | 4 +- src/Common/Miscellaneous/packages.lock.json | 120 +- ...loy.WorkflowManager.TaskManager.API.csproj | 4 +- src/TaskManager/API/packages.lock.json | 18 +- ...orkflowManager.TaskManager.Database.csproj | 2 +- src/TaskManager/Database/packages.lock.json | 42 +- .../AideClinicalReview/packages.lock.json | 114 +- ...oy.WorkflowManager.TaskManager.Argo.csproj | 5 +- .../Plug-ins/Argo/packages.lock.json | 470 +---- ....WorkflowManager.TaskManager.Docker.csproj | 2 +- ...y.WorkflowManager.TaskManager.Email.csproj | 4 - ....Deploy.WorkflowManager.TaskManager.csproj | 30 +- src/TaskManager/TaskManager/Program.cs | 14 +- src/TaskManager/TaskManager/nlog.config | 2 +- .../TaskManager/packages.lock.json | 778 ++------ ...ai.Deploy.WorkflowManager.Contracts.csproj | 4 +- ...nai.Deploy.WorkflowManager.Database.csproj | 2 +- .../Database/packages.lock.json | 42 +- .../Logging/Log.500000.Messaging.cs | 24 +- .../Logging/packages.lock.json | 18 +- .../PayloadListener/packages.lock.json | 134 +- ...nai.Deploy.WorkflowManager.Services.csproj | 2 +- .../Services/packages.lock.json | 97 +- .../Storage/packages.lock.json | 18 +- .../WorkflowExecuter/packages.lock.json | 134 +- .../Monai.Deploy.WorkflowManager.csproj | 26 +- .../WorkflowManager/Program.cs | 14 +- .../WorkflowManager/nlog.config | 2 +- .../WorkflowManager/packages.lock.json | 364 ++-- ...anager.TaskManager.IntegrationTests.csproj | 12 +- ...r.WorkflowExecutor.IntegrationTests.csproj | 10 +- ...Deploy.WorkflowManager.Common.Tests.csproj | 12 +- ...lowManager.ConditionsResolver.Tests.csproj | 8 +- ...WorkflowManager.Configuration.Tests.csproj | 10 +- ...ploy.WorkflowManager.Database.Tests.csproj | 10 +- ...Deploy.WorkflowManager.Shared.Tests.csproj | 11 +- ...anager.MonaiBackgroundService.Tests.csproj | 10 +- ...rkflowManager.PayloadListener.Tests.csproj | 8 +- .../PayloadListener.Tests/packages.lock.json | 184 +- ...eploy.WorkflowManager.Storage.Tests.csproj | 12 +- ...askManager.AideClinicalReview.Tests.csproj | 15 +- ...kflowManager.TaskManager.Argo.Tests.csproj | 11 +- ...lowManager.TaskManager.Docker.Tests.csproj | 10 +- ...flowManager.TaskManager.Email.Tests.csproj | 10 +- ...y.WorkflowManager.TaskManager.Tests.csproj | 13 +- ...kflowManager.WorkflowExecuter.Tests.csproj | 12 +- ...ploy.WorkflowManager.Services.Tests.csproj | 10 +- .../Monai.Deploy.WorkflowManager.Tests.csproj | 12 +- .../WorkflowManager.Tests/packages.lock.json | 391 ++-- 53 files changed, 1731 insertions(+), 3290 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ef6427b3..018469499 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,13 +99,12 @@ jobs: report-name: dockle-report failure-threshold: fatal - # Disable upload due to bug https://github.com/erzz/dockle-action/issues/18 - # - name: Upload Dockle SARIF Report - # uses: github/codeql-action/upload-sarif@v2 - # continue-on-error: true - # if: ${{ contains(github.ref, 'refs/heads/main') || contains(github.head_ref, 'release/') }} - # with: - # sarif_file: dockle-report.sarif + - name: Upload Dockle SARIF Report + uses: github/codeql-action/upload-sarif@v2 + continue-on-error: true + if: ${{ contains(github.ref, 'refs/heads/main') || contains(github.head_ref, 'release/') }} + with: + sarif_file: dockle-report.sarif - name: Trivy Vulnerability Scanner uses: aquasecurity/trivy-action@master diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index ab8029e95..cabd3e5f3 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -4,2609 +4,1904 @@ - :who: mocsharp :why: Apache-2.0 (http://aws.amazon.com/apache2.0/) :versions: - - 3.7.100.6 - - 3.7.100.14 - - 3.7.100.25 - - 3.7.105.20 - - 3.7.200.13 + - 3.7.100.14 + - 3.7.200.13 :when: 2022-10-14 23:36:39.233755632 Z - - :approve - AWSSDK.SecurityToken - :who: mocsharp :why: Apache-2.0 (http://aws.amazon.com/apache2.0/) :versions: - - 3.7.100.6 - - 3.7.100.14 - - 3.7.100.25 - - 3.7.101.26 - - 3.7.201.9 + - 3.7.100.14 + - 3.7.201.9 :when: 2022-10-14 23:36:39.628260680 Z - - :approve - Ardalis.GuardClauses - :who: mocsharp :why: MIT (https://github.com/ardalis/GuardClauses.Analyzers/raw/master/LICENSE) :versions: - - 4.0.1 - - 4.1.1 + - 4.1.1 :when: 2023-08-15 16:36:39.999308652 Z +- - :approve + - AspNetCore.HealthChecks.MongoDb + - :who: mocsharp + :why: Apache-2.0 (https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/raw/master/LICENSE) + :versions: + - 6.0.2 + :when: 2022-10-12 03:14:07.396706995 Z - - :approve - AutoFixture - :who: mocsharp :why: MIT (https://github.com/AutoFixture/AutoFixture/raw/master/LICENCE.txt) :versions: - - 4.18.0 + - 4.18.0 :when: 2022-10-14 23:36:40.385299903 Z - - :approve - AutoFixture.Xunit2 - :who: mocsharp :why: MIT (https://github.com/AutoFixture/AutoFixture/raw/master/LICENCE.txt) :versions: - - 4.18.0 + - 4.18.0 :when: 2022-10-14 23:36:40.800322187 Z -- - :approve - - AutoMapper - - :who: mocsharp - :why: MIT (https://github.com/AutoMapper/AutoMapper/raw/master/LICENSE.txt) - :versions: - - 10.1.1 - - 12.0.0 - :when: 2022-10-14 23:36:41.184157833 Z - - :approve - BoDi - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/SpecFlowOSS/BoDi/master/LICENSE.txt) :versions: - - 1.5.0 + - 1.5.0 :when: 2022-10-14 23:36:41.565837951 Z - - :approve - Castle.Core - :who: mocsharp :why: Apache-2.0 (https://github.com/castleproject/Core/raw/master/LICENSE) :versions: - - 5.1.1 + - 5.1.1 :when: 2022-10-14 23:36:41.941595839 Z - - :approve - - Crc32.NET - - :who: mocsharp - :why: MIT (https://github.com/force-net/Crc32.NET/raw/develop/LICENSE) + - CommunityToolkit.HighPerformance + - :who: nsouth + :why: MIT (https://github.com/CommunityToolkit/dotnet/raw/main/License.md) :versions: - - 1.2.0 - :when: 2022-10-14 23:36:42.385933234 Z + - 8.2.0 + :when: 2023-08-18 09:09:00.000000000 Z - - :approve - DnsClient - :who: mocsharp :why: Apache-2.0 (https://github.com/MichaCo/DnsClient.NET/raw/dev/LICENSE) :versions: - - 1.6.1 - - 1.4.0 + - 1.4.0 + - 1.6.1 :when: 2022-10-14 23:36:42.746807998 Z - - :approve - Docker.DotNet - :who: mocsharp :why: MIT (https://github.com/dotnet/Docker.DotNet/raw/master/LICENSE) :versions: - - 3.125.13 + - 3.125.15 :when: 2022-10-14 23:36:43.127020723 Z -- - :approve - - Elastic.CommonSchema - - :who: mocsharp - :why: Apache-2.0 (https://github.com/elastic/ecs-dotnet/raw/main/license.txt) - :versions: - - 1.5.3 - :when: 2022-10-14 23:36:43.489059633 Z -- - :approve - - Elastic.CommonSchema.Serilog - - :who: mocsharp - :why: Apache-2.0 (https://github.com/elastic/ecs-dotnet/raw/main/license.txt) - :versions: - - 1.5.3 - :when: 2022-10-14 23:36:43.870748780 Z - - :approve - Fare - :who: mocsharp :why: MIT (https://github.com/moodmosaic/Fare/raw/master/LICENSE) :versions: - - 2.1.1 + - 2.1.1 :when: 2022-10-14 23:36:44.282139144 Z - - :approve - FluentAssertions - :who: mocsharp :why: Apache-2.0 (https://github.com/fluentassertions/fluentassertions/raw/develop/LICENSE) :versions: - - 6.10.0 + - 6.12.0 :when: 2022-10-14 23:36:44.688882343 Z - - :approve - Fractions - :who: mocsharp :why: BSD-2 (https://github.com/danm-de/Fractions/raw/master/license.txt) :versions: - - 7.1.0 - - 7.2.0 - - 7.2.1 + - 7.2.1 :when: 2022-10-14 23:36:45.046338701 Z - - :approve - Gherkin - :who: mocsharp :why: MIT (https://github.com/cucumber/gherkin/raw/main/LICENSE) :versions: - - 19.0.3 + - 19.0.3 :when: 2022-10-14 23:36:45.421942193 Z - - :approve - IdentityModel - :who: mocsharp :why: Apache-2.0 (https://github.com/IdentityModel/IdentityModel/raw/main/LICENSE) :versions: - - 5.2.0 + - 5.2.0 :when: 2022-10-14 23:36:45.799373098 Z - - :approve - IdentityModel.OidcClient - :who: mocsharp :why: Apache-2.0 (https://github.com/IdentityModel/IdentityModel.OidcClient/raw/main/LICENSE) :versions: - - 5.1.0 - - 5.2.0 - - 5.2.1 + - 5.2.1 :when: 2022-10-14 23:36:46.266913084 Z -- - :approve - - JetBrains.Annotations - - :who: mocsharp - :why: MIT (https://github.com/JetBrains/JetBrains.Annotations/raw/main/license.md) - :versions: - - 2021.3.0 - :when: 2022-10-14 23:36:46.653419042 Z - - :approve - KubernetesClient - :who: mocsharp :why: Apache-2.0 (https://github.com/kubernetes-client/csharp/raw/master/LICENSE) :versions: - - 9.0.38 - - 9.1.3 - - 10.1.4 + - 12.0.16 :when: 2022-10-14 23:36:47.426563919 Z - - :approve - KubernetesClient.Basic - :who: mocsharp :why: Apache-2.0 (https://github.com/kubernetes-client/csharp/raw/master/LICENSE) :versions: - - 9.0.38 - - 9.1.3 - - 10.1.4 + - 12.0.16 :when: 2022-10-14 23:36:47.841963923 Z - - :approve - KubernetesClient.Models - :who: mocsharp :why: Apache-2.0 (https://github.com/kubernetes-client/csharp/raw/master/LICENSE) :versions: - - 9.0.38 - - 9.1.3 - - 10.1.4 + - 12.0.16 :when: 2022-10-14 23:36:48.248893280 Z +- - :approve + - LightInject + - :who: neildsouth + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :versions: + - 5.4.0 + :when: 2023-02-02 15:35:00.000000000 Z - - :approve - Microsoft.AspNet.WebApi.Client - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 5.2.9 + - 5.2.9 :when: 2022-10-14 23:36:48.627551442 Z - - :approve - Microsoft.AspNetCore.Authentication.Abstractions - :who: mocsharp :why: Apache-2.0 (https://github.com/aspnet/HttpAbstractions/raw/master/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:49.002833711 Z - - :approve - Microsoft.AspNetCore.Authentication.Core - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:49.375458112 Z - - :approve - Microsoft.AspNetCore.Authentication.JwtBearer - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 6.0.10 + - 6.0.11 :when: 2022-10-14 23:36:49.751931025 Z - - :approve - Microsoft.AspNetCore.Authorization - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:50.146239219 Z - - :approve - Microsoft.AspNetCore.Authorization.Policy - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:50.534798960 Z - - :approve - Microsoft.AspNetCore.Hosting.Abstractions - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:50.900363959 Z - - :approve - Microsoft.AspNetCore.Hosting.Server.Abstractions - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:51.302393676 Z - - :approve - Microsoft.AspNetCore.Http - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:51.679003594 Z - - :approve - Microsoft.AspNetCore.Http.Abstractions - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.1.0 - - 2.2.0 + - 2.1.0 + - 2.2.0 :when: 2022-10-14 23:36:52.062635438 Z - - :approve - Microsoft.AspNetCore.Http.Extensions - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:52.822928556 Z - - :approve - Microsoft.AspNetCore.Http.Features - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.1.0 + - 2.1.0 :when: 2022-10-14 23:36:53.204402569 Z - - :approve - Microsoft.AspNetCore.Http.Features - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:53.685184784 Z - - :approve - Microsoft.AspNetCore.JsonPatch - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 6.0.14 + - 6.0.22 :when: 2022-10-14 23:36:54.037540738 Z - - :approve - Microsoft.AspNetCore.Mvc.Abstractions - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:54.439559750 Z - - :approve - Microsoft.AspNetCore.Mvc.Core - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.5 + - 2.2.5 :when: 2022-10-14 23:36:54.801261581 Z - - :approve - Microsoft.AspNetCore.Mvc.NewtonsoftJson - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 6.0.14 + - 6.0.22 :when: 2022-10-14 23:36:55.184068414 Z - - :approve - - Microsoft.AspNetCore.Mvc.Versioning - - :who: mocsharp - :why: MIT (https://github.com/dotnet/aspnet-api-versioning/raw/main/LICENSE.txt) - :versions: - - 5.0.0 - :when: 2022-10-14 23:36:55.575759130 Z -- - :approve - - Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer - - :who: mocsharp - :why: MIT (https://github.com/dotnet/aspnet-api-versioning/raw/main/LICENSE.txt) + - Microsoft.AspNetCore.Mvc.Testing + - :who: neildsouth + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 5.0.0 - :when: 2022-10-14 23:36:55.964638467 Z + - 6.0.22 + :when: 2023-04-11 13:37:00.000000000 Z - - :approve - Microsoft.AspNetCore.ResponseCaching.Abstractions - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:56.367292922 Z - - :approve - Microsoft.AspNetCore.Routing - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:56.754140699 Z - - :approve - Microsoft.AspNetCore.Routing.Abstractions - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:57.135241512 Z +- - :approve + - Microsoft.AspNetCore.TestHost + - :who: neildsouth + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :versions: + - 6.0.22 + :when: 2023-04-11 13:37:00.000000000 Z - - :approve - Microsoft.AspNetCore.WebUtilities - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 + - 2.2.0 :when: 2022-10-14 23:36:57.522464888 Z - - :approve - - Microsoft.CSharp - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) + - Microsoft.Bcl.AsyncInterfaces + - :who: samrooke + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 4.0.1 - :when: 2022-10-14 23:36:57.890621400 Z + - 6.0.0 + :when: 2023-05-17 14:44:00.000000000 Z - - :approve - - Microsoft.CSharp + - Microsoft.Bcl.HashCode - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 4.5.0 - :when: 2022-10-14 23:36:58.263850221 Z + - 1.1.1 + :when: 2023-05-17 14:44:00.000000000 Z - - :approve - Microsoft.CSharp - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 4.7.0 - :when: 2022-10-14 23:36:58.635271436 Z + - 4.5.0 + - 4.7.0 + :when: 2022-10-14 23:36:57.890621400 Z - - :approve - Microsoft.CodeCoverage - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/main/LICENSE) :versions: - - 17.1.0 - - 17.5.0 + - 17.7.2 :when: 2022-10-14 23:36:59.038758007 Z - - :approve - Microsoft.DotNet.PlatformAbstractions - :who: mocsharp - :why: MIT (https://github.com/dotnet/core-setup/raw/release/2.1/LICENSE.TXT) + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 1.0.3 - - 2.1.0 - :when: 2022-10-14 23:36:59.424849648 Z + - 1.0.3 + - 2.1.0 + :when: 2022-10-14 23:36:59.038758007 Z - - :approve - Microsoft.Extensions.ApiDescription.Client - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 6.0.14 - - 6.0.15 + - 6.0.22 :when: 2022-10-14 23:36:59.804108720 Z - - :approve - Microsoft.Extensions.ApiDescription.Server - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 6.0.5 + - 6.0.5 :when: 2022-10-14 23:37:00.219980609 Z - - :approve - Microsoft.Extensions.Configuration - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.1 - - 7.0.0 - - 2.2.0 - - 3.1.0 + - 2.2.0 + - 6.0.1 :when: 2022-10-14 23:37:00.596541774 Z - - :approve - Microsoft.Extensions.Configuration.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 + - 6.0.0 :when: 2022-10-14 23:37:00.965204596 Z - - :approve - Microsoft.Extensions.Configuration.Binder - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 3.0.0 - - 3.1.0 - - 2.2.0 - - 7.0.3 + - 2.2.0 + - 6.0.0 :when: 2022-10-14 23:37:01.366955631 Z -- - :approve - - Microsoft.Extensions.Configuration.Binder - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.0 - :when: 2022-10-14 23:37:01.733261055 Z - - :approve - Microsoft.Extensions.Configuration.CommandLine - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 + - 6.0.0 :when: 2022-10-14 23:37:02.101196514 Z - - :approve - Microsoft.Extensions.Configuration.EnvironmentVariables - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.1 - - 7.0.0 + - 6.0.1 :when: 2022-10-14 23:37:02.494310563 Z - - :approve - Microsoft.Extensions.Configuration.FileExtensions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 + - 6.0.0 :when: 2022-10-14 23:37:02.876351993 Z - - :approve - Microsoft.Extensions.Configuration.Json - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 + - 6.0.0 :when: 2022-10-14 23:37:03.264528794 Z - - :approve - Microsoft.Extensions.Configuration.UserSecrets - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.1 - - 7.0.0 + - 6.0.1 :when: 2022-10-14 23:37:03.616456695 Z - - :approve - Microsoft.Extensions.DependencyInjection - :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 - - 7.0.0 + - 2.2.0 + - 6.0.0 + - 6.0.1 :when: 2022-10-14 23:37:03.975202345 Z - - :approve - Microsoft.Extensions.DependencyInjection.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 + - 6.0.0 + - 7.0.0 :when: 2022-10-14 23:37:04.347623848 Z - - :approve - Microsoft.Extensions.DependencyModel - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 1.0.3 - - 2.1.0 + - 1.0.3 + - 2.1.0 + - 6.0.0 :when: 2022-10-14 23:37:04.818759747 Z -- - :approve - - Microsoft.Extensions.DependencyModel - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 3.0.0 - :when: 2022-10-14 23:37:05.193332007 Z - - :approve - Microsoft.Extensions.Diagnostics.HealthChecks - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 6.0.10 - - 6.0.12 - - 6.0.14 - - 6.0.15 - - 6.0.21 + - 6.0.21 :when: 2022-10-14 23:37:05.589288760 Z - - :approve - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 6.0.12 - - 6.0.14 - - 6.0.15 - - 6.0.21 + - 6.0.21 + - 6.0.22 :when: 2022-10-14 23:37:05.963687838 Z - - :approve - Microsoft.Extensions.FileProviders.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 + - 6.0.0 :when: 2022-10-14 23:37:06.355048773 Z - - :approve - Microsoft.Extensions.FileProviders.Physical - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 3.0.0 - - 7.0.0 - :when: 2022-10-14 23:37:06.775924763 Z -- - :approve - - Microsoft.Extensions.FileProviders.Physical - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.0 + - 6.0.0 :when: 2022-10-14 23:37:07.149162748 Z - - :approve - Microsoft.Extensions.FileSystemGlobbing - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 3.0.0 - - 7.0.0 - :when: 2022-10-14 23:37:07.536437899 Z -- - :approve - - Microsoft.Extensions.FileSystemGlobbing - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.0 + - 6.0.0 :when: 2022-10-14 23:37:07.913276883 Z - - :approve - Microsoft.Extensions.Hosting - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.1 - - 7.0.1 + - 6.0.1 :when: 2022-10-14 23:37:08.290708539 Z - - :approve - Microsoft.Extensions.Hosting.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 + - 6.0.0 :when: 2022-10-14 23:37:08.685809938 Z - - :approve - Microsoft.Extensions.Http - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 3.1.0 + - 3.1.0 + - 6.0.0 :when: 2022-10-14 23:37:09.069264115 Z - - :approve - Microsoft.Extensions.Logging - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 - - 2.2.0 - - 3.1.0 + - 2.2.0 + - 6.0.0 :when: 2022-10-14 23:37:09.454044811 Z - - :approve - Microsoft.Extensions.Logging.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.2 - - 2.0.0 - - 6.0.4 - - 7.0.0 - - 6.0.4 + - 6.0.4 :when: 2022-10-14 23:37:09.821156462 Z - - :approve - Microsoft.Extensions.Logging.Configuration - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 3.0.0 - - 2.2.0 - - 7.0.0 + - 2.2.0 + - 6.0.0 :when: 2022-10-14 23:37:10.225726023 Z -- - :approve - - Microsoft.Extensions.Logging.Configuration - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.0 - :when: 2022-10-14 23:37:10.647983123 Z - - :approve - Microsoft.Extensions.Logging.Console - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 2.2.0 - - 7.0.0 + - 2.2.0 + - 6.0.0 :when: 2022-10-14 23:37:11.015778545 Z - - :approve - Microsoft.Extensions.Logging.Debug - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 2.0.0 - - 2.2.0 - - 7.0.0 + - 2.2.0 + - 6.0.0 :when: 2022-10-14 23:37:11.396975779 Z - - :approve - Microsoft.Extensions.Logging.EventLog - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 + - 6.0.0 :when: 2022-10-14 23:37:11.778355224 Z - - :approve - Microsoft.Extensions.Logging.EventSource - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 + - 6.0.0 :when: 2022-10-14 23:37:12.159538043 Z - - :approve - Microsoft.Extensions.ObjectPool - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) :versions: - - 2.2.0 - - 7.0.0 + - 7.0.0 :when: 2022-10-14 23:37:12.523798182 Z - - :approve - Microsoft.Extensions.Options - :who: mocsharp :why: Apache-2.0 (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 2.0.0 - - 7.0.1 + - 6.0.0 :when: 2022-10-14 23:37:12.901607973 Z - - :approve - Microsoft.Extensions.Options.ConfigurationExtensions - :who: mocsharp :why: Apache-2.0 (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 3.0.0 - - 2.0.0 - - 2.2.0 - - 7.0.0 - :when: 2022-10-14 23:37:13.281680374 Z -- - :approve - - Microsoft.Extensions.Options.ConfigurationExtensions - - :who: mocsharp - :why: Apache-2.0 (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.0 + - 2.2.0 + - 6.0.0 :when: 2022-10-14 23:37:13.652246288 Z - - :approve - Microsoft.Extensions.Primitives - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 + - 6.0.0 :when: 2022-10-14 23:37:14.010026638 Z - - :approve - Microsoft.IdentityModel.JsonWebTokens - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 6.10.0 - - 6.25.1 + - 6.10.0 + - 6.25.1 :when: 2022-10-14 23:37:14.398733049 Z - - :approve - Microsoft.IdentityModel.JsonWebTokens - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 6.13.1 - - 6.25.1 + - 6.13.1 + - 6.25.1 :when: 2022-10-14 23:37:14.823989673 Z - - :approve - Microsoft.IdentityModel.Logging - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 6.10.0 - - 6.25.1 + - 6.10.0 + - 6.25.1 :when: 2022-10-14 23:37:15.196566449 Z - - :approve - Microsoft.IdentityModel.Logging - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 6.13.1 - - 6.25.1 + - 6.13.1 + - 6.25.1 :when: 2022-10-14 23:37:15.581340343 Z - - :approve - - Microsoft.IdentityModel.Protocols + - Microsoft.IdentityModel.Abstractions - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 6.10.0 - :when: 2022-10-14 23:37:16.007362554 Z + - 6.32.2 + :when: 2022-10-21 05:31:10.785578919 Z - - :approve - - Microsoft.IdentityModel.Protocols.OpenIdConnect + - Microsoft.IdentityModel.JsonWebTokens - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 6.10.0 - :when: 2022-10-14 23:37:16.403183970 Z + - 6.10.0 + - 6.32.2 + :when: 2022-10-21 05:31:37.975238340 Z - - :approve - - Microsoft.IdentityModel.Tokens + - Microsoft.IdentityModel.Logging + - :who: mocsharp + :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) + :versions: + - 6.10.0 + - 6.32.2 + :when: 2022-10-21 05:31:55.670637917 Z +- - :approve + - Microsoft.IdentityModel.Protocols + - :who: mocsharp + :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) + :versions: + - 6.10.0 + :when: 2022-10-14 23:37:16.007362554 Z +- - :approve + - Microsoft.IdentityModel.Protocols.OpenIdConnect - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 6.10.0 - :when: 2022-10-14 23:37:16.793759607 Z + - 6.10.0 + :when: 2022-10-14 23:37:16.403183970 Z - - :approve - Microsoft.IdentityModel.Tokens - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 6.13.1 - - 6.25.1 + - 6.10.0 + - 6.32.2 :when: 2022-10-14 23:37:17.250669524 Z - - :approve - Microsoft.NET.Test.Sdk - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/microsoft/vstest/main/LICENSE) :versions: - - 17.1.0 - - 17.5.0 + - 17.7.2 :when: 2022-10-14 23:37:17.640523842 Z - - :approve - Microsoft.NETCore.Platforms - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 1.1.0 - - 2.1.2 + - 1.1.0 + - 2.1.2 :when: 2022-10-14 23:37:18.412134581 Z - - :approve - Microsoft.NETCore.Platforms - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 5.0.0 + - 5.0.0 :when: 2022-10-14 23:37:18.787826784 Z -- - :approve - - Microsoft.NETCore.Platforms - - :who: samrooke - :why: MIT (https://github.com/dotnet/corefx/blob/master/LICENSE.TXT) - :versions: - - 3.0.0 - :when: 2023-05-17 14:44:00.000000000 Z - - :approve - Microsoft.NETCore.Targets - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 1.0.1 + - 1.0.1 :when: 2022-10-14 23:37:19.165415150 Z - - :approve - Microsoft.NETCore.Targets - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 1.1.0 + - 1.1.0 :when: 2022-10-14 23:37:19.541699612 Z - - :approve - Microsoft.NETCore.Targets - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 1.1.3 + - 1.1.3 :when: 2022-10-14 23:37:19.920370900 Z - - :approve - Microsoft.Net.Http.Headers - :who: mocsharp - :why: Apache-2.0 (https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) + :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 2.2.0 - :when: 2022-10-14 23:37:20.291311205 Z + - 2.2.0 + :when: 2022-10-14 23:37:19.920370900 Z - - :approve - Microsoft.OpenApi - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/Microsoft/OpenAPI.NET/master/LICENSE) :versions: - - 1.2.3 + - 1.2.3 :when: 2022-10-14 23:37:20.697766518 Z - - :approve - Microsoft.TestPlatform.ObjectModel - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/v17.1.0/LICENSE) :versions: - - 17.1.0 - - 17.5.0 + - 17.7.2 :when: 2022-10-14 23:37:21.093539466 Z - - :approve - Microsoft.TestPlatform.TestHost - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/v17.1.0/LICENSE) :versions: - - 17.1.0 - - 17.5.0 + - 17.7.2 :when: 2022-10-14 23:37:21.534044574 Z - - :approve - Microsoft.Win32.Primitives - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:37:21.973714230 Z - - :approve - Microsoft.Win32.Registry - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 5.0.0 + - 5.0.0 :when: 2022-10-14 23:37:22.365778554 Z - - :approve - Minio - :who: mocsharp :why: Apache-2.0 (https://github.com/minio/minio-dotnet/raw/master/LICENSE) :versions: - - 4.0.6 - - 4.0.7 - - 5.0.0 + - 5.0.0 :when: 2022-10-14 23:37:22.726827733 Z +- - :approve + - Monai.Deploy.Messaging + - :who: neildsouth + :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) + :versions: + - 1.0.1 + :when: 2023-29-08 21:43:10.781625468 Z +- - :approve + - Monai.Deploy.Messaging.RabbitMQ + - :who: neildsouth + :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) + :versions: + - 1.0.1 + :when: 2023-29-08 21:43:20.975488411 Z +- - :approve + - Monai.Deploy.Security + - :who: lillie-dae + :why: Apache-2.0 (https://raw.githubusercontent.com/Project-MONAI/monai-deploy-security/main/LICENSE) + :versions: + - 0.1.3 + :when: 2022-12-02 13:13:13.431951720 Z +### +- - :approve + - Monai.Deploy.Storage + - :who: neildsouth + :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) + :versions: + - 0.2.18 + :when: 2022-11-02 21:43:46.964761113 Z +- - :approve + - Monai.Deploy.Storage.MinIO + - :who: neildsouth + :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) + :versions: + - 0.2.18 + :when: 2022-11-02 21:43:57.620687413 Z +- - :approve + - Monai.Deploy.Storage.S3Policy + - :who: neildsouth + :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) + :versions: + - 0.2.18 + :when: 2022-11-02 21:44:06.994266372 Z +- - :approve + - Mongo.Migration + - :who: neildsouth + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :versions: + - 3.1.4 + :when: 2023-02-02 15:35:00.000000000 Z +- - :approve + - MongoDB.Bson + - :who: mocsharp + :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) + :versions: + - 2.13.1 + - 2.21.0 + :when: 2022-11-02 21:44:41.801284907 Z +- - :approve + - MongoDB.Driver + - :who: mocsharp + :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) + :versions: + - 2.13.1 + - 2.21.0 + :when: 2022-11-02 21:45:23.777282609 Z +- - :approve + - MongoDB.Driver.Core + - :who: mocsharp + :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) + :versions: + - 2.13.1 + - 2.21.0 + :when: 2022-11-02 21:45:23.777282609 Z +- - :approve + - MongoDB.Libmongocrypt + - :who: mocsharp + :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) + :versions: + - 1.2.2 + - 1.8.0 + :when: 2022-11-02 21:45:54.431951720 Z - - :approve - Moq - :who: mocsharp :why: BSD 3-Clause License (https://raw.githubusercontent.com/moq/moq4/main/License.txt) :versions: - - 4.18.4 + - 4.20.69 :when: 2022-10-14 23:37:26.611091190 Z - - :approve - NETStandard.Library - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 1.6.1 + - 1.6.1 :when: 2022-10-14 23:37:27.037471947 Z - - :approve - NETStandard.Library - :who: mocsharp :why: MIT (https://github.com/dotnet/standard/raw/release/2.0.0/LICENSE.TXT) :versions: - - 2.0.0 + - 2.0.0 :when: 2022-10-14 23:37:27.511303972 Z +- - :approve + - NLog + - :who: mocsharp + :why: BSD 3-Clause License (https://github.com/NLog/NLog/raw/dev/LICENSE.txt) + :versions: + - 4.7.11 + - 5.2.4 + :when: 2022-10-12 03:14:06.538744982 Z +- - :approve + - NLog.Extensions.Logging + - :who: mocsharp + :why: BSD 2-Clause Simplified License (https://github.com/NLog/NLog.Extensions.Logging/raw/master/LICENSE) + :versions: + - 5.3.4 + :when: 2022-10-12 03:14:06.964203977 Z +- - :approve + - NLog.Web.AspNetCore + - :who: mocsharp + :why: BSD 3-Clause License (https://github.com/NLog/NLog.Web/raw/master/LICENSE) + :versions: + - 5.3.4 + :when: 2022-10-12 03:14:07.396706995 Z - - :approve - NUnit - :who: mocsharp :why: MIT (https://github.com/nunit/nunit/raw/master/LICENSE.txt) :versions: - - 3.13.3 + - 3.13.3 :when: 2022-10-14 23:37:27.885327724 Z - - :approve - NUnit3TestAdapter - :who: mocsharp :why: MIT (https://github.com/nunit/nunit3-vs-adapter/raw/master/LICENSE) :versions: - - 4.4.2 + - 4.5.0 :when: 2022-10-14 23:37:28.273089349 Z - - :approve - Newtonsoft.Json - :who: mocsharp :why: MIT (https://github.com/JamesNK/Newtonsoft.Json/raw/master/LICENSE.md) :versions: - - 13.0.1 - - 13.0.2 - - 13.0.3 + - 13.0.3 :when: 2022-10-14 23:37:28.643149375 Z -- - :approve - - Newtonsoft.Json - - :who: mocsharp - :why: MIT (https://github.com/JamesNK/Newtonsoft.Json/raw/master/LICENSE.md) - :versions: - - 9.0.1 - :when: 2022-10-14 23:37:29.029337957 Z - - :approve - Newtonsoft.Json.Bson - :who: mocsharp :why: MIT (https://github.com/JamesNK/Newtonsoft.Json.Bson/raw/master/LICENSE.md) :versions: - - 1.0.2 + - 1.0.2 :when: 2022-10-14 23:37:29.415594816 Z - - :approve - NuGet.Frameworks - :who: mocsharp :why: Apache-2.0 (https://github.com/NuGet/NuGet.Client/raw/dev/LICENSE.txt) :versions: - - 5.11.0 + - 6.5.0 :when: 2022-10-14 23:37:29.783041162 Z - - :approve - Polly - :who: mocsharp :why: BSD-3-Clause (https://github.com/App-vNext/Polly/raw/main/LICENSE.txt) :versions: - - 7.2.3 - - 7.2.4 + - 7.2.4 :when: 2022-10-14 23:37:30.185774702 Z - - :approve - RabbitMQ.Client - :who: mocsharp :why: Apache-2.0 (https://github.com/rabbitmq/rabbitmq-dotnet-client/raw/main/LICENSE-APACHE2) :versions: - - 6.4.0 - - 6.5.0 + - 6.5.0 :when: 2022-10-14 23:37:30.555988654 Z - - :approve - Serilog - :who: mocsharp :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) :versions: - - 2.10.0 - - 2.12.0 - - 2.8.0 + - 2.8.0 :when: 2022-10-14 23:37:30.926882753 Z - -- - :approve - - Serilog.AspNetCore - - :who: mocsharp - :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) - :versions: - - 6.0.1 - :when: 2022-10-14 23:37:31.684523386 Z -- - :approve - - Serilog.Enrichers.Environment - - :who: mocsharp - :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) - :versions: - - 2.2.0 - :when: 2022-10-14 23:37:32.079861004 Z -- - :approve - - Serilog.Exceptions - - :who: mocsharp - :why: MIT (https://github.com/RehanSaeed/Serilog.Exceptions/raw/main/LICENSE.md) - :versions: - - 8.4.0 - :when: 2022-10-14 23:37:32.539456616 Z -- - :approve - - Serilog.Extensions.Hosting - - :who: mocsharp - :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) - :versions: - - 5.0.1 - :when: 2022-10-14 23:37:32.987249593 Z - - :approve - Serilog.Extensions.Logging - :who: mocsharp :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) :versions: - - 3.1.0 + - 2.0.4 :when: 2022-10-14 23:37:33.387895862 Z - - :approve - - Serilog.Formatting.Compact - - :who: mocsharp - :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) - :versions: - - 1.1.0 - :when: 2022-10-14 23:37:33.755291739 Z -- - :approve - - Serilog.Settings.Configuration - - :who: mocsharp + - Serilog.Extensions.Logging.File + - :who: neildsouth :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) :versions: - - 3.3.0 - :when: 2022-10-14 23:37:34.139440996 Z + - 2.0.0 + :when: 2023-02-02 15:35:00.000000000 Z - - :approve - - Serilog.Sinks.Console + - Serilog.Formatting.Compact - :who: mocsharp :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) :versions: - - 4.0.1 - :when: 2022-10-14 23:37:34.532284674 Z + - 1.0.0 + - 1.1.0 + :when: 2022-10-14 23:37:33.755291739 Z - - :approve - - Serilog.Sinks.Debug - - :who: mocsharp + - Serilog.Sinks.Async + - :who: neildsouth :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) :versions: - - 2.0.0 - :when: 2022-10-14 23:37:34.948902793 Z + - 1.1.0 + :when: 2022-10-14 23:37:35.402868961 Z - - :approve - Serilog.Sinks.File - :who: mocsharp :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) :versions: - - 5.0.0 - - 3.2.0 + - 3.2.0 :when: 2022-10-14 23:37:35.402868961 Z - - :approve - Serilog.Sinks.RollingFile - :who: neildsouth :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) :versions: - - 3.3.0 - :when: 2022-10-14 23:37:35.402868961 Z -- - :approve - - Serilog.Sinks.Async - - :who: neildsouth - :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) - :versions: - - 1.1.0 + - 3.3.0 :when: 2022-10-14 23:37:35.402868961 Z -- - :approve - - Serilog.Sinks.Http - - :who: mocsharp - :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) - :versions: - - 8.0.0 - :when: 2022-10-14 23:37:35.867331522 Z +#### - - :approve - SharpCompress - :who: mocsharp :why: MIT (https://github.com/adamhathcock/sharpcompress/raw/master/LICENSE.txt) :versions: - - 0.30.1 - - 0.23.0 + - 0.23.0 + - 0.30.1 :when: 2022-10-14 23:37:36.289199068 Z - - :approve - Snappier - :who: mocsharp :why: BSD-3-Clause (https://github.com/brantburnett/Snappier/raw/main/COPYING.txt) :versions: - - 1.0.0 + - 1.0.0 :when: 2022-10-14 23:37:36.642306800 Z - - :approve - Snapshooter - :who: mocsharp :why: MIT (https://github.com/SwissLife-OSS/snapshooter/raw/master/LICENSE) :versions: - - 0.13.0 + - 0.13.0 :when: 2022-10-14 23:37:37.042360494 Z - - :approve - Snapshooter.NUnit - :who: mocsharp :why: MIT (https://github.com/SwissLife-OSS/snapshooter/raw/master/LICENSE) :versions: - - 0.13.0 + - 0.13.0 :when: 2022-10-14 23:37:37.474483432 Z - - :approve - SpecFlow - :who: mocsharp :why: BSD-3-Clause (https://github.com/SpecFlowOSS/SpecFlow/raw/master/LICENSE.txt) :versions: - - 3.9.74 + - 3.9.74 :when: 2022-10-14 23:37:37.866252373 Z - - :approve - SpecFlow.Internal.Json - :who: mocsharp :why: MIT (https://github.com/SpecFlowOSS/SpecFlow.Internal.Json/raw/master/LICENSE) :versions: - - 1.0.8 + - 1.0.8 :when: 2022-10-14 23:37:38.248142428 Z - - :approve - SpecFlow.NUnit - :who: mocsharp :why: BSD-3-Clause (https://github.com/SpecFlowOSS/SpecFlow/raw/master/LICENSE.txt) :versions: - - 3.9.74 + - 3.9.74 :when: 2022-10-14 23:37:38.719669586 Z - - :approve - SpecFlow.Plus.LivingDocPlugin - :who: mocsharp :why: BSD-3-Clause (https://github.com/SpecFlowOSS/SpecFlow/raw/master/LICENSE.txt) :versions: - - 3.9.57 + - 3.9.57 :when: 2022-10-14 23:37:39.085585492 Z - - :approve - SpecFlow.Tools.MsBuild.Generation - :who: mocsharp :why: BSD-3-Clause (https://github.com/SpecFlowOSS/SpecFlow/raw/master/LICENSE.txt) :versions: - - 3.9.74 + - 3.9.74 :when: 2022-10-14 23:37:39.467320445 Z - - :approve - StyleCop.Analyzers - :who: mocsharp :why: MIT (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/raw/master/LICENSE) :versions: - - 1.1.118 + - 1.1.118 :when: 2022-10-14 23:37:39.870546183 Z - - :approve - Swashbuckle.AspNetCore - :who: mocsharp :why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE) :versions: - - 6.5.0 + - 6.5.0 :when: 2022-10-14 23:37:40.252385824 Z - - :approve - Swashbuckle.AspNetCore.Swagger - :who: mocsharp :why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE) :versions: - - 6.5.0 + - 6.5.0 :when: 2022-10-14 23:37:40.616726128 Z - - :approve - Swashbuckle.AspNetCore.SwaggerGen - :who: mocsharp :why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE) :versions: - - 6.5.0 + - 6.5.0 :when: 2022-10-14 23:37:41.040002310 Z - - :approve - Swashbuckle.AspNetCore.SwaggerUI - :who: mocsharp :why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE) :versions: - - 6.5.0 + - 6.5.0 :when: 2022-10-14 23:37:41.481037942 Z - - :approve - System.AppContext - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.1.0 + - 4.1.0 + - 4.3.0 :when: 2022-10-14 23:37:41.882128956 Z - - :approve - - System.AppContext + - System.Buffers - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) + :why: MIT (https://github.com/dotnet/corefx/blob/master/LICENSE.TXT) :versions: - - 4.3.0 - :when: 2022-10-14 23:37:42.303565127 Z -- - :approve - - System.Buffers - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-10-14 23:37:42.748785182 Z -- - :approve - - System.Buffers - - :who: mocsharp - :why: MIT (https://github.com/dotnet/corefx/blob/master/LICENSE.TXT) - :versions: - - 4.5.0 - :when: 2022-10-14 23:37:43.165995374 Z -- - :approve - - System.Buffers - - :who: mocsharp - :why: MIT (https://github.com/dotnet/corefx/blob/master/LICENSE.TXT) - :versions: - - 4.5.1 - :when: 2022-10-14 23:37:43.563027338 Z + - 4.3.0 + - 4.5.1 + :when: 2022-10-14 23:37:43.563027338 Z - - :approve - System.Collections - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.11 - :when: 2022-10-14 23:37:43.993287248 Z -- - :approve - - System.Collections - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.0.11 + - 4.3.0 :when: 2022-10-14 23:37:44.416059382 Z - - :approve - System.Collections.Concurrent - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - - 4.0.12 + - 4.0.12 + - 4.3.0 :when: 2022-10-14 23:37:44.795018964 Z - - :approve - - System.ComponentModel.Annotations - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + - System.Collections.NonGeneric + - :who: neildsouth + :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 5.0.0 - - 4.3.0 - :when: 2022-10-14 23:37:45.155805918 Z + - 4.3.0 + :when: 2023-02-02 15:35:00.000000000 Z - - :approve - System.ComponentModel - :who: nsouth :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2023-8-18 08:53:45.155805918 Z - - :approve - - System.Configuration.ConfigurationManager + - System.ComponentModel.Annotations - :who: mocsharp - :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 4.4.0 - :when: 2022-10-14 23:37:45.604002171 Z + - 4.3.0 + :when: 2022-10-14 23:37:45.155805918 Z - - :approve - System.Configuration.ConfigurationManager - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.5.0 + - 4.4.0 + - 4.5.0 :when: 2022-10-14 23:37:46.007913939 Z - - :approve - System.Console - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:37:46.411291171 Z - - :approve - System.Diagnostics.Debug - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.11 - :when: 2022-10-14 23:37:46.784834774 Z -- - :approve - - System.Diagnostics.Debug - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:37:47.186567543 Z -- - :approve - - System.Diagnostics.DiagnosticSource - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-10-14 23:37:47.604075647 Z - - :approve - System.Diagnostics.DiagnosticSource - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.1 + - 4.3.0 + - 6.0.0 :when: 2022-10-14 23:37:47.604075647 Z - - :approve - System.Diagnostics.EventLog - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 - - 7.0.0 + - 6.0.0 :when: 2022-10-14 23:37:47.971770524 Z - - :approve - System.Diagnostics.Tools - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.1 - :when: 2022-10-14 23:37:48.334918551 Z -- - :approve - - System.Diagnostics.Tools - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:37:48.730421260 Z - - :approve - System.Diagnostics.Tracing - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - - 4.1.0 + - 4.1.0 + - 4.3.0 :when: 2022-10-14 23:37:49.133631683 Z - - :approve - System.Dynamic.Runtime - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.11 + - 4.0.11 :when: 2022-10-14 23:37:49.516418123 Z - - :approve - System.Globalization - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.11 - :when: 2022-10-14 23:37:50.061489892 Z -- - :approve - - System.Globalization - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:37:50.468033426 Z - - :approve - System.Globalization.Calendars - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:37:50.873299730 Z - - :approve - System.Globalization.Extensions - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:37:51.303704556 Z - - :approve - System.IO - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.1.0 - :when: 2022-10-14 23:37:51.709611921 Z -- - :approve - - System.IO - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:37:52.104736802 Z - - :approve - System.IO.Abstractions - :who: mocsharp :why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) :versions: - - 17.2.3 + - 17.2.3 :when: 2022-10-14 23:37:52.505560225 Z - - :approve - System.IO.Abstractions.TestingHelpers - :who: mocsharp :why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) :versions: - - 17.2.3 + - 17.2.3 :when: 2022-10-14 23:37:52.929501031 Z - - :approve - System.IO.Compression - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:37:53.325855487 Z - - :approve - System.IO.Compression.ZipFile - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:37:53.718248561 Z - - :approve - System.IO.FileSystem - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.1 - :when: 2022-10-14 23:37:54.102583645 Z -- - :approve - - System.IO.FileSystem - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.0.1 + - 4.3.0 :when: 2022-10-14 23:37:54.487812729 Z - - :approve - System.IO.FileSystem.Primitives - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.1 - :when: 2022-10-14 23:37:54.897558383 Z -- - :approve - - System.IO.FileSystem.Primitives - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.0.1 + - 4.3.0 :when: 2022-10-14 23:37:55.295846123 Z - - :approve - System.IO.Hashing - :who: nsouth :why: MIT :versions: - - 7.0.0 + - 7.0.0 :when: 2023-8-18 08:53:55.295846123 Z +- - :approve + - System.IO.Pipelines + - :who: neildsouth + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :versions: + - 6.0.3 + :when: 2023-04-11 13:37:00.000000000 Z - - :approve - System.IdentityModel.Tokens.Jwt - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 6.10.0 - - 6.23.1 - - 6.25.1 - - 6.27.0 + - 6.10.0 + - 6.32.2 :when: 2022-10-14 23:37:56.206982078 Z - - :approve - System.Linq - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.1.0 - :when: 2022-10-14 23:37:56.617282535 Z -- - :approve - - System.Linq - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.1.0 + - 4.3.0 :when: 2022-10-14 23:37:57.017496659 Z - - :approve - System.Linq.Expressions - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.1.0 - :when: 2022-10-14 23:37:57.426292919 Z -- - :approve - - System.Linq.Expressions - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.1.0 + - 4.3.0 :when: 2022-10-14 23:37:57.864181763 Z - - :approve - System.Memory - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.5.4 - - 4.5.5 + - 4.5.5 :when: 2022-10-14 23:37:58.271685148 Z - - :approve - System.Net.Http - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - :when: 2022-10-14 23:37:58.650397271 Z -- - :approve - - System.Net.Http - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.4 + - 4.3.0 + - 4.3.4 :when: 2022-10-14 23:37:59.028839966 Z - - :approve - System.Net.Primitives - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:37:59.437579346 Z -- - :approve - - System.Net.Primitives - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.1 - :when: 2022-10-14 23:37:59.844260711 Z - - :approve - System.Net.Sockets - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:00.259162985 Z - - :approve - System.ObjectModel - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.12 - :when: 2022-10-14 23:38:00.657251488 Z -- - :approve - - System.ObjectModel - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.0.12 + - 4.3.0 :when: 2022-10-14 23:38:01.082867105 Z - - :approve - System.Reactive - :who: mocsharp :why: MIT (https://github.com/dotnet/reactive/raw/main/LICENSE) :versions: - - 5.0.0 + - 5.0.0 :when: 2022-10-14 23:38:01.548449905 Z - - :approve - System.Reactive.Linq - :who: mocsharp :why: MIT (https://github.com/dotnet/reactive/raw/main/LICENSE) :versions: - - 5.0.0 + - 5.0.0 :when: 2022-10-14 23:38:01.937520640 Z - - :approve - System.Reflection - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.1.0 - :when: 2022-10-14 23:38:02.338498683 Z -- - :approve - - System.Reflection - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:02.761842869 Z - - :approve - System.Reflection.Emit - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.1 + - 4.0.1 + - 4.3.0 :when: 2022-10-14 23:38:03.208786716 Z -- - :approve - - System.Reflection.Emit - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-10-14 23:38:03.599841645 Z - - :approve - System.Reflection.Emit - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.7.0 + - 4.7.0 :when: 2022-10-14 23:38:03.977268585 Z - - :approve - System.Reflection.Emit.ILGeneration - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.1 - :when: 2022-10-14 23:38:04.360177541 Z -- - :approve - - System.Reflection.Emit.ILGeneration - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.0.1 + - 4.3.0 :when: 2022-10-14 23:38:04.751623283 Z - - :approve - System.Reflection.Emit.Lightweight - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.1 - :when: 2022-10-14 23:38:05.146536365 Z -- - :approve - - System.Reflection.Emit.Lightweight - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.0.1 + - 4.3.0 :when: 2022-10-14 23:38:05.546134537 Z - - :approve - System.Reflection.Extensions - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.1 - :when: 2022-10-14 23:38:06.057273804 Z -- - :approve - - System.Reflection.Extensions - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.0.1 + - 4.3.0 :when: 2022-10-14 23:38:06.460157494 Z - - :approve - System.Reflection.Metadata - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 1.6.0 + - 1.6.0 :when: 2022-10-14 23:38:06.997936406 Z - - :approve - System.Reflection.Primitives - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.1 - :when: 2022-10-14 23:38:07.375013468 Z -- - :approve - - System.Reflection.Primitives - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:07.806034352 Z - - :approve - System.Reflection.TypeExtensions - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.1.0 - :when: 2022-10-14 23:38:08.241785925 Z -- - :approve - - System.Reflection.TypeExtensions - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.1.0 + - 4.3.0 :when: 2022-10-14 23:38:08.649935195 Z -- - :approve - - System.Reflection.TypeExtensions - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.7.0 - :when: 2022-10-14 23:38:09.042702384 Z -- - :approve - - System.Resources.ResourceManager - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.0.1 - :when: 2022-10-14 23:38:09.442070811 Z - - :approve - System.Resources.ResourceManager - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:09.871015575 Z - - :approve - System.Runtime - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.1.0 - :when: 2022-10-14 23:38:10.272679483 Z -- - :approve - - System.Runtime - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:10.699419705 Z -- - :approve - - System.Runtime - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.1 - :when: 2022-10-14 23:38:11.078670319 Z - - :approve - System.Runtime.CompilerServices.Unsafe - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 6.0.0 + - 6.0.0 :when: 2022-10-14 23:38:11.495308906 Z - - :approve - System.Runtime.Extensions - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.1.0 - :when: 2022-10-14 23:38:11.911249133 Z -- - :approve - - System.Runtime.Extensions - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:12.322806608 Z - - :approve - System.Runtime.Handles - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.1 - :when: 2022-10-14 23:38:12.738768032 Z -- - :approve - - System.Runtime.Handles - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.0.1 + - 4.3.0 :when: 2022-10-14 23:38:13.158659754 Z - - :approve - System.Runtime.InteropServices - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.1.0 - :when: 2022-10-14 23:38:13.582548524 Z -- - :approve - - System.Runtime.InteropServices - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.1.0 + - 4.3.0 :when: 2022-10-14 23:38:13.965650337 Z - - :approve - System.Runtime.InteropServices.RuntimeInformation - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.0 - :when: 2022-10-14 23:38:14.366695072 Z -- - :approve - - System.Runtime.InteropServices.RuntimeInformation - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.0.0 + - 4.3.0 :when: 2022-10-14 23:38:14.782041309 Z - - :approve - System.Runtime.Loader - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:15.187954184 Z - - :approve - System.Runtime.Numerics - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:15.570842339 Z -- - :approve - - System.Runtime.Serialization.Primitives - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.1.1 - :when: 2022-10-14 23:38:16.015954661 Z - - :approve - System.Security.AccessControl - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 5.0.0 + - 5.0.0 :when: 2022-10-14 23:38:16.428431015 Z - - :approve - System.Security.Cryptography.Algorithms - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:16.818589404 Z -- - :approve - - System.Security.Cryptography.Cng - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-10-14 23:38:17.230535995 Z - - :approve - System.Security.Cryptography.Cng - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.5.0 - :when: 2022-10-14 23:38:17.643863795 Z + - 4.3.0 + - 4.5.0 + :when: 2022-10-14 23:38:17.230535995 Z - - :approve - System.Security.Cryptography.Csp - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:18.113344609 Z - - :approve - System.Security.Cryptography.Encoding - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:18.547542577 Z - - :approve - System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:18.927611943 Z - - :approve - System.Security.Cryptography.Primitives - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:19.310839635 Z - - :approve - System.Security.Cryptography.ProtectedData - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.4.0 - :when: 2022-10-14 23:38:19.724737662 Z -- - :approve - - System.Security.Cryptography.ProtectedData - - :who: mocsharp - :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) - :versions: - - 4.5.0 + - 4.4.0 + - 4.5.0 :when: 2022-10-14 23:38:20.163661610 Z - - :approve - System.Security.Cryptography.X509Certificates - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:20.584478475 Z - - :approve - System.Security.Permissions - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.5.0 + - 4.5.0 :when: 2022-10-14 23:38:20.985855549 Z - - :approve - System.Security.Principal.Windows - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 5.0.0 + - 5.0.0 :when: 2022-10-14 23:38:21.400907014 Z - - :approve - System.Text.Encoding - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.11 - :when: 2022-10-14 23:38:21.865032812 Z -- - :approve - - System.Text.Encoding - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:22.271031192 Z - - :approve - - System.Text.Encoding.Extensions - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) + - System.Text.Encoding.CodePages + - :who: neildsouth + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 4.0.11 - :when: 2022-10-14 23:38:22.672319174 Z + - 4.5.1 + - 6.0.0 + :when: 2023-05-17 14:44:00.000000000 Z - - :approve - System.Text.Encoding.Extensions - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.0.11 + - 4.3.0 :when: 2022-10-14 23:38:23.100193974 Z - - :approve - System.Text.Encodings.Web - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.5.0 - - 4.7.2 - - 6.0.0 - - 7.0.0 + - 4.5.0 + - 6.0.0 + - 7.0.0 :when: 2022-10-14 23:38:23.546189380 Z - - :approve - System.Text.Json - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.7.2 - - 6.0.0 - - 6.0.6 - - 7.0.0 - - 7.0.2 + - 6.0.7 + - 7.0.3 :when: 2022-10-14 23:38:24.828973176 Z -- - :approve - - System.Text.RegularExpressions - - :who: mocsharp - :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) - :versions: - - 4.1.0 - :when: 2022-10-14 23:38:25.242850537 Z - - :approve - System.Text.RegularExpressions - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:25.664716231 Z - - :approve - System.Threading - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.11 - :when: 2022-10-14 23:38:26.089848423 Z -- - :approve - - System.Threading - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:26.508310981 Z - - :approve - System.Threading.Channels - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 4.7.1 - - 6.0.0 - - 7.0.0 + - 6.0.0 + - 7.0.0 :when: 2022-10-14 23:38:26.916570960 Z - - :approve - System.Threading.Tasks - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.11 - :when: 2022-10-14 23:38:27.345305291 Z -- - :approve - - System.Threading.Tasks - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:27.742387419 Z - - :approve - System.Threading.Tasks.Extensions - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.0 - :when: 2022-10-14 23:38:28.160369501 Z -- - :approve - - System.Threading.Tasks.Extensions - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:28.559070284 Z - - :approve - System.Threading.Tasks.Extensions - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.5.1 + - 4.5.1 :when: 2022-10-14 23:38:28.943218193 Z - - :approve - System.Threading.Tasks.Extensions - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.5.4 + - 4.5.4 :when: 2022-10-14 23:38:29.373094207 Z - - :approve - System.Threading.Timer - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - - 4.0.1 + - 4.0.1 + - 4.3.0 :when: 2022-10-14 23:38:29.841118580 Z - - :approve - System.ValueTuple - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.4.0 - - 4.5.0 + - 4.5.0 :when: 2022-10-14 23:38:30.241703462 Z - - :approve - System.Xml.ReaderWriter - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.11 - :when: 2022-10-14 23:38:30.640929127 Z -- - :approve - - System.Xml.ReaderWriter - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:31.041578126 Z - - :approve - System.Xml.XDocument - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.11 - :when: 2022-10-14 23:38:31.441449476 Z -- - :approve - - System.Xml.XDocument - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:31.845271884 Z - - :approve - YamlDotNet - :who: mocsharp :why: MIT (https://github.com/aaubry/YamlDotNet/raw/master/LICENSE.txt) :versions: - - 12.0.1 - - 12.0.2 - - 12.1.0 - - 13.0.1 - - 13.0.2 + - 13.3.1 :when: 2022-10-18 19:24:00.795702526 Z - - :approve - ZstdSharp.Port - :who: mocsharp :why: MIT (https://github.com/oleg-st/ZstdSharp/raw/master/LICENSE) :versions: - - 0.6.2 + - 0.6.2 :when: 2022-10-14 23:38:32.685243680 Z - - :approve - coverlet.collector - :who: mocsharp :why: MIT (https://github.com/coverlet-coverage/coverlet/raw/master/LICENSE) :versions: - - 3.2.0 + - 6.0.0 :when: 2022-10-14 23:38:33.099118125 Z +- - :approve + - fo-dicom + - :who: samrooke + :why: Microsoft Public License (https://github.com/fo-dicom/fo-dicom/raw/development/License.txt) + :versions: + - 5.1.1 + :when: 2023-05-17 14:44:00.000000000 Z - - :approve - prometheus-net - :who: mocsharp :why: MIT (https://github.com/prometheus-net/prometheus-net/raw/master/LICENSE) :versions: - - 6.0.0 - - 7.0.0 - - 8.0.0 + - 8.0.1 :when: 2022-10-14 23:38:33.492435168 Z - - :approve - runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - :when: 2022-10-14 23:38:33.921932420 Z -- - :approve - - runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.2 + - 4.3.0 + - 4.3.2 :when: 2022-10-14 23:38:34.336431013 Z - - :approve - runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - :when: 2022-10-14 23:38:34.725065010 Z -- - :approve - - runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.2 + - 4.3.0 + - 4.3.2 :when: 2022-10-14 23:38:35.228676508 Z - - :approve - runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - :when: 2022-10-14 23:38:35.693311149 Z -- - :approve - - runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.2 + - 4.3.0 + - 4.3.2 :when: 2022-10-14 23:38:36.156866589 Z - - :approve - runtime.native.System - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.0.0 - :when: 2022-10-14 23:38:36.636053161 Z -- - :approve - - runtime.native.System - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-10-14 23:38:37.058890262 Z + - 4.0.0 + - 4.3.0 + :when: 2022-10-14 23:38:37.058890262 Z - - :approve - runtime.native.System.IO.Compression - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:37.447742724 Z - - :approve - runtime.native.System.Net.Http - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:37.881954471 Z - - :approve - runtime.native.System.Security.Cryptography.Apple - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:38.328329310 Z - - :approve - runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:38.733728603 Z - - :approve - runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.2 + - 4.3.2 :when: 2022-10-14 23:38:39.208516221 Z - - :approve - runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - :when: 2022-10-14 23:38:39.607636924 Z -- - :approve - - runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.2 + - 4.3.0 + - 4.3.2 :when: 2022-10-14 23:38:40.004894748 Z - - :approve - runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - :when: 2022-10-14 23:38:40.388496813 Z -- - :approve - - runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.2 + - 4.3.0 + - 4.3.2 :when: 2022-10-14 23:38:40.874679656 Z - - :approve - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 + - 4.3.0 :when: 2022-10-14 23:38:41.271073186 Z - - :approve - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - :when: 2022-10-14 23:38:41.674052665 Z -- - :approve - - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.2 + - 4.3.0 + - 4.3.2 :when: 2022-10-14 23:38:42.120675728 Z - - :approve - runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - :when: 2022-10-14 23:38:42.537847314 Z -- - :approve - - runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.2 + - 4.3.0 + - 4.3.2 :when: 2022-10-14 23:38:42.968336551 Z - - :approve - runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - :when: 2022-10-14 23:38:43.360284505 Z -- - :approve - - runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.2 + - 4.3.0 + - 4.3.2 :when: 2022-10-14 23:38:43.797525128 Z - - :approve - runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - :when: 2022-10-14 23:38:44.238963929 Z -- - :approve - - runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.2 + - 4.3.0 + - 4.3.2 :when: 2022-10-14 23:38:44.619065962 Z - - :approve - runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.3.0 - :when: 2022-10-14 23:38:45.007628862 Z -- - :approve - - runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.2 + - 4.3.0 + - 4.3.2 :when: 2022-10-14 23:38:45.400114249 Z - - :approve - xunit - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.4.2 + - 2.5.0 :when: 2022-10-14 23:38:45.841410258 Z - - :approve - xunit.abstractions - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.0.3 + - 2.0.3 :when: 2022-10-14 23:38:46.277356766 Z - - :approve - xunit.analyzers - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 1.0.0 + - 1.2.0 :when: 2022-10-14 23:38:46.734228383 Z - - :approve - xunit.assert - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.4.2 + - 2.5.0 :when: 2022-10-14 23:38:47.152795590 Z - - :approve - xunit.core - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.4.2 + - 2.5.0 :when: 2022-10-14 23:38:47.555886382 Z - - :approve - xunit.extensibility.core - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.4.2 + - 2.5.0 :when: 2022-10-14 23:38:47.948549944 Z - - :approve - xunit.extensibility.execution - :who: mocsharp :why: Apache-2.0 (https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.4.2 + - 2.5.0 :when: 2022-10-14 23:38:48.372407264 Z - - :approve - xunit.runner.visualstudio - :who: mocsharp :why: MIT (https://licenses.nuget.org/MIT) :versions: - - 2.4.5 + - 2.5.0 :when: 2022-10-14 23:38:48.802854287 Z -- - :approve - - NLog.Extensions.Logging - - :who: mocsharp - :why: BSD 2-Clause Simplified License (https://github.com/NLog/NLog.Extensions.Logging/raw/master/LICENSE) - :versions: - - 5.2.2 - :when: 2022-10-12 03:14:06.964203977 Z -- - :approve - - NLog.Web.AspNetCore - - :who: mocsharp - :why: BSD 3-Clause License (https://github.com/NLog/NLog.Web/raw/master/LICENSE) - :versions: - - 5.2.2 - :when: 2022-10-12 03:14:07.396706995 Z -- - :approve - - AspNetCore.HealthChecks.MongoDb - - :who: mocsharp - :why: Apache-2.0 (https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/raw/master/LICENSE) - :versions: - - 6.0.2 - :when: 2022-10-12 03:14:07.396706995 Z -- - :approve - - Microsoft.IdentityModel.Abstractions - - :who: mocsharp - :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) - :versions: - - 6.23.1 - - 6.25.1 - - 6.27.0 - :when: 2022-10-21 05:31:10.785578919 Z -- - :approve - - Microsoft.IdentityModel.JsonWebTokens - - :who: mocsharp - :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) - :versions: - - 6.23.1 - - 6.27.0 - :when: 2022-10-21 05:31:37.975238340 Z -- - :approve - - Microsoft.IdentityModel.Logging - - :who: mocsharp - :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) - :versions: - - 6.23.1 - - 6.27.0 - :when: 2022-10-21 05:31:55.670637917 Z -- - :approve - - Microsoft.IdentityModel.Tokens - - :who: mocsharp - :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) - :versions: - - 6.23.1 - - 6.27.0 - :when: 2022-10-21 05:32:02.785856125 Z -- - :approve - - Monai.Deploy.Messaging - - :who: neildsouth - :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) - :versions: - - 0.1.21 - - 0.1.23 - - 0.1.25 - - 1.0.0 - :when: 2023-29-08 21:43:10.781625468 Z -- - :approve - - Monai.Deploy.Messaging.RabbitMQ - - :who: neildsouth - :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) - :versions: - - 0.1.21 - - 0.1.23 - - 0.1.25 - - 1.0.0 - :when: 2023-29-08 21:43:20.975488411 Z -- - :approve - - Monai.Deploy.Storage - - :who: neildsouth - :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) - :versions: - - 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 - - :who: neildsouth - :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) - :versions: - - 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 - - :who: neildsouth - :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) - :versions: - - 0.2.10 - - 0.2.13 - - 0.2.15 - - 0.2.18 - :when: 2022-11-02 21:44:06.994266372 Z -- - :approve - - MongoDB.Bson - - :who: mocsharp - :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) - :versions: - - 2.19.0 - :when: 2022-11-02 21:44:41.801284907 Z -- - :approve - - MongoDB.Driver.Core - - :who: mocsharp - :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) - :versions: - - 2.19.0 - - 2.13.1 - :when: 2022-11-02 21:45:23.777282609 Z -- - :approve - - MongoDB.Libmongocrypt - - :who: mocsharp - :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) - :versions: - - 1.7.0 - - 1.2.2 - :when: 2022-11-02 21:45:54.431951720 Z -- - :approve - - Monai.Deploy.Storage - - :who: RemakingEden - :why: Apache-2.0 (https://raw.githubusercontent.com/Project-MONAI/monai-deploy-storage/main/LICENSE) - :versions: - - 0.2.10 - :when: 2022-11-08 14:49:46.964761113 Z -- - :approve - - Monai.Deploy.Storage.MinIO - - :who: RemakingEden - :why: Apache-2.0 (https://raw.githubusercontent.com/Project-MONAI/monai-deploy-storage/main/LICENSE) - :versions: - - 0.2.10 - :when: 2022-11-08 14:49:46.964761113 Z -- - :approve - - Monai.Deploy.Storage.S3Policy - - :who: RemakingEden - :why: Apache-2.0 (https://raw.githubusercontent.com/Project-MONAI/monai-deploy-storage/main/LICENSE) - :versions: - - 0.2.10 - :when: 2022-11-08 14:49:46.964761113 Z -- - :approve - - Monai.Deploy.Security - - :who: lillie-dae - :why: Apache-2.0 (https://raw.githubusercontent.com/Project-MONAI/monai-deploy-security/main/LICENSE) - :versions: [0.1.0, 0.1.2, 0.1.3] - :when: 2022-12-02 13:13:13.431951720 Z -- - :approve - - Microsoft.AspNetCore.Authentication.JwtBearer - - :who: lillie-dae - :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) - :versions: - - 6.0.11 - :when: 2022-12-02 13:13:13.431951720 Z -- - :approve - - Microsoft.Extensions.Logging.Abstractions - - :who: lillie-dae - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.3 - :when: 2022-12-02 13:13:13.431951720 Z -- - :approve - - MongoDB.Driver - - :who: mocsharp - :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt) - :versions: - - 2.19.0 - - 2.13.1 - :when: 2022-11-02 21:45:01.214220067 Z -- - :approve - - NLog - - :who: mocsharp - :why: BSD 3-Clause License (https://github.com/NLog/NLog/raw/dev/LICENSE.txt) - :versions: - - 5.1.2 - - 4.7.11 - :when: 2022-10-12 03:14:06.538744982 Z -- - :approve - - Mongo.Migration - - :who: neildsouth - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 3.1.4 - :when: 2023-02-02 15:35:00.000000000 Z -- - :approve - - LightInject - - :who: neildsouth - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 5.4.0 - :when: 2023-02-02 15:35:00.000000000 Z -- - :approve - - Serilog.Extensions.Logging - - :who: neildsouth - :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) - :versions: - - 2.0.4 - :when: 2023-02-02 15:35:00.000000000 Z -- - :approve - - Serilog.Extensions.Logging.File - - :who: neildsouth - :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) - :versions: - - 2.0.0 - :when: 2023-02-02 15:35:00.000000000 Z -- - :approve - - Serilog.Formatting.Compact - - :who: neildsouth - :why: Apache-2.0 (https://github.com/serilog/serilog/raw/dev/LICENSE) - :versions: - - 1.0.0 - :when: 2023-02-02 15:35:00.000000000 Z - -- - :approve - - System.Text.Encoding.CodePages - - :who: neildsouth - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 4.5.1 - :when: 2023-02-02 15:35:00.000000000 Z - -- - :approve - - System.Text.Encoding.CodePages - - :who: samrooke - :why: MIT (https://github.com/dotnet/corefx/blob/master/LICENSE.TXT) - :versions: - - 4.6.0 - :when: 2023-05-17 14:44:00.000000000 Z - -- - :approve - - System.Collections.NonGeneric - - :who: neildsouth - :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2023-02-02 15:35:00.000000000 Z - -- - :approve - - System.IO.Pipelines - - :who: neildsouth - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.3 - :when: 2023-04-11 13:37:00.000000000 Z -- - :approve - - Microsoft.Extensions.DependencyModel - - :who: neildsouth - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.0 - :when: 2023-04-11 13:37:00.000000000 Z -- - :approve - - Microsoft.AspNetCore.TestHost - - :who: neildsouth - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.15 - :when: 2023-04-11 13:37:00.000000000 Z -- - :approve - - Microsoft.AspNetCore.Mvc.Testing - - :who: neildsouth - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.15 - :when: 2023-04-11 13:37:00.000000000 Z -- - :approve - - Microsoft.Bcl.AsyncInterfaces - - :who: samrooke - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 1.1.1 - :when: 2023-05-17 14:44:00.000000000 Z -- - :approve - - Microsoft.Toolkit.HighPerformance - - :who: samrooke - :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 - - :who: samrooke - :why: Microsoft Public License (https://github.com/fo-dicom/fo-dicom/raw/development/License.txt) - :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/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj index 274efb480..c659b7fde 100644 --- a/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj +++ b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/Common/Configuration/packages.lock.json b/src/Common/Configuration/packages.lock.json index 959a37076..ca58581e4 100644 --- a/src/Common/Configuration/packages.lock.json +++ b/src/Common/Configuration/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "requested": "[1.0.1, )", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", diff --git a/src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj b/src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj index 9b6a642b8..e035fca2f 100644 --- a/src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj +++ b/src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj @@ -47,9 +47,7 @@ - - - + diff --git a/src/Common/Miscellaneous/packages.lock.json b/src/Common/Miscellaneous/packages.lock.json index 53f4d5126..6695daa2b 100644 --- a/src/Common/Miscellaneous/packages.lock.json +++ b/src/Common/Miscellaneous/packages.lock.json @@ -2,34 +2,29 @@ "version": 1, "dependencies": { "net6.0": { - "Ardalis.GuardClauses": { - "type": "Direct", - "requested": "[4.1.1, )", - "resolved": "4.1.1", - "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" - }, "fo-dicom": { "type": "Direct", - "requested": "[5.0.3, )", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "requested": "[5.1.1, )", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "dependencies": { + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { - "type": "Direct", - "requested": "[6.0.21, )", - "resolved": "6.0.21", - "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + "Ardalis.GuardClauses": { + "type": "Transitive", + "resolved": "4.1.1", + "contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA==" }, "AWSSDK.Core": { "type": "Transitive", @@ -44,10 +39,20 @@ "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", @@ -59,10 +64,11 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -81,6 +87,11 @@ "Microsoft.Extensions.Options": "6.0.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.21", + "contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -99,6 +110,18 @@ "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.4", @@ -121,20 +144,10 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" - }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -172,6 +185,14 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "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", @@ -184,21 +205,28 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading.Channels": { "type": "Transitive", @@ -208,7 +236,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "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 4d4309a42..009d2c07c 100644 --- a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj +++ b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj @@ -39,9 +39,9 @@ - + - + diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json index 6ff7fd3ac..b12c6603a 100755 --- a/src/TaskManager/API/packages.lock.json +++ b/src/TaskManager/API/packages.lock.json @@ -4,9 +4,9 @@ "net6.0": { "Monai.Deploy.Messaging": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "requested": "[1.0.1, )", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -38,10 +38,11 @@ }, "MongoDB.Bson": { "type": "Direct", - "requested": "[2.19.0, )", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "requested": "[2.21.0, )", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, @@ -485,6 +486,11 @@ "System.Runtime": "4.1.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", diff --git a/src/TaskManager/Database/Monai.Deploy.WorkflowManager.TaskManager.Database.csproj b/src/TaskManager/Database/Monai.Deploy.WorkflowManager.TaskManager.Database.csproj index 543b840ca..4b397d288 100755 --- a/src/TaskManager/Database/Monai.Deploy.WorkflowManager.TaskManager.Database.csproj +++ b/src/TaskManager/Database/Monai.Deploy.WorkflowManager.TaskManager.Database.csproj @@ -34,7 +34,7 @@ - + diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json index 4596d1753..b7b31c480 100755 --- a/src/TaskManager/Database/packages.lock.json +++ b/src/TaskManager/Database/packages.lock.json @@ -4,14 +4,14 @@ "net6.0": { "MongoDB.Driver": { "type": "Direct", - "requested": "[2.19.0, )", - "resolved": "2.19.0", - "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", + "requested": "[2.21.0, )", + "resolved": "2.21.0", + "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Driver.Core": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.21.0", + "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "Ardalis.GuardClauses": { @@ -247,8 +247,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -279,22 +279,23 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", + "resolved": "2.21.0", + "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -303,8 +304,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -515,6 +516,11 @@ "System.Runtime": "4.1.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -678,9 +684,9 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } } } diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json index b83cfbc24..3cc15455a 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -20,6 +20,11 @@ "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "DnsClient": { "type": "Transitive", "resolved": "1.4.0", @@ -27,17 +32,19 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -86,9 +93,14 @@ } }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -116,10 +128,11 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -163,13 +176,14 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", "dependencies": { - "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.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": { @@ -234,23 +248,18 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -301,9 +310,10 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, @@ -481,6 +491,14 @@ "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", @@ -541,6 +559,11 @@ "System.Runtime": "4.1.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -634,10 +657,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -653,13 +676,20 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading": { "type": "Transitive", @@ -703,25 +733,23 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.1.1, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } } } diff --git a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj index a355c5015..664ee72e2 100755 --- a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj +++ b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj @@ -32,9 +32,8 @@ - - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 1fc92b79e..5abc68421 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -4,45 +4,22 @@ "net6.0": { "KubernetesClient": { "type": "Direct", - "requested": "[10.1.4, )", - "resolved": "10.1.4", - "contentHash": "oTCgJ5xd/K75mxMxIvICUiS5sRVFEgjswovze8AZ11MU/Ki5xMgY3+47cyY5Is4o9fzOFRu/VHKQuqd1fBzvxw==", + "requested": "[12.0.16, )", + "resolved": "12.0.16", + "contentHash": "QQz2R/mxilejqnLcJ9fBO+/5w54wk72hy4JjRbpV6wdGyytp2o+kBOrqitWv/N9IYMp65rCJGobBjBNuSzOUHA==", "dependencies": { "IdentityModel.OidcClient": "5.2.1", - "KubernetesClient.Basic": "10.1.4", - "KubernetesClient.Models": "10.1.4", - "System.IdentityModel.Tokens.Jwt": "6.27.0", - "prometheus-net": "8.0.0" - } - }, - "Microsoft.AspNetCore.Mvc.Core": { - "type": "Direct", - "requested": "[2.2.5, )", - "resolved": "2.2.5", - "contentHash": "/8sr8ixIUD57UFwUntha9bOwex7/AkZfdk1f9oNJG1Ek7p/uuKVa7fuHmYZpQOf35Oxrt+2Ku4WPwMSbNxOuWg==", - "dependencies": { - "Microsoft.AspNetCore.Authentication.Core": "2.2.0", - "Microsoft.AspNetCore.Authorization.Policy": "2.2.0", - "Microsoft.AspNetCore.Hosting.Abstractions": "2.2.0", - "Microsoft.AspNetCore.Http": "2.2.0", - "Microsoft.AspNetCore.Http.Extensions": "2.2.0", - "Microsoft.AspNetCore.Mvc.Abstractions": "2.2.0", - "Microsoft.AspNetCore.ResponseCaching.Abstractions": "2.2.0", - "Microsoft.AspNetCore.Routing": "2.2.0", - "Microsoft.AspNetCore.Routing.Abstractions": "2.2.0", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.DependencyModel": "2.1.0", - "Microsoft.Extensions.FileProviders.Abstractions": "2.2.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "System.Diagnostics.DiagnosticSource": "4.5.0", - "System.Threading.Tasks.Extensions": "4.5.1" + "KubernetesClient.Basic": "12.0.16", + "KubernetesClient.Models": "12.0.16", + "System.IdentityModel.Tokens.Jwt": "6.32.2", + "prometheus-net": "8.0.1" } }, "Microsoft.Extensions.ApiDescription.Client": { "type": "Direct", - "requested": "[6.0.15, )", - "resolved": "6.0.15", - "contentHash": "dc9JpbsObO7Rpm2sBDv7fiv5HdOl29VcLtHYmK6YW5zV8BgoSvLBtUUWERB6PIDqYIAggKKoCmr5YITe5G8QQA==" + "requested": "[6.0.22, )", + "resolved": "6.0.22", + "contentHash": "PcPQBeYLezTWRLRnhnIT/wQkBGOxnnXVdpgJM+29H1Igv6cn3i3j+KQCUVv29zC4UrNtha4Qiy6tr7JjjyuopQ==" }, "Ardalis.GuardClauses": { "type": "Transitive", @@ -62,6 +39,11 @@ "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "DnsClient": { "type": "Transitive", "resolved": "1.4.0", @@ -69,17 +51,19 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -104,20 +88,20 @@ }, "KubernetesClient.Basic": { "type": "Transitive", - "resolved": "10.1.4", - "contentHash": "5Ol86+J08nXa7DvqbgAlh4WF0eQfr9579EtBnmI6PLlQ8u3bLXnK1O9ziAnotOrYlRpEwtAKf8P0zf/mjiM0gw==", + "resolved": "12.0.16", + "contentHash": "CV7+yoZbFF6OB5zTz2qqpqMhDsSZ0DBdOHEcZaadrXYI8V3Zefd7JCGtAB/U9AsUQBJnVSYynMPJmfhqSWJsbg==", "dependencies": { - "KubernetesClient.Models": "10.1.4" + "KubernetesClient.Models": "12.0.16" } }, "KubernetesClient.Models": { "type": "Transitive", - "resolved": "10.1.4", - "contentHash": "QGnyf0KUQfh8rk8os5H23Zvy9Gey4o4mFXDsB7pk+DASRYkrxZDuIWMGl7tCvoj/5jO/t+hF58KAxYIK85300w==", + "resolved": "12.0.16", + "contentHash": "VVS9KUbN7eAEJ5SP4vRhs6NbrktEKY1RV8cc2aJPwHC6Ikmw7TZOLkIqXEBA4/UZqRRIn6qNDLR2XEFgqxDO+Q==", "dependencies": { "Fractions": "7.2.1", - "System.Text.Json": "7.0.2", - "YamlDotNet": "13.0.1" + "System.Text.Json": "7.0.3", + "YamlDotNet": "13.3.1" } }, "LightInject": { @@ -128,44 +112,6 @@ "System.ValueTuple": "4.5.0" } }, - "Microsoft.AspNetCore.Authentication.Abstractions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "VloMLDJMf3n/9ic5lCBOa42IBYJgyB1JhzLsL68Zqg+2bEPWfGBj/xCJy/LrKTArN0coOcZp3wyVTZlx0y9pHQ==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.2.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0" - } - }, - "Microsoft.AspNetCore.Authentication.Core": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "XlVJzJ5wPOYW+Y0J6Q/LVTEyfS4ssLXmt60T0SPP+D8abVhBTl+cgw2gDHlyKYIkcJg7btMVh383NDkMVqD/fg==", - "dependencies": { - "Microsoft.AspNetCore.Authentication.Abstractions": "2.2.0", - "Microsoft.AspNetCore.Http": "2.2.0", - "Microsoft.AspNetCore.Http.Extensions": "2.2.0" - } - }, - "Microsoft.AspNetCore.Authorization": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "/L0W8H3jMYWyaeA9gBJqS/tSWBegP9aaTM0mjRhxTttBY9z4RVDRYJ2CwPAmAXIuPr3r1sOw+CS8jFVRGHRezQ==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0" - } - }, - "Microsoft.AspNetCore.Authorization.Policy": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "aJCo6niDRKuNg2uS2WMEmhJTooQUGARhV2ENQ2tO5443zVHUo19MSgrgGo9FIrfD+4yKPF8Q+FF33WkWfPbyKw==", - "dependencies": { - "Microsoft.AspNetCore.Authentication.Abstractions": "2.2.0", - "Microsoft.AspNetCore.Authorization": "2.2.0" - } - }, "Microsoft.AspNetCore.Hosting.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -185,18 +131,6 @@ "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, - "Microsoft.AspNetCore.Http": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "YogBSMotWPAS/X5967pZ+yyWPQkThxhmzAwyCHCSSldzYBkW5W5d6oPfBaPqQOnSHYTpSOSOkpZoAce0vwb6+A==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.2.0", - "Microsoft.AspNetCore.WebUtilities": "2.2.0", - "Microsoft.Extensions.ObjectPool": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Net.Http.Headers": "2.2.0" - } - }, "Microsoft.AspNetCore.Http.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -206,17 +140,6 @@ "System.Text.Encodings.Web": "4.5.0" } }, - "Microsoft.AspNetCore.Http.Extensions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "2DgZ9rWrJtuR7RYiew01nGRzuQBDaGHGmK56Rk54vsLLsCdzuFUPqbDTJCS1qJQWTbmbIQ9wGIOjpxA1t0l7/w==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.2.0", - "Microsoft.Extensions.FileProviders.Abstractions": "2.2.0", - "Microsoft.Net.Http.Headers": "2.2.0", - "System.Buffers": "4.5.0" - } - }, "Microsoft.AspNetCore.Http.Features": { "type": "Transitive", "resolved": "2.2.0", @@ -225,77 +148,21 @@ "Microsoft.Extensions.Primitives": "2.2.0" } }, - "Microsoft.AspNetCore.Mvc.Abstractions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "ET6uZpfVbGR1NjCuLaLy197cQ3qZUjzl7EG5SL4GfJH/c9KRE89MMBrQegqWsh0w1iRUB/zQaK0anAjxa/pz4g==", - "dependencies": { - "Microsoft.AspNetCore.Routing.Abstractions": "2.2.0", - "Microsoft.Net.Http.Headers": "2.2.0" - } - }, - "Microsoft.AspNetCore.ResponseCaching.Abstractions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "CIHWEKrHzZfFp7t57UXsueiSA/raku56TgRYauV/W1+KAQq6vevz60zjEKaazt3BI76zwMz3B4jGWnCwd8kwQw==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.2.0" - } - }, - "Microsoft.AspNetCore.Routing": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "jAhDBy0wryOnMhhZTtT9z63gJbvCzFuLm8yC6pHzuVu9ZD1dzg0ltxIwT4cfwuNkIL/TixdKsm3vpVOpG8euWQ==", - "dependencies": { - "Microsoft.AspNetCore.Http.Extensions": "2.2.0", - "Microsoft.AspNetCore.Routing.Abstractions": "2.2.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "Microsoft.Extensions.ObjectPool": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0" - } - }, - "Microsoft.AspNetCore.Routing.Abstractions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "lRRaPN7jDlUCVCp9i0W+PB0trFaKB0bgMJD7hEJS9Uo4R9MXaMC8X2tJhPLmeVE3SGDdYI4QNKdVmhNvMJGgPQ==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.2.0" - } - }, - "Microsoft.AspNetCore.WebUtilities": { + "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "9ErxAAKaDzxXASB/b5uLEkLgUWv1QbeVxyJYEHQwMaxXOeFFVkQxiq8RyfVcifLU7NR0QY0p3acqx4ZpYfhHDg==", - "dependencies": { - "Microsoft.Net.Http.Headers": "2.2.0", - "System.Text.Encodings.Web": "4.5.0" - } + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, - "Microsoft.Bcl.AsyncInterfaces": { + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CSharp": { "type": "Transitive", "resolved": "4.5.0", "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" }, - "Microsoft.DotNet.PlatformAbstractions": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "9KPDwvb/hLEVXYruVHVZ8BkebC8j17DmPb56LnqRF74HqSPLjCkrlFUjOtFpQPA2DeADBRTI/e69aCfRBfrhxw==", - "dependencies": { - "System.AppContext": "4.1.0", - "System.Collections": "4.0.11", - "System.IO": "4.1.0", - "System.IO.FileSystem": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" - } - }, "Microsoft.Extensions.Configuration": { "type": "Transitive", "resolved": "2.2.0", @@ -322,8 +189,8 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -334,18 +201,6 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, - "Microsoft.Extensions.DependencyModel": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "nS2XKqi+1A1umnYNLX2Fbm/XnzCxs5i+zXVJ3VC6r9t2z0NZr9FLnJN4VQpKigdcWH/iFTbMuX6M6WQJcTjVIg==", - "dependencies": { - "Microsoft.DotNet.PlatformAbstractions": "2.1.0", - "Newtonsoft.Json": "9.0.1", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Linq": "4.1.0" - } - }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", "resolved": "6.0.21", @@ -469,15 +324,15 @@ }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.27.0", - "contentHash": "HO3yJcG+9gp/qTlwBuiGfqvvRMyul/BKbflMC4+rnxoTvVQIto0iSCmhGTqsC4LXYK8GPU3etd4kMw6mBuvnQg==" + "resolved": "6.32.2", + "contentHash": "Ul0qehKXMlq6+73l2w8/daStt8InzIzTzwt2fcMHGbe7pI5pBnwrLEwqALAxcnOkMy2wFY45kJn7QilaOdbkgw==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.27.0", - "contentHash": "jP5vsjxSmdrWQVPxXX4gBHf1ATVcg8SLPt5sRPokNSo9tzKAi9xGQWinpWWbiiZon8V4c3U6fn4xhfUPLbN+nQ==", + "resolved": "6.32.2", + "contentHash": "QfoQdEBDir4ShH3ub/hObgNCqoH3/5bhtyMshn6WhD/3PA7lKQyIEU5QpFUON/XeOcdYQqBmzqlgwTo27C9DgQ==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.27.0", + "Microsoft.IdentityModel.Tokens": "6.32.2", "System.Text.Encoding": "4.3.0", "System.Text.Encodings.Web": "4.7.2", "System.Text.Json": "4.7.2" @@ -485,50 +340,36 @@ }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.27.0", - "contentHash": "4IzWb/CjtSYzq4FRcxRZSkkhhosj6DuDltBjj7BIq8f83O0J0lS8Wv50puiGyzAJH3WMjpZXz0TVOTjBi+BhQA==", + "resolved": "6.32.2", + "contentHash": "OgXpzJVBIQNdoyYCNgFprMZGrn2aAcU08w2oqyA2RvGrYvcVWsxJsygGcrMN0vDTvCwKUlpvjqT84eEktp3Avg==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.27.0" + "Microsoft.IdentityModel.Abstractions": "6.32.2" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.27.0", - "contentHash": "DnI9Ov6vbWrGQeGg6X/xp+3dkap2JDlQ9hUbP/rBvIZaEVjew5etS+bVXGH9fFDMTVghHVpBWiCREQnzRHuv2w==", + "resolved": "6.32.2", + "contentHash": "U4er/0UAY0AE8/Rzu9xHV1z95IqV3IbFZpqi2I4/042EBldb+s+E4lhZ3axuuioqg1mU1Ucr5Kq2EOCjf2JSgQ==", "dependencies": { "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.27.0", + "Microsoft.IdentityModel.Logging": "6.32.2", "System.Security.Cryptography.Cng": "4.5.0" } }, - "Microsoft.Net.Http.Headers": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "iZNkjYqlo8sIOI0bQfpsSoMTmB/kyvmV2h225ihyZT33aTp48ZpF6qYnXxzSXmHt8DpBAwBTX+1s1UFLbYfZKg==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.2.0", - "System.Buffers": "4.5.0" - } - }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "TsETIgVJb/AKoYfSP+iCxkuly5d3inZjTdx/ItZLk2CxY85v8083OBS3uai84kK3/baLnS5/b5XGs6zR7SuuHQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -579,9 +420,10 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, @@ -624,22 +466,13 @@ }, "prometheus-net": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "tUz6ScbA4J193hT1xUxTXQuEAZj8b5YUUrdUVIEXb6yYOZZEvPzs4zqFqI2iJW6aLmldMEiUqCFq93EOLvqITA==", + "resolved": "8.0.1", + "contentHash": "A9sOtQB2gEhujBxPKw+KcGScBiPvBmy4lYVM5OlETMj4xjVD5r/ixIg52HHg2P0lcImJTpfeWnD0/9tpQsRQTA==", "dependencies": { "Microsoft.Extensions.Http": "3.1.0", "Microsoft.Extensions.ObjectPool": "7.0.0" } }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "QfS/nQI7k/BLgmLrw7qm7YBoULEvgWnPI+cYsbfCVFTW8Aj+i8JhccxcFMu1RWms0YZzF+UHguNBK4Qn89e2Sg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1" - } - }, "Serilog": { "type": "Transitive", "resolved": "2.8.0", @@ -722,14 +555,6 @@ "System.Text.Encoding.CodePages": "4.5.1" } }, - "System.AppContext": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "3QjO4jNV7PdKkmQAVp9atA+usVnKRwI3Kx1nMwJ93T0LcQfx7pKAYk0nKz5wn1oP5iqlhZuy6RXOFdhr7rDwow==", - "dependencies": { - "System.Runtime": "4.1.0" - } - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -803,28 +628,6 @@ "System.Runtime": "4.1.0" } }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "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.Globalization": { "type": "Transitive", "resolved": "4.3.0", @@ -837,11 +640,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.27.0", - "contentHash": "hDFRuE411tcrVtlvOxOqMO52tySiOn7v3bn8VBJcvEUAOWeFnFDmBTsCAGxk82xEAjC/yh+TTsoSlAZxCsAK2g==", + "resolved": "6.32.2", + "contentHash": "rChCYKLnmKLO8xFcLmOYSJh4lJXV1XkyddblRK5H3C3KDC/oYMMesU6oHd5CjvlqH1L5umtil1FQKYZG4/qDfQ==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.27.0", - "Microsoft.IdentityModel.Tokens": "6.27.0" + "Microsoft.IdentityModel.JsonWebTokens": "6.32.2", + "Microsoft.IdentityModel.Tokens": "6.32.2" } }, "System.IO": { @@ -884,53 +687,10 @@ "System.Runtime": "4.1.0" } }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "bQ0iYFOQI0nuTnt+NQADns6ucV4DUvMdwN6CbkB1yj8i7arTGiTN5eok1kQwdnnNWSDZfIUySQY+J3d5KjWn0g==", - "dependencies": { - "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": { + "System.Memory": { "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "I+y02iqkgmCAyfbqOmSDOgqdZQ5tTj80Akm5BPSS8EeB0VGWdy6X1KCoYe8Pk6pwDoAKZUOdLVxnTJcExiv5zw==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Emit.Lightweight": "4.0.1", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "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.ObjectModel": { - "type": "Transitive", - "resolved": "4.0.12", - "contentHash": "tAgJM1xt3ytyMoW4qn4wIqgJYm7L7TShRZG4+Q4Qsi2PCcj96pXN7nRywS9KkB3p/xDUjc2HSwP9SROyPYDYKQ==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Threading": "4.0.11" - } + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" }, "System.Reflection": { "type": "Transitive", @@ -944,50 +704,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "P2wqAj72fFjpP6wb9nSfDqNBMab+2ovzSDzUZK7MVIm54tBJEPr9jWfSjjoTpPwj1LeKcmX3vr0ttyjSSFM47g==", - "dependencies": { - "System.IO": "4.1.0", - "System.Reflection": "4.1.0", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "Ov6dU8Bu15Bc7zuqttgHF12J5lwSWyTf1S+FJouUXVMSqImLZzYaQ+vRr1rQ0OZ0HqsrwWl4dsKHELckQkVpgA==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "sSzHHXueZ5Uh0OLpUQprhr+ZYJrLPA2Cmr4gn0wj9+FftNKXx8RIMKvO9qnjk2ebPYUjZ+F2ulGdPOsvj+MEjA==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "GYrtRsZcMuHF3sbmRHfMYpvxZoIN2bQGrYGerUiWLEkqdEUQZhH3TRSaC/oI4wO0II1RKBPlpIa1TOMxIcOOzQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" - } - }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -998,15 +714,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "tsQ/ptQ3H5FYfON8lL4MxRk/8kFyE0A+tGPXmVP967cT/gzLHYxIejIYSxp4JmIeFHVP78g/F2FE1mUUTbDtrg==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" - } - }, "System.Resources.ResourceManager": { "type": "Transitive", "resolved": "4.3.0", @@ -1066,20 +773,6 @@ "System.Runtime.Handles": "4.0.1" } }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "hWPhJxc453RCa8Z29O91EmfGeZIHX1ZH2A8L6lYQVSaKzku2DfArSfMEb1/MYYzPQRJZeu0c9dmYeJKxW5Fgng==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.Reflection": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading": "4.0.11", - "runtime.native.System": "4.0.0" - } - }, "System.Security.Cryptography.Cng": { "type": "Transitive", "resolved": "4.5.0", @@ -1097,10 +790,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1124,8 +817,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "7.0.2", - "contentHash": "/LZf/JrGyilojqwpaywb+sSz8Tew7ij4K/Sk+UW8AKfAK7KRhR6mKpKtTm06cYA7bCpGTWfYksIW+mVsdxPegQ==", + "resolved": "7.0.3", + "contentHash": "AyjhwXN1zTFeIibHimfJn6eAsZ7rTBib79JQpzg8WAuR/HKDu9JGNHTuu3nbbXQ/bgI+U4z6HtZmCHNXB1QXrQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "7.0.0" @@ -1155,11 +848,6 @@ "System.Runtime": "4.3.0" } }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "WSKUTtLhPR8gllzIWO2x6l4lmAIfbyMAiTlyXAis4QBDonXK4b4S6F8zGARX4/P8wH3DH+sLdhamCiHn+fTU1A==" - }, "System.Threading.Timer": { "type": "Transitive", "resolved": "4.0.1", @@ -1177,31 +865,29 @@ }, "YamlDotNet": { "type": "Transitive", - "resolved": "13.0.1", - "contentHash": "E1e/xFXB+Cbn7pLVlr+8E3nemEitIReVgmAMMMveADvZvXGuSGHP+1Cg6oA+SUfwXHfaXLQn4STCaPKtdIJkWA==" + "resolved": "13.3.1", + "contentHash": "Q2dqDsb0xAlr092grgHk8/vTXI2snIiYM5ND3IXkgJDFIdPnqDYwYnlk+gwzSeRByDLhiSzTog8uT7xFwH68Zg==" }, "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.1.1, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } } } diff --git a/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj b/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj index 03b04f619..d83e94888 100644 --- a/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj +++ b/src/TaskManager/Plug-ins/Docker/Monai.Deploy.WorkflowManager.TaskManager.Docker.csproj @@ -40,7 +40,7 @@ - + diff --git a/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj b/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj index c299e29dd..30af7abd0 100644 --- a/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj +++ b/src/TaskManager/Plug-ins/Email/Monai.Deploy.WorkflowManager.TaskManager.Email.csproj @@ -28,10 +28,6 @@ - - - - diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index e196d84ff..afb6add9c 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -57,18 +57,18 @@ - - - - - - - - + + + true + + + true + - - - + + true + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -82,10 +82,14 @@ - + + true + - + + true + diff --git a/src/TaskManager/TaskManager/Program.cs b/src/TaskManager/TaskManager/Program.cs index f9f2be025..ca2ade634 100755 --- a/src/TaskManager/TaskManager/Program.cs +++ b/src/TaskManager/TaskManager/Program.cs @@ -38,7 +38,6 @@ using Mongo.Migration.Startup.DotNetCore; using MongoDB.Driver; using NLog; -using NLog.LayoutRenderers; using NLog.Web; namespace Monai.Deploy.WorkflowManager.TaskManager @@ -150,11 +149,14 @@ private static void ConfigureServices(HostBuilderContext hostContext, IServiceCo private static Logger ConfigureNLog(string assemblyVersionNumber) { - LayoutRenderer.Register("servicename", logEvent => typeof(Program).Namespace); - LayoutRenderer.Register("serviceversion", logEvent => assemblyVersionNumber); - LayoutRenderer.Register("machinename", logEvent => Environment.MachineName); - - return LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger(); + return LogManager.Setup().SetupExtensions(ext => + { + ext.RegisterLayoutRenderer("servicename", logEvent => typeof(Program).Namespace); + ext.RegisterLayoutRenderer("serviceversion", logEvent => assemblyVersionNumber); + ext.RegisterLayoutRenderer("machinename", logEvent => Environment.MachineName); + }) + .LoadConfigurationFromAppSettings() + .GetCurrentClassLogger(); } } } diff --git a/src/TaskManager/TaskManager/nlog.config b/src/TaskManager/TaskManager/nlog.config index 8b73ab7c1..00fd12381 100644 --- a/src/TaskManager/TaskManager/nlog.config +++ b/src/TaskManager/TaskManager/nlog.config @@ -45,7 +45,7 @@ limitations under the License. - + diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index 79d9b4cf9..5112a7570 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -14,83 +14,22 @@ }, "Microsoft.AspNetCore.Mvc.NewtonsoftJson": { "type": "Direct", - "requested": "[6.0.14, )", - "resolved": "6.0.14", - "contentHash": "blMa3cqHH2f/9DETvUZpVLVid5vNKjm5vbQbdLEg7h3RQ6XWphHeKZrR7MauGVnwUbNaBCzxxFMcDl2YeAlxdg==", + "requested": "[6.0.22, )", + "resolved": "6.0.22", + "contentHash": "CVZatoGdeRlC74aw1lrg0+U49h1o+T23gcsFI/Xxmb+48+5cuoZawshSLLhpMeCxurIvmk6owfA+D6wvOvkn0g==", "dependencies": { - "Microsoft.AspNetCore.JsonPatch": "6.0.14", + "Microsoft.AspNetCore.JsonPatch": "6.0.22", "Newtonsoft.Json": "13.0.1", "Newtonsoft.Json.Bson": "1.0.2" } }, - "Microsoft.Extensions.DependencyInjection": { - "type": "Direct", - "requested": "[6.0.1, )", - "resolved": "6.0.1", - "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "Microsoft.Extensions.Hosting": { - "type": "Direct", - "requested": "[6.0.1, )", - "resolved": "6.0.1", - "contentHash": "hbmizc9KPWOacLU8Z8YMaBG6KWdZFppczYV/KwnPGU/8xebWxQxdDeJmLOgg968prb7g2oQgnp6JVLX6lgby8g==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "6.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", - "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Configuration": "6.0.0", - "Microsoft.Extensions.Logging.Console": "6.0.0", - "Microsoft.Extensions.Logging.Debug": "6.0.0", - "Microsoft.Extensions.Logging.EventLog": "6.0.0", - "Microsoft.Extensions.Logging.EventSource": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0" - } - }, - "Microsoft.Extensions.Options": { - "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Monai.Deploy.Messaging": { - "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", - "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" - } - }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "1UiWYO+EjNZSFrL/SUElqmBo3TktG+XiCXm8oyXheEWz/CuZS2hhepYB4BDz7XAohUqt2/Hv7wpLiaauiaIFZg==", + "requested": "[1.0.1, )", + "resolved": "1.0.1", + "contentHash": "zBVO6HOqyTfDj6YcITy1XtEiqRurFKUrIgLdJYVahhXlUnymn6/WmCuqkX1Z+3IKxy91D4LeF0KahH/rM8u6+w==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.0", + "Monai.Deploy.Messaging": "1.0.1", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -110,18 +49,6 @@ "Microsoft.Extensions.Logging.Configuration": "6.0.0" } }, - "Monai.Deploy.Storage": { - "type": "Direct", - "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" - } - }, "Monai.Deploy.Storage.MinIO": { "type": "Direct", "requested": "[0.2.18, )", @@ -133,41 +60,19 @@ "Monai.Deploy.Storage.S3Policy": "0.2.18" } }, - "Mongo.Migration": { - "type": "Direct", - "requested": "[3.1.4, )", - "resolved": "3.1.4", - "contentHash": "iA13H1tFH7x3eeKhBAYdgFxzK4gj78hY2pc5yiB08zX3kmhxGT/hp5k+iTDlSlCCyl+pMNpitTUiKiqOI6L6Gg==", - "dependencies": { - "LightInject": "5.4.0", - "Microsoft.AspNetCore.Hosting.Abstractions": "2.2.0", - "Microsoft.AspNetCore.Http.Abstractions": "2.2.0", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "Microsoft.Extensions.Logging.Console": "2.2.0", - "Microsoft.Extensions.Logging.Debug": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "MongoDB.Driver": "2.13.1", - "NLog": "4.7.11", - "Serilog": "2.8.0", - "Serilog.Extensions.Logging": "2.0.4", - "Serilog.Extensions.Logging.File": "2.0.0", - "System.ValueTuple": "4.5.0" - } - }, "NLog": { "type": "Direct", - "requested": "[5.1.2, )", - "resolved": "5.1.2", - "contentHash": "JfQY93ure3IPVTN3eabBewBGvrcXcWIlaesFEXdy5UzIymfIT9yCgLISYtM0cOhjWziIaUr/6Z9NC2RwtjwrsQ==" + "requested": "[5.2.4, )", + "resolved": "5.2.4", + "contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ==" }, "NLog.Web.AspNetCore": { "type": "Direct", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "0Qa6V7LXgbWNxYdZDLcQz/TjGrSfx32XThxAL+xoAtjplC2uCIhy27WiMIjznuMAJR3zjElIiYzMmPSsQ4LZSQ==", + "requested": "[5.3.4, )", + "resolved": "5.3.4", + "contentHash": "80FaN8CKu94E3mZqZ+r46nRyEYgnHMn4i3vPslbaINs8k+TqJClNFYw6uWLhPU4AN7PKi/jHHzpswqn7K8jgGg==", "dependencies": { - "NLog.Extensions.Logging": "5.2.2" + "NLog.Extensions.Logging": "5.3.4" } }, "StyleCop.Analyzers": { @@ -208,8 +113,8 @@ }, "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "8.1.0", - "contentHash": "kgDi65k02hrgnHy3N0xENecsr0spW13RdIA1tipovi9t16gKziI7uZIu3qkxz0GctCHNM4hfeqXYg//6wHJ6Kw==" + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" }, "DnsClient": { "type": "Transitive", @@ -221,8 +126,8 @@ }, "Docker.DotNet": { "type": "Transitive", - "resolved": "3.125.13", - "contentHash": "p1DrW2Sw4ND2jFlIvpHB8/pY5o5HIkDalbGAI8tUvqjJR6n0/ubos7kDGWI+Xbx9+L3US3SUR8r59Zwq+ZxBvw==", + "resolved": "3.125.15", + "contentHash": "XN8FKxVv8Mjmwu104/Hl9lM61pLY675s70gzwSj8KR5pwblo8HfWLcCuinh9kYsqujBkMH4HVRCEcRuU6al4BQ==", "dependencies": { "Newtonsoft.Json": "13.0.1", "System.Buffers": "4.5.1", @@ -231,17 +136,19 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -266,32 +173,32 @@ }, "KubernetesClient": { "type": "Transitive", - "resolved": "10.1.4", - "contentHash": "oTCgJ5xd/K75mxMxIvICUiS5sRVFEgjswovze8AZ11MU/Ki5xMgY3+47cyY5Is4o9fzOFRu/VHKQuqd1fBzvxw==", + "resolved": "12.0.16", + "contentHash": "QQz2R/mxilejqnLcJ9fBO+/5w54wk72hy4JjRbpV6wdGyytp2o+kBOrqitWv/N9IYMp65rCJGobBjBNuSzOUHA==", "dependencies": { "IdentityModel.OidcClient": "5.2.1", - "KubernetesClient.Basic": "10.1.4", - "KubernetesClient.Models": "10.1.4", - "System.IdentityModel.Tokens.Jwt": "6.27.0", - "prometheus-net": "8.0.0" + "KubernetesClient.Basic": "12.0.16", + "KubernetesClient.Models": "12.0.16", + "System.IdentityModel.Tokens.Jwt": "6.32.2", + "prometheus-net": "8.0.1" } }, "KubernetesClient.Basic": { "type": "Transitive", - "resolved": "10.1.4", - "contentHash": "5Ol86+J08nXa7DvqbgAlh4WF0eQfr9579EtBnmI6PLlQ8u3bLXnK1O9ziAnotOrYlRpEwtAKf8P0zf/mjiM0gw==", + "resolved": "12.0.16", + "contentHash": "CV7+yoZbFF6OB5zTz2qqpqMhDsSZ0DBdOHEcZaadrXYI8V3Zefd7JCGtAB/U9AsUQBJnVSYynMPJmfhqSWJsbg==", "dependencies": { - "KubernetesClient.Models": "10.1.4" + "KubernetesClient.Models": "12.0.16" } }, "KubernetesClient.Models": { "type": "Transitive", - "resolved": "10.1.4", - "contentHash": "QGnyf0KUQfh8rk8os5H23Zvy9Gey4o4mFXDsB7pk+DASRYkrxZDuIWMGl7tCvoj/5jO/t+hF58KAxYIK85300w==", + "resolved": "12.0.16", + "contentHash": "VVS9KUbN7eAEJ5SP4vRhs6NbrktEKY1RV8cc2aJPwHC6Ikmw7TZOLkIqXEBA4/UZqRRIn6qNDLR2XEFgqxDO+Q==", "dependencies": { "Fractions": "7.2.1", - "System.Text.Json": "7.0.2", - "YamlDotNet": "13.0.1" + "System.Text.Json": "7.0.3", + "YamlDotNet": "13.3.1" } }, "LightInject": { @@ -302,26 +209,6 @@ "System.ValueTuple": "4.5.0" } }, - "Microsoft.AspNetCore.Authentication.Abstractions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "VloMLDJMf3n/9ic5lCBOa42IBYJgyB1JhzLsL68Zqg+2bEPWfGBj/xCJy/LrKTArN0coOcZp3wyVTZlx0y9pHQ==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.2.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0" - } - }, - "Microsoft.AspNetCore.Authentication.Core": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "XlVJzJ5wPOYW+Y0J6Q/LVTEyfS4ssLXmt60T0SPP+D8abVhBTl+cgw2gDHlyKYIkcJg7btMVh383NDkMVqD/fg==", - "dependencies": { - "Microsoft.AspNetCore.Authentication.Abstractions": "2.2.0", - "Microsoft.AspNetCore.Http": "2.2.0", - "Microsoft.AspNetCore.Http.Extensions": "2.2.0" - } - }, "Microsoft.AspNetCore.Authentication.JwtBearer": { "type": "Transitive", "resolved": "6.0.11", @@ -330,24 +217,6 @@ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } }, - "Microsoft.AspNetCore.Authorization": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "/L0W8H3jMYWyaeA9gBJqS/tSWBegP9aaTM0mjRhxTttBY9z4RVDRYJ2CwPAmAXIuPr3r1sOw+CS8jFVRGHRezQ==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0" - } - }, - "Microsoft.AspNetCore.Authorization.Policy": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "aJCo6niDRKuNg2uS2WMEmhJTooQUGARhV2ENQ2tO5443zVHUo19MSgrgGo9FIrfD+4yKPF8Q+FF33WkWfPbyKw==", - "dependencies": { - "Microsoft.AspNetCore.Authentication.Abstractions": "2.2.0", - "Microsoft.AspNetCore.Authorization": "2.2.0" - } - }, "Microsoft.AspNetCore.Hosting.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -367,18 +236,6 @@ "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, - "Microsoft.AspNetCore.Http": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "YogBSMotWPAS/X5967pZ+yyWPQkThxhmzAwyCHCSSldzYBkW5W5d6oPfBaPqQOnSHYTpSOSOkpZoAce0vwb6+A==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.2.0", - "Microsoft.AspNetCore.WebUtilities": "2.2.0", - "Microsoft.Extensions.ObjectPool": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Net.Http.Headers": "2.2.0" - } - }, "Microsoft.AspNetCore.Http.Abstractions": { "type": "Transitive", "resolved": "2.2.0", @@ -388,17 +245,6 @@ "System.Text.Encodings.Web": "4.5.0" } }, - "Microsoft.AspNetCore.Http.Extensions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "2DgZ9rWrJtuR7RYiew01nGRzuQBDaGHGmK56Rk54vsLLsCdzuFUPqbDTJCS1qJQWTbmbIQ9wGIOjpxA1t0l7/w==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.2.0", - "Microsoft.Extensions.FileProviders.Abstractions": "2.2.0", - "Microsoft.Net.Http.Headers": "2.2.0", - "System.Buffers": "4.5.0" - } - }, "Microsoft.AspNetCore.Http.Features": { "type": "Transitive", "resolved": "2.2.0", @@ -409,106 +255,28 @@ }, "Microsoft.AspNetCore.JsonPatch": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "rX4pfSKnDErxnpcJrQ/PruPa64LjdkEl1nBvC587XRANzHOaLrUu9pAbZmqBYUn5Yq9xKd5Sg+95Ev+f84iiQw==", + "resolved": "6.0.22", + "contentHash": "jQAfNQ7ExLXVUeenihZDqxRr3sBNf8SsenFDOgikb9KaWoWuX91PqSo3G+JDWJppHMucjN55wgEEC3fg5Lzqew==", "dependencies": { "Microsoft.CSharp": "4.7.0", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.AspNetCore.Mvc.Abstractions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "ET6uZpfVbGR1NjCuLaLy197cQ3qZUjzl7EG5SL4GfJH/c9KRE89MMBrQegqWsh0w1iRUB/zQaK0anAjxa/pz4g==", - "dependencies": { - "Microsoft.AspNetCore.Routing.Abstractions": "2.2.0", - "Microsoft.Net.Http.Headers": "2.2.0" - } - }, - "Microsoft.AspNetCore.Mvc.Core": { - "type": "Transitive", - "resolved": "2.2.5", - "contentHash": "/8sr8ixIUD57UFwUntha9bOwex7/AkZfdk1f9oNJG1Ek7p/uuKVa7fuHmYZpQOf35Oxrt+2Ku4WPwMSbNxOuWg==", - "dependencies": { - "Microsoft.AspNetCore.Authentication.Core": "2.2.0", - "Microsoft.AspNetCore.Authorization.Policy": "2.2.0", - "Microsoft.AspNetCore.Hosting.Abstractions": "2.2.0", - "Microsoft.AspNetCore.Http": "2.2.0", - "Microsoft.AspNetCore.Http.Extensions": "2.2.0", - "Microsoft.AspNetCore.Mvc.Abstractions": "2.2.0", - "Microsoft.AspNetCore.ResponseCaching.Abstractions": "2.2.0", - "Microsoft.AspNetCore.Routing": "2.2.0", - "Microsoft.AspNetCore.Routing.Abstractions": "2.2.0", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.DependencyModel": "2.1.0", - "Microsoft.Extensions.FileProviders.Abstractions": "2.2.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "System.Diagnostics.DiagnosticSource": "4.5.0", - "System.Threading.Tasks.Extensions": "4.5.1" - } - }, - "Microsoft.AspNetCore.ResponseCaching.Abstractions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "CIHWEKrHzZfFp7t57UXsueiSA/raku56TgRYauV/W1+KAQq6vevz60zjEKaazt3BI76zwMz3B4jGWnCwd8kwQw==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.2.0" - } - }, - "Microsoft.AspNetCore.Routing": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "jAhDBy0wryOnMhhZTtT9z63gJbvCzFuLm8yC6pHzuVu9ZD1dzg0ltxIwT4cfwuNkIL/TixdKsm3vpVOpG8euWQ==", - "dependencies": { - "Microsoft.AspNetCore.Http.Extensions": "2.2.0", - "Microsoft.AspNetCore.Routing.Abstractions": "2.2.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "Microsoft.Extensions.ObjectPool": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0" - } - }, - "Microsoft.AspNetCore.Routing.Abstractions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "lRRaPN7jDlUCVCp9i0W+PB0trFaKB0bgMJD7hEJS9Uo4R9MXaMC8X2tJhPLmeVE3SGDdYI4QNKdVmhNvMJGgPQ==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.2.0" - } - }, - "Microsoft.AspNetCore.WebUtilities": { + "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "9ErxAAKaDzxXASB/b5uLEkLgUWv1QbeVxyJYEHQwMaxXOeFFVkQxiq8RyfVcifLU7NR0QY0p3acqx4ZpYfhHDg==", - "dependencies": { - "Microsoft.Net.Http.Headers": "2.2.0", - "System.Text.Encodings.Web": "4.5.0" - } + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, - "Microsoft.Bcl.AsyncInterfaces": { + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CSharp": { "type": "Transitive", "resolved": "4.7.0", "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" }, - "Microsoft.DotNet.PlatformAbstractions": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "9KPDwvb/hLEVXYruVHVZ8BkebC8j17DmPb56LnqRF74HqSPLjCkrlFUjOtFpQPA2DeADBRTI/e69aCfRBfrhxw==", - "dependencies": { - "System.AppContext": "4.1.0", - "System.Collections": "4.0.11", - "System.IO": "4.1.0", - "System.IO.FileSystem": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" - } - }, "Microsoft.Extensions.ApiDescription.Server": { "type": "Transitive", "resolved": "6.0.5", @@ -539,57 +307,13 @@ "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, - "Microsoft.Extensions.Configuration.CommandLine": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "3nL1qCkZ1Oxx14ZTzgo4MmlO7tso7F+TtMZAY2jUAtTLyAcDp+EDjk3RqafoKiNaePyPvvlleEcBxh3b2Hzl1g==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.EnvironmentVariables": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "pnyXV1LFOsYjGveuC07xp0YHIyGq7jRq5Ncb5zrrIieMLWVwgMyYxcOH0jTnBedDT4Gh1QinSqsjqzcieHk1og==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.FileExtensions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "V4Dth2cYMZpw3HhGw9XUDIijpI6gN+22LDt0AhufIgOppCUfpWX4483OmN+dFXRJkJLc8Tv0Q8QK+1ingT2+KQ==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.Json": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GJGery6QytCzS/BxJ96klgG9in3uH26KcUBbiVG/coNDXCRq6LGVVlUT4vXq34KPuM+R2av+LeYdX9h4IZOCUg==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "System.Text.Json": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.UserSecrets": { + "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", "resolved": "6.0.1", - "contentHash": "Fy8yr4V6obi7ZxvKYI1i85jqtwMq8tqyxQVZpRSkgeA8enqy/KvBIMdcuNdznlxQMZa72mvbHqb7vbg4Pyx95w==", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -597,18 +321,6 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, - "Microsoft.Extensions.DependencyModel": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "nS2XKqi+1A1umnYNLX2Fbm/XnzCxs5i+zXVJ3VC6r9t2z0NZr9FLnJN4VQpKigdcWH/iFTbMuX6M6WQJcTjVIg==", - "dependencies": { - "Microsoft.DotNet.PlatformAbstractions": "2.1.0", - "Newtonsoft.Json": "9.0.1", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Linq": "4.1.0" - } - }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", "resolved": "6.0.21", @@ -633,21 +345,6 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.FileProviders.Physical": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "QvkL7l0nM8udt3gfyu0Vw8bbCXblxaKOl7c2oBfgGy4LCURRaL9XWZX1FWJrQc43oMokVneVxH38iz+bY1sbhg==", - "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.FileSystemGlobbing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" - }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -702,58 +399,36 @@ }, "Microsoft.Extensions.Logging.Console": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gsqKzOEdsvq28QiXFxagmn1oRB9GeI5GgYCkoybZtQA0IUb7QPwf1WmN3AwJeNIsadTvIFQCiVK0OVIgKfOBGg==", + "resolved": "2.2.0", + "contentHash": "1eGgcOJ++PMxW6sn++j6U7wsWvhEBm/5ScqBUUBGLRE8M7AHahi9tsxivDMqEXVM3F0/pshHl3kEpMXtw4BeFg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Configuration": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Text.Json": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Microsoft.Extensions.Logging.Configuration": "2.2.0" } }, "Microsoft.Extensions.Logging.Debug": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "M9g/JixseSZATJE9tcMn9uzoD4+DbSglivFqVx8YkRJ7VVPmnvCEbOZ0AAaxsL1EKyI4cz07DXOOJExxNsUOHw==", + "resolved": "2.2.0", + "contentHash": "JjqWtshxUujSnxslFccCRAaH8uFOciqXkYdRw+h5MwpC4sUc+ju9yZzvVi6PA5vW09ckv26EkasEvXrofGiaJg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0" + "Microsoft.Extensions.Logging": "2.2.0" } }, - "Microsoft.Extensions.Logging.EventLog": { + "Microsoft.Extensions.ObjectPool": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "rlo0RxlMd0WtLG3CHI0qOTp6fFn7MvQjlrCjucA31RqmiMFCZkF8CHNbe8O7tbBIyyoLGWB1he9CbaA5iyHthg==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.EventLog": "6.0.0" - } + "resolved": "7.0.0", + "contentHash": "udvKco0sAVgYGTBnHUb0tY9JQzJ/nPDiv/8PIyz69wl1AibeCDZOLVVI+6156dPfHmJH7ws5oUJRiW4ZmAvuuA==" }, - "Microsoft.Extensions.Logging.EventSource": { + "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "BeDyyqt7nkm/nr+Gdk+L8n1tUT/u33VkbXAOesgYSNsxDM9hJ1NOBGoZfj9rCbeD2+9myElI6JOVVFmnzgeWQA==", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "6.0.0" + "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.ObjectPool": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "udvKco0sAVgYGTBnHUb0tY9JQzJ/nPDiv/8PIyz69wl1AibeCDZOLVVI+6156dPfHmJH7ws5oUJRiW4ZmAvuuA==" - }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", "resolved": "6.0.0", @@ -776,15 +451,15 @@ }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.27.0", - "contentHash": "HO3yJcG+9gp/qTlwBuiGfqvvRMyul/BKbflMC4+rnxoTvVQIto0iSCmhGTqsC4LXYK8GPU3etd4kMw6mBuvnQg==" + "resolved": "6.32.2", + "contentHash": "Ul0qehKXMlq6+73l2w8/daStt8InzIzTzwt2fcMHGbe7pI5pBnwrLEwqALAxcnOkMy2wFY45kJn7QilaOdbkgw==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.27.0", - "contentHash": "jP5vsjxSmdrWQVPxXX4gBHf1ATVcg8SLPt5sRPokNSo9tzKAi9xGQWinpWWbiiZon8V4c3U6fn4xhfUPLbN+nQ==", + "resolved": "6.32.2", + "contentHash": "QfoQdEBDir4ShH3ub/hObgNCqoH3/5bhtyMshn6WhD/3PA7lKQyIEU5QpFUON/XeOcdYQqBmzqlgwTo27C9DgQ==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.27.0", + "Microsoft.IdentityModel.Tokens": "6.32.2", "System.Text.Encoding": "4.3.0", "System.Text.Encodings.Web": "4.7.2", "System.Text.Json": "4.7.2" @@ -792,10 +467,10 @@ }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.27.0", - "contentHash": "4IzWb/CjtSYzq4FRcxRZSkkhhosj6DuDltBjj7BIq8f83O0J0lS8Wv50puiGyzAJH3WMjpZXz0TVOTjBi+BhQA==", + "resolved": "6.32.2", + "contentHash": "OgXpzJVBIQNdoyYCNgFprMZGrn2aAcU08w2oqyA2RvGrYvcVWsxJsygGcrMN0vDTvCwKUlpvjqT84eEktp3Avg==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.27.0" + "Microsoft.IdentityModel.Abstractions": "6.32.2" } }, "Microsoft.IdentityModel.Protocols": { @@ -818,23 +493,14 @@ }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.27.0", - "contentHash": "DnI9Ov6vbWrGQeGg6X/xp+3dkap2JDlQ9hUbP/rBvIZaEVjew5etS+bVXGH9fFDMTVghHVpBWiCREQnzRHuv2w==", + "resolved": "6.32.2", + "contentHash": "U4er/0UAY0AE8/Rzu9xHV1z95IqV3IbFZpqi2I4/042EBldb+s+E4lhZ3axuuioqg1mU1Ucr5Kq2EOCjf2JSgQ==", "dependencies": { "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.27.0", + "Microsoft.IdentityModel.Logging": "6.32.2", "System.Security.Cryptography.Cng": "4.5.0" } }, - "Microsoft.Net.Http.Headers": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "iZNkjYqlo8sIOI0bQfpsSoMTmB/kyvmV2h225ihyZT33aTp48ZpF6qYnXxzSXmHt8DpBAwBTX+1s1UFLbYfZKg==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.2.0", - "System.Buffers": "4.5.0" - } - }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", @@ -850,11 +516,6 @@ "resolved": "1.2.3", "contentHash": "Nug3rO+7Kl5/SBAadzSMAVgqDlfGjJZ0GenQrLywJ84XGKO0uRqkunz5Wyl0SDwcR71bAATXvSdbdzPrYRYKGw==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -874,6 +535,28 @@ "System.Reactive.Linq": "5.0.0" } }, + "Monai.Deploy.Messaging": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", + "dependencies": { + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Newtonsoft.Json": "13.0.3", + "System.IO.Abstractions": "17.2.3" + } + }, + "Monai.Deploy.Storage": { + "type": "Transitive", + "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" + } + }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", "resolved": "0.2.18", @@ -883,35 +566,57 @@ "Newtonsoft.Json": "13.0.3" } }, + "Mongo.Migration": { + "type": "Transitive", + "resolved": "3.1.4", + "contentHash": "iA13H1tFH7x3eeKhBAYdgFxzK4gj78hY2pc5yiB08zX3kmhxGT/hp5k+iTDlSlCCyl+pMNpitTUiKiqOI6L6Gg==", + "dependencies": { + "LightInject": "5.4.0", + "Microsoft.AspNetCore.Hosting.Abstractions": "2.2.0", + "Microsoft.AspNetCore.Http.Abstractions": "2.2.0", + "Microsoft.Extensions.DependencyInjection": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Console": "2.2.0", + "Microsoft.Extensions.Logging.Debug": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0", + "MongoDB.Driver": "2.13.1", + "NLog": "4.7.11", + "Serilog": "2.8.0", + "Serilog.Extensions.Logging": "2.0.4", + "Serilog.Extensions.Logging.File": "2.0.0", + "System.ValueTuple": "4.5.0" + } + }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", + "resolved": "2.21.0", + "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Driver.Core": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.21.0", + "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", + "resolved": "2.21.0", + "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -920,8 +625,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -938,12 +643,12 @@ }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.2.2", - "contentHash": "V6sd+0Hrk2XlU//XbUizFYTE8Hf8+xFkhi81shIhsKl4tvWFUYmjBY/zBy/wlQCt0K6mfseaEKnayRJVhIz5Iw==", + "resolved": "5.3.4", + "contentHash": "rxUGUqhE3DlcKfKhPJOI0xOt8q2+NX0NkBY9lbRXwZEYQsh8ASFS8X7K+Y7/dcE8v0tpAe7GF8rPD5h4h9Hpsg==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.1.2" + "NLog": "5.2.4" } }, "Polly": { @@ -953,8 +658,8 @@ }, "prometheus-net": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "tUz6ScbA4J193hT1xUxTXQuEAZj8b5YUUrdUVIEXb6yYOZZEvPzs4zqFqI2iJW6aLmldMEiUqCFq93EOLvqITA==", + "resolved": "8.0.1", + "contentHash": "A9sOtQB2gEhujBxPKw+KcGScBiPvBmy4lYVM5OlETMj4xjVD5r/ixIg52HHg2P0lcImJTpfeWnD0/9tpQsRQTA==", "dependencies": { "Microsoft.Extensions.Http": "3.1.0", "Microsoft.Extensions.ObjectPool": "7.0.0" @@ -969,15 +674,6 @@ "System.Threading.Channels": "7.0.0" } }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "QfS/nQI7k/BLgmLrw7qm7YBoULEvgWnPI+cYsbfCVFTW8Aj+i8JhccxcFMu1RWms0YZzF+UHguNBK4Qn89e2Sg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1" - } - }, "Serilog": { "type": "Transitive", "resolved": "2.8.0", @@ -1083,14 +779,6 @@ "resolved": "6.5.0", "contentHash": "OvbvxX+wL8skxTBttcBsVxdh73Fag4xwqEU2edh4JMn7Ws/xJHnY/JB1e9RoCb6XpDxUF3hD9A0Z1lEUx40Pfw==" }, - "System.AppContext": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "3QjO4jNV7PdKkmQAVp9atA+usVnKRwI3Kx1nMwJ93T0LcQfx7pKAYk0nKz5wn1oP5iqlhZuy6RXOFdhr7rDwow==", - "dependencies": { - "System.Runtime": "4.1.0" - } - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -1154,11 +842,6 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw==" - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -1169,28 +852,6 @@ "System.Runtime": "4.1.0" } }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "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.Globalization": { "type": "Transitive", "resolved": "4.3.0", @@ -1203,11 +864,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.27.0", - "contentHash": "hDFRuE411tcrVtlvOxOqMO52tySiOn7v3bn8VBJcvEUAOWeFnFDmBTsCAGxk82xEAjC/yh+TTsoSlAZxCsAK2g==", + "resolved": "6.32.2", + "contentHash": "rChCYKLnmKLO8xFcLmOYSJh4lJXV1XkyddblRK5H3C3KDC/oYMMesU6oHd5CjvlqH1L5umtil1FQKYZG4/qDfQ==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.27.0", - "Microsoft.IdentityModel.Tokens": "6.27.0" + "Microsoft.IdentityModel.JsonWebTokens": "6.32.2", + "Microsoft.IdentityModel.Tokens": "6.32.2" } }, "System.IO": { @@ -1255,59 +916,11 @@ "resolved": "7.0.0", "contentHash": "sDnWM0N3AMCa86LrKTWeF3BZLD2sgWyYUc7HL6z4+xyDZNQRwzmxbo4qP2rX2MqC+Sy1/gOSRDah5ltxY5jPxw==" }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "bQ0iYFOQI0nuTnt+NQADns6ucV4DUvMdwN6CbkB1yj8i7arTGiTN5eok1kQwdnnNWSDZfIUySQY+J3d5KjWn0g==", - "dependencies": { - "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": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "I+y02iqkgmCAyfbqOmSDOgqdZQ5tTj80Akm5BPSS8EeB0VGWdy6X1KCoYe8Pk6pwDoAKZUOdLVxnTJcExiv5zw==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Emit.Lightweight": "4.0.1", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "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.Memory": { "type": "Transitive", "resolved": "4.5.5", "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.0.12", - "contentHash": "tAgJM1xt3ytyMoW4qn4wIqgJYm7L7TShRZG4+Q4Qsi2PCcj96pXN7nRywS9KkB3p/xDUjc2HSwP9SROyPYDYKQ==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Threading": "4.0.11" - } - }, "System.Reactive": { "type": "Transitive", "resolved": "5.0.0", @@ -1334,50 +947,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "P2wqAj72fFjpP6wb9nSfDqNBMab+2ovzSDzUZK7MVIm54tBJEPr9jWfSjjoTpPwj1LeKcmX3vr0ttyjSSFM47g==", - "dependencies": { - "System.IO": "4.1.0", - "System.Reflection": "4.1.0", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "Ov6dU8Bu15Bc7zuqttgHF12J5lwSWyTf1S+FJouUXVMSqImLZzYaQ+vRr1rQ0OZ0HqsrwWl4dsKHELckQkVpgA==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "sSzHHXueZ5Uh0OLpUQprhr+ZYJrLPA2Cmr4gn0wj9+FftNKXx8RIMKvO9qnjk2ebPYUjZ+F2ulGdPOsvj+MEjA==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "GYrtRsZcMuHF3sbmRHfMYpvxZoIN2bQGrYGerUiWLEkqdEUQZhH3TRSaC/oI4wO0II1RKBPlpIa1TOMxIcOOzQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" - } - }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1388,15 +957,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "tsQ/ptQ3H5FYfON8lL4MxRk/8kFyE0A+tGPXmVP967cT/gzLHYxIejIYSxp4JmIeFHVP78g/F2FE1mUUTbDtrg==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" - } - }, "System.Resources.ResourceManager": { "type": "Transitive", "resolved": "4.3.0", @@ -1456,20 +1016,6 @@ "System.Runtime.Handles": "4.0.1" } }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "hWPhJxc453RCa8Z29O91EmfGeZIHX1ZH2A8L6lYQVSaKzku2DfArSfMEb1/MYYzPQRJZeu0c9dmYeJKxW5Fgng==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.Reflection": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading": "4.0.11", - "runtime.native.System": "4.0.0" - } - }, "System.Security.AccessControl": { "type": "Transitive", "resolved": "5.0.0", @@ -1501,10 +1047,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1528,8 +1074,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "7.0.2", - "contentHash": "/LZf/JrGyilojqwpaywb+sSz8Tew7ij4K/Sk+UW8AKfAK7KRhR6mKpKtTm06cYA7bCpGTWfYksIW+mVsdxPegQ==", + "resolved": "7.0.3", + "contentHash": "AyjhwXN1zTFeIibHimfJn6eAsZ7rTBib79JQpzg8WAuR/HKDu9JGNHTuu3nbbXQ/bgI+U4z6HtZmCHNXB1QXrQ==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "7.0.0" @@ -1581,8 +1127,8 @@ }, "YamlDotNet": { "type": "Transitive", - "resolved": "13.0.1", - "contentHash": "E1e/xFXB+Cbn7pLVlr+8E3nemEitIReVgmAMMMveADvZvXGuSGHP+1Cg6oA+SUfwXHfaXLQn4STCaPKtdIJkWA==" + "resolved": "13.3.1", + "contentHash": "Q2dqDsb0xAlr092grgHk8/vTXI2snIiYM5ND3IXkgJDFIdPnqDYwYnlk+gwzSeRByDLhiSzTog8uT7xFwH68Zg==" }, "ZstdSharp.Port": { "type": "Transitive", @@ -1592,17 +1138,15 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.1.1, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.workflowmanager.taskmanager.aideclinicalreview": { @@ -1616,16 +1160,15 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } }, "monai.deploy.workflowmanager.taskmanager.argo": { "type": "Project", "dependencies": { - "KubernetesClient": "[10.1.4, )", - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", + "KubernetesClient": "[12.0.16, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )" @@ -1635,13 +1178,13 @@ "type": "Project", "dependencies": { "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )", - "MongoDB.Driver": "[2.19.0, )" + "MongoDB.Driver": "[2.21.0, )" } }, "monai.deploy.workflowmanager.taskmanager.docker": { "type": "Project", "dependencies": { - "Docker.DotNet": "[3.125.13, )", + "Docker.DotNet": "[3.125.15, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )" @@ -1652,8 +1195,7 @@ "dependencies": { "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )", - "fo-dicom": "[5.0.3, )" + "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )" } } } diff --git a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index a235082ed..13f9f6f22 100644 --- a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj +++ b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj @@ -38,8 +38,8 @@ - + - + diff --git a/src/WorkflowManager/Database/Monai.Deploy.WorkflowManager.Database.csproj b/src/WorkflowManager/Database/Monai.Deploy.WorkflowManager.Database.csproj index 856408e1e..174cbfa6c 100755 --- a/src/WorkflowManager/Database/Monai.Deploy.WorkflowManager.Database.csproj +++ b/src/WorkflowManager/Database/Monai.Deploy.WorkflowManager.Database.csproj @@ -44,7 +44,7 @@ - + diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index d37568330..64d67d767 100755 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -26,14 +26,14 @@ }, "MongoDB.Driver": { "type": "Direct", - "requested": "[2.19.0, )", - "resolved": "2.19.0", - "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", + "requested": "[2.21.0, )", + "resolved": "2.21.0", + "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Driver.Core": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.21.0", + "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "Ardalis.GuardClauses": { @@ -269,8 +269,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -280,22 +280,23 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", + "resolved": "2.21.0", + "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -304,8 +305,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -516,6 +517,11 @@ "System.Runtime": "4.1.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -679,9 +685,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } }, "monai.deploy.workflowmanager.logging": { diff --git a/src/WorkflowManager/Logging/Log.500000.Messaging.cs b/src/WorkflowManager/Logging/Log.500000.Messaging.cs index dcadc5bf2..936f7ee23 100644 --- a/src/WorkflowManager/Logging/Log.500000.Messaging.cs +++ b/src/WorkflowManager/Logging/Log.500000.Messaging.cs @@ -35,40 +35,40 @@ public static partial class Log [LoggerMessage(EventId = 500004, Level = LogLevel.Error, Message = "Workflow request message {messageId} is invalid and has been rejected without being requeued.")] public static partial void WorkflowRequestRejectValidationError(this ILogger logger, string messageId); - [LoggerMessage(EventId = 200005, Level = LogLevel.Error, Message = "Workflow request message {messageId} failed unexpectedly and has been requeued.")] + [LoggerMessage(EventId = 500005, Level = LogLevel.Error, Message = "Workflow request message {messageId} failed unexpectedly and has been requeued.")] public static partial void WorkflowRequestRequeuePayloadCreateError(this ILogger logger, string messageId); - [LoggerMessage(EventId = 200006, Level = LogLevel.Error, Message = "Workflow request message {messageId} failed unexpectedly and has been requeued.")] + [LoggerMessage(EventId = 500006, Level = LogLevel.Error, Message = "Workflow request message {messageId} failed unexpectedly and has been requeued.")] public static partial void WorkflowRequestRequeuePayloadProcessError(this ILogger logger, string messageId); - [LoggerMessage(EventId = 200007, Level = LogLevel.Error, Message = "Workflow request message {messageId} failed unexpectedly and has been requeued.")] + [LoggerMessage(EventId = 500007, Level = LogLevel.Error, Message = "Workflow request message {messageId} failed unexpectedly and has been requeued.")] public static partial void WorkflowRequestRequeueUnknownError(this ILogger logger, string messageId, Exception ex); - [LoggerMessage(EventId = 200008, Level = LogLevel.Error, Message = "Task update message {messageId} is invalid and has been rejected without being requeued.")] + [LoggerMessage(EventId = 500008, Level = LogLevel.Error, Message = "Task update message {messageId} is invalid and has been rejected without being requeued.")] public static partial void TaskUpdateRejectValiationError(this ILogger logger, string messageId); - [LoggerMessage(EventId = 200009, Level = LogLevel.Error, Message = "Task update message {messageId} failed unexpectedly and has been requeued.")] + [LoggerMessage(EventId = 500009, Level = LogLevel.Error, Message = "Task update message {messageId} failed unexpectedly and has been requeued.")] public static partial void TaskUpdateRequeueProcessingError(this ILogger logger, string messageId); - [LoggerMessage(EventId = 200010, Level = LogLevel.Error, Message = "Task update message {messageId} failed unexpectedly and has been requeued.")] + [LoggerMessage(EventId = 500010, Level = LogLevel.Error, Message = "Task update message {messageId} failed unexpectedly and has been requeued.")] public static partial void TaskUpdateRequeueUnknownError(this ILogger logger, string messageId, Exception ex); - [LoggerMessage(EventId = 200011, Level = LogLevel.Error, Message = "Export complete message {messageId} is invalid and has been rejected without being requeued.")] + [LoggerMessage(EventId = 500011, Level = LogLevel.Error, Message = "Export complete message {messageId} is invalid and has been rejected without being requeued.")] public static partial void ExportCompleteRejectValiationError(this ILogger logger, string messageId); - [LoggerMessage(EventId = 200012, Level = LogLevel.Error, Message = "Export complete message {messageId} failed unexpectedly and has been requeued.")] + [LoggerMessage(EventId = 500012, Level = LogLevel.Error, Message = "Export complete message {messageId} failed unexpectedly and has been requeued.")] public static partial void ExportCompleteRequeueProcessingError(this ILogger logger, string messageId); - [LoggerMessage(EventId = 200013, Level = LogLevel.Error, Message = "Export complete message {messageId} failed unexpectedly and has been requeued.")] + [LoggerMessage(EventId = 500013, Level = LogLevel.Error, Message = "Export complete message {messageId} failed unexpectedly and has been requeued.")] public static partial void ExportCompleteRequeueUnknownError(this ILogger logger, string messageId, Exception ex); - [LoggerMessage(EventId = 200014, Level = LogLevel.Debug, Message = "Workflow request message received.")] + [LoggerMessage(EventId = 500014, Level = LogLevel.Debug, Message = "Workflow request message received.")] public static partial void WorkflowRequestReceived(this ILogger logger); - [LoggerMessage(EventId = 200015, Level = LogLevel.Debug, Message = "Task update message received.")] + [LoggerMessage(EventId = 500015, Level = LogLevel.Debug, Message = "Task update message received.")] public static partial void TaskUpdateReceived(this ILogger logger); - [LoggerMessage(EventId = 200016, Level = LogLevel.Debug, Message = "Export complete message received.")] + [LoggerMessage(EventId = 500016, Level = LogLevel.Debug, Message = "Export complete message received.")] public static partial void ExportCompleteReceived(this ILogger logger); } } diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index 3dc0373e1..344b27cc6 100755 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -210,8 +210,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -242,9 +242,10 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, @@ -482,6 +483,11 @@ "System.Runtime": "4.1.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -635,9 +641,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } } } diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index 08522a2d7..3c23c98f8 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -20,6 +20,11 @@ "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", @@ -30,17 +35,19 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -89,9 +96,14 @@ } }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -119,10 +131,11 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -166,13 +179,14 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", "dependencies": { - "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.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": { @@ -245,11 +259,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -261,8 +270,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -313,33 +322,34 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", + "resolved": "2.21.0", + "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Driver.Core": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.21.0", + "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", + "resolved": "2.21.0", + "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -348,8 +358,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -500,6 +510,14 @@ "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", @@ -560,6 +578,11 @@ "System.Runtime": "4.1.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -667,10 +690,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -686,13 +709,20 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading": { "type": "Transitive", @@ -749,17 +779,15 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.1.1, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { @@ -774,9 +802,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } }, "monai.deploy.workflowmanager.database": { @@ -785,7 +813,7 @@ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Driver": "[2.19.0, )" + "MongoDB.Driver": "[2.21.0, )" } }, "monai.deploy.workflowmanager.logging": { diff --git a/src/WorkflowManager/Services/Monai.Deploy.WorkflowManager.Services.csproj b/src/WorkflowManager/Services/Monai.Deploy.WorkflowManager.Services.csproj index 3aedbd03d..84b49af3d 100644 --- a/src/WorkflowManager/Services/Monai.Deploy.WorkflowManager.Services.csproj +++ b/src/WorkflowManager/Services/Monai.Deploy.WorkflowManager.Services.csproj @@ -36,7 +36,7 @@ - + diff --git a/src/WorkflowManager/Services/packages.lock.json b/src/WorkflowManager/Services/packages.lock.json index abbd3085f..d0b4599f1 100644 --- a/src/WorkflowManager/Services/packages.lock.json +++ b/src/WorkflowManager/Services/packages.lock.json @@ -4,13 +4,14 @@ "net6.0": { "Microsoft.Extensions.Http": { "type": "Direct", - "requested": "[3.1.0, )", - "resolved": "3.1.0", - "contentHash": "DLigdcV0nYaT6/ly0rnfP80BnXq8NNd/h8/SkfY39uio7Bd9LauVntp6RcRh1Kj23N+uf80GgL7Win6P3BCtoQ==", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "15+pa2G0bAMHbHewaQIdr/y6ag2H3yh4rd9hTXavtWDzQBkvpe2RMqFg8BxDpcQWssmjmBApGPcw93QRz6YcMg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0", - "Microsoft.Extensions.Logging": "3.1.0", - "Microsoft.Extensions.Options": "3.1.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0" } }, "Ardalis.GuardClauses": { @@ -85,10 +86,10 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "3.1.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { @@ -101,18 +102,19 @@ }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==", + "resolved": "2.2.0", + "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "3.1.0" + "Microsoft.Extensions.Configuration": "2.2.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==", + "resolved": "6.0.0", + "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -156,13 +158,14 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", "dependencies": { - "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.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": { @@ -246,8 +249,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -298,33 +301,34 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", + "resolved": "2.21.0", + "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Driver.Core": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.21.0", + "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", + "resolved": "2.21.0", + "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -333,8 +337,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -485,6 +489,14 @@ "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", @@ -545,6 +557,11 @@ "System.Runtime": "4.1.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -716,16 +733,16 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } }, "monai.deploy.workflowmanager.database": { @@ -734,7 +751,7 @@ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Driver": "[2.19.0, )" + "MongoDB.Driver": "[2.21.0, )" } }, "monai.deploy.workflowmanager.logging": { diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index e898b1551..6d5c5f0ec 100755 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -235,8 +235,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -276,9 +276,10 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, @@ -516,6 +517,11 @@ "System.Runtime": "4.1.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -669,9 +675,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } }, "monai.deploy.workflowmanager.logging": { diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index 9d5cfe7db..3b2510d1b 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -20,6 +20,11 @@ "AWSSDK.Core": "[3.7.200.13, 4.0.0)" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", @@ -30,17 +35,19 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -89,9 +96,14 @@ } }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -119,10 +131,11 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -166,13 +179,14 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", "dependencies": { - "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.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": { @@ -245,11 +259,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -261,8 +270,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -313,33 +322,34 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", + "resolved": "2.21.0", + "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Driver.Core": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.21.0", + "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", + "resolved": "2.21.0", + "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -348,8 +358,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -500,6 +510,14 @@ "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", @@ -560,6 +578,11 @@ "System.Runtime": "4.1.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -667,10 +690,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -686,13 +709,20 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading": { "type": "Transitive", @@ -749,17 +779,15 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.1.1, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { @@ -774,9 +802,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } }, "monai.deploy.workflowmanager.database": { @@ -785,7 +813,7 @@ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Driver": "[2.19.0, )" + "MongoDB.Driver": "[2.21.0, )" } }, "monai.deploy.workflowmanager.logging": { diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index eb93f2588..0eba7a786 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -41,19 +41,21 @@ - - - - - + - - - - - - - + + true + + + true + + + true + + + true + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/WorkflowManager/WorkflowManager/Program.cs b/src/WorkflowManager/WorkflowManager/Program.cs index 033de4834..60d06255a 100755 --- a/src/WorkflowManager/WorkflowManager/Program.cs +++ b/src/WorkflowManager/WorkflowManager/Program.cs @@ -45,7 +45,6 @@ using Mongo.Migration.Startup.DotNetCore; using MongoDB.Driver; using NLog; -using NLog.LayoutRenderers; using NLog.Web; namespace Monai.Deploy.WorkflowManager.Common @@ -185,11 +184,14 @@ private static void Main(string[] args) private static Logger ConfigureNLog(string assemblyVersionNumber) { - LayoutRenderer.Register("servicename", logEvent => typeof(Program).Namespace); - LayoutRenderer.Register("serviceversion", logEvent => assemblyVersionNumber); - LayoutRenderer.Register("machinename", logEvent => Environment.MachineName); - - return LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger(); + return LogManager.Setup().SetupExtensions(ext => + { + ext.RegisterLayoutRenderer("servicename", logEvent => typeof(Program).Namespace); + ext.RegisterLayoutRenderer("serviceversion", logEvent => assemblyVersionNumber); + ext.RegisterLayoutRenderer("machinename", logEvent => Environment.MachineName); + }) + .LoadConfigurationFromAppSettings() + .GetCurrentClassLogger(); } #pragma warning restore SA1600 // Elements should be documented diff --git a/src/WorkflowManager/WorkflowManager/nlog.config b/src/WorkflowManager/WorkflowManager/nlog.config index 69aa7bf95..355b72fd9 100644 --- a/src/WorkflowManager/WorkflowManager/nlog.config +++ b/src/WorkflowManager/WorkflowManager/nlog.config @@ -45,7 +45,7 @@ limitations under the License. - + diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 38e87bf7b..47527521e 100755 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -14,79 +14,22 @@ }, "Microsoft.AspNetCore.Mvc.NewtonsoftJson": { "type": "Direct", - "requested": "[6.0.14, )", - "resolved": "6.0.14", - "contentHash": "blMa3cqHH2f/9DETvUZpVLVid5vNKjm5vbQbdLEg7h3RQ6XWphHeKZrR7MauGVnwUbNaBCzxxFMcDl2YeAlxdg==", + "requested": "[6.0.22, )", + "resolved": "6.0.22", + "contentHash": "CVZatoGdeRlC74aw1lrg0+U49h1o+T23gcsFI/Xxmb+48+5cuoZawshSLLhpMeCxurIvmk6owfA+D6wvOvkn0g==", "dependencies": { - "Microsoft.AspNetCore.JsonPatch": "6.0.14", + "Microsoft.AspNetCore.JsonPatch": "6.0.22", "Newtonsoft.Json": "13.0.1", "Newtonsoft.Json.Bson": "1.0.2" } }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Direct", - "requested": "[7.0.0, )", - "resolved": "7.0.0", - "contentHash": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw==" - }, - "Microsoft.Extensions.Hosting": { - "type": "Direct", - "requested": "[6.0.1, )", - "resolved": "6.0.1", - "contentHash": "hbmizc9KPWOacLU8Z8YMaBG6KWdZFppczYV/KwnPGU/8xebWxQxdDeJmLOgg968prb7g2oQgnp6JVLX6lgby8g==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "6.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", - "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Configuration": "6.0.0", - "Microsoft.Extensions.Logging.Console": "6.0.0", - "Microsoft.Extensions.Logging.Debug": "6.0.0", - "Microsoft.Extensions.Logging.EventLog": "6.0.0", - "Microsoft.Extensions.Logging.EventSource": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0" - } - }, - "Microsoft.Extensions.Options": { - "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Monai.Deploy.Messaging": { - "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", - "dependencies": { - "Ardalis.GuardClauses": "4.1.1", - "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", - "Newtonsoft.Json": "13.0.3", - "System.IO.Abstractions": "17.2.3" - } - }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "1UiWYO+EjNZSFrL/SUElqmBo3TktG+XiCXm8oyXheEWz/CuZS2hhepYB4BDz7XAohUqt2/Hv7wpLiaauiaIFZg==", + "requested": "[1.0.1, )", + "resolved": "1.0.1", + "contentHash": "zBVO6HOqyTfDj6YcITy1XtEiqRurFKUrIgLdJYVahhXlUnymn6/WmCuqkX1Z+3IKxy91D4LeF0KahH/rM8u6+w==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.0", + "Monai.Deploy.Messaging": "1.0.1", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -106,18 +49,6 @@ "Microsoft.Extensions.Logging.Configuration": "6.0.0" } }, - "Monai.Deploy.Storage": { - "type": "Direct", - "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" - } - }, "Monai.Deploy.Storage.MinIO": { "type": "Direct", "requested": "[0.2.18, )", @@ -151,25 +82,19 @@ "System.ValueTuple": "4.5.0" } }, - "Newtonsoft.Json": { - "type": "Direct", - "requested": "[13.0.3, )", - "resolved": "13.0.3", - "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, "NLog": { "type": "Direct", - "requested": "[5.1.2, )", - "resolved": "5.1.2", - "contentHash": "JfQY93ure3IPVTN3eabBewBGvrcXcWIlaesFEXdy5UzIymfIT9yCgLISYtM0cOhjWziIaUr/6Z9NC2RwtjwrsQ==" + "requested": "[5.2.4, )", + "resolved": "5.2.4", + "contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ==" }, "NLog.Web.AspNetCore": { "type": "Direct", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "0Qa6V7LXgbWNxYdZDLcQz/TjGrSfx32XThxAL+xoAtjplC2uCIhy27WiMIjznuMAJR3zjElIiYzMmPSsQ4LZSQ==", + "requested": "[5.3.4, )", + "resolved": "5.3.4", + "contentHash": "80FaN8CKu94E3mZqZ+r46nRyEYgnHMn4i3vPslbaINs8k+TqJClNFYw6uWLhPU4AN7PKi/jHHzpswqn7K8jgGg==", "dependencies": { - "NLog.Extensions.Logging": "5.2.2" + "NLog.Extensions.Logging": "5.3.4" } }, "StyleCop.Analyzers": { @@ -210,8 +135,8 @@ }, "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "8.1.0", - "contentHash": "kgDi65k02hrgnHy3N0xENecsr0spW13RdIA1tipovi9t16gKziI7uZIu3qkxz0GctCHNM4hfeqXYg//6wHJ6Kw==" + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" }, "DnsClient": { "type": "Transitive", @@ -223,17 +148,19 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -291,17 +218,22 @@ }, "Microsoft.AspNetCore.JsonPatch": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "rX4pfSKnDErxnpcJrQ/PruPa64LjdkEl1nBvC587XRANzHOaLrUu9pAbZmqBYUn5Yq9xKd5Sg+95Ev+f84iiQw==", + "resolved": "6.0.22", + "contentHash": "jQAfNQ7ExLXVUeenihZDqxRr3sBNf8SsenFDOgikb9KaWoWuX91PqSo3G+JDWJppHMucjN55wgEEC3fg5Lzqew==", "dependencies": { "Microsoft.CSharp": "4.7.0", "Newtonsoft.Json": "13.0.1" } }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -338,67 +270,19 @@ "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, - "Microsoft.Extensions.Configuration.CommandLine": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "3nL1qCkZ1Oxx14ZTzgo4MmlO7tso7F+TtMZAY2jUAtTLyAcDp+EDjk3RqafoKiNaePyPvvlleEcBxh3b2Hzl1g==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.EnvironmentVariables": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "pnyXV1LFOsYjGveuC07xp0YHIyGq7jRq5Ncb5zrrIieMLWVwgMyYxcOH0jTnBedDT4Gh1QinSqsjqzcieHk1og==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.FileExtensions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "V4Dth2cYMZpw3HhGw9XUDIijpI6gN+22LDt0AhufIgOppCUfpWX4483OmN+dFXRJkJLc8Tv0Q8QK+1ingT2+KQ==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.Json": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GJGery6QytCzS/BxJ96klgG9in3uH26KcUBbiVG/coNDXCRq6LGVVlUT4vXq34KPuM+R2av+LeYdX9h4IZOCUg==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "System.Text.Json": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.UserSecrets": { + "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", "resolved": "6.0.1", - "contentHash": "Fy8yr4V6obi7ZxvKYI1i85jqtwMq8tqyxQVZpRSkgeA8enqy/KvBIMdcuNdznlxQMZa72mvbHqb7vbg4Pyx95w==", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "Microsoft.Extensions.DependencyInjection": { + "Microsoft.Extensions.DependencyInjection.Abstractions": { "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" - } + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", @@ -424,21 +308,6 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.FileProviders.Physical": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "QvkL7l0nM8udt3gfyu0Vw8bbCXblxaKOl7c2oBfgGy4LCURRaL9XWZX1FWJrQc43oMokVneVxH38iz+bY1sbhg==", - "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.FileSystemGlobbing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" - }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -451,12 +320,13 @@ }, "Microsoft.Extensions.Http": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "DLigdcV0nYaT6/ly0rnfP80BnXq8NNd/h8/SkfY39uio7Bd9LauVntp6RcRh1Kj23N+uf80GgL7Win6P3BCtoQ==", + "resolved": "6.0.0", + "contentHash": "15+pa2G0bAMHbHewaQIdr/y6ag2H3yh4rd9hTXavtWDzQBkvpe2RMqFg8BxDpcQWssmjmBApGPcw93QRz6YcMg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0", - "Microsoft.Extensions.Logging": "3.1.0", - "Microsoft.Extensions.Options": "3.1.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Logging": { @@ -493,51 +363,29 @@ }, "Microsoft.Extensions.Logging.Console": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gsqKzOEdsvq28QiXFxagmn1oRB9GeI5GgYCkoybZtQA0IUb7QPwf1WmN3AwJeNIsadTvIFQCiVK0OVIgKfOBGg==", + "resolved": "2.2.0", + "contentHash": "1eGgcOJ++PMxW6sn++j6U7wsWvhEBm/5ScqBUUBGLRE8M7AHahi9tsxivDMqEXVM3F0/pshHl3kEpMXtw4BeFg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Configuration": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Text.Json": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Microsoft.Extensions.Logging.Configuration": "2.2.0" } }, "Microsoft.Extensions.Logging.Debug": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "M9g/JixseSZATJE9tcMn9uzoD4+DbSglivFqVx8YkRJ7VVPmnvCEbOZ0AAaxsL1EKyI4cz07DXOOJExxNsUOHw==", + "resolved": "2.2.0", + "contentHash": "JjqWtshxUujSnxslFccCRAaH8uFOciqXkYdRw+h5MwpC4sUc+ju9yZzvVi6PA5vW09ckv26EkasEvXrofGiaJg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0" + "Microsoft.Extensions.Logging": "2.2.0" } }, - "Microsoft.Extensions.Logging.EventLog": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "rlo0RxlMd0WtLG3CHI0qOTp6fFn7MvQjlrCjucA31RqmiMFCZkF8CHNbe8O7tbBIyyoLGWB1he9CbaA5iyHthg==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.EventLog": "6.0.0" - } - }, - "Microsoft.Extensions.Logging.EventSource": { + "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "BeDyyqt7nkm/nr+Gdk+L8n1tUT/u33VkbXAOesgYSNsxDM9hJ1NOBGoZfj9rCbeD2+9myElI6JOVVFmnzgeWQA==", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "6.0.0" + "Microsoft.Extensions.Primitives": "6.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { @@ -616,11 +464,6 @@ "resolved": "1.2.3", "contentHash": "Nug3rO+7Kl5/SBAadzSMAVgqDlfGjJZ0GenQrLywJ84XGKO0uRqkunz5Wyl0SDwcR71bAATXvSdbdzPrYRYKGw==" }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -640,6 +483,28 @@ "System.Reactive.Linq": "5.0.0" } }, + "Monai.Deploy.Messaging": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", + "dependencies": { + "Ardalis.GuardClauses": "4.1.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", + "Newtonsoft.Json": "13.0.3", + "System.IO.Abstractions": "17.2.3" + } + }, + "Monai.Deploy.Storage": { + "type": "Transitive", + "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" + } + }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", "resolved": "0.2.18", @@ -651,33 +516,34 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", + "resolved": "2.21.0", + "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Driver.Core": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.21.0", + "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", + "resolved": "2.21.0", + "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -686,8 +552,13 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.3", + "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" }, "Newtonsoft.Json.Bson": { "type": "Transitive", @@ -699,12 +570,12 @@ }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.2.2", - "contentHash": "V6sd+0Hrk2XlU//XbUizFYTE8Hf8+xFkhi81shIhsKl4tvWFUYmjBY/zBy/wlQCt0K6mfseaEKnayRJVhIz5Iw==", + "resolved": "5.3.4", + "contentHash": "rxUGUqhE3DlcKfKhPJOI0xOt8q2+NX0NkBY9lbRXwZEYQsh8ASFS8X7K+Y7/dcE8v0tpAe7GF8rPD5h4h9Hpsg==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.1.2" + "NLog": "5.2.4" } }, "Polly": { @@ -889,11 +760,6 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw==" - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.1.0", @@ -1099,10 +965,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1126,8 +992,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==", + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1193,17 +1059,15 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.1.1, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { @@ -1218,9 +1082,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } }, "monai.deploy.workflowmanager.database": { @@ -1229,7 +1093,7 @@ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Driver": "[2.19.0, )" + "MongoDB.Driver": "[2.21.0, )" } }, "monai.deploy.workflowmanager.logging": { @@ -1258,7 +1122,7 @@ "monai.deploy.workflowmanager.services": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Http": "[3.1.0, )", + "Microsoft.Extensions.Http": "[6.0.0, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )" } 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 63c8f7718..f00b8978f 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj @@ -24,11 +24,11 @@ - - + + - - + + @@ -37,8 +37,8 @@ - - + + diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj index 854e410c0..34d69e1e6 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj @@ -32,10 +32,10 @@ - + - - + + @@ -43,8 +43,8 @@ - - + + diff --git a/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj b/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj index ca1e15882..b2b13109a 100644 --- a/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj +++ b/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj @@ -25,15 +25,15 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj b/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj index e0a17feb3..616ba122b 100644 --- a/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj +++ b/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj @@ -24,13 +24,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj index 9b768dea8..3c5dc83b8 100644 --- a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj +++ b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj @@ -24,14 +24,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj b/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj index d96dc73bd..ac16b681a 100644 --- a/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj +++ b/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj @@ -24,14 +24,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/Monai.Deploy.WorkflowManager.Shared.Tests.csproj b/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/Monai.Deploy.WorkflowManager.Shared.Tests.csproj index bc9c756df..1e7ac095b 100644 --- a/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/Monai.Deploy.WorkflowManager.Shared.Tests.csproj +++ b/tests/UnitTests/Monai.Deploy.WorkflowManager.Shared.Tests/Monai.Deploy.WorkflowManager.Shared.Tests.csproj @@ -25,18 +25,17 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - diff --git a/tests/UnitTests/MonaiBackgroundService.Tests/Monai.Deploy.WorkflowManager.MonaiBackgroundService.Tests.csproj b/tests/UnitTests/MonaiBackgroundService.Tests/Monai.Deploy.WorkflowManager.MonaiBackgroundService.Tests.csproj index ea44a0622..75e30da1f 100644 --- a/tests/UnitTests/MonaiBackgroundService.Tests/Monai.Deploy.WorkflowManager.MonaiBackgroundService.Tests.csproj +++ b/tests/UnitTests/MonaiBackgroundService.Tests/Monai.Deploy.WorkflowManager.MonaiBackgroundService.Tests.csproj @@ -25,14 +25,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj index 01ae9bc9b..ffcbeb639 100644 --- a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj +++ b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj @@ -24,11 +24,11 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/UnitTests/PayloadListener.Tests/packages.lock.json b/tests/UnitTests/PayloadListener.Tests/packages.lock.json index 0f5defbad..09b937847 100644 --- a/tests/UnitTests/PayloadListener.Tests/packages.lock.json +++ b/tests/UnitTests/PayloadListener.Tests/packages.lock.json @@ -4,25 +4,25 @@ "net6.0": { "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.7.2, )", + "resolved": "17.7.2", + "contentHash": "WOSF/GUYcnrLGkdvCbXDRig2rShtBwfQc5l7IxQE6PZI3CeXAqF1SpyzwlGA5vw+MdEAXs3niy+ZkGBBWna6tw==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.7.2", + "Microsoft.TestPlatform.TestHost": "17.7.2" } }, "Moq": { "type": "Direct", - "requested": "[4.18.4, )", - "resolved": "4.18.4", - "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", + "requested": "[4.20.69, )", + "resolved": "4.20.69", + "contentHash": "8P/oAUOL8ZVyXnzBBcgdhTsOD1kQbAWfOcMI7KDQO3HqQtzB/0WYLdnMa4Jefv8nu/MQYiiG0IuoJdvG0v0Nig==", "dependencies": { "Castle.Core": "5.1.1" } @@ -38,9 +38,9 @@ }, "NUnit3TestAdapter": { "type": "Direct", - "requested": "[4.4.2, )", - "resolved": "4.4.2", - "contentHash": "vA/iHYcR+LYw+pRWQugckC/zW2fXHaqMr2uA82NOBt8v4YK4wMJrQ7QC8XLc7PjetEZ96cPbBTWsDDtmQiRZTA==" + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" }, "Ardalis.GuardClauses": { "type": "Transitive", @@ -68,6 +68,11 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "CommunityToolkit.HighPerformance": { + "type": "Transitive", + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" + }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", @@ -78,17 +83,19 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", + "dependencies": { + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -137,14 +144,19 @@ } }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.7.2", + "contentHash": "ntbkwIqwszkfCRjxVZOyEQiHauiYsY9NtYjw9ASsoxDSiG8YtV6AGcOAwrAk3TZv2UOq4MrpX+3MYEeMHSb03w==" }, "Microsoft.Extensions.Configuration": { "type": "Transitive", @@ -172,10 +184,11 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { @@ -219,13 +232,14 @@ }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", "dependencies": { - "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.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": { @@ -300,27 +314,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.7.2", + "contentHash": "aHzQWgDMVBnk39HhQVmn06w+YxzF1h2V5/M4WgrNQAn7q97GR4Si3vLRTDlmJo9nK/Nknce+H4tXx4gqOKyLeg==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.7.2", + "contentHash": "pv9yVD7IKPLJV28zYjLsWFiM3j506I2ye+6NquG8vsbm/gR7lgyig8IgY6Vo57VMvGaAKwtUECzcj+C5tH271Q==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.7.2", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -332,8 +341,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -384,33 +393,34 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", + "resolved": "2.21.0", + "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Driver.Core": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.21.0", + "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", + "resolved": "2.21.0", + "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -419,8 +429,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "NETStandard.Library": { "type": "Transitive", @@ -442,8 +452,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "Serilog": { "type": "Transitive", @@ -584,6 +594,14 @@ "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.EventLog": { "type": "Transitive", "resolved": "6.0.0", @@ -649,6 +667,11 @@ "System.Runtime": "4.1.0" } }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -761,10 +784,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -780,13 +803,20 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Threading": { "type": "Transitive", @@ -843,17 +873,15 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.1.1, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { @@ -868,9 +896,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } }, "monai.deploy.workflowmanager.database": { @@ -879,7 +907,7 @@ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Driver": "[2.19.0, )" + "MongoDB.Driver": "[2.21.0, )" } }, "monai.deploy.workflowmanager.logging": { diff --git a/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj b/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj index 865b17fde..b3eca3556 100644 --- a/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj +++ b/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj @@ -24,15 +24,15 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Tests.csproj b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Tests.csproj index 38828a909..73fb22a18 100755 --- a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Tests.csproj +++ b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Tests.csproj @@ -24,23 +24,24 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + true + diff --git a/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj b/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj index d0fa52872..e514c9e5b 100755 --- a/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj +++ b/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj @@ -28,18 +28,17 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - diff --git a/tests/UnitTests/TaskManager.Docker.Tests/Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests.csproj b/tests/UnitTests/TaskManager.Docker.Tests/Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests.csproj index 6f5d44b04..206894790 100755 --- a/tests/UnitTests/TaskManager.Docker.Tests/Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests.csproj +++ b/tests/UnitTests/TaskManager.Docker.Tests/Monai.Deploy.WorkflowManager.TaskManager.Docker.Tests.csproj @@ -29,15 +29,15 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/TaskManager.Email.Tests/Monai.Deploy.WorkflowManager.TaskManager.Email.Tests.csproj b/tests/UnitTests/TaskManager.Email.Tests/Monai.Deploy.WorkflowManager.TaskManager.Email.Tests.csproj index d386ec0c6..deead3508 100644 --- a/tests/UnitTests/TaskManager.Email.Tests/Monai.Deploy.WorkflowManager.TaskManager.Email.Tests.csproj +++ b/tests/UnitTests/TaskManager.Email.Tests/Monai.Deploy.WorkflowManager.TaskManager.Email.Tests.csproj @@ -24,14 +24,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj index 3adbde4d5..6c8201674 100644 --- a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj +++ b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj @@ -24,15 +24,14 @@ - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -42,8 +41,6 @@ - - diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj index 8feafaf1d..f98c3ee7b 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj +++ b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj @@ -24,15 +24,15 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/WorkflowManager.Services.Tests/Monai.Deploy.WorkflowManager.Services.Tests.csproj b/tests/UnitTests/WorkflowManager.Services.Tests/Monai.Deploy.WorkflowManager.Services.Tests.csproj index e3435622b..a2b3deed4 100644 --- a/tests/UnitTests/WorkflowManager.Services.Tests/Monai.Deploy.WorkflowManager.Services.Tests.csproj +++ b/tests/UnitTests/WorkflowManager.Services.Tests/Monai.Deploy.WorkflowManager.Services.Tests.csproj @@ -25,14 +25,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj b/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj index f08924691..363e85695 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj +++ b/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj @@ -26,15 +26,15 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 300bab6a7..067ca159c 100755 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -14,54 +14,54 @@ }, "coverlet.collector": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "xjY8xBigSeWIYs4I7DgUHqSNoGqnHi7Fv7/7RZD02rvZyG3hlsjnQKiVKVWKgr9kRKgmV+dEfu8KScvysiC0Wg==" + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "tW3lsNS+dAEII6YGUX/VMoJjBS1QvsxqJeqLaJXub08y1FSjasFPtQ4UBUsudE9PNrzLjooClMsPtY2cZLdXpQ==" }, "FluentAssertions": { "type": "Direct", - "requested": "[6.10.0, )", - "resolved": "6.10.0", - "contentHash": "Da3YsiRDnOHKBfxutjnupL1rOX0K/jnG6crn5AgwukeqZ/yi+HNCOFshic01ke0ztZFWzpfQMXH8fO9aAbG0Gw==", + "requested": "[6.12.0, )", + "resolved": "6.12.0", + "contentHash": "ZXhHT2YwP9lajrwSKbLlFqsmCCvFJMoRSK9t7sImfnCyd0OB3MhgxdoMcVqxbq1iyxD6mD2fiackWmBb7ayiXQ==", "dependencies": { "System.Configuration.ConfigurationManager": "4.4.0" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.5.0, )", - "resolved": "17.5.0", - "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==", + "requested": "[17.7.2, )", + "resolved": "17.7.2", + "contentHash": "WOSF/GUYcnrLGkdvCbXDRig2rShtBwfQc5l7IxQE6PZI3CeXAqF1SpyzwlGA5vw+MdEAXs3niy+ZkGBBWna6tw==", "dependencies": { - "Microsoft.CodeCoverage": "17.5.0", - "Microsoft.TestPlatform.TestHost": "17.5.0" + "Microsoft.CodeCoverage": "17.7.2", + "Microsoft.TestPlatform.TestHost": "17.7.2" } }, "Moq": { "type": "Direct", - "requested": "[4.18.4, )", - "resolved": "4.18.4", - "contentHash": "IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", + "requested": "[4.20.69, )", + "resolved": "4.20.69", + "contentHash": "8P/oAUOL8ZVyXnzBBcgdhTsOD1kQbAWfOcMI7KDQO3HqQtzB/0WYLdnMa4Jefv8nu/MQYiiG0IuoJdvG0v0Nig==", "dependencies": { "Castle.Core": "5.1.1" } }, "xunit": { "type": "Direct", - "requested": "[2.4.2, )", - "resolved": "2.4.2", - "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "f2V5wuAdoaq0mRTt9UBmPbVex9HcwFYn+y7WaKUz5Xpakcrv7lhtQWBJUWNY4N3Z+o+atDBLyAALM1QWx04C6Q==", "dependencies": { - "xunit.analyzers": "1.0.0", - "xunit.assert": "2.4.2", - "xunit.core": "[2.4.2]" + "xunit.analyzers": "1.2.0", + "xunit.assert": "2.5.0", + "xunit.core": "[2.5.0]" } }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.5, )", - "resolved": "2.4.5", - "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + "requested": "[2.5.0, )", + "resolved": "2.5.0", + "contentHash": "+Gp9vuC2431yPyKB15YrOTxCuEAErBQUTIs6CquumX1F073UaPHGW0VE/XVJLMh9W4sXdz3TBkcHdFWZrRn2Hw==" }, "Ardalis.GuardClauses": { "type": "Transitive", @@ -109,8 +109,8 @@ }, "CommunityToolkit.HighPerformance": { "type": "Transitive", - "resolved": "8.1.0", - "contentHash": "kgDi65k02hrgnHy3N0xENecsr0spW13RdIA1tipovi9t16gKziI7uZIu3qkxz0GctCHNM4hfeqXYg//6wHJ6Kw==" + "resolved": "8.2.0", + "contentHash": "iKzsPiSnXoQUN5AoApYmdfnLn9osNb+YCLWRr5PFmrDEQVIu7OeOyf4DPvNBvbqbYLZCfvHozPkulyv6zBQsFw==" }, "DnsClient": { "type": "Transitive", @@ -130,17 +130,19 @@ }, "fo-dicom": { "type": "Transitive", - "resolved": "5.0.3", - "contentHash": "OPkCQ9+X/fvGRokAAgjR8bOpai04qlnNHmq+LsgI+Kyug3yar2zk6IMOSSvPOLgWe0EG9ScdqH44AGKnviH5Rw==", + "resolved": "5.1.1", + "contentHash": "YraR81u9XuTN7l+pt6HzT0KvuhgWVZ9LCuHMH3zgFfAtv4peT1y+nYMSGwF9YqNP+oZnzh0s0PJ+vJMsTDpGIw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "Microsoft.Extensions.DependencyInjection": "2.2.0", - "Microsoft.Extensions.Options": "2.2.0", - "Microsoft.Toolkit.HighPerformance": "7.1.2", + "CommunityToolkit.HighPerformance": "8.2.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.DependencyInjection": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", "System.Buffers": "4.5.1", - "System.Text.Encoding.CodePages": "4.6.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.7", "System.Threading.Channels": "6.0.0" } }, @@ -198,8 +200,8 @@ }, "Microsoft.AspNetCore.JsonPatch": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "rX4pfSKnDErxnpcJrQ/PruPa64LjdkEl1nBvC587XRANzHOaLrUu9pAbZmqBYUn5Yq9xKd5Sg+95Ev+f84iiQw==", + "resolved": "6.0.22", + "contentHash": "jQAfNQ7ExLXVUeenihZDqxRr3sBNf8SsenFDOgikb9KaWoWuX91PqSo3G+JDWJppHMucjN55wgEEC3fg5Lzqew==", "dependencies": { "Microsoft.CSharp": "4.7.0", "Newtonsoft.Json": "13.0.1" @@ -207,23 +209,28 @@ }, "Microsoft.AspNetCore.Mvc.NewtonsoftJson": { "type": "Transitive", - "resolved": "6.0.14", - "contentHash": "blMa3cqHH2f/9DETvUZpVLVid5vNKjm5vbQbdLEg7h3RQ6XWphHeKZrR7MauGVnwUbNaBCzxxFMcDl2YeAlxdg==", + "resolved": "6.0.22", + "contentHash": "CVZatoGdeRlC74aw1lrg0+U49h1o+T23gcsFI/Xxmb+48+5cuoZawshSLLhpMeCxurIvmk6owfA+D6wvOvkn0g==", "dependencies": { - "Microsoft.AspNetCore.JsonPatch": "6.0.14", + "Microsoft.AspNetCore.JsonPatch": "6.0.22", "Newtonsoft.Json": "13.0.1", "Newtonsoft.Json.Bson": "1.0.2" } }, "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig==" + "resolved": "17.7.2", + "contentHash": "ntbkwIqwszkfCRjxVZOyEQiHauiYsY9NtYjw9ASsoxDSiG8YtV6AGcOAwrAk3TZv2UOq4MrpX+3MYEeMHSb03w==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -260,63 +267,10 @@ "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" } }, - "Microsoft.Extensions.Configuration.CommandLine": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "3nL1qCkZ1Oxx14ZTzgo4MmlO7tso7F+TtMZAY2jUAtTLyAcDp+EDjk3RqafoKiNaePyPvvlleEcBxh3b2Hzl1g==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.EnvironmentVariables": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "pnyXV1LFOsYjGveuC07xp0YHIyGq7jRq5Ncb5zrrIieMLWVwgMyYxcOH0jTnBedDT4Gh1QinSqsjqzcieHk1og==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.FileExtensions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "V4Dth2cYMZpw3HhGw9XUDIijpI6gN+22LDt0AhufIgOppCUfpWX4483OmN+dFXRJkJLc8Tv0Q8QK+1ingT2+KQ==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.Json": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "GJGery6QytCzS/BxJ96klgG9in3uH26KcUBbiVG/coNDXCRq6LGVVlUT4vXq34KPuM+R2av+LeYdX9h4IZOCUg==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "System.Text.Json": "6.0.0" - } - }, - "Microsoft.Extensions.Configuration.UserSecrets": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "Fy8yr4V6obi7ZxvKYI1i85jqtwMq8tqyxQVZpRSkgeA8enqy/KvBIMdcuNdznlxQMZa72mvbHqb7vbg4Pyx95w==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0" - } - }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "resolved": "6.0.1", + "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -324,8 +278,8 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw==" + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "Transitive", @@ -351,49 +305,6 @@ "Microsoft.Extensions.Primitives": "6.0.0" } }, - "Microsoft.Extensions.FileProviders.Physical": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "QvkL7l0nM8udt3gfyu0Vw8bbCXblxaKOl7c2oBfgGy4LCURRaL9XWZX1FWJrQc43oMokVneVxH38iz+bY1sbhg==", - "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0" - } - }, - "Microsoft.Extensions.FileSystemGlobbing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" - }, - "Microsoft.Extensions.Hosting": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "hbmizc9KPWOacLU8Z8YMaBG6KWdZFppczYV/KwnPGU/8xebWxQxdDeJmLOgg968prb7g2oQgnp6JVLX6lgby8g==", - "dependencies": { - "Microsoft.Extensions.Configuration": "6.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", - "Microsoft.Extensions.Configuration.Binder": "6.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "6.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "6.0.1", - "Microsoft.Extensions.Configuration.FileExtensions": "6.0.0", - "Microsoft.Extensions.Configuration.Json": "6.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "6.0.1", - "Microsoft.Extensions.DependencyInjection": "6.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", - "Microsoft.Extensions.FileProviders.Physical": "6.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Configuration": "6.0.0", - "Microsoft.Extensions.Logging.Console": "6.0.0", - "Microsoft.Extensions.Logging.Debug": "6.0.0", - "Microsoft.Extensions.Logging.EventLog": "6.0.0", - "Microsoft.Extensions.Logging.EventSource": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0" - } - }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -406,12 +317,13 @@ }, "Microsoft.Extensions.Http": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "DLigdcV0nYaT6/ly0rnfP80BnXq8NNd/h8/SkfY39uio7Bd9LauVntp6RcRh1Kj23N+uf80GgL7Win6P3BCtoQ==", + "resolved": "6.0.0", + "contentHash": "15+pa2G0bAMHbHewaQIdr/y6ag2H3yh4rd9hTXavtWDzQBkvpe2RMqFg8BxDpcQWssmjmBApGPcw93QRz6YcMg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0", - "Microsoft.Extensions.Logging": "3.1.0", - "Microsoft.Extensions.Options": "3.1.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0" } }, "Microsoft.Extensions.Logging": { @@ -448,51 +360,20 @@ }, "Microsoft.Extensions.Logging.Console": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gsqKzOEdsvq28QiXFxagmn1oRB9GeI5GgYCkoybZtQA0IUb7QPwf1WmN3AwJeNIsadTvIFQCiVK0OVIgKfOBGg==", + "resolved": "2.2.0", + "contentHash": "1eGgcOJ++PMxW6sn++j6U7wsWvhEBm/5ScqBUUBGLRE8M7AHahi9tsxivDMqEXVM3F0/pshHl3kEpMXtw4BeFg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging.Configuration": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Text.Json": "6.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Microsoft.Extensions.Logging.Configuration": "2.2.0" } }, "Microsoft.Extensions.Logging.Debug": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "M9g/JixseSZATJE9tcMn9uzoD4+DbSglivFqVx8YkRJ7VVPmnvCEbOZ0AAaxsL1EKyI4cz07DXOOJExxNsUOHw==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0" - } - }, - "Microsoft.Extensions.Logging.EventLog": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "rlo0RxlMd0WtLG3CHI0qOTp6fFn7MvQjlrCjucA31RqmiMFCZkF8CHNbe8O7tbBIyyoLGWB1he9CbaA5iyHthg==", + "resolved": "2.2.0", + "contentHash": "JjqWtshxUujSnxslFccCRAaH8uFOciqXkYdRw+h5MwpC4sUc+ju9yZzvVi6PA5vW09ckv26EkasEvXrofGiaJg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "System.Diagnostics.EventLog": "6.0.0" - } - }, - "Microsoft.Extensions.Logging.EventSource": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "BeDyyqt7nkm/nr+Gdk+L8n1tUT/u33VkbXAOesgYSNsxDM9hJ1NOBGoZfj9rCbeD2+9myElI6JOVVFmnzgeWQA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Microsoft.Extensions.Primitives": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "6.0.0" + "Microsoft.Extensions.Logging": "2.2.0" } }, "Microsoft.Extensions.Options": { @@ -582,27 +463,22 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==", + "resolved": "17.7.2", + "contentHash": "aHzQWgDMVBnk39HhQVmn06w+YxzF1h2V5/M4WgrNQAn7q97GR4Si3vLRTDlmJo9nK/Nknce+H4tXx4gqOKyLeg==", "dependencies": { - "NuGet.Frameworks": "5.11.0", + "NuGet.Frameworks": "6.5.0", "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.5.0", - "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==", + "resolved": "17.7.2", + "contentHash": "pv9yVD7IKPLJV28zYjLsWFiM3j506I2ye+6NquG8vsbm/gR7lgyig8IgY6Vo57VMvGaAKwtUECzcj+C5tH271Q==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.7.2", "Newtonsoft.Json": "13.0.1" } }, - "Microsoft.Toolkit.HighPerformance": { - "type": "Transitive", - "resolved": "7.1.2", - "contentHash": "cezzRky0BUJyYmSrcQUcX8qAv90JfUwCqWEbqfWZLHyeANo9/LWgW6y50pqbyc8r8SPXVsu2GNH98fB3VxrnvA==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -634,8 +510,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Xr1V3ZrSJByfUP4w+aiOAqC7Uzt1GqRXj35qSTQs9C1oI4gCiBN4wnre0SSvoA7vHQNZPGWNWXtiqbI7Cov3Mg==", + "resolved": "1.0.1", + "contentHash": "w0+37sCMzhZg4vhYFG+9TKmDW+Dks5DOiTrJzdnT8xJCfH1MK6xkRnIf+dBfxes0wFwPiKueaUWDcUsg1RnadQ==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -645,10 +521,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "1UiWYO+EjNZSFrL/SUElqmBo3TktG+XiCXm8oyXheEWz/CuZS2hhepYB4BDz7XAohUqt2/Hv7wpLiaauiaIFZg==", + "resolved": "1.0.1", + "contentHash": "zBVO6HOqyTfDj6YcITy1XtEiqRurFKUrIgLdJYVahhXlUnymn6/WmCuqkX1Z+3IKxy91D4LeF0KahH/rM8u6+w==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.0", + "Monai.Deploy.Messaging": "1.0.1", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -720,33 +596,34 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==", + "resolved": "2.21.0", + "contentHash": "QT+D1I3Jz6r6S6kCgJD1L9dRCLVJCKlkGRkA+tJ7uLpHRmjDNcNKy4D1T+L9gQrjl95lDN9PHdwEytdvCW/jzA==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==", + "resolved": "2.21.0", + "contentHash": "VxKj1wuhadiXhaXkykCWRgsYOysdaOYJ202hJFz25UjkrqC/tHA8RS4hdS5HYfGWoI//fypBXnxZCkEjXLXdfw==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Driver.Core": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0" + "MongoDB.Bson": "2.21.0", + "MongoDB.Driver.Core": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.19.0", - "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==", + "resolved": "2.21.0", + "contentHash": "Ac44U3bQfinmdH5KNFjTidJe9LKW87SxkXJ3YuIUJQMITEc4083YF1yvjJxaSeYF9er0YgHSmwhHpsZv0Fwplg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.100.14", "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "2.19.0", - "MongoDB.Libmongocrypt": "1.7.0", + "MongoDB.Bson": "2.21.0", + "MongoDB.Libmongocrypt": "1.8.0", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -755,8 +632,8 @@ }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.7.0", - "contentHash": "p9+peTZX63nGHskOLhvhfBtrknxNg1RzXepE07rPozuCGz27bMjCcQyvn2YByg0L3YEcNWdTmI4BlnG/5RF+5Q==" + "resolved": "1.8.0", + "contentHash": "fgNw8Dxpkq7mpoaAYes8cfnPRzvFIoB8oL9GPXwi3op/rONftl0WAeg4akRLcxfoVuUvuUO2wGoVBr3JzJ7Svw==" }, "NETStandard.Library": { "type": "Transitive", @@ -824,31 +701,31 @@ }, "NLog": { "type": "Transitive", - "resolved": "5.1.2", - "contentHash": "JfQY93ure3IPVTN3eabBewBGvrcXcWIlaesFEXdy5UzIymfIT9yCgLISYtM0cOhjWziIaUr/6Z9NC2RwtjwrsQ==" + "resolved": "5.2.4", + "contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ==" }, "NLog.Extensions.Logging": { "type": "Transitive", - "resolved": "5.2.2", - "contentHash": "V6sd+0Hrk2XlU//XbUizFYTE8Hf8+xFkhi81shIhsKl4tvWFUYmjBY/zBy/wlQCt0K6mfseaEKnayRJVhIz5Iw==", + "resolved": "5.3.4", + "contentHash": "rxUGUqhE3DlcKfKhPJOI0xOt8q2+NX0NkBY9lbRXwZEYQsh8ASFS8X7K+Y7/dcE8v0tpAe7GF8rPD5h4h9Hpsg==", "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", - "NLog": "5.1.2" + "NLog": "5.2.4" } }, "NLog.Web.AspNetCore": { "type": "Transitive", - "resolved": "5.2.2", - "contentHash": "0Qa6V7LXgbWNxYdZDLcQz/TjGrSfx32XThxAL+xoAtjplC2uCIhy27WiMIjznuMAJR3zjElIiYzMmPSsQ4LZSQ==", + "resolved": "5.3.4", + "contentHash": "80FaN8CKu94E3mZqZ+r46nRyEYgnHMn4i3vPslbaINs8k+TqJClNFYw6uWLhPU4AN7PKi/jHHzpswqn7K8jgGg==", "dependencies": { - "NLog.Extensions.Logging": "5.2.2" + "NLog.Extensions.Logging": "5.3.4" } }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.11.0", - "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" + "resolved": "6.5.0", + "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg==" }, "Polly": { "type": "Transitive", @@ -1805,10 +1682,10 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "OCUK9C/U97+UheVwo+JE+IUcKySUE3Oe+BcHhVtQrvmKSUFLrUDO8B5zEPRL6mBGbczxZp4w1boSck6/fw4dog==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.0.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encoding.Extensions": { @@ -1832,8 +1709,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==", + "resolved": "6.0.7", + "contentHash": "/Tf/9XjprpHolbcDOrxsKVYy/mUG/FS7aGd9YUgBVEiHeQH4kAE0T1sMbde7q6B5xcrNUsJ5iW7D1RvHudQNqA==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "6.0.0" @@ -1939,30 +1816,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" + "resolved": "1.2.0", + "contentHash": "d3dehV/DASLRlR8stWQmbPPjfYC2tct50Evav+OlsJMkfFqkhYvzO1k0s81lk0px8O0knZU/FqC8SqbXOtn+hw==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", + "resolved": "2.5.0", + "contentHash": "wN84pKX5jzfpgJ0bB6arrCA/oelBeYLCpnQ9Wj5xGEVPydKzVSDY5tEatFLHE/rO0+0RC+I4H5igGE118jRh1w==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", + "resolved": "2.5.0", + "contentHash": "dnV0Mn2s1C0y2m33AylQyMkEyhBQsL4R0302kwSGiEGuY3JwzEmhTa9pnghyMRPliYSs4fXfkEAP+5bKXryGFg==", "dependencies": { - "xunit.extensibility.core": "[2.4.2]", - "xunit.extensibility.execution": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]", + "xunit.extensibility.execution": "[2.5.0]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", + "resolved": "2.5.0", + "contentHash": "xRm6NIV3i7I+LkjsAJ91Xz2fxJm/oMEi2CYq1G5HlGTgcK1Zo2wNbLO6nKX1VG5FZzXibSdoLwr/MofVvh3mFA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1970,11 +1847,11 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.2", - "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", + "resolved": "2.5.0", + "contentHash": "7+v2Bvp+1ew1iMGQVb1glICi8jcNdHbRUX6Ru0dmJBViGdjiS7kyqcX2VxleQhFbKNi+WF0an7/TeTXD283RlQ==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.2]" + "xunit.extensibility.core": "[2.5.0]" } }, "ZstdSharp.Port": { @@ -1986,14 +1863,9 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", - "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.14, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[7.0.0, )", - "Microsoft.Extensions.Hosting": "[6.0.1, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[1.0.0, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.0, )", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.22, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.1, )", "Monai.Deploy.Security": "[0.1.3, )", - "Monai.Deploy.Storage": "[0.2.18, )", "Monai.Deploy.Storage.MinIO": "[0.2.18, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )", @@ -2004,9 +1876,8 @@ "Monai.Deploy.WorkflowManager.PayloadListener": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Services": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "NLog": "[5.1.2, )", - "NLog.Web.AspNetCore": "[5.2.2, )", - "Newtonsoft.Json": "[13.0.3, )", + "NLog": "[5.2.4, )", + "NLog.Web.AspNetCore": "[5.3.4, )", "Swashbuckle.AspNetCore": "[6.5.0, )" } }, @@ -2021,17 +1892,15 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.common.miscellaneous": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.1.1, )", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "[6.0.21, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", - "fo-dicom": "[5.0.3, )" + "fo-dicom": "[5.1.1, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { @@ -2046,9 +1915,9 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.0, )", + "Monai.Deploy.Messaging": "[1.0.1, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Bson": "[2.19.0, )" + "MongoDB.Bson": "[2.21.0, )" } }, "monai.deploy.workflowmanager.database": { @@ -2057,7 +1926,7 @@ "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Mongo.Migration": "[3.1.4, )", - "MongoDB.Driver": "[2.19.0, )" + "MongoDB.Driver": "[2.21.0, )" } }, "monai.deploy.workflowmanager.logging": { @@ -2086,7 +1955,7 @@ "monai.deploy.workflowmanager.services": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Http": "[3.1.0, )", + "Microsoft.Extensions.Http": "[6.0.0, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )" } From 26b31383854d86a82bb105da52984b11395c8a6e Mon Sep 17 00:00:00 2001 From: Neil South Date: Wed, 4 Oct 2023 11:21:08 +0100 Subject: [PATCH 10/18] stop new payload creation for continuing app Signed-off-by: Neil South --- .../Logging/Log.500000.Messaging.cs | 3 ++ .../Services/EventPayloadRecieverService.cs | 30 ++++++++++++------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/WorkflowManager/Logging/Log.500000.Messaging.cs b/src/WorkflowManager/Logging/Log.500000.Messaging.cs index a79eed69e..e25454a43 100644 --- a/src/WorkflowManager/Logging/Log.500000.Messaging.cs +++ b/src/WorkflowManager/Logging/Log.500000.Messaging.cs @@ -70,5 +70,8 @@ public static partial class Log [LoggerMessage(EventId = 200016, Level = LogLevel.Debug, Message = "Export complete message received.")] public static partial void ExportCompleteReceived(this ILogger logger); + + [LoggerMessage(EventId = 200017, Level = LogLevel.Debug, Message = "Workflow continuation event so not creating payload.")] + public static partial void WorkflowContinuation(this ILogger logger); } } diff --git a/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs index 67d781124..135e6e93f 100644 --- a/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs +++ b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs @@ -73,21 +73,29 @@ public async Task ReceiveWorkflowPayload(MessageReceivedEventArgs message) return; } - var payload = await PayloadService.CreateAsync(requestEvent); - if (payload is null) + if (string.IsNullOrWhiteSpace(requestEvent.WorkflowInstanceId) || string.IsNullOrWhiteSpace(requestEvent.TaskId)) { - Logger.WorkflowRequestRequeuePayloadCreateError(message.Message.MessageId); - await _messageSubscriber.RequeueWithDelay(message.Message); - return; - } + var payload = await PayloadService.CreateAsync(requestEvent); + if (payload is null) + { + Logger.WorkflowRequestRequeuePayloadCreateError(message.Message.MessageId); + await _messageSubscriber.RequeueWithDelay(message.Message); - if (!await WorkflowExecuterService.ProcessPayload(requestEvent, payload)) - { - Logger.WorkflowRequestRequeuePayloadProcessError(message.Message.MessageId); - await _messageSubscriber.RequeueWithDelay(message.Message); + return; + } - return; + if (!await WorkflowExecuterService.ProcessPayload(requestEvent, payload)) + { + Logger.WorkflowRequestRequeuePayloadProcessError(message.Message.MessageId); + await _messageSubscriber.RequeueWithDelay(message.Message); + + return; + } + } + else + { + Logger.WorkflowContinuation(); } _messageSubscriber.Acknowledge(message.Message); From a4c63accf1645bea1dfb591700f9daee970fcea8 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Thu, 5 Oct 2023 01:49:03 -0700 Subject: [PATCH 11/18] Print duration of callback app (#885) Signed-off-by: Victor Chang --- src/TaskManager/CallbackApp/app.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/TaskManager/CallbackApp/app.py b/src/TaskManager/CallbackApp/app.py index ec1806b63..1455dd453 100644 --- a/src/TaskManager/CallbackApp/app.py +++ b/src/TaskManager/CallbackApp/app.py @@ -15,6 +15,7 @@ import pika import uuid +from time import perf_counter as pc def main(): parser = argparse.ArgumentParser() @@ -50,4 +51,9 @@ def main(): print('Message sent.') if __name__ == "__main__": - main() + t0 = pc() + try: + main() + except Exception as e: + print(e) + print(f"Duration: {pc()-t0}") From 06fc826adcbd5549914f285276e6b32e5a97f967 Mon Sep 17 00:00:00 2001 From: Neil South Date: Thu, 5 Oct 2023 09:50:20 +0100 Subject: [PATCH 12/18] add test for create workflow message but with task and workflow Ids Signed-off-by: Neil South --- .../Services/PayloadListenerService.cs | 3 ++- .../EventPayloadRecieverServiceTests.cs | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs b/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs index be8a0fafe..119f0b386 100644 --- a/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs +++ b/src/WorkflowManager/PayloadListener/Services/PayloadListenerService.cs @@ -104,7 +104,8 @@ private void SetupPolling() _logger.EventSubscription(ServiceName, TaskStatusUpdateRoutingKey); _messageSubscriber.SubscribeAsync(ExportCompleteRoutingKey, ExportCompleteRoutingKey, OnExportCompleteReceivedCallback); - _logger.EventSubscription(ServiceName, ExportCompleteRoutingKey); } + _logger.EventSubscription(ServiceName, ExportCompleteRoutingKey); + } private async Task OnWorkflowRequestReceivedCallbackAsync(MessageReceivedEventArgs eventArgs) { diff --git a/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs b/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs index e3659da61..3ee331405 100644 --- a/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs +++ b/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs @@ -276,6 +276,28 @@ public void ExportCompletePayload_ErrorIsThrown_MessageIsRejectedAndRequeued() _mockMessageBrokerSubscriberService.VerifyNoOtherCalls(); } + [Test] + public void ReceiveWorkflowPayload_With_WorkflowId_And_TaskID() + { + + var exportRequestMessage = new WorkflowRequestEvent + { + CorrelationId = Guid.NewGuid().ToString(), + WorkflowInstanceId = Guid.NewGuid().ToString(), + TaskId = "exporttask" + }; + var jsonMessage = new JsonMessage(exportRequestMessage, MessageBrokerConfiguration.WorkflowManagerApplicationId, exportRequestMessage.CorrelationId); + var message = new MessageReceivedEventArgs(jsonMessage.ToMessage(), CancellationToken.None); + + _mockEventPayloadValidator.Setup(p => p.ValidateWorkflowRequest(It.IsAny())).Returns(true); + + _workflowExecuterService.Setup(p => p.ProcessPayload(It.IsAny(), It.IsAny())).ReturnsAsync(true); + + _eventPayloadReceiverService.ReceiveWorkflowPayload(message); + + _payloadService.Verify(p => p.CreateAsync(It.IsAny()), Times.Never()); + } + private static MessageReceivedEventArgs CreateMessageReceivedEventArgs(string[] destinations) { var exportRequestMessage = new ExportRequestEvent From e1b1a6d9e0ac949441fd6b934a44786dc5ae6e2c Mon Sep 17 00:00:00 2001 From: Neil South Date: Mon, 9 Oct 2023 11:18:05 +0100 Subject: [PATCH 13/18] adding more logging Signed-off-by: Neil South --- src/TaskManager/Plug-ins/Argo/ArgoClient.cs | 11 +++++++--- src/TaskManager/Plug-ins/Argo/ArgoProvider.cs | 7 ++++--- src/TaskManager/Plug-ins/Argo/Logging/Log.cs | 3 +++ src/TaskManager/TaskManager/Logging/Log.cs | 2 +- .../TaskManager.Argo.Tests/ArgoClientTest.cs | 21 +++++++++++-------- ...y.WorkflowManager.TaskManager.Tests.csproj | 1 + 6 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs index 5224afbbe..8f0aeb4a1 100755 --- a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs @@ -18,13 +18,14 @@ using System.Text; using Argo; using Ardalis.GuardClauses; - +using Microsoft.Extensions.Logging; +using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging; namespace Monai.Deploy.WorkflowManager.TaskManager.Argo { public class ArgoClient : BaseArgoClient, IArgoClient { - public ArgoClient(HttpClient httpClient) : base(httpClient) { } + public ArgoClient(HttpClient httpClient, ILogger logger) : base(httpClient, logger) { } public async Task Argo_CreateWorkflowAsync(string argoNamespace, WorkflowCreateRequest body, CancellationToken cancellationToken) { @@ -227,9 +228,11 @@ public class BaseArgoClient protected readonly HttpClient HttpClient; - public BaseArgoClient(HttpClient httpClient) + protected readonly ILogger Logger; + public BaseArgoClient(HttpClient httpClient, ILogger logger) { HttpClient = httpClient; + Logger = logger; } protected async Task SendRequest(StringContent stringContent, StringBuilder urlBuilder, string method, CancellationToken cancellationToken) @@ -246,6 +249,8 @@ protected async Task SendRequest(StringContent stringContent, StringBuilde request.RequestUri = new Uri(urlBuilder.ToString(), UriKind.RelativeOrAbsolute); HttpResponseMessage? response = null; + var logStringContent = stringContent == null ? string.Empty : await stringContent.ReadAsStringAsync(); + Logger.CallingArgoHttpInfo(request.RequestUri.ToString(), method, logStringContent); response = await HttpClient.SendAsync(request, HttpCompletionOption.ResponseContentRead, cancellationToken).ConfigureAwait(false); try diff --git a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs index 6a89f5de5..7251e4244 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs @@ -27,11 +27,12 @@ public class ArgoProvider : IArgoProvider { private readonly ILogger _logger; private readonly IHttpClientFactory _httpClientFactory; - - public ArgoProvider(ILogger logger, IHttpClientFactory httpClientFactory) + private readonly ILogger _argoClientLogger; + public ArgoProvider(ILogger logger, IHttpClientFactory httpClientFactory, ILogger argoClientLogger) { _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory)); + _argoClientLogger = argoClientLogger; } public IArgoClient CreateClient(string baseUrl, string? apiToken, bool allowInsecure = true) @@ -50,7 +51,7 @@ public IArgoClient CreateClient(string baseUrl, string? apiToken, bool allowInse { httpClient.SetBearerToken(apiToken); } - return new ArgoClient(httpClient) { BaseUrl = baseUrl }; + return new ArgoClient(httpClient, _argoClientLogger) { BaseUrl = baseUrl }; } } diff --git a/src/TaskManager/Plug-ins/Argo/Logging/Log.cs b/src/TaskManager/Plug-ins/Argo/Logging/Log.cs index 2b28b9092..c2ddb9365 100755 --- a/src/TaskManager/Plug-ins/Argo/Logging/Log.cs +++ b/src/TaskManager/Plug-ins/Argo/Logging/Log.cs @@ -80,5 +80,8 @@ public static partial class Log [LoggerMessage(EventId = 1019, Level = LogLevel.Error, Message = "Error deleting Template in Argo.")] public static partial void ErrorDeletingWorkflowTemplate(this ILogger logger, Exception ex); + [LoggerMessage(EventId = 1020, Level = LogLevel.Trace, Message = "Calling argo at url {url} : {method} : {stringContent}")] + public static partial void CallingArgoHttpInfo(this ILogger logger, string url, string method, string stringContent); + } } diff --git a/src/TaskManager/TaskManager/Logging/Log.cs b/src/TaskManager/TaskManager/Logging/Log.cs index 0edd98d22..d9919d38f 100644 --- a/src/TaskManager/TaskManager/Logging/Log.cs +++ b/src/TaskManager/TaskManager/Logging/Log.cs @@ -90,7 +90,7 @@ public static partial class Log [LoggerMessage(EventId = 109, Level = LogLevel.Warning, Message = "Unable to query for job status, no activate executor associated with execution ID={executionId}.")] public static partial void NoActiveExecutorWithTheId(this ILogger logger, string executionId); - [LoggerMessage(EventId = 110, Level = LogLevel.Error, Message = "Unsupported type of task runner: '{assemblyName}'.")] + [LoggerMessage(EventId = 110, Level = LogLevel.Error, Message = "Exception initialising task runner: '{assemblyName}'.")] public static partial void UnsupportedRunner(this ILogger logger, string assemblyName, Exception ex); [LoggerMessage(EventId = 111, Level = LogLevel.Debug, Message = "Sending acknowledgment message for {eventType}.")] diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoClientTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoClientTest.cs index 4c04bd75f..85fff1fbe 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoClientTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoClientTest.cs @@ -22,6 +22,7 @@ using System.Threading; using System.Threading.Tasks; using Argo; +using Microsoft.Extensions.Logging; using Moq; using Moq.Protected; using Xunit; @@ -30,6 +31,8 @@ namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests { public class ArgoClientTest { + private readonly Mock> _loggerMock = new Mock>(); + [Fact(DisplayName = "Argo_DeleteWorkflowTemplateAsync - Calls Send Async With Delete")] public async Task Argo_DeleteWorkflowTemplateAsync() { @@ -40,7 +43,7 @@ public async Task Argo_DeleteWorkflowTemplateAsync() var httpclient = new HttpClient(mockHttpMessageHandler.Object); - ArgoClient argoClient = new(httpclient); + ArgoClient argoClient = new(httpclient, _loggerMock.Object); var result = await argoClient.Argo_DeleteWorkflowTemplateAsync("test", "test", new CancellationToken(false)); @@ -69,7 +72,7 @@ public async Task Argo_GetVersionAsync() var httpclient = new HttpClient(mockHttpMessageHandler.Object); - ArgoClient argoClient = new(httpclient); + ArgoClient argoClient = new(httpclient, _loggerMock.Object); var result = await argoClient.Argo_GetVersionAsync(); @@ -95,7 +98,7 @@ public async Task Argo_CreateWorkflowAsync() var httpclient = new HttpClient(mockHttpMessageHandler.Object); - ArgoClient argoClient = new(httpclient); + ArgoClient argoClient = new(httpclient, _loggerMock.Object); var result = await argoClient.Argo_CreateWorkflowAsync( "argo", @@ -118,7 +121,7 @@ public async Task Argo_GetWorkflowAsync() var httpclient = new HttpClient(mockHttpMessageHandler.Object); - ArgoClient argoClient = new(httpclient); + ArgoClient argoClient = new(httpclient, _loggerMock.Object); var result = await argoClient.Argo_GetWorkflowAsync("argo", "name", "version", "fields", CancellationToken.None); @@ -139,7 +142,7 @@ public async Task Argo_StopWorkflowAsync() var httpclient = new HttpClient(mockHttpMessageHandler.Object); - ArgoClient argoClient = new(httpclient); + ArgoClient argoClient = new(httpclient, _loggerMock.Object); var result = await argoClient.Argo_StopWorkflowAsync("argo", "name", new WorkflowStopRequest { Namespace = "argo" }); @@ -160,7 +163,7 @@ public async Task Argo_TerminateWorkflowAsync() var httpclient = new HttpClient(mockHttpMessageHandler.Object); - ArgoClient argoClient = new(httpclient); + ArgoClient argoClient = new(httpclient, _loggerMock.Object); var result = await argoClient.Argo_TerminateWorkflowAsync("argo", "name", new WorkflowTerminateRequest { Namespace = "argo" }); @@ -181,7 +184,7 @@ public async Task Argo_GetWorkflowTemplateAsync() var httpclient = new HttpClient(mockHttpMessageHandler.Object); - ArgoClient argoClient = new(httpclient); + ArgoClient argoClient = new(httpclient, _loggerMock.Object); var result = await argoClient.Argo_GetWorkflowTemplateAsync("argo", "name", "options"); @@ -201,7 +204,7 @@ public async Task Argo_Get_WorkflowLogsAsync() var httpclient = new HttpClient(mockHttpMessageHandler.Object); - ArgoClient argoClient = new(httpclient); + ArgoClient argoClient = new(httpclient, _loggerMock.Object); var result = await argoClient.Argo_Get_WorkflowLogsAsync("argo", "name", "pod", "options"); @@ -221,7 +224,7 @@ public async Task Argo_CreateWorkflowTemplateAsync() var httpclient = new HttpClient(mockHttpMessageHandler.Object); - ArgoClient argoClient = new(httpclient); + ArgoClient argoClient = new(httpclient, _loggerMock.Object); var result = await argoClient.Argo_CreateWorkflowTemplateAsync("argo", new WorkflowTemplateCreateRequest { Namespace = "argo", Template = new WorkflowTemplate() }, diff --git a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj index 3adbde4d5..93ab06266 100644 --- a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj +++ b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj @@ -41,6 +41,7 @@ + From 414bd7efda77d0b144a1bbc2dbe0e10dbba165fe Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 10 Oct 2023 15:59:04 +0100 Subject: [PATCH 14/18] fix status setting Signed-off-by: Neil South --- src/TaskManager/Plug-ins/Argo/ArgoClient.cs | 8 +- src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 24 ++-- src/TaskManager/Plug-ins/Argo/ArgoProvider.cs | 8 +- src/TaskManager/Plug-ins/Argo/Logging/Log.cs | 3 + src/TaskManager/TaskManager/Logging/Log.cs | 3 + src/TaskManager/TaskManager/TaskManager.cs | 21 +++- .../Logging/Log.200000.Workflow.cs | 2 +- .../MonaiBackgroundService/Worker.cs | 13 -- .../Services/WorkflowExecuterService.cs | 34 ++--- .../WorkerTests.cs | 1 + .../TaskManager.Argo.Tests/ArgoClientTest.cs | 8 +- .../ArgoProviderTest.cs | 2 +- .../Services/WorkflowExecuterServiceTests.cs | 116 ++++++++++++++++++ 13 files changed, 189 insertions(+), 54 deletions(-) diff --git a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs index b3a737331..2d960f3fe 100755 --- a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs @@ -25,7 +25,7 @@ namespace Monai.Deploy.WorkflowManager.TaskManager.Argo { public class ArgoClient : BaseArgoClient, IArgoClient { - public ArgoClient(HttpClient httpClient, ILogger logger) : base(httpClient, logger) { } + public ArgoClient(HttpClient httpClient, ILoggerFactory logger) : base(httpClient, logger) { } public async Task Argo_CreateWorkflowAsync(string argoNamespace, WorkflowCreateRequest body, CancellationToken cancellationToken) { @@ -232,11 +232,11 @@ public class BaseArgoClient protected readonly HttpClient HttpClient; - protected readonly ILogger Logger; - public BaseArgoClient(HttpClient httpClient, ILogger logger) + protected readonly ILogger Logger; + public BaseArgoClient(HttpClient httpClient, ILoggerFactory loggerFactory) { HttpClient = httpClient; - Logger = logger; + Logger = loggerFactory.CreateLogger("BaseArgoClient"); } protected async Task SendRequest(StringContent stringContent, StringBuilder urlBuilder, string method, CancellationToken cancellationToken) diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index d276c1f70..6a23eb3d9 100755 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -902,18 +902,24 @@ private async ValueTask DisposeAsyncCore() public override async Task HandleTimeout(string identity) { var client = _argoProvider.CreateClient(_baseUrl, _apiToken, _allowInsecure); - - await client.Argo_StopWorkflowAsync(_namespace, identity, new WorkflowStopRequest + try { - Namespace = _namespace, - Name = identity, - }); + await client.Argo_StopWorkflowAsync(_namespace, identity, new WorkflowStopRequest + { + Namespace = _namespace, + Name = identity, + }); - await client.Argo_TerminateWorkflowAsync(_namespace, identity, new WorkflowTerminateRequest + await client.Argo_TerminateWorkflowAsync(_namespace, identity, new WorkflowTerminateRequest + { + Name = identity, + Namespace = _namespace + }); + } + catch (Exception ex) { - Name = identity, - Namespace = _namespace - }); + _logger.ExecptionStoppingArgoWorkflow(identity, ex); + } } public async Task CreateArgoTemplate(string template) diff --git a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs index 3ad8aa51f..1631c4fd2 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs @@ -27,12 +27,12 @@ public class ArgoProvider : IArgoProvider { private readonly ILogger _logger; private readonly IHttpClientFactory _httpClientFactory; - private readonly ILogger _argoClientLogger; - public ArgoProvider(ILogger logger, IHttpClientFactory httpClientFactory, ILogger argoClientLogger) + private readonly ILoggerFactory _logFactory; + public ArgoProvider(ILogger logger, IHttpClientFactory httpClientFactory, ILoggerFactory logFactory) { _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory)); - _argoClientLogger = argoClientLogger; + _logFactory = logFactory; } public IArgoClient CreateClient(string baseUrl, string? apiToken, bool allowInsecure = true) @@ -51,7 +51,7 @@ public IArgoClient CreateClient(string baseUrl, string? apiToken, bool allowInse { httpClient.SetBearerToken(apiToken); } - return new ArgoClient(httpClient, _argoClientLogger) { BaseUrl = baseUrl }; + return new ArgoClient(httpClient, _logFactory) { BaseUrl = baseUrl }; } } diff --git a/src/TaskManager/Plug-ins/Argo/Logging/Log.cs b/src/TaskManager/Plug-ins/Argo/Logging/Log.cs index c2ddb9365..000f1175f 100755 --- a/src/TaskManager/Plug-ins/Argo/Logging/Log.cs +++ b/src/TaskManager/Plug-ins/Argo/Logging/Log.cs @@ -83,5 +83,8 @@ public static partial class Log [LoggerMessage(EventId = 1020, Level = LogLevel.Trace, Message = "Calling argo at url {url} : {method} : {stringContent}")] public static partial void CallingArgoHttpInfo(this ILogger logger, string url, string method, string stringContent); + [LoggerMessage(EventId = 1021, Level = LogLevel.Debug, Message = "Exception stopping argo workflow {workflowId}, does it exist?")] + public static partial void ExecptionStoppingArgoWorkflow(this ILogger logger, string workflowId, Exception ex); + } } diff --git a/src/TaskManager/TaskManager/Logging/Log.cs b/src/TaskManager/TaskManager/Logging/Log.cs index d9919d38f..46662a5b8 100644 --- a/src/TaskManager/TaskManager/Logging/Log.cs +++ b/src/TaskManager/TaskManager/Logging/Log.cs @@ -122,5 +122,8 @@ public static partial class Log [LoggerMessage(EventId = 120, Level = LogLevel.Error, Message = "Recovering connection to storage service: {reason}.")] public static partial void MessagingServiceErrorRecover(this ILogger logger, string reason); + + [LoggerMessage(EventId = 121, Level = LogLevel.Error, Message = "Exception handling task : '{assemblyName}' timeout.")] + public static partial void ExectionTimingOutTask(this ILogger logger, string assemblyName, Exception ex); } } diff --git a/src/TaskManager/TaskManager/TaskManager.cs b/src/TaskManager/TaskManager/TaskManager.cs index 7cdfe9453..f3c499504 100644 --- a/src/TaskManager/TaskManager/TaskManager.cs +++ b/src/TaskManager/TaskManager/TaskManager.cs @@ -181,6 +181,7 @@ private async Task TaskDispatchEventReceivedCallback(MessageReceivedEventArgs ar private async Task TaskCancelationEventCallback(MessageReceivedEventArgs args) { + // Cancelation just stops running tasks and does Not set any status await TaskCallBackGeneric(args, HandleCancellationTask); } @@ -240,6 +241,7 @@ private async Task HandleCancellationTask(JsonMessage mes } var pluginAssembly = string.Empty; + ITaskPlugin? taskRunner = null; try { var taskExecution = await _taskDispatchEventService.GetByTaskExecutionIdAsync(message.Body.ExecutionId).ConfigureAwait(false); @@ -250,10 +252,7 @@ private async Task HandleCancellationTask(JsonMessage mes throw new InvalidOperationException("Task Event data not found."); } - var taskRunner = typeof(ITaskPlugin).CreateInstance(serviceProvider: _scope.ServiceProvider, typeString: pluginAssembly, _serviceScopeFactory, taskExecEvent); - await taskRunner.HandleTimeout(message.Body.Identity); - - AcknowledgeMessage(message); + taskRunner = typeof(ITaskPlugin).CreateInstance(serviceProvider: _scope.ServiceProvider, typeString: pluginAssembly, _serviceScopeFactory, taskExecEvent); } catch (Exception ex) { @@ -261,6 +260,20 @@ private async Task HandleCancellationTask(JsonMessage mes await HandleMessageException(message, message.Body.WorkflowInstanceId, message.Body.TaskId, message.Body.ExecutionId, false).ConfigureAwait(false); return; } + + try + { + await taskRunner.HandleTimeout(message.Body.Identity); + } + catch (Exception ex) + { + // Ignoring exception here as we've asked for the task to be stopped. + _logger.ExectionTimingOutTask(pluginAssembly, ex); + } + finally + { + AcknowledgeMessage(message); + } } private async Task HandleTaskCallback(JsonMessage message) diff --git a/src/WorkflowManager/Logging/Log.200000.Workflow.cs b/src/WorkflowManager/Logging/Log.200000.Workflow.cs index 637062c9f..b93da4732 100644 --- a/src/WorkflowManager/Logging/Log.200000.Workflow.cs +++ b/src/WorkflowManager/Logging/Log.200000.Workflow.cs @@ -60,7 +60,7 @@ public static partial class Log [LoggerMessage(EventId = 200012, Level = LogLevel.Error, Message = "The following task: {taskId} in workflow {workflowInstanceId} is currently timed out and not processing anymore updates, timed out at {timedOut}.")] public static partial void TaskTimedOut(this ILogger logger, string taskId, string workflowInstanceId, DateTime timedOut); - [LoggerMessage(EventId = 200013, Level = LogLevel.Critical, Message = "Workflow `{workflowId}` not found.")] + [LoggerMessage(EventId = 200013, Level = LogLevel.Critical, Message = "Workflow `{workflowId}` not found or is deleted.")] public static partial void WorkflowNotFound(this ILogger logger, string workflowId); [LoggerMessage(EventId = 200014, Level = LogLevel.Error, Message = "The task execution status for task {taskId} cannot be updated from {oldStatus} to {newStatus}. Payload: {payloadId}")] diff --git a/src/WorkflowManager/MonaiBackgroundService/Worker.cs b/src/WorkflowManager/MonaiBackgroundService/Worker.cs index a786f587d..be73ac393 100644 --- a/src/WorkflowManager/MonaiBackgroundService/Worker.cs +++ b/src/WorkflowManager/MonaiBackgroundService/Worker.cs @@ -93,19 +93,6 @@ private async Task PublishCancellationEvent(TaskExecution task, string correlati { _logger.TimingOutTaskCancellationEvent(identity, task.WorkflowInstanceId); - var updateEvent = EventMapper.GenerateTaskUpdateEvent(new GenerateTaskUpdateEventParams - { - CorrelationId = correlationId, - ExecutionId = task.ExecutionId, - WorkflowInstanceId = workflowInstanceId, - TaskId = task.TaskId, - TaskExecutionStatus = TaskExecutionStatus.Failed, - FailureReason = FailureReason.TimedOut, - Stats = task.ExecutionStats - }); - - updateEvent.Validate(); - var cancellationEvent = EventMapper.GenerateTaskCancellationEvent( identity, task.ExecutionId, diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index bd6c1fab1..01ba4bdc0 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -58,7 +58,7 @@ public class WorkflowExecuterService : IWorkflowExecuterService private string TaskDispatchRoutingKey { get; } private string ExportRequestRoutingKey { get; } - private string TaskTimeoutRoutingKey { get; } + private string ClinicalReviewTimeoutRoutingKey { get; } public WorkflowExecuterService( ILogger logger, @@ -88,7 +88,7 @@ public WorkflowExecuterService( _defaultTaskTimeoutMinutes = configuration.Value.TaskTimeoutMinutes; _defaultPerTaskTypeTimeoutMinutes = configuration.Value.PerTaskTypeTimeoutMinutes; TaskDispatchRoutingKey = configuration.Value.Messaging.Topics.TaskDispatchRequest; - TaskTimeoutRoutingKey = configuration.Value.Messaging.Topics.AideClinicalReviewCancelation; + ClinicalReviewTimeoutRoutingKey = configuration.Value.Messaging.Topics.AideClinicalReviewCancelation; _migExternalAppPlugins = configuration.Value.MigExternalAppPlugins.ToList(); ExportRequestRoutingKey = $"{configuration.Value.Messaging.Topics.ExportRequestPrefix}.{configuration.Value.Messaging.DicomAgents.ScuAgentName}"; @@ -305,18 +305,9 @@ public async Task ProcessTaskUpdate(TaskUpdateEvent message) if (message.Reason == FailureReason.TimedOut && currentTask.Status == TaskExecutionStatus.Failed) { _logger.TaskTimedOut(message.TaskId, message.WorkflowInstanceId, currentTask.Timeout); - await TimeOutEvent(workflowInstance, currentTask, message.CorrelationId); + await ClinicalReviewTimeOutEvent(workflowInstance, currentTask, message.CorrelationId); - return false; - } - - var workflow = await _workflowRepository.GetByWorkflowIdAsync(workflowInstance.WorkflowId); - - if (workflow is null) - { - _logger.WorkflowNotFound(workflowInstance.WorkflowId); - - return false; + //return false; } if (!message.Status.IsTaskExecutionStatusUpdateValid(currentTask.Status)) @@ -344,6 +335,15 @@ public async Task ProcessTaskUpdate(TaskUpdateEvent message) return await HandleUpdatingTaskStatus(currentTask, workflowInstance.WorkflowId, message.Status); } + var workflow = await _workflowRepository.GetByWorkflowIdAsync(workflowInstance.WorkflowId); + + if (workflow is null) + { + _logger.WorkflowNotFound(workflowInstance.WorkflowId); + + return false; + } + var isValid = await HandleOutputArtifacts(workflowInstance, message.Outputs, currentTask, workflow); if (isValid is false) @@ -808,13 +808,13 @@ private async Task ExportRequest(WorkflowInstance workflowInstance, TaskEx return true; } - private async Task TimeOutEvent(WorkflowInstance workflowInstance, TaskExecution taskExec, string correlationId) + private async Task ClinicalReviewTimeOutEvent(WorkflowInstance workflowInstance, TaskExecution taskExec, string correlationId) { - var exportRequestEvent = EventMapper.GenerateTaskCancellationEvent("", taskExec.ExecutionId, workflowInstance.Id, taskExec.TaskId, FailureReason.TimedOut, "Timed out"); - var jsonMesssage = new JsonMessage(exportRequestEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, correlationId, Guid.NewGuid().ToString()); + var cancelationRequestEvent = EventMapper.GenerateTaskCancellationEvent("", taskExec.ExecutionId, workflowInstance.Id, taskExec.TaskId, FailureReason.TimedOut, "Timed out"); + var jsonMesssage = new JsonMessage(cancelationRequestEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, correlationId, Guid.NewGuid().ToString()); _logger.TaskTimedOut(taskExec.TaskId, workflowInstance.Id, taskExec.Timeout); - await _messageBrokerPublisherService.Publish(TaskTimeoutRoutingKey, jsonMesssage.ToMessage()); + await _messageBrokerPublisherService.Publish(ClinicalReviewTimeoutRoutingKey, jsonMesssage.ToMessage()); return true; } diff --git a/tests/UnitTests/MonaiBackgroundService.Tests/WorkerTests.cs b/tests/UnitTests/MonaiBackgroundService.Tests/WorkerTests.cs index c43505742..bd715e18c 100644 --- a/tests/UnitTests/MonaiBackgroundService.Tests/WorkerTests.cs +++ b/tests/UnitTests/MonaiBackgroundService.Tests/WorkerTests.cs @@ -83,6 +83,7 @@ public async Task MonaiBackgroundService_DoWork_ShouldPublishMessages() // Verify DoWork publishes TaskCancellationRequest _pubService.Verify(p => p.Publish(It.Is(m => m == _options.Value.Messaging.Topics.TaskCancellationRequest), It.IsAny()), Times.Once()); + // Verify DoWork publishes TaskUpdateRequest _pubService.Verify(p => p.Publish(It.Is(m => m == _options.Value.Messaging.Topics.TaskUpdateRequest), It.IsAny()), Times.Once()); diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoClientTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoClientTest.cs index 85fff1fbe..9848ff406 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoClientTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoClientTest.cs @@ -31,11 +31,17 @@ namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests { public class ArgoClientTest { - private readonly Mock> _loggerMock = new Mock>(); + private readonly Mock _loggerMock = new Mock(); + + public ArgoClientTest() + { + _loggerMock.Setup(l => l.CreateLogger(It.IsAny())).Returns(new Mock().Object); + } [Fact(DisplayName = "Argo_DeleteWorkflowTemplateAsync - Calls Send Async With Delete")] public async Task Argo_DeleteWorkflowTemplateAsync() { + _loggerMock.Setup(l => l.CreateLogger(It.IsAny())).Returns(new Mock().Object); var mockHttpMessageHandler = new Mock(); mockHttpMessageHandler.Protected() .Setup>("SendAsync", ItExpr.IsAny(), ItExpr.IsAny()) diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs index 9d2ff83d2..81c79239a 100755 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs @@ -62,7 +62,7 @@ public async Task GeneratesArgoClientWithApiToken() logger.Setup(p => p.IsEnabled(It.IsAny())).Returns(true); httpFactory.Setup(p => p.CreateClient(It.IsAny())).Returns(httpClient); - var argo = new ArgoProvider(logger.Object, httpFactory.Object); + var argo = new ArgoProvider(logger.Object, httpFactory.Object, new Mock().Object); var client = argo.CreateClient(baseUri, token) as ArgoClient; diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs index 6d318ff17..4e0551a39 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs @@ -2838,6 +2838,122 @@ public async Task ProcessPayload_With_WorkflowInstanceId_Continues() _workflowRepository.Verify(w => w.GetByWorkflowsIdsAsync(It.IsAny>()), Times.Never()); _workflowRepository.Verify(w => w.GetWorkflowsForWorkflowRequestAsync(It.IsAny(), It.IsAny()), Times.Never); } + + [Fact] + public async Task ProcessTaskUpdate_Timout_Sends_Sets_WorkflowInstanceStatus() + { + var workflowInstanceId = Guid.NewGuid().ToString(); + + var metadata = new Dictionary(); + metadata.Add("a", "b"); + + var updateEvent = new TaskUpdateEvent + { + WorkflowInstanceId = workflowInstanceId, + TaskId = "pizza", + ExecutionId = Guid.NewGuid().ToString(), + Status = TaskExecutionStatus.Failed, + Reason = FailureReason.TimedOut, + Message = "This is a message", + Metadata = metadata, + CorrelationId = Guid.NewGuid().ToString() + }; + + var workflowId = Guid.NewGuid().ToString(); + + var workflow = new WorkflowRevision + { + Id = Guid.NewGuid().ToString(), + WorkflowId = workflowId, + Revision = 1, + Workflow = new Workflow + { + Name = "Workflowname2", + Description = "Workflowdesc2", + Version = "1", + } + }; + + var workflowInstance = new WorkflowInstance + { + Id = workflowInstanceId, + WorkflowId = workflowId, + WorkflowName = workflow.Workflow.Name, + PayloadId = Guid.NewGuid().ToString(), + Status = Status.Created, + BucketId = "bucket", + Tasks = new List + { + new TaskExecution + { + TaskId = "pizza", + Status = TaskExecutionStatus.Created + } + } + }; + + _workflowInstanceRepository.Setup(w => w.GetByWorkflowInstanceIdAsync(workflowInstance.Id)).ReturnsAsync(workflowInstance); + var response = await WorkflowExecuterService.ProcessTaskUpdate(updateEvent); + _workflowInstanceRepository.Verify(r => r.UpdateWorkflowInstanceStatusAsync(It.IsAny(), Status.Failed), Times.AtLeastOnce); + } + + [Fact] + public async Task ProcessTaskUpdate_Timout_Sends_Sets_Task_Status() + { + var workflowInstanceId = Guid.NewGuid().ToString(); + + var metadata = new Dictionary(); + metadata.Add("a", "b"); + + var updateEvent = new TaskUpdateEvent + { + WorkflowInstanceId = workflowInstanceId, + TaskId = "pizza", + ExecutionId = Guid.NewGuid().ToString(), + Status = TaskExecutionStatus.Failed, + Reason = FailureReason.TimedOut, + Message = "This is a message", + Metadata = metadata, + CorrelationId = Guid.NewGuid().ToString() + }; + + var workflowId = Guid.NewGuid().ToString(); + + var workflow = new WorkflowRevision + { + Id = Guid.NewGuid().ToString(), + WorkflowId = workflowId, + Revision = 1, + Workflow = new Workflow + { + Name = "Workflowname2", + Description = "Workflowdesc2", + Version = "1", + } + }; + + var workflowInstance = new WorkflowInstance + { + Id = workflowInstanceId, + WorkflowId = workflowId, + WorkflowName = workflow.Workflow.Name, + PayloadId = Guid.NewGuid().ToString(), + Status = Status.Created, + BucketId = "bucket", + Tasks = new List + { + new TaskExecution + { + TaskId = "pizza", + Status = TaskExecutionStatus.Accepted + } + } + }; + + _workflowInstanceRepository.Setup(w => w.GetByWorkflowInstanceIdAsync(workflowInstance.Id)).ReturnsAsync(workflowInstance); + var response = await WorkflowExecuterService.ProcessTaskUpdate(updateEvent); + _workflowInstanceRepository.Verify(r => r.UpdateTaskStatusAsync(workflowInstance.Id, "pizza", TaskExecutionStatus.Failed), Times.Once); + } } #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type. } From b482888c7c3dab3161331631ee102bb6ddcf3e24 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 10 Oct 2023 16:31:05 +0100 Subject: [PATCH 15/18] fix upo index for status Signed-off-by: Neil South --- src/WorkflowManager/Database/Repositories/TasksRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WorkflowManager/Database/Repositories/TasksRepository.cs b/src/WorkflowManager/Database/Repositories/TasksRepository.cs index 7fdd540a4..00c9c7332 100755 --- a/src/WorkflowManager/Database/Repositories/TasksRepository.cs +++ b/src/WorkflowManager/Database/Repositories/TasksRepository.cs @@ -68,7 +68,7 @@ private static async Task EnsureIndex(IMongoCollection workflo Name = "TasksIndex" }; var model = new CreateIndexModel( - Builders.IndexKeys.Ascending(s => s.Tasks), + Builders.IndexKeys.Ascending($"{nameof(WorkflowInstance.Tasks)}.{nameof(Task.Status)}"), options ); From ee57b9a321b4ffd1d612f42cab2813b2e26b9b9c Mon Sep 17 00:00:00 2001 From: Neil South Date: Wed, 11 Oct 2023 10:11:08 +0100 Subject: [PATCH 16/18] added additional exception to handle 404 Signed-off-by: Neil South --- src/TaskManager/Plug-ins/Argo/ArgoClient.cs | 37 ++++++++++++++++- src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 7 +++- .../ArgoWorkflowNotFoundException.cs | 41 +++++++++++++++++++ .../ArtifactMappingNotFoundException.cs | 2 +- .../TemplateNotFoundException.cs | 2 +- 5 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 src/TaskManager/Plug-ins/Argo/Exceptions/ArgoWorkflowNotFoundException.cs rename src/TaskManager/Plug-ins/Argo/{ => Exceptions}/ArtifactMappingNotFoundException.cs (94%) rename src/TaskManager/Plug-ins/Argo/{ => Exceptions}/TemplateNotFoundException.cs (95%) diff --git a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs index 2d960f3fe..a3b32f11c 100755 --- a/src/TaskManager/Plug-ins/Argo/ArgoClient.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoClient.cs @@ -20,6 +20,8 @@ using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging; +using System.Net; +using Monai.Deploy.WorkflowManager.TaskManager.Argo.Exceptions; namespace Monai.Deploy.WorkflowManager.TaskManager.Argo { @@ -78,7 +80,23 @@ public async Task Argo_StopWorkflowAsync(string argoNamespace, string const string method = "PUT"; var content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body)); - return await SendRequest(content, urlBuilder, method, new CancellationToken()).ConfigureAwait(false); + try + { + return await SendRequest(content, urlBuilder, method, new CancellationToken()).ConfigureAwait(false); + } + catch (ApiException ex) + { + if (ex.StatusCode == (int)HttpStatusCode.NotFound) + { + throw new ArgoWorkflowNotFoundException(body.Name, ex); + } + throw; + } + catch (Exception) + { + throw; + } + } @@ -93,7 +111,22 @@ public async Task Argo_TerminateWorkflowAsync(string argoNamespace, st const string method = "PUT"; var content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body)); - return await SendRequest(content, urlBuilder, method, new CancellationToken()).ConfigureAwait(false); + try + { + return await SendRequest(content, urlBuilder, method, new CancellationToken()).ConfigureAwait(false); + } + catch (ApiException ex) + { + if (ex.StatusCode == (int)HttpStatusCode.NotFound) + { + throw new ArgoWorkflowNotFoundException(body.Name, ex); + } + throw; + } + catch (Exception) + { + throw; + } } public async Task Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptionsResourceVersion) diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index 6a23eb3d9..0999872ed 100755 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -30,6 +30,7 @@ using Monai.Deploy.WorkflowManager.TaskManager.API.Models; using Monai.Deploy.WorkflowManager.TaskManager.Argo.Logging; using Newtonsoft.Json; +using Monai.Deploy.WorkflowManager.TaskManager.Argo.Exceptions; [assembly: PlugIn()] namespace Monai.Deploy.WorkflowManager.TaskManager.Argo @@ -916,10 +917,14 @@ public override async Task HandleTimeout(string identity) Namespace = _namespace }); } - catch (Exception ex) + catch (ArgoWorkflowNotFoundException ex) { _logger.ExecptionStoppingArgoWorkflow(identity, ex); } + catch (Exception) + { + throw; + } } public async Task CreateArgoTemplate(string template) diff --git a/src/TaskManager/Plug-ins/Argo/Exceptions/ArgoWorkflowNotFoundException.cs b/src/TaskManager/Plug-ins/Argo/Exceptions/ArgoWorkflowNotFoundException.cs new file mode 100644 index 000000000..ad6dc88d6 --- /dev/null +++ b/src/TaskManager/Plug-ins/Argo/Exceptions/ArgoWorkflowNotFoundException.cs @@ -0,0 +1,41 @@ +/* + * 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.Runtime.Serialization; + +namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.Exceptions +{ + [Serializable] + public class ArgoWorkflowNotFoundException : Exception + { + public ArgoWorkflowNotFoundException(string argoWorkflowName) + : base($"Argo workflow '{argoWorkflowName}' not found.") + { + } + + public ArgoWorkflowNotFoundException(string? message, Exception? innerException) : base(message, innerException) + { + } + + protected ArgoWorkflowNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) + { + } + + public ArgoWorkflowNotFoundException() + { + } + } +} diff --git a/src/TaskManager/Plug-ins/Argo/ArtifactMappingNotFoundException.cs b/src/TaskManager/Plug-ins/Argo/Exceptions/ArtifactMappingNotFoundException.cs similarity index 94% rename from src/TaskManager/Plug-ins/Argo/ArtifactMappingNotFoundException.cs rename to src/TaskManager/Plug-ins/Argo/Exceptions/ArtifactMappingNotFoundException.cs index 71254eaf9..b5685de53 100644 --- a/src/TaskManager/Plug-ins/Argo/ArtifactMappingNotFoundException.cs +++ b/src/TaskManager/Plug-ins/Argo/Exceptions/ArtifactMappingNotFoundException.cs @@ -16,7 +16,7 @@ using System.Runtime.Serialization; -namespace Monai.Deploy.WorkflowManager.TaskManager.Argo +namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.Exceptions { [Serializable] public class ArtifactMappingNotFoundException : Exception diff --git a/src/TaskManager/Plug-ins/Argo/TemplateNotFoundException.cs b/src/TaskManager/Plug-ins/Argo/Exceptions/TemplateNotFoundException.cs similarity index 95% rename from src/TaskManager/Plug-ins/Argo/TemplateNotFoundException.cs rename to src/TaskManager/Plug-ins/Argo/Exceptions/TemplateNotFoundException.cs index 316645e8c..154042a4c 100644 --- a/src/TaskManager/Plug-ins/Argo/TemplateNotFoundException.cs +++ b/src/TaskManager/Plug-ins/Argo/Exceptions/TemplateNotFoundException.cs @@ -16,7 +16,7 @@ using System.Runtime.Serialization; -namespace Monai.Deploy.WorkflowManager.TaskManager.Argo +namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.Exceptions { [Serializable] public class TemplateNotFoundException : Exception From 1099d4269c3526ad8d23c8d829071c341a3c3e0c Mon Sep 17 00:00:00 2001 From: Neil South Date: Wed, 11 Oct 2023 10:27:01 +0100 Subject: [PATCH 17/18] removed commented out line Signed-off-by: Neil South --- .../WorkflowExecuter/Services/WorkflowExecuterService.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 01ba4bdc0..35531ab0c 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -306,8 +306,6 @@ public async Task ProcessTaskUpdate(TaskUpdateEvent message) { _logger.TaskTimedOut(message.TaskId, message.WorkflowInstanceId, currentTask.Timeout); await ClinicalReviewTimeOutEvent(workflowInstance, currentTask, message.CorrelationId); - - //return false; } if (!message.Status.IsTaskExecutionStatusUpdateValid(currentTask.Status)) From a664dbff395cafb5ded11b0e6423456ca33383b1 Mon Sep 17 00:00:00 2001 From: Neil South Date: Wed, 11 Oct 2023 10:33:22 +0100 Subject: [PATCH 18/18] removed a single space Signed-off-by: Neil South --- src/TaskManager/TaskManager/TaskManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaskManager/TaskManager/TaskManager.cs b/src/TaskManager/TaskManager/TaskManager.cs index f3c499504..a51fee4c7 100644 --- a/src/TaskManager/TaskManager/TaskManager.cs +++ b/src/TaskManager/TaskManager/TaskManager.cs @@ -267,7 +267,7 @@ private async Task HandleCancellationTask(JsonMessage mes } catch (Exception ex) { - // Ignoring exception here as we've asked for the task to be stopped. + // Ignoring exception here as we've asked for the task to be stopped. _logger.ExectionTimingOutTask(pluginAssembly, ex); } finally