From ab3de0922dac3a7350ff9dccc19afb7f6fb38221 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 24 Oct 2023 09:16:41 +0100 Subject: [PATCH 1/5] passing payloadId Signed-off-by: Neil South --- src/Common/Configuration/packages.lock.json | 6 +++--- src/Common/Miscellaneous/packages.lock.json | 6 +++--- src/TaskManager/API/packages.lock.json | 6 +++--- src/TaskManager/Database/packages.lock.json | 6 +++--- .../AideClinicalReview/packages.lock.json | 8 ++++---- src/TaskManager/Plug-ins/Argo/packages.lock.json | 8 ++++---- src/TaskManager/TaskManager/packages.lock.json | 16 ++++++++-------- src/WorkflowManager/Database/packages.lock.json | 6 +++--- src/WorkflowManager/Logging/packages.lock.json | 6 +++--- .../PayloadListener/packages.lock.json | 8 ++++---- src/WorkflowManager/Services/packages.lock.json | 8 ++++---- src/WorkflowManager/Storage/packages.lock.json | 6 +++--- .../Services/WorkflowExecuterService.cs | 1 + .../WorkflowExecuter/packages.lock.json | 8 ++++---- .../WorkflowManager/packages.lock.json | 16 ++++++++-------- .../WorkflowManager.Tests/packages.lock.json | 16 ++++++++-------- 16 files changed, 66 insertions(+), 65 deletions(-) diff --git a/src/Common/Configuration/packages.lock.json b/src/Common/Configuration/packages.lock.json index dbb1fbf67..9b81a27cf 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.3, )", - "resolved": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "requested": "[1.0.4-rc0004, )", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "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 da4a0f6d4..156d83d0d 100644 --- a/src/Common/Miscellaneous/packages.lock.json +++ b/src/Common/Miscellaneous/packages.lock.json @@ -146,8 +146,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -236,7 +236,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Monai.Deploy.Storage": "[0.2.18, )" } } diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json index 84b3026f5..c4109ebc5 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.3, )", - "resolved": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "requested": "[1.0.4-rc0004, )", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "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 cb614df2e..718449c02 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": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -684,7 +684,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "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 4ac7874b0..436cf58f3 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -258,8 +258,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -733,7 +733,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -747,7 +747,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index fb671ea54..1c046e257 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -368,8 +368,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -871,7 +871,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -885,7 +885,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index 6ed57946e..44c966651 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -25,11 +25,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[1.0.1, )", - "resolved": "1.0.1", - "contentHash": "zBVO6HOqyTfDj6YcITy1XtEiqRurFKUrIgLdJYVahhXlUnymn6/WmCuqkX1Z+3IKxy91D4LeF0KahH/rM8u6+w==", + "requested": "[1.0.4-rc0004, )", + "resolved": "1.0.4-rc0004", + "contentHash": "eai16hRZ0Z7wqbsWaX5ISg4av2FlLLyDf3JpxEu+YelyAdhXLaaLZqRhDlQo6xqLih6x5Xtrnl71pwIWh9TT4Q==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.1", + "Monai.Deploy.Messaging": "1.0.4-rc0004", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -537,8 +537,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -1138,7 +1138,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -1160,7 +1160,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index 7be6e4fd3..fa3309f2e 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": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -685,7 +685,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index ccb0e5dd3..9a0530623 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.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -641,7 +641,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index d7a0d44f8..49ead2d52 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -270,8 +270,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -779,7 +779,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -802,7 +802,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/Services/packages.lock.json b/src/WorkflowManager/Services/packages.lock.json index 5a6b2cf09..a81305259 100644 --- a/src/WorkflowManager/Services/packages.lock.json +++ b/src/WorkflowManager/Services/packages.lock.json @@ -249,8 +249,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -733,14 +733,14 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index 73027d62d..3cf78ef1a 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.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -675,7 +675,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 137a62fcf..99eaa964d 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -856,6 +856,7 @@ private async Task DispatchTask(WorkflowInstance workflowInstance, Workflo private async Task ExportRequest(WorkflowInstance workflowInstance, TaskExecution taskExec, string[] exportDestinations, IList dicomImages, string correlationId, List plugins) { var exportRequestEvent = EventMapper.ToExportRequestEvent(dicomImages, exportDestinations, taskExec.TaskId, workflowInstance.Id, correlationId, plugins); + exportRequestEvent.PayloadId = workflowInstance.PayloadId; var jsonMesssage = new JsonMessage(exportRequestEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, exportRequestEvent.CorrelationId, Guid.NewGuid().ToString()); await _messageBrokerPublisherService.Publish(ExportRequestRoutingKey, jsonMesssage.ToMessage()); diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index ce5c56316..991443e25 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -270,8 +270,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -779,7 +779,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -802,7 +802,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 4f9aa46de..45a0ed862 100755 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -25,11 +25,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[1.0.1, )", - "resolved": "1.0.1", - "contentHash": "zBVO6HOqyTfDj6YcITy1XtEiqRurFKUrIgLdJYVahhXlUnymn6/WmCuqkX1Z+3IKxy91D4LeF0KahH/rM8u6+w==", + "requested": "[1.0.4-rc0004, )", + "resolved": "1.0.4-rc0004", + "contentHash": "eai16hRZ0Z7wqbsWaX5ISg4av2FlLLyDf3JpxEu+YelyAdhXLaaLZqRhDlQo6xqLih6x5Xtrnl71pwIWh9TT4Q==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.1", + "Monai.Deploy.Messaging": "1.0.4-rc0004", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -485,8 +485,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -1059,7 +1059,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -1082,7 +1082,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 4221e8991..187d8c26d 100755 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -510,8 +510,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "DoQrTyztAGmOafiPNhxZ44D50Qcbqv4W94N9LxofyhW2NgSqMOKMbS+6FcomMsCKlLC1E3dyoYdZF8GFunwKUw==", + "resolved": "1.0.4-rc0004", + "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -521,10 +521,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.1", - "contentHash": "zBVO6HOqyTfDj6YcITy1XtEiqRurFKUrIgLdJYVahhXlUnymn6/WmCuqkX1Z+3IKxy91D4LeF0KahH/rM8u6+w==", + "resolved": "1.0.4-rc0004", + "contentHash": "eai16hRZ0Z7wqbsWaX5ISg4av2FlLLyDf3JpxEu+YelyAdhXLaaLZqRhDlQo6xqLih6x5Xtrnl71pwIWh9TT4Q==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.1", + "Monai.Deploy.Messaging": "1.0.4-rc0004", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1864,7 +1864,7 @@ "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.22, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.1, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.4-rc0004, )", "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage.MinIO": "[0.2.18, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", @@ -1892,7 +1892,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -1915,7 +1915,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.3, )", + "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } From f579d854cb0775bd1a0d4c116bad022db3d3365a Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 24 Oct 2023 10:08:52 +0100 Subject: [PATCH 2/5] upping messaging version Signed-off-by: Neil South --- .../Monai.Deploy.WorkflowManager.Common.Configuration.csproj | 2 +- .../API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj | 2 +- .../Monai.Deploy.WorkflowManager.TaskManager.csproj | 2 +- .../Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj | 2 +- .../WorkflowManager/Monai.Deploy.WorkflowManager.csproj | 2 +- ...Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj | 4 ++-- ...y.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj index fc873f3f3..753a96965 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/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj index 80f27b78f..f80432744 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/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index afb6add9c..96bbe4f48 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -61,7 +61,7 @@ true - + true diff --git a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index 3bafa6ceb..a74357ec0 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/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 0eba7a786..ff67cdff5 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -46,7 +46,7 @@ true - + true 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 d605f7556..31ad01917 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/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj index 28b700d71..53051d2d0 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 @@ - - + + From 78c6e2e06d6f13a31adaed5746551f58fd552b51 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 24 Oct 2023 10:20:25 +0100 Subject: [PATCH 3/5] adding new messaging Signed-off-by: Neil South --- doc/dependency_decisions.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index c3e20f3bc..8b72e4e40 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -762,6 +762,8 @@ :versions: - 1.0.1 - 1.0.3 + - 1.0.4-rc0004 + - 1.0.4 :when: 2023-29-08 21:43:10.781625468 Z - - :approve - Monai.Deploy.Messaging.RabbitMQ @@ -770,6 +772,8 @@ :versions: - 1.0.1 - 1.0.3 + - 1.0.4-rc0004 + - 1.0.4 :when: 2023-29-08 21:43:20.975488411 Z - - :approve - Monai.Deploy.Security From 19c0ba139b4cdce81dadaed92ef167b2c3a70bb5 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 24 Oct 2023 11:15:24 +0100 Subject: [PATCH 4/5] update messaging lib Signed-off-by: Neil South --- doc/dependency_decisions.yml | 6 ++---- ...y.WorkflowManager.Common.Configuration.csproj | 2 +- src/Common/Configuration/packages.lock.json | 6 +++--- src/Common/Miscellaneous/packages.lock.json | 6 +++--- ...Deploy.WorkflowManager.TaskManager.API.csproj | 2 +- src/TaskManager/API/packages.lock.json | 6 +++--- src/TaskManager/Database/packages.lock.json | 6 +++--- .../AideClinicalReview/packages.lock.json | 8 ++++---- src/TaskManager/Plug-ins/Argo/packages.lock.json | 8 ++++---- ...nai.Deploy.WorkflowManager.TaskManager.csproj | 2 +- src/TaskManager/TaskManager/packages.lock.json | 16 ++++++++-------- ...Monai.Deploy.WorkflowManager.Contracts.csproj | 2 +- src/WorkflowManager/Database/packages.lock.json | 6 +++--- src/WorkflowManager/Logging/packages.lock.json | 6 +++--- .../PayloadListener/packages.lock.json | 8 ++++---- src/WorkflowManager/Services/packages.lock.json | 8 ++++---- src/WorkflowManager/Storage/packages.lock.json | 6 +++--- .../WorkflowExecuter/packages.lock.json | 8 ++++---- .../Monai.Deploy.WorkflowManager.csproj | 2 +- .../WorkflowManager/packages.lock.json | 16 ++++++++-------- ...owManager.TaskManager.IntegrationTests.csproj | 4 ++-- ...ager.WorkflowExecutor.IntegrationTests.csproj | 4 ++-- .../WorkflowManager.Tests/packages.lock.json | 16 ++++++++-------- 23 files changed, 76 insertions(+), 78 deletions(-) diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 8b72e4e40..9cba1da9f 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -762,9 +762,8 @@ :versions: - 1.0.1 - 1.0.3 - - 1.0.4-rc0004 - 1.0.4 - :when: 2023-29-08 21:43:10.781625468 Z + :when: 2023-24-10 11:43:10.781625468 Z - - :approve - Monai.Deploy.Messaging.RabbitMQ - :who: neildsouth @@ -772,9 +771,8 @@ :versions: - 1.0.1 - 1.0.3 - - 1.0.4-rc0004 - 1.0.4 - :when: 2023-29-08 21:43:20.975488411 Z + :when: 2023-24-10 11:43:20.975488411 Z - - :approve - Monai.Deploy.Security - :who: lillie-dae diff --git a/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj b/src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj index 753a96965..60bcb55a2 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 9b81a27cf..185e07f7a 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.4-rc0004, )", - "resolved": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "requested": "[1.0.4, )", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "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 156d83d0d..533255609 100644 --- a/src/Common/Miscellaneous/packages.lock.json +++ b/src/Common/Miscellaneous/packages.lock.json @@ -146,8 +146,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -236,7 +236,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "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 f80432744..8c3ba19cd 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 c4109ebc5..616240540 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.4-rc0004, )", - "resolved": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "requested": "[1.0.4, )", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "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 718449c02..d2b62f9dc 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": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -684,7 +684,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "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 436cf58f3..38d3aec6f 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -258,8 +258,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -733,7 +733,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -747,7 +747,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 1c046e257..caa66d3de 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -368,8 +368,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -871,7 +871,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -885,7 +885,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index 96bbe4f48..bb3074898 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -61,7 +61,7 @@ true - + true diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index 44c966651..4682facfe 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -25,11 +25,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[1.0.4-rc0004, )", - "resolved": "1.0.4-rc0004", - "contentHash": "eai16hRZ0Z7wqbsWaX5ISg4av2FlLLyDf3JpxEu+YelyAdhXLaaLZqRhDlQo6xqLih6x5Xtrnl71pwIWh9TT4Q==", + "requested": "[1.0.4, )", + "resolved": "1.0.4", + "contentHash": "2llZ4XbE91Km2Q+JEKSSeTyhZLWRq3lN5xQ6+Klqow3V8SXBAlOQQ+b5//BEm6x0QdoycFberMOVAsZYYM0j7g==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.4-rc0004", + "Monai.Deploy.Messaging": "1.0.4", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -537,8 +537,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -1138,7 +1138,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -1160,7 +1160,7 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/WorkflowManager/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index a74357ec0..a988250e4 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 fa3309f2e..c755c997f 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": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -685,7 +685,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index 9a0530623..3d96aac6b 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.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -641,7 +641,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index 49ead2d52..8f48895f8 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -270,8 +270,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -779,7 +779,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -802,7 +802,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/Services/packages.lock.json b/src/WorkflowManager/Services/packages.lock.json index a81305259..5e228295f 100644 --- a/src/WorkflowManager/Services/packages.lock.json +++ b/src/WorkflowManager/Services/packages.lock.json @@ -249,8 +249,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -733,14 +733,14 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index 3cf78ef1a..0cf7faadc 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.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -675,7 +675,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index 991443e25..759e2a5d7 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -270,8 +270,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -779,7 +779,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -802,7 +802,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index ff67cdff5..90f183156 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -46,7 +46,7 @@ true - + true diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 45a0ed862..c93952e86 100755 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -25,11 +25,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[1.0.4-rc0004, )", - "resolved": "1.0.4-rc0004", - "contentHash": "eai16hRZ0Z7wqbsWaX5ISg4av2FlLLyDf3JpxEu+YelyAdhXLaaLZqRhDlQo6xqLih6x5Xtrnl71pwIWh9TT4Q==", + "requested": "[1.0.4, )", + "resolved": "1.0.4", + "contentHash": "2llZ4XbE91Km2Q+JEKSSeTyhZLWRq3lN5xQ6+Klqow3V8SXBAlOQQ+b5//BEm6x0QdoycFberMOVAsZYYM0j7g==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.4-rc0004", + "Monai.Deploy.Messaging": "1.0.4", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -485,8 +485,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -1059,7 +1059,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -1082,7 +1082,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.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 31ad01917..a937adff8 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/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj index 53051d2d0..2027038fd 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/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 187d8c26d..2f0ed7fc1 100755 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -510,8 +510,8 @@ }, "Monai.Deploy.Messaging": { "type": "Transitive", - "resolved": "1.0.4-rc0004", - "contentHash": "FrNe2mwf7gj5aylCYQ0af5Adv8/xQRRPDPFBp1a/sZP1m9TlWtjjwheDR0HVWjTq4M8LUpKzvt55mhQJxHld7w==", + "resolved": "1.0.4", + "contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==", "dependencies": { "Ardalis.GuardClauses": "4.1.1", "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21", @@ -521,10 +521,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "1.0.4-rc0004", - "contentHash": "eai16hRZ0Z7wqbsWaX5ISg4av2FlLLyDf3JpxEu+YelyAdhXLaaLZqRhDlQo6xqLih6x5Xtrnl71pwIWh9TT4Q==", + "resolved": "1.0.4", + "contentHash": "2llZ4XbE91Km2Q+JEKSSeTyhZLWRq3lN5xQ6+Klqow3V8SXBAlOQQ+b5//BEm6x0QdoycFberMOVAsZYYM0j7g==", "dependencies": { - "Monai.Deploy.Messaging": "1.0.4-rc0004", + "Monai.Deploy.Messaging": "1.0.4", "Polly": "7.2.4", "RabbitMQ.Client": "6.5.0" } @@ -1864,7 +1864,7 @@ "dependencies": { "AspNetCore.HealthChecks.MongoDb": "[6.0.2, )", "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.22, )", - "Monai.Deploy.Messaging.RabbitMQ": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging.RabbitMQ": "[1.0.4, )", "Monai.Deploy.Security": "[0.1.3, )", "Monai.Deploy.Storage.MinIO": "[0.2.18, )", "Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )", @@ -1892,7 +1892,7 @@ "monai.deploy.workflowmanager.common.configuration": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Monai.Deploy.Storage": "[0.2.18, )" } }, @@ -1915,7 +1915,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[1.0.4-rc0004, )", + "Monai.Deploy.Messaging": "[1.0.4, )", "Mongo.Migration": "[3.1.4, )", "MongoDB.Bson": "[2.21.0, )" } From b2889133da9dc58a2f629b2f7cdf73e7db8d5632 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 24 Oct 2023 11:55:54 +0100 Subject: [PATCH 5/5] fixing up tests Signed-off-by: Neil South --- .../Services/EventPayloadRecieverServiceTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs b/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs index 07a21d24b..a274b90e1 100644 --- a/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs +++ b/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs @@ -365,6 +365,7 @@ private static MessageReceivedEventArgs CreateMessageReceivedEventArgs(string[] Files = new[] { "file1" }, MessageId = Guid.NewGuid().ToString(), WorkflowInstanceId = Guid.NewGuid().ToString(), + PayloadId = Guid.NewGuid().ToString() }; var jsonMessage = new JsonMessage(exportRequestMessage, MessageBrokerConfiguration.WorkflowManagerApplicationId, exportRequestMessage.CorrelationId, exportRequestMessage.DeliveryTag);