From 4c8c62fa24236397f222b1a07e2f2e761f417c0c Mon Sep 17 00:00:00 2001 From: Jack Schofield Date: Fri, 2 Sep 2022 14:07:26 +0100 Subject: [PATCH 1/7] fix misc issues Signed-off-by: Jack Schofield --- ...eploy.WorkflowManager.Configuration.csproj | 2 +- src/Shared/Configuration/packages.lock.json | 61 +++-- ...loy.WorkflowManager.TaskManager.API.csproj | 2 +- src/TaskManager/API/packages.lock.json | 63 ++++-- src/TaskManager/Database/packages.lock.json | 63 ++++-- .../AideClinicalReview/packages.lock.json | 67 ++++-- src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 4 +- ...oy.WorkflowManager.TaskManager.Argo.csproj | 2 +- .../Plug-ins/Argo/packages.lock.json | 83 ++++--- ....Deploy.WorkflowManager.TaskManager.csproj | 4 +- .../Services/TaskDispatchEventService.cs | 2 +- src/TaskManager/TaskManager/TaskManager.cs | 2 +- .../TaskManager/appsettings.Development.json | 9 +- .../TaskManager/appsettings.Local.json | 7 +- src/TaskManager/TaskManager/appsettings.json | 8 +- .../TaskManager/packages.lock.json | 101 +++++---- .../Database/packages.lock.json | 14 +- .../Logging/packages.lock.json | 8 + ...loy.WorkflowManager.PayloadListener.csproj | 2 +- .../PayloadListener/packages.lock.json | 118 ++++++---- ...onai.Deploy.WorkflowManager.Storage.csproj | 2 +- .../Storage/packages.lock.json | 62 +++-- .../WorkflowExecuter/Common/ArtifactMapper.cs | 22 +- ...loy.WorkloadManager.WorkfowExecuter.csproj | 2 +- .../Services/WorkflowExecuterService.cs | 13 +- .../WorkflowExecuter/packages.lock.json | 120 ++++++---- .../Monai.Deploy.WorkflowManager.csproj | 2 +- .../appsettings.Development.json | 2 + .../WorkflowManager/appsettings.Local.json | 6 +- .../WorkflowManager/appsettings.json | 2 + .../WorkflowManager/packages.lock.json | 167 +++++++------- ...anager.TaskManager.IntegrationTests.csproj | 2 +- ...r.WorkflowExecutor.IntegrationTests.csproj | 2 +- .../WorkflowManager.Tests/packages.lock.json | 211 ++++++++++-------- 34 files changed, 792 insertions(+), 445 deletions(-) diff --git a/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj index 5849a80ae..7971b7a9f 100644 --- a/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj +++ b/src/Shared/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/Shared/Configuration/packages.lock.json b/src/Shared/Configuration/packages.lock.json index 1120e420c..a430661b4 100644 --- a/src/Shared/Configuration/packages.lock.json +++ b/src/Shared/Configuration/packages.lock.json @@ -64,15 +64,16 @@ }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.1, )", - "resolved": "0.2.1", - "contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==", + "requested": "[0.2.5, )", + "resolved": "0.2.5", + "contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.1", + "Monai.Deploy.Storage.S3Policy": "0.2.5", "System.IO.Abstractions": "17.1.1" } }, @@ -98,15 +99,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.21", - "contentHash": "nKa0w3u+VKVJB6joat/mX7KtQFCVHkwpyLaE/og1eATe3mzSdiWC58YUlPTB3MqV/ng0/6uc9ih0H0kCt20a6A==" + "resolved": "3.7.12.26", + "contentHash": "Axc3mHH1B+KChD4soiFnolvVxD8dVKeEsVFQ0jOxn+VBhHEizUd3oNq0id/AFYkJL6hdC3NGmbs0Y4OGtT5eEg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.185", - "contentHash": "YAQx6PWkaX1woe4MPDqfpwTXitq+rreIbq0HecG1hMpMzFGCSBMyarTEOqrxnloDyPaVntzLFX64MtdcQRiQSQ==", + "resolved": "3.7.1.190", + "contentHash": "6njZoO/BBDWIAeN5DrIjZdQXOt6SSpE+x1A8JRWC9moyz3sqwU3l4uePZSpDyrQuLre+dkj1088Z62u9HX6FpQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.21, 4.0.0)" + "AWSSDK.Core": "[3.7.12.26, 4.0.0)" } }, "JetBrains.Annotations": { @@ -144,12 +145,28 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "kahEeykb6FyQytoZNNXuz74X85B4weIEt8Kd+0klK48bkXDWOIHAOvNjlGsPMcS9CL935Te8QGQS83JqCbpdHA==", + "resolved": "6.0.0", + "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", "dependencies": { - "Microsoft.Extensions.Primitives": "3.0.0" + "Microsoft.Extensions.Primitives": "6.0.0" } }, "Microsoft.Extensions.FileProviders.Physical": { @@ -166,10 +183,20 @@ "resolved": "3.0.0", "contentHash": "E1GcUu8JvY/8QfqMUYTs6HlDLefMYhEzeHsjrhRqOZguBmDTFU8d8m+mGtHEyYHWMRT1TEiha0a8I2AuozDUWQ==" }, - "Microsoft.Extensions.Logging.Abstractions": { + "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==" + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -201,8 +228,8 @@ }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==", + "resolved": "0.2.5", + "contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj index 5ed064375..28e2f0bcc 100644 --- a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj +++ b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj @@ -34,7 +34,7 @@ - + diff --git a/src/TaskManager/API/packages.lock.json b/src/TaskManager/API/packages.lock.json index f4097c9be..ba41a921d 100644 --- a/src/TaskManager/API/packages.lock.json +++ b/src/TaskManager/API/packages.lock.json @@ -19,15 +19,16 @@ }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.1, )", - "resolved": "0.2.1", - "contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==", + "requested": "[0.2.5, )", + "resolved": "0.2.5", + "contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.1", + "Monai.Deploy.Storage.S3Policy": "0.2.5", "System.IO.Abstractions": "17.1.1" } }, @@ -50,15 +51,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.21", - "contentHash": "nKa0w3u+VKVJB6joat/mX7KtQFCVHkwpyLaE/og1eATe3mzSdiWC58YUlPTB3MqV/ng0/6uc9ih0H0kCt20a6A==" + "resolved": "3.7.12.26", + "contentHash": "Axc3mHH1B+KChD4soiFnolvVxD8dVKeEsVFQ0jOxn+VBhHEizUd3oNq0id/AFYkJL6hdC3NGmbs0Y4OGtT5eEg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.185", - "contentHash": "YAQx6PWkaX1woe4MPDqfpwTXitq+rreIbq0HecG1hMpMzFGCSBMyarTEOqrxnloDyPaVntzLFX64MtdcQRiQSQ==", + "resolved": "3.7.1.190", + "contentHash": "6njZoO/BBDWIAeN5DrIjZdQXOt6SSpE+x1A8JRWC9moyz3sqwU3l4uePZSpDyrQuLre+dkj1088Z62u9HX6FpQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.21, 4.0.0)" + "AWSSDK.Core": "[3.7.12.26, 4.0.0)" } }, "JetBrains.Annotations": { @@ -97,6 +98,40 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + } + }, "Microsoft.Extensions.Logging": { "type": "Transitive", "resolved": "6.0.0", @@ -111,8 +146,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==" + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -133,8 +168,8 @@ }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==", + "resolved": "0.2.5", + "contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json index 1b1c170cc..4093d3619 100644 --- a/src/TaskManager/Database/packages.lock.json +++ b/src/TaskManager/Database/packages.lock.json @@ -49,15 +49,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.21", - "contentHash": "nKa0w3u+VKVJB6joat/mX7KtQFCVHkwpyLaE/og1eATe3mzSdiWC58YUlPTB3MqV/ng0/6uc9ih0H0kCt20a6A==" + "resolved": "3.7.12.26", + "contentHash": "Axc3mHH1B+KChD4soiFnolvVxD8dVKeEsVFQ0jOxn+VBhHEizUd3oNq0id/AFYkJL6hdC3NGmbs0Y4OGtT5eEg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.185", - "contentHash": "YAQx6PWkaX1woe4MPDqfpwTXitq+rreIbq0HecG1hMpMzFGCSBMyarTEOqrxnloDyPaVntzLFX64MtdcQRiQSQ==", + "resolved": "3.7.1.190", + "contentHash": "6njZoO/BBDWIAeN5DrIjZdQXOt6SSpE+x1A8JRWC9moyz3sqwU3l4uePZSpDyrQuLre+dkj1088Z62u9HX6FpQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.21, 4.0.0)" + "AWSSDK.Core": "[3.7.12.26, 4.0.0)" } }, "DnsClient": { @@ -104,6 +104,40 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + } + }, "Microsoft.Extensions.Logging": { "type": "Transitive", "resolved": "6.0.0", @@ -154,21 +188,22 @@ }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==", + "resolved": "0.2.5", + "contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.1", + "Monai.Deploy.Storage.S3Policy": "0.2.5", "System.IO.Abstractions": "17.1.1" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==", + "resolved": "0.2.5", + "contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" @@ -265,9 +300,9 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "MongoDB.Bson": "[2.17.1, )" + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "MongoDB.Bson": "2.17.1" } } } diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json index 1673f0ca2..04a3a9ec9 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json +++ b/src/TaskManager/Plug-ins/AideClinicalReview/packages.lock.json @@ -12,15 +12,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.21", - "contentHash": "nKa0w3u+VKVJB6joat/mX7KtQFCVHkwpyLaE/og1eATe3mzSdiWC58YUlPTB3MqV/ng0/6uc9ih0H0kCt20a6A==" + "resolved": "3.7.12.26", + "contentHash": "Axc3mHH1B+KChD4soiFnolvVxD8dVKeEsVFQ0jOxn+VBhHEizUd3oNq0id/AFYkJL6hdC3NGmbs0Y4OGtT5eEg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.185", - "contentHash": "YAQx6PWkaX1woe4MPDqfpwTXitq+rreIbq0HecG1hMpMzFGCSBMyarTEOqrxnloDyPaVntzLFX64MtdcQRiQSQ==", + "resolved": "3.7.1.190", + "contentHash": "6njZoO/BBDWIAeN5DrIjZdQXOt6SSpE+x1A8JRWC9moyz3sqwU3l4uePZSpDyrQuLre+dkj1088Z62u9HX6FpQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.21, 4.0.0)" + "AWSSDK.Core": "[3.7.12.26, 4.0.0)" } }, "JetBrains.Annotations": { @@ -59,6 +59,40 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + } + }, "Microsoft.Extensions.Logging": { "type": "Transitive", "resolved": "6.0.0", @@ -73,8 +107,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==" + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" }, "Microsoft.Extensions.Options": { "type": "Transitive", @@ -109,21 +143,22 @@ }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==", + "resolved": "0.2.5", + "contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.1", + "Monai.Deploy.Storage.S3Policy": "0.2.5", "System.IO.Abstractions": "17.1.1" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==", + "resolved": "0.2.5", + "contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" @@ -187,9 +222,9 @@ "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "MongoDB.Bson": "[2.17.1, )" + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "MongoDB.Bson": "2.17.1" } } } diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index 1a0c5114c..7af916ed2 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -416,7 +416,7 @@ private async Task AddExitHookTemplate(Workflow workflow, CancellationToken canc Guard.Against.Null(workflow, nameof(workflow)); var temporaryStore = Event.IntermediateStorage.Clone() as Messaging.Common.Storage; - temporaryStore!.RelativeRootPath = $"{temporaryStore.RelativeRootPath}/{{{{ workflow.name }}}}/messaging"; + temporaryStore!.RelativeRootPath = $"{temporaryStore.RelativeRootPath}/messaging"; var exitTemplateSteps = new Template2() { @@ -635,7 +635,7 @@ private Messaging.Common.Storage GenerateIntermediaryArtifactStore(string artifa } var storageInfo = Event.IntermediateStorage.Clone() as Messaging.Common.Storage; - storageInfo!.RelativeRootPath = $"{storageInfo.RelativeRootPath}/{{{{ workflow.name }}}}/{artifactName}"; + storageInfo!.RelativeRootPath = $"{storageInfo.RelativeRootPath}/{artifactName}"; _intermediaryArtifactStores.Add(artifactName, storageInfo); 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 1834589cb..579779051 100644 --- a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj +++ b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj @@ -34,7 +34,7 @@ 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 bb264a7f1..dc62f32dd 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -49,15 +49,16 @@ }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.1, )", - "resolved": "0.2.1", - "contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==", + "requested": "[0.2.5, )", + "resolved": "0.2.5", + "contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.1", + "Monai.Deploy.Storage.S3Policy": "0.2.5", "System.IO.Abstractions": "17.1.1" } }, @@ -86,15 +87,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.21", - "contentHash": "nKa0w3u+VKVJB6joat/mX7KtQFCVHkwpyLaE/og1eATe3mzSdiWC58YUlPTB3MqV/ng0/6uc9ih0H0kCt20a6A==" + "resolved": "3.7.12.26", + "contentHash": "Axc3mHH1B+KChD4soiFnolvVxD8dVKeEsVFQ0jOxn+VBhHEizUd3oNq0id/AFYkJL6hdC3NGmbs0Y4OGtT5eEg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.185", - "contentHash": "YAQx6PWkaX1woe4MPDqfpwTXitq+rreIbq0HecG1hMpMzFGCSBMyarTEOqrxnloDyPaVntzLFX64MtdcQRiQSQ==", + "resolved": "3.7.1.190", + "contentHash": "6njZoO/BBDWIAeN5DrIjZdQXOt6SSpE+x1A8JRWC9moyz3sqwU3l4uePZSpDyrQuLre+dkj1088Z62u9HX6FpQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.21, 4.0.0)" + "AWSSDK.Core": "[3.7.12.26, 4.0.0)" } }, "Fractions": { @@ -189,12 +190,28 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "kahEeykb6FyQytoZNNXuz74X85B4weIEt8Kd+0klK48bkXDWOIHAOvNjlGsPMcS9CL935Te8QGQS83JqCbpdHA==", + "resolved": "6.0.0", + "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", "dependencies": { - "Microsoft.Extensions.Primitives": "3.0.0" + "Microsoft.Extensions.Primitives": "6.0.0" } }, "Microsoft.Extensions.FileProviders.Physical": { @@ -211,6 +228,16 @@ "resolved": "3.0.0", "contentHash": "E1GcUu8JvY/8QfqMUYTs6HlDLefMYhEzeHsjrhRqOZguBmDTFU8d8m+mGtHEyYHWMRT1TEiha0a8I2AuozDUWQ==" }, + "Microsoft.Extensions.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" + } + }, "Microsoft.Extensions.Http": { "type": "Transitive", "resolved": "3.1.9", @@ -235,8 +262,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==" + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -310,8 +337,8 @@ }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==", + "resolved": "0.2.5", + "contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" @@ -525,22 +552,22 @@ "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.1.1" } }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "MongoDB.Bson": "[2.17.1, )" + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "MongoDB.Bson": "2.17.1" } } } diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index fb58c61be..fd7e7524c 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -53,9 +53,9 @@ - + - + diff --git a/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs b/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs index 3de7b74bd..ee4ab65ec 100644 --- a/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs +++ b/src/TaskManager/TaskManager/Services/TaskDispatchEventService.cs @@ -55,7 +55,7 @@ public TaskDispatchEventService(ITaskDispatchEventRepository taskDispatchEventRe try { - return await _taskDispatchEventRepository.CreateAsync(taskDispatchEvent).ConfigureAwait(false); + return await _taskDispatchEventRepository.UpdateUserAccountsAsync(taskDispatchEvent).ConfigureAwait(false); } finally { diff --git a/src/TaskManager/TaskManager/TaskManager.cs b/src/TaskManager/TaskManager/TaskManager.cs index a7441dfe2..5d18b0ecd 100644 --- a/src/TaskManager/TaskManager/TaskManager.cs +++ b/src/TaskManager/TaskManager/TaskManager.cs @@ -244,7 +244,7 @@ private async Task HandleTaskCallback(JsonMessage message) try { var executionStatus = await taskRunner.GetStatus(message.Body.Identity, _cancellationTokenSource.Token).ConfigureAwait(false); - updateMessage = GenerateUpdateEventMessage(message, message.Body.ExecutionId, message.Body.WorkflowInstanceId, message.Body.TaskId, executionStatus); + updateMessage = GenerateUpdateEventMessage(message, message.Body.ExecutionId, message.Body.WorkflowInstanceId, message.Body.TaskId, executionStatus, taskExecution.Event.Outputs); updateMessage.Body.Metadata.Add(Strings.JobIdentity, message.Body.Identity); foreach (var item in message.Body.Metadata) updateMessage.Body.Metadata.Add(item.Key, item.Value); diff --git a/src/TaskManager/TaskManager/appsettings.Development.json b/src/TaskManager/TaskManager/appsettings.Development.json index e3047c5a9..e9efe31e2 100644 --- a/src/TaskManager/TaskManager/appsettings.Development.json +++ b/src/TaskManager/TaskManager/appsettings.Development.json @@ -4,7 +4,8 @@ "DatabaseName": "WorkloadManager", "WorkflowCollectionName": "Workflows", "WorkflowInstanceCollectionName": "WorkflowInstances", - "PayloadCollectionName": "Payloads" + "PayloadCollectionName": "Payloads", + "TaskDispatchEventCollectionName": "TaskDispatchEvents" }, "WorkflowManager": { "endpointSettings": { @@ -27,9 +28,9 @@ "serviceAssemblyName": "Monai.Deploy.Storage.MinIO.MinIoStorageService, Monai.Deploy.Storage.MinIO", "settings": { "endpoint": "localhost:9000", - "accessKey": "minioadmin", - "accessToken": "minioadmin", - "bucket": "test-bucket", + "accessKey": "admin", + "accessToken": "password", + "bucket": "my-bucket", "region": "eu-west-2", "securedConnection": false, "executableLocation": "/.", diff --git a/src/TaskManager/TaskManager/appsettings.Local.json b/src/TaskManager/TaskManager/appsettings.Local.json index 29a4f2dc8..5b064b104 100644 --- a/src/TaskManager/TaskManager/appsettings.Local.json +++ b/src/TaskManager/TaskManager/appsettings.Local.json @@ -1,10 +1,11 @@ { "WorkloadManagerDatabase": { - "ConnectionString": "mongodb://root:rootpassword@localhost:30017", + "ConnectionString": "mongodb://root:rootpassword@localhost:27017", "DatabaseName": "WorkloadManager", "WorkflowCollectionName": "Workflows", "WorkflowInstanceCollectionName": "WorkflowInstances", - "PayloadCollectionName": "Payloads" + "PayloadCollectionName": "Payloads", + "TaskDispatchEventCollectionName": "TaskDispatchEvents" }, "WorkflowManager": { "endpointSettings": { @@ -29,7 +30,7 @@ "endpoint": "minio:9000", // note edit C:\Windows\System32\drivers\etc\Hosts and add `127.0.0.1 minio` "accessKey": "admin", "accessToken": "password", - "bucket": "test-bucket", + "bucket": "my-bucket", "region": "eu-west-2", "securedConnection": false, "executableLocation": "mc.exe", diff --git a/src/TaskManager/TaskManager/appsettings.json b/src/TaskManager/TaskManager/appsettings.json index bc3f2ce46..51e9ab126 100644 --- a/src/TaskManager/TaskManager/appsettings.json +++ b/src/TaskManager/TaskManager/appsettings.json @@ -43,6 +43,7 @@ "endpoint": "localhost", "username": "admin", "password": "admin", + "port": "30072", "virtualHost": "monaideploy", "exchange": "monaideploy", "deadLetterExchange": "deadLetterExchange", @@ -54,6 +55,7 @@ "endpoint": "localhost", "username": "admin", "password": "admin", + "port": "30072", "virtualHost": "monaideploy", "exchange": "monaideploy", "deadLetterExchange": "monaideploy-dead-letter", @@ -66,10 +68,10 @@ "serviceAssemblyName": "Monai.Deploy.Storage.MinIO.MinIoStorageService, Monai.Deploy.Storage.MinIO", "settings": { "endpoint": "localhost:9000", - "accessKey": "minioadmin", - "accessToken": "minioadmin", + "accessKey": "admin", + "accessToken": "password", "region": "eu-west-2", - "bucket": "test-bucket", + "bucket": "my-bucket", "securedConnection": false, "executableLocation": "mc", "serviceName": "test" diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index 2aeb560e9..1fdcf99bd 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -106,31 +106,32 @@ }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.1, )", - "resolved": "0.2.1", - "contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==", + "requested": "[0.2.5, )", + "resolved": "0.2.5", + "contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.1", + "Monai.Deploy.Storage.S3Policy": "0.2.5", "System.IO.Abstractions": "17.1.1" } }, "Monai.Deploy.Storage.MinIO": { "type": "Direct", - "requested": "[0.2.1, )", - "resolved": "0.2.1", - "contentHash": "0pMDS8ux1ZqxpGQ5qwDIkbjtARsvUhgfz94hNRcBoVY4kEAzAdEJAKkqR3iX8jWmZOV+CjV+vUt+j5B5ukJZPA==", + "requested": "[0.2.5, )", + "resolved": "0.2.5", + "contentHash": "WPGzHQ1cTM4TlGFq8vJv37I0kuumzRVRv1bwxVfmzWkEOTb1vm5uRy9bfOnq97VRQJZTzcLs+FRXU5Otbu1P2g==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", "Minio": "4.0.5", - "Monai.Deploy.Storage": "0.2.1", - "Monai.Deploy.Storage.S3Policy": "0.2.1" + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.Storage.S3Policy": "0.2.5" } }, "Ardalis.GuardClauses": { @@ -152,15 +153,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.21", - "contentHash": "nKa0w3u+VKVJB6joat/mX7KtQFCVHkwpyLaE/og1eATe3mzSdiWC58YUlPTB3MqV/ng0/6uc9ih0H0kCt20a6A==" + "resolved": "3.7.12.26", + "contentHash": "Axc3mHH1B+KChD4soiFnolvVxD8dVKeEsVFQ0jOxn+VBhHEizUd3oNq0id/AFYkJL6hdC3NGmbs0Y4OGtT5eEg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.185", - "contentHash": "YAQx6PWkaX1woe4MPDqfpwTXitq+rreIbq0HecG1hMpMzFGCSBMyarTEOqrxnloDyPaVntzLFX64MtdcQRiQSQ==", + "resolved": "3.7.1.190", + "contentHash": "6njZoO/BBDWIAeN5DrIjZdQXOt6SSpE+x1A8JRWC9moyz3sqwU3l4uePZSpDyrQuLre+dkj1088Z62u9HX6FpQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.21, 4.0.0)" + "AWSSDK.Core": "[3.7.12.26, 4.0.0)" } }, "Crc32.NET": { @@ -335,6 +336,22 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -512,8 +529,8 @@ }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==", + "resolved": "0.2.5", + "contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" @@ -1226,45 +1243,45 @@ "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.1.1" } }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "MongoDB.Bson": "[2.17.1, )" + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "MongoDB.Bson": "2.17.1" } }, "monai.deploy.workflowmanager.taskmanager.argo": { "type": "Project", "dependencies": { - "IdentityModel.OidcClient": "[5.0.2, )", - "KubernetesClient": "[7.2.19, )", - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )", - "Newtonsoft.Json": "[13.0.1, )" + "IdentityModel.OidcClient": "5.0.2", + "KubernetesClient": "7.2.19", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", + "Newtonsoft.Json": "13.0.1" } }, "monai.deploy.workflowmanager.taskmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )", - "MongoDB.Bson": "[2.17.1, )", - "MongoDB.Driver": "[2.17.1, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", + "MongoDB.Bson": "2.17.1", + "MongoDB.Driver": "2.17.1" } } } diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index 374d309e4..6ba0aa106 100644 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -807,19 +807,27 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { +<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", "Newtonsoft.Json": "[13.0.1, )" +======= + "AWSSDK.SecurityToken": "3.7.1.191", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" +>>>>>>> 723aa6b2 (fix misc issues) } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } } } diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index 3a9d39658..36b4fad40 100644 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -741,11 +741,19 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { +<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", "Newtonsoft.Json": "[13.0.1, )" +======= + "AWSSDK.SecurityToken": "3.7.1.191", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" +>>>>>>> 723aa6b2 (fix misc issues) } } } diff --git a/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj b/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj index 30e68fcfb..d18ef57c4 100644 --- a/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj +++ b/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index 888d9224d..2265ca29f 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -24,15 +24,16 @@ }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.1, )", - "resolved": "0.2.1", - "contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==", + "requested": "[0.2.5, )", + "resolved": "0.2.5", + "contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.1", + "Monai.Deploy.Storage.S3Policy": "0.2.5", "System.IO.Abstractions": "17.1.1" } }, @@ -304,6 +305,22 @@ "System.Linq": "4.1.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -429,8 +446,8 @@ }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==", + "resolved": "0.2.5", + "contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" @@ -879,78 +896,87 @@ "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.1.1" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { +<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", "Newtonsoft.Json": "[13.0.1, )" +======= + "AWSSDK.SecurityToken": "3.7.1.191", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" +>>>>>>> 723aa6b2 (fix misc issues) } }, "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "MongoDB.Bson": "[2.17.1, )", - "MongoDB.Driver": "[2.17.1, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "MongoDB.Bson": "2.17.1", + "MongoDB.Driver": "2.17.1" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0" } }, "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { +<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", @@ -963,6 +989,20 @@ "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )", "Newtonsoft.Json": "[13.0.1, )" +======= + "AWSSDK.SecurityToken": "3.7.1.191", + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0", + "Newtonsoft.Json": "13.0.1" +>>>>>>> 723aa6b2 (fix misc issues) } } } diff --git a/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj b/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj index 3cdf708ff..cfe0de90d 100644 --- a/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj +++ b/src/WorkflowManager/Storage/Monai.Deploy.WorkflowManager.Storage.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index 1a63b0be3..e341db33a 100644 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -13,15 +13,16 @@ }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.1, )", - "resolved": "0.2.1", - "contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==", + "requested": "[0.2.5, )", + "resolved": "0.2.5", + "contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.1", + "Monai.Deploy.Storage.S3Policy": "0.2.5", "System.IO.Abstractions": "17.1.1" } }, @@ -266,23 +267,38 @@ "System.Linq": "4.1.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "EcnaSsPTqx2MGnHrmWOD0ugbuuqVT8iICqSqPzi45V5/MA1LjUNb0kwgcxBGqizV1R+WeBK7/Gw25Jzkyk9bIw==", + "resolved": "6.0.0", + "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", "dependencies": { - "Microsoft.Extensions.Primitives": "2.2.0" + "Microsoft.Extensions.Primitives": "6.0.0" } }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "+k4AEn68HOJat5gj1TWa6X28WlirNQO9sPIIeQbia+91n03esEtMSSoekSTpMjUzjqtJWQN3McVx0GvSPFHF/Q==", + "resolved": "6.0.0", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "2.2.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", - "Microsoft.Extensions.FileProviders.Abstractions": "2.2.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0" + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" } }, "Microsoft.Extensions.Logging": { @@ -359,8 +375,8 @@ }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==", + "resolved": "0.2.5", + "contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" @@ -763,19 +779,27 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { +<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", "Newtonsoft.Json": "[13.0.1, )" +======= + "AWSSDK.SecurityToken": "3.7.1.191", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" +>>>>>>> 723aa6b2 (fix misc issues) } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } } } diff --git a/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs index cd5a9f896..2b4fa3de2 100644 --- a/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs +++ b/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs @@ -58,7 +58,9 @@ public async Task> ConvertArtifactVariablesToPath(Art throw new FileNotFoundException($"Mandatory artifact failed to be parsed: {artifact.Name}, {artifact.Value}"); } - var mappedArtifact = await ConvertVariableStringToPath(artifact, variableString, workflowInstanceId, payloadId, bucketId, shouldExistYet); + var suffix = GetArtifactSuffix(artifact.Value); + + var mappedArtifact = await ConvertVariableStringToPath(artifact, variableString, workflowInstanceId, payloadId, bucketId, shouldExistYet, suffix); if (mappedArtifact.Equals(default(KeyValuePair)) is false) { @@ -76,6 +78,18 @@ public async Task> ConvertArtifactVariablesToPath(Art return artifactPathDictionary; } + private static string? GetArtifactSuffix(string valueString) + { + var variableStrings = valueString.Split("}"); + + if (variableStrings.Length < 2) + { + return null; + } + + return variableStrings[1]; + } + private static bool TrimArtifactVariable(string valueString, out string variableString) { var variableStrings = valueString.Split(" "); @@ -92,11 +106,11 @@ private static bool TrimArtifactVariable(string valueString, out string variable return true; } - private async Task> ConvertVariableStringToPath(Artifact artifact, string variableString, string workflowInstanceId, string payloadId, string bucketId, bool shouldExistYet) + private async Task> ConvertVariableStringToPath(Artifact artifact, string variableString, string workflowInstanceId, string payloadId, string bucketId, bool shouldExistYet, string suffix = "") { if (variableString.StartsWith("context.input.dicom", StringComparison.InvariantCultureIgnoreCase)) { - return await VerifyExists(new KeyValuePair(artifact.Name, $"{payloadId}/dcm/"), bucketId, shouldExistYet); + return await VerifyExists(new KeyValuePair(artifact.Name, $"{payloadId}/dcm{suffix}"), bucketId, shouldExistYet); } if (variableString.StartsWith("context.executions", StringComparison.InvariantCultureIgnoreCase)) @@ -115,7 +129,7 @@ private async Task> ConvertVariableStringToPath(Art if (string.Equals(variableLocation, "output_dir", StringComparison.InvariantCultureIgnoreCase)) { - return await VerifyExists(new KeyValuePair(artifact.Name, task.OutputDirectory), bucketId, shouldExistYet); + return await VerifyExists(new KeyValuePair(artifact.Name, $"{task.OutputDirectory}{suffix}"), bucketId, shouldExistYet); } if (string.Equals(variableLocation, "artifacts", StringComparison.InvariantCultureIgnoreCase)) diff --git a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj index 11de3febe..b9c40bcbb 100644 --- a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj +++ b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 379c788b2..8d7709c7a 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -527,7 +527,18 @@ private async Task> CreateTaskDestinations(WorkflowInstance private async Task DispatchTask(WorkflowInstance workflowInstance, WorkflowRevision workflow, TaskExecution taskExec, string correlationId) { - var outputArtifacts = workflow?.Workflow?.Tasks?.FirstOrDefault(t => t.Id == taskExec.TaskId)?.Artifacts?.Output; + var task = workflow?.Workflow?.Tasks?.FirstOrDefault(t => t.Id == taskExec.TaskId); + + var outputArtifacts = task?.Artifacts?.Output; + + foreach (var artifact in outputArtifacts) + { + if (string.IsNullOrWhiteSpace(artifact.Value)) + { + artifact.Value = $"{{ context.executions.{task.Id}.output_dir }}/{artifact.Name}"; + } + } + var pathOutputArtifacts = await _artifactMapper.ConvertArtifactVariablesToPath(outputArtifacts ?? Array.Empty(), workflowInstance.PayloadId, workflowInstance.Id, workflowInstance.BucketId, false); var taskDispatchEvent = EventMapper.ToTaskDispatchEvent(taskExec, workflowInstance, pathOutputArtifacts, correlationId, _storageConfiguration); diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index 12ff7ab95..4ed627ed4 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -37,15 +37,16 @@ }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.1, )", - "resolved": "0.2.1", - "contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==", + "requested": "[0.2.5, )", + "resolved": "0.2.5", + "contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.1", + "Monai.Deploy.Storage.S3Policy": "0.2.5", "System.IO.Abstractions": "17.1.1" } }, @@ -315,12 +316,28 @@ "System.Linq": "4.1.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "kahEeykb6FyQytoZNNXuz74X85B4weIEt8Kd+0klK48bkXDWOIHAOvNjlGsPMcS9CL935Te8QGQS83JqCbpdHA==", + "resolved": "6.0.0", + "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==", "dependencies": { - "Microsoft.Extensions.Primitives": "3.0.0" + "Microsoft.Extensions.Primitives": "6.0.0" } }, "Microsoft.Extensions.FileProviders.Physical": { @@ -339,13 +356,12 @@ }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "+k4AEn68HOJat5gj1TWa6X28WlirNQO9sPIIeQbia+91n03esEtMSSoekSTpMjUzjqtJWQN3McVx0GvSPFHF/Q==", + "resolved": "6.0.0", + "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "2.2.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", - "Microsoft.Extensions.FileProviders.Abstractions": "2.2.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0" + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0" } }, "Microsoft.Extensions.Logging": { @@ -437,8 +453,8 @@ }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==", + "resolved": "0.2.5", + "contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" @@ -882,73 +898,81 @@ "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.1.1" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { +<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", "Newtonsoft.Json": "[13.0.1, )" +======= + "AWSSDK.SecurityToken": "3.7.1.191", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" +>>>>>>> 723aa6b2 (fix misc issues) } }, "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "MongoDB.Bson": "[2.17.1, )", - "MongoDB.Driver": "[2.17.1, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "MongoDB.Bson": "2.17.1", + "MongoDB.Driver": "2.17.1" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0" } } } diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index c5acec9bf..2b8947afa 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/WorkflowManager/WorkflowManager/appsettings.Development.json b/src/WorkflowManager/WorkflowManager/appsettings.Development.json index 3b8c6843f..e1a4d32eb 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.Development.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.Development.json @@ -65,6 +65,7 @@ "endpoint": "localhost", "username": "admin", "password": "admin", + "port": "30072", "virtualHost": "monaideploy", "exchange": "monaideploy", "deadLetterExchange": "monaideploy-dead-letter", @@ -76,6 +77,7 @@ "endpoint": "localhost", "username": "admin", "password": "admin", + "port": "30072", "virtualHost": "monaideploy", "exchange": "monaideploy", "exportRequestQueue": "export_tasks" diff --git a/src/WorkflowManager/WorkflowManager/appsettings.Local.json b/src/WorkflowManager/WorkflowManager/appsettings.Local.json index ce1487f5c..81442f4f6 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.Local.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.Local.json @@ -1,6 +1,6 @@ { "WorkloadManagerDatabase": { - "ConnectionString": "mongodb://root:rootpassword@localhost:30017", + "ConnectionString": "mongodb://root:rootpassword@localhost:27017", "DatabaseName": "WorkloadManager", "WorkflowCollectionName": "Workflows", "WorkflowInstanceCollectionName": "WorkflowInstances", @@ -52,7 +52,7 @@ "endpoint": "minio:9000", // note edit C:\Windows\System32\drivers\etc\Hosts and add `127.0.0.1 minio` "accessKey": "admin", "accessToken": "password", - "bucket": "test-bucket", + "bucket": "my-bucket", "region": "eu-west-2", "securedConnection": false, "executableLocation": "mc.exe", @@ -65,9 +65,9 @@ "endpoint": "localhost", "username": "admin", "password": "admin", - "port": "30072", "virtualHost": "monaideploy", "exchange": "monaideploy", + "port": "30072", "deadLetterExchange": "monaideploy-dead-letter", "deliveryLimit": 3, "requeueDelay": 30 diff --git a/src/WorkflowManager/WorkflowManager/appsettings.json b/src/WorkflowManager/WorkflowManager/appsettings.json index 82290dd7f..12c9e72b0 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.json @@ -66,6 +66,7 @@ "endpoint": "localhost", "username": "admin", "password": "admin", + "port": "30072", "virtualHost": "monaideploy", "exchange": "monaideploy", "deadLetterExchange": "deadLetterExchange", @@ -79,6 +80,7 @@ "password": "admin", "virtualHost": "monaideploy", "exchange": "monaideploy", + "port": "30072", "deadLetterExchange": "monaideploy-dead-letter", "exportRequestQueue": "export_tasks", "deliveryLimit": 3, diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 5a8289411..259d2bf77 100644 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -147,17 +147,17 @@ }, "Monai.Deploy.Storage.MinIO": { "type": "Direct", - "requested": "[0.2.1, )", - "resolved": "0.2.1", - "contentHash": "0pMDS8ux1ZqxpGQ5qwDIkbjtARsvUhgfz94hNRcBoVY4kEAzAdEJAKkqR3iX8jWmZOV+CjV+vUt+j5B5ukJZPA==", + "requested": "[0.2.5, )", + "resolved": "0.2.5", + "contentHash": "WPGzHQ1cTM4TlGFq8vJv37I0kuumzRVRv1bwxVfmzWkEOTb1vm5uRy9bfOnq97VRQJZTzcLs+FRXU5Otbu1P2g==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", "Minio": "4.0.5", - "Monai.Deploy.Storage": "0.2.1", - "Monai.Deploy.Storage.S3Policy": "0.2.1" + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.Storage.S3Policy": "0.2.5" } }, "Newtonsoft.Json": { @@ -554,6 +554,22 @@ "System.Linq": "4.1.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -772,21 +788,22 @@ }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==", + "resolved": "0.2.5", + "contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.1", + "Monai.Deploy.Storage.S3Policy": "0.2.5", "System.IO.Abstractions": "17.1.1" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==", + "resolved": "0.2.5", + "contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" @@ -1646,119 +1663,119 @@ "monai.deploy.workflowmanager.authentication": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.8, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.8", + "Monai.Deploy.WorkflowManager.Common": "1.0.0" } }, "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.1.1" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "MongoDB.Bson": "[2.17.1, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.191", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" } }, "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "MongoDB.Bson": "[2.17.1, )", - "MongoDB.Driver": "[2.17.1, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "MongoDB.Bson": "2.17.1", + "MongoDB.Driver": "2.17.1" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } }, "monai.deploy.workflowmanager.monaibackgroundservice": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Hosting": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" + "Microsoft.Extensions.Hosting": "6.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" } }, "monai.deploy.workflowmanager.payloadlistener": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0" } }, "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.191", + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0", + "Newtonsoft.Json": "13.0.1" } } } 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 9f7650d79..910cebdad 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj @@ -31,7 +31,7 @@ - + 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 0dfb6b31f..470136bd3 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj @@ -40,7 +40,7 @@ - + diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 9823196dc..a28b2be84 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -534,6 +534,22 @@ "System.Text.Json": "6.0.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -835,35 +851,36 @@ }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "kh/DhbcfRStgnfi1s9MicrNTpDVLpS4XlxqNdIjsSGJXNZHdgG92T9xDxQfF/YpIUfRYkYhVRvITkSp82LwMtQ==", + "resolved": "0.2.5", + "contentHash": "EkctSwMUPm+omInxEGAbPPXz6dyd8nY4BAzrdGKt9MHsL1OesFXsgUXsmlCx+ltauohiiTSfjgd9eeVkUUD8MA==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.1", + "Monai.Deploy.Storage.S3Policy": "0.2.5", "System.IO.Abstractions": "17.1.1" } }, "Monai.Deploy.Storage.MinIO": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "0pMDS8ux1ZqxpGQ5qwDIkbjtARsvUhgfz94hNRcBoVY4kEAzAdEJAKkqR3iX8jWmZOV+CjV+vUt+j5B5ukJZPA==", + "resolved": "0.2.5", + "contentHash": "WPGzHQ1cTM4TlGFq8vJv37I0kuumzRVRv1bwxVfmzWkEOTb1vm5uRy9bfOnq97VRQJZTzcLs+FRXU5Otbu1P2g==", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.185", + "AWSSDK.SecurityToken": "3.7.1.190", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", "Minio": "4.0.5", - "Monai.Deploy.Storage": "0.2.1", - "Monai.Deploy.Storage.S3Policy": "0.2.1" + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.Storage.S3Policy": "0.2.5" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.1", - "contentHash": "in6vX8uPAaQ3QxRvnNx8SvqA+vK3H5Sl1PpGFXnwVldMVq/1vEqm97vHKGfqtcqhR34WLQSZSF4mWh08sgg8eg==", + "resolved": "0.2.5", + "contentHash": "wtvoeDf7MsuUE48Sggs6FYNOkLFUfQ5mPZer75jb63b9SKQjK2S34IdS8SnHVovNes1xhWInTB9YT2HUNgtzig==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" @@ -1679,147 +1696,147 @@ "monai.deploy.workflowmanager": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.8, )", - "Microsoft.AspNetCore.Mvc.Versioning": "[5.0.0, )", - "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer": "[5.0.0, )", - "Microsoft.EntityFrameworkCore": "[6.0.8, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Microsoft.Extensions.Hosting": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Logging.Console": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging.RabbitMQ": "[0.1.3-rc0011, )", - "Monai.Deploy.Storage.MinIO": "[0.2.1, )", - "Monai.Deploy.WorkflowManager.Authentication": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.MonaiBackgroundService": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.PayloadListener": "[1.0.0, )", - "Newtonsoft.Json": "[13.0.1, )", - "Swashbuckle.AspNetCore": "[6.4.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "6.0.8", + "Microsoft.AspNetCore.Mvc.Versioning": "5.0.0", + "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer": "5.0.0", + "Microsoft.EntityFrameworkCore": "6.0.8", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Hosting": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Logging.Console": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0011", + "Monai.Deploy.Storage.MinIO": "0.2.5", + "Monai.Deploy.WorkflowManager.Authentication": "1.0.0", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkflowManager.MonaiBackgroundService": "1.0.0", + "Monai.Deploy.WorkflowManager.PayloadListener": "1.0.0", + "Newtonsoft.Json": "13.0.1", + "Swashbuckle.AspNetCore": "6.4.0" } }, "monai.deploy.workflowmanager.authentication": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.8, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.8", + "Monai.Deploy.WorkflowManager.Common": "1.0.0" } }, "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Microsoft.Extensions.Logging": "[6.0.0, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "Newtonsoft.Json": "13.0.1", + "System.IO.Abstractions": "17.1.1" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", - "Microsoft.Extensions.Configuration": "[6.0.1, )", - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "MongoDB.Bson": "[2.17.1, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.191", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "MongoDB.Bson": "2.17.1", + "Newtonsoft.Json": "13.0.1" } }, "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "MongoDB.Bson": "[2.17.1, )", - "MongoDB.Driver": "[2.17.1, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "MongoDB.Bson": "2.17.1", + "MongoDB.Driver": "2.17.1" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Microsoft.AspNetCore.Mvc.Core": "2.2.5", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" } }, "monai.deploy.workflowmanager.monaibackgroundservice": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Hosting": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" + "Microsoft.Extensions.Hosting": "6.0.1", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" } }, "monai.deploy.workflowmanager.payloadlistener": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0" } }, "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", - "Ardalis.GuardClauses": "[4.0.1, )", - "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", - "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", - "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )", - "Newtonsoft.Json": "[13.0.1, )" + "AWSSDK.SecurityToken": "3.7.1.191", + "Ardalis.GuardClauses": "4.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0012", + "Monai.Deploy.Storage": "0.2.5", + "Monai.Deploy.WorkflowManager.Common": "1.0.0", + "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", + "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "Monai.Deploy.WorkflowManager.Storage": "1.0.0", + "Newtonsoft.Json": "13.0.1" } } } From eaaaab7765967d9d642d97d6964fa5df89f69a60 Mon Sep 17 00:00:00 2001 From: Jack Schofield Date: Fri, 2 Sep 2022 14:15:41 +0100 Subject: [PATCH 2/7] fix build Signed-off-by: Jack Schofield --- tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs b/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs index 8349229ea..9f43b6b10 100644 --- a/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs +++ b/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs @@ -29,7 +29,7 @@ namespace Monai.Deploy.WorkflowManager.Tests { internal class DummyStorageRegistrar : ServiceRegistrationBase { - public DummyStorageRegistrar(string fullyQualifiedAssemblyName) : base(fullyQualifiedAssemblyName) + public DummyStorageRegistrar(string fullyQualifiedAssemblyName) : base() { } From 9b3336c529b661931b8d2192650818fa8134f16f Mon Sep 17 00:00:00 2001 From: Jack Schofield Date: Fri, 2 Sep 2022 15:15:16 +0100 Subject: [PATCH 3/7] fix int tests Signed-off-by: Jack Schofield --- .../TaskManager/appsettings.Development.json | 6 ++-- .../appsettings.Development.json | 2 -- .../TaskManager.Argo.Tests/ArgoPluginTest.cs | 4 +-- .../Common/ArtifactMapperTests.cs | 36 +++++++++---------- .../DummyStorageService.cs | 13 ++++--- 5 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/TaskManager/TaskManager/appsettings.Development.json b/src/TaskManager/TaskManager/appsettings.Development.json index e9efe31e2..b3ba84501 100644 --- a/src/TaskManager/TaskManager/appsettings.Development.json +++ b/src/TaskManager/TaskManager/appsettings.Development.json @@ -28,9 +28,9 @@ "serviceAssemblyName": "Monai.Deploy.Storage.MinIO.MinIoStorageService, Monai.Deploy.Storage.MinIO", "settings": { "endpoint": "localhost:9000", - "accessKey": "admin", - "accessToken": "password", - "bucket": "my-bucket", + "accessKey": "minioadmin", + "accessToken": "minioadmin", + "bucket": "test-bucket", "region": "eu-west-2", "securedConnection": false, "executableLocation": "/.", diff --git a/src/WorkflowManager/WorkflowManager/appsettings.Development.json b/src/WorkflowManager/WorkflowManager/appsettings.Development.json index e1a4d32eb..3b8c6843f 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.Development.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.Development.json @@ -65,7 +65,6 @@ "endpoint": "localhost", "username": "admin", "password": "admin", - "port": "30072", "virtualHost": "monaideploy", "exchange": "monaideploy", "deadLetterExchange": "monaideploy-dead-letter", @@ -77,7 +76,6 @@ "endpoint": "localhost", "username": "admin", "password": "admin", - "port": "30072", "virtualHost": "monaideploy", "exchange": "monaideploy", "exportRequestQueue": "export_tasks" diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs index a4c7c5477..c738a16bc 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs @@ -373,12 +373,12 @@ private static void ValidateDagWithIntermediateArtifacts(TaskDispatchEvent messa template = workflow.Spec.Templates.FirstOrDefault(p => p.Name.Equals("segmentation", StringComparison.Ordinal)); Assert.NotNull(template!); Assert.Null(template!.Inputs.Artifacts.First().S3); - Assert.Equal($"{message.IntermediateStorage.RelativeRootPath}/{{{{ workflow.name }}}}/{template.Outputs.Artifacts.First().Name}", template.Outputs.Artifacts.First().S3.Key); + Assert.Equal($"{message.IntermediateStorage.RelativeRootPath}/{template.Outputs.Artifacts.First().Name}", template.Outputs.Artifacts.First().S3.Key); template = workflow.Spec.Templates.FirstOrDefault(p => p.Name.Equals("inference", StringComparison.Ordinal)); Assert.NotNull(template!); Assert.Null(template!.Inputs.Artifacts.First().S3); - Assert.Equal($"{message.IntermediateStorage.RelativeRootPath}/{{{{ workflow.name }}}}/{template.Outputs.Artifacts.First().Name}", template.Outputs.Artifacts.First().S3.Key); + Assert.Equal($"{message.IntermediateStorage.RelativeRootPath}/{template.Outputs.Artifacts.First().Name}", template.Outputs.Artifacts.First().S3.Key); template = workflow.Spec.Templates.FirstOrDefault(p => p.Name.Equals("generate-report", StringComparison.Ordinal)); Assert.NotNull(template!); diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Common/ArtifactMapperTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Common/ArtifactMapperTests.cs index ae1912d10..15ade425e 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Common/ArtifactMapperTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Common/ArtifactMapperTests.cs @@ -75,9 +75,9 @@ public async Task ConvertArtifactVariablesToPath_MultipleArtifacts_ReturnsMapped var expected = new Dictionary { - { "dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/" }, - { "dicomimage", $"{payloadId}/dcm/" }, - { "outputtaskdir", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/" } + { "dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}" }, + { "dicomimage", $"{payloadId}/dcm" }, + { "outputtaskdir", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}" } }; var workflowInstance = new WorkflowInstance @@ -96,14 +96,14 @@ public async Task ConvertArtifactVariablesToPath_MultipleArtifacts_ReturnsMapped Status = TaskExecutionStatus.Dispatched, OutputArtifacts = new Dictionary { - { "dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/" } + { "dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}" } } }, new TaskExecution { TaskId = "coffee", Status = TaskExecutionStatus.Created, - OutputDirectory = $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/" + OutputDirectory = $"{payloadId}/workflows/{workflowInstanceId}/{executionId}" } } }; @@ -111,9 +111,9 @@ public async Task ConvertArtifactVariablesToPath_MultipleArtifacts_ReturnsMapped _workflowInstanceRepository.Setup(w => w.GetTaskByIdAsync(workflowInstance.Id, "image_type_detector")).ReturnsAsync(workflowInstance.Tasks[0]); _workflowInstanceRepository.Setup(w => w.GetTaskByIdAsync(workflowInstance.Id, "coffee")).ReturnsAsync(workflowInstance.Tasks[1]); - var value1 = new KeyValuePair("dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/"); - var value2 = new KeyValuePair("dicomimage", $"{payloadId}/dcm/"); - var value3 = new KeyValuePair("outputtaskdir", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/"); + var value1 = new KeyValuePair("dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}"); + var value2 = new KeyValuePair("dicomimage", $"{payloadId}/dcm"); + var value3 = new KeyValuePair("outputtaskdir", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}"); _storageService.Setup(w => w.VerifyObjectExistsAsync(workflowInstance.BucketId, value1)).ReturnsAsync(value1); _storageService.Setup(w => w.VerifyObjectExistsAsync(workflowInstance.BucketId, value2)).ReturnsAsync(value2); @@ -169,14 +169,14 @@ public async Task ConvertArtifactVariablesToPath_MultipleMissingRequiredArtifact Status = TaskExecutionStatus.Dispatched, OutputArtifacts = new Dictionary { - { "dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/" } + { "dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}" } } }, new TaskExecution { TaskId = "coffee", Status = TaskExecutionStatus.Created, - OutputDirectory = $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/" + OutputDirectory = $"{payloadId}/workflows/{workflowInstanceId}/{executionId}" } } }; @@ -291,9 +291,9 @@ public async Task ConvertArtifactVariablesToPath_RequiredArtifactShouldNotExistY var expected = new Dictionary { - { "dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/" }, - { "dicomimage", $"{payloadId}/dcm/" }, - { "outputtaskdir", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/" } + { "dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}" }, + { "dicomimage", $"{payloadId}/dcm" }, + { "outputtaskdir", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}" } }; var workflowInstance = new WorkflowInstance @@ -312,14 +312,14 @@ public async Task ConvertArtifactVariablesToPath_RequiredArtifactShouldNotExistY Status = TaskExecutionStatus.Dispatched, OutputArtifacts = new Dictionary { - { "dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/" } + { "dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}" } } }, new TaskExecution { TaskId = "coffee", Status = TaskExecutionStatus.Created, - OutputDirectory = $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/" + OutputDirectory = $"{payloadId}/workflows/{workflowInstanceId}/{executionId}" } } }; @@ -327,9 +327,9 @@ public async Task ConvertArtifactVariablesToPath_RequiredArtifactShouldNotExistY _workflowInstanceRepository.Setup(w => w.GetTaskByIdAsync(workflowInstance.Id, "image_type_detector")).ReturnsAsync(workflowInstance.Tasks[0]); _workflowInstanceRepository.Setup(w => w.GetTaskByIdAsync(workflowInstance.Id, "coffee")).ReturnsAsync(workflowInstance.Tasks[1]); - var value1 = new KeyValuePair("dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/"); - var value2 = new KeyValuePair("dicomimage", $"{payloadId}/dcm/"); - var value3 = new KeyValuePair("outputtaskdir", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/"); + var value1 = new KeyValuePair("dicom", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}"); + var value2 = new KeyValuePair("dicomimage", $"{payloadId}/dcm"); + var value3 = new KeyValuePair("outputtaskdir", $"{payloadId}/workflows/{workflowInstanceId}/{executionId}"); _storageService.Setup(w => w.VerifyObjectExistsAsync(workflowInstance.BucketId, value1)).ReturnsAsync(new KeyValuePair()); _storageService.Setup(w => w.VerifyObjectExistsAsync(workflowInstance.BucketId, value2)).ReturnsAsync(value2); diff --git a/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs b/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs index 9f43b6b10..4379fcea1 100644 --- a/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs +++ b/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs @@ -22,6 +22,7 @@ using System.Threading.Tasks; using Amazon.SecurityToken.Model; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.HealthChecks; using Monai.Deploy.Storage; using Monai.Deploy.Storage.API; @@ -29,12 +30,16 @@ namespace Monai.Deploy.WorkflowManager.Tests { internal class DummyStorageRegistrar : ServiceRegistrationBase { - public DummyStorageRegistrar(string fullyQualifiedAssemblyName) : base() - { - } - public override IServiceCollection Configure(IServiceCollection services) => services; } + + internal class TestHealthCheckRegistrar : HealthCheckRegistrationBase + { + public override IHealthChecksBuilder ConfigureAdminHealthCheck(IHealthChecksBuilder builder, HealthStatus? failureStatus = null, IEnumerable? tags = null, TimeSpan? timeout = null) => builder; + + public override IHealthChecksBuilder ConfigureHealthCheck(IHealthChecksBuilder builder, HealthStatus? failureStatus = null, IEnumerable? tags = null, TimeSpan? timeout = null) => builder; + } + internal class DummyStorageService : IStorageService { public string Name => "Dummy Storage Service"; From 20e3d66166e16e53cca06e33da968e13b60f70d8 Mon Sep 17 00:00:00 2001 From: Jack Schofield Date: Mon, 5 Sep 2022 10:03:02 +0100 Subject: [PATCH 4/7] change appsettings Signed-off-by: Jack Schofield --- ...i.Deploy.WorkflowManager.TaskManager.csproj | 2 +- src/TaskManager/TaskManager/appsettings.json | 2 -- src/TaskManager/TaskManager/packages.lock.json | 8 ++++---- .../Monai.Deploy.WorkflowManager.csproj | 2 +- .../Properties/launchSettings.json | 18 ------------------ .../WorkflowManager/appsettings.json | 2 -- .../WorkflowManager/packages.lock.json | 8 ++++---- ...Manager.TaskManager.IntegrationTests.csproj | 2 +- .../appsettings.Test.json | 10 ++++++++-- ...er.WorkflowExecutor.IntegrationTests.csproj | 2 +- .../appsettings.Test.json | 6 +++++- .../WorkflowManager.Tests/packages.lock.json | 8 ++++---- 12 files changed, 29 insertions(+), 41 deletions(-) delete mode 100644 src/WorkflowManager/WorkflowManager/Properties/launchSettings.json diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index fd7e7524c..3fd9a2d1e 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -56,7 +56,7 @@ - + diff --git a/src/TaskManager/TaskManager/appsettings.json b/src/TaskManager/TaskManager/appsettings.json index 51e9ab126..33b932036 100644 --- a/src/TaskManager/TaskManager/appsettings.json +++ b/src/TaskManager/TaskManager/appsettings.json @@ -43,7 +43,6 @@ "endpoint": "localhost", "username": "admin", "password": "admin", - "port": "30072", "virtualHost": "monaideploy", "exchange": "monaideploy", "deadLetterExchange": "deadLetterExchange", @@ -55,7 +54,6 @@ "endpoint": "localhost", "username": "admin", "password": "admin", - "port": "30072", "virtualHost": "monaideploy", "exchange": "monaideploy", "deadLetterExchange": "monaideploy-dead-letter", diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index 1fdcf99bd..3c621edbc 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -97,11 +97,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.3-rc0010, )", - "resolved": "0.1.3-rc0010", - "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", + "requested": "[0.1.3-rc0012, )", + "resolved": "0.1.3-rc0012", + "contentHash": "IIzty1xAAn3pTSK9VPI5o22nZDGyPyKWNiGstC4bkzIHdxghPEX/ErR7IVkClxCc9kK8X+4sReGFksdGKShQnw==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0010" + "Monai.Deploy.Messaging": "0.1.3-rc0012" } }, "Monai.Deploy.Storage": { diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 2b8947afa..ea1c1559b 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -48,7 +48,7 @@ - + all diff --git a/src/WorkflowManager/WorkflowManager/Properties/launchSettings.json b/src/WorkflowManager/WorkflowManager/Properties/launchSettings.json deleted file mode 100644 index bc0fc05a7..000000000 --- a/src/WorkflowManager/WorkflowManager/Properties/launchSettings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "profiles": { - "Monai.Deploy.WorkflowManager": { - "commandName": "Project", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Local", - "WorkflowManager__messaging__subscriberSettings__endpoint": "localhost" - } - }, - "WSL": { - "commandName": "WSL2", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "distributionName": "" - } - } -} \ No newline at end of file diff --git a/src/WorkflowManager/WorkflowManager/appsettings.json b/src/WorkflowManager/WorkflowManager/appsettings.json index 12c9e72b0..82290dd7f 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.json @@ -66,7 +66,6 @@ "endpoint": "localhost", "username": "admin", "password": "admin", - "port": "30072", "virtualHost": "monaideploy", "exchange": "monaideploy", "deadLetterExchange": "deadLetterExchange", @@ -80,7 +79,6 @@ "password": "admin", "virtualHost": "monaideploy", "exchange": "monaideploy", - "port": "30072", "deadLetterExchange": "monaideploy-dead-letter", "exportRequestQueue": "export_tasks", "deliveryLimit": 3, diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 259d2bf77..4d12c26f1 100644 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -138,11 +138,11 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Direct", - "requested": "[0.1.3-rc0011, )", - "resolved": "0.1.3-rc0011", - "contentHash": "kT5aW7aHv8XVgVo8AoIIG14DHOkvRj9wI68wKkpLg0zfo9J46G6wCrPg2lxa0KlY0JyXGLUhg/KW+Appa1vV2w==", + "requested": "[0.1.3-rc0012, )", + "resolved": "0.1.3-rc0012", + "contentHash": "IIzty1xAAn3pTSK9VPI5o22nZDGyPyKWNiGstC4bkzIHdxghPEX/ErR7IVkClxCc9kK8X+4sReGFksdGKShQnw==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0011" + "Monai.Deploy.Messaging": "0.1.3-rc0012" } }, "Monai.Deploy.Storage.MinIO": { 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 910cebdad..da98f0d21 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj @@ -30,7 +30,7 @@ - + diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/appsettings.Test.json b/tests/IntegrationTests/TaskManager.IntegrationTests/appsettings.Test.json index bfb602be9..9581b0fac 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/appsettings.Test.json +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/appsettings.Test.json @@ -34,20 +34,26 @@ } }, "messaging": { + "publisherServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessagePublisherService, Monai.Deploy.Messaging.RabbitMQ", "publisherSettings": { "endpoint": "localhost", "username": "admin", "password": "admin", "virtualHost": "monaideploy", - "exchange": "monaideploy" + "exchange": "monaideploy", + "deliveryLimit": 5, + "requeueDelay": 0 }, + "subscriberServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessageSubscriberService, Monai.Deploy.Messaging.RabbitMQ", "subscriberSettings": { "endpoint": "localhost", "username": "admin", "password": "admin", "virtualHost": "monaideploy", "exchange": "monaideploy", - "exportRequestQueue": "export_tasks" + "exportRequestQueue": "export_tasks", + "deliveryLimit": 5, + "requeueDelay": 0 }, "retries": { "retryDelays": "localhost" 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 470136bd3..c72a93751 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj @@ -39,7 +39,7 @@ - + diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/appsettings.Test.json b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/appsettings.Test.json index 2d068856e..2b46eb274 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/appsettings.Test.json +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/appsettings.Test.json @@ -35,18 +35,22 @@ } }, "messaging": { + "publisherServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessagePublisherService, Monai.Deploy.Messaging.RabbitMQ", "publisherSettings": { "endpoint": "localhost", "username": "admin", "password": "admin", "virtualHost": "monaideploy", - "exchange": "monaideploy" + "exchange": "monaideploy", + "deadLetterExchange": "monaideploy-dead-letter" }, + "subscriberServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessageSubscriberService, Monai.Deploy.Messaging.RabbitMQ", "subscriberSettings": { "endpoint": "localhost", "username": "admin", "password": "admin", "virtualHost": "monaideploy", + "deadLetterExchange": "monaideploy-dead-letter", "exchange": "monaideploy", "exportRequestQueue": "export_tasks" }, diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index a28b2be84..1a77409c9 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -843,10 +843,10 @@ }, "Monai.Deploy.Messaging.RabbitMQ": { "type": "Transitive", - "resolved": "0.1.3-rc0011", - "contentHash": "kT5aW7aHv8XVgVo8AoIIG14DHOkvRj9wI68wKkpLg0zfo9J46G6wCrPg2lxa0KlY0JyXGLUhg/KW+Appa1vV2w==", + "resolved": "0.1.3-rc0012", + "contentHash": "IIzty1xAAn3pTSK9VPI5o22nZDGyPyKWNiGstC4bkzIHdxghPEX/ErR7IVkClxCc9kK8X+4sReGFksdGKShQnw==", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0011" + "Monai.Deploy.Messaging": "0.1.3-rc0012" } }, "Monai.Deploy.Storage": { @@ -1707,7 +1707,7 @@ "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Logging.Console": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0011", + "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0012", "Monai.Deploy.Storage.MinIO": "0.2.5", "Monai.Deploy.WorkflowManager.Authentication": "1.0.0", "Monai.Deploy.WorkflowManager.Common": "1.0.0", From c08ee63b1ef26216caf4d122625fcb56b8078649 Mon Sep 17 00:00:00 2001 From: Jack Schofield Date: Mon, 5 Sep 2022 10:32:54 +0100 Subject: [PATCH 5/7] fix int tests Signed-off-by: Jack Schofield --- .../Support/Assertions.cs | 4 ++-- .../Support/MinioDataSeeding.cs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs index 065af0701..7579b9c6e 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs @@ -84,7 +84,7 @@ public void AssertInputArtifactsForWorkflowInstance(TaskObject workflowRevisionT { if (workflowArtifact.Value == "{{ context.input.dicom }}") { - workflowInstanceTask.InputArtifacts[workflowArtifact.Name].Should().Match($"{payloadId}/dcm/"); + workflowInstanceTask.InputArtifacts[workflowArtifact.Name].Should().Match($"{payloadId}/dcm"); } else if (workflowArtifact.Value.Contains("artifacts")) { @@ -108,7 +108,7 @@ public void AssertInputArtifactsForTaskDispatch(TaskObject workflowRevisionTask, if (workflowArtifact.Value == "{{ context.input.dicom }}") { - taskDispatchArtifact.RelativeRootPath.Should().Match($"{payloadId}/dcm/"); + taskDispatchArtifact.RelativeRootPath.Should().Match($"{payloadId}/dcm"); } else if (workflowArtifact.Value.Contains("artifacts")) { diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioDataSeeding.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioDataSeeding.cs index 3eb3b76b8..502410342 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioDataSeeding.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioDataSeeding.cs @@ -42,19 +42,19 @@ public async Task SeedWorkflowInputArtifacts(string payloadId, string? folderNam if (string.IsNullOrEmpty(folderName)) { - OutputHelper.WriteLine($"folderName not specified. Seeding Minio with objects from **/DICOMs/full_patient_metadata/dcm/"); + OutputHelper.WriteLine($"folderName not specified. Seeding Minio with objects from **/DICOMs/full_patient_metadata/dcm"); localPath = Path.Combine(GetDirectory(), "DICOMs", "full_patient_metadata", "dcm"); } else { - OutputHelper.WriteLine($"Seeding Minio with artifacts from **/DICOMs/{folderName}/dcm/"); + OutputHelper.WriteLine($"Seeding Minio with artifacts from **/DICOMs/{folderName}/dcm"); localPath = Path.Combine(GetDirectory(), "DICOMs", folderName, "dcm"); } - OutputHelper.WriteLine($"Seeding objects to {TestExecutionConfig.MinioConfig.Bucket}/{payloadId}/dcm/"); - await MinioClient.AddFileToStorage(localPath, $"{payloadId}/dcm/"); + OutputHelper.WriteLine($"Seeding objects to {TestExecutionConfig.MinioConfig.Bucket}/{payloadId}/dcm"); + await MinioClient.AddFileToStorage(localPath, $"{payloadId}/dcm"); OutputHelper.WriteLine($"Objects seeded"); } @@ -64,13 +64,13 @@ public async Task SeedTaskOutputArtifacts(string payloadId, string workflowInsta if (string.IsNullOrEmpty(folderName)) { - OutputHelper.WriteLine($"folderName not specified. Seeding Minio with objects from **/DICOMs/output_metadata/dcm/"); + OutputHelper.WriteLine($"folderName not specified. Seeding Minio with objects from **/DICOMs/output_metadata/dcm"); localPath = Path.Combine(GetDirectory(), "DICOMs", "output_metadata", "dcm"); } else { - OutputHelper.WriteLine($"Seeding Minio with objects from **/DICOMs/{folderName}/dcm/"); + OutputHelper.WriteLine($"Seeding Minio with objects from **/DICOMs/{folderName}/dcm"); localPath = Path.Combine(GetDirectory(), "DICOMs", folderName, "dcm"); } From 5f49844341174833e338f669a4643413068d88fb Mon Sep 17 00:00:00 2001 From: Jack Schofield Date: Mon, 5 Sep 2022 11:07:23 +0100 Subject: [PATCH 6/7] add output test Signed-off-by: Jack Schofield --- .../Services/WorkflowExecuterService.cs | 16 +++- .../Services/WorkflowExecuterServiceTests.cs | 96 +++++++++++++++++++ 2 files changed, 109 insertions(+), 3 deletions(-) diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 8d7709c7a..a350c9668 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -529,12 +529,22 @@ private async Task DispatchTask(WorkflowInstance workflowInstance, Workflo { var task = workflow?.Workflow?.Tasks?.FirstOrDefault(t => t.Id == taskExec.TaskId); - var outputArtifacts = task?.Artifacts?.Output; + if (task is null) + { + return false; + } - foreach (var artifact in outputArtifacts) + var outputArtifacts = task.Artifacts?.Output; + + if (outputArtifacts is not null && outputArtifacts.Any()) { - if (string.IsNullOrWhiteSpace(artifact.Value)) + foreach (var artifact in outputArtifacts) { + if (!string.IsNullOrWhiteSpace(artifact.Value)) + { + continue; + } + artifact.Value = $"{{ context.executions.{task.Id}.output_dir }}/{artifact.Name}"; } } diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs index 61c4be372..4bcfee479 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs @@ -232,6 +232,102 @@ public async Task ProcessPayload_ValidWorkflowIdRequest_ReturnesTrue() Assert.True(result); } + [Fact] + public async Task ProcessPayload_ValidWorkflowIdRequestWithArtifacts_ReturnesTrue() + { + var workflowId1 = Guid.NewGuid().ToString(); + var workflowId2 = Guid.NewGuid().ToString(); + var workflowRequest = new WorkflowRequestEvent + { + Bucket = "testbucket", + CalledAeTitle = "aetitle", + CallingAeTitle = "aetitle", + CorrelationId = Guid.NewGuid().ToString(), + Timestamp = DateTime.UtcNow, + Workflows = new List + { + workflowId1.ToString(), + workflowId2.ToString() + } + }; + + var workflows = new List + { + new WorkflowRevision + { + Id = Guid.NewGuid().ToString(), + WorkflowId = workflowId1, + Revision = 1, + Workflow = new Workflow + { + Name = "Workflowname1", + Description = "Workflowdesc1", + Version = "1", + InformaticsGateway = new InformaticsGateway + { + AeTitle = "aetitle" + }, + Tasks = new TaskObject[] + { + new TaskObject { + Id = Guid.NewGuid().ToString(), + Type = "type", + Description = "taskdesc" + } + } + } + }, + new WorkflowRevision + { + Id = Guid.NewGuid().ToString(), + WorkflowId = workflowId2, + Revision = 1, + Workflow = new Workflow + { + Name = "Workflowname2", + Description = "Workflowdesc2", + Version = "1", + InformaticsGateway = new InformaticsGateway + { + AeTitle = "aetitle" + }, + Tasks = new TaskObject[] + { + new TaskObject { + Id = Guid.NewGuid().ToString(), + Type = "type", + Description = "taskdesc", + Artifacts = new ArtifactMap + { + Output = new Artifact[] + { + new Artifact + { + Name = "output.pdf" + } + } + } + } + } + } + } + }; + + _workflowRepository.Setup(w => w.GetByWorkflowsIdsAsync(new List { workflowId1.ToString(), workflowId2.ToString() })).ReturnsAsync(workflows); + _workflowRepository.Setup(w => w.GetByWorkflowIdAsync(workflowId1)).ReturnsAsync(workflows[0]); + _workflowRepository.Setup(w => w.GetByWorkflowIdAsync(workflowId2)).ReturnsAsync(workflows[1]); + _workflowInstanceRepository.Setup(w => w.CreateAsync(It.IsAny>())).ReturnsAsync(true); + _workflowInstanceRepository.Setup(w => w.GetByWorkflowsIdsAsync(It.IsAny>())).ReturnsAsync(new List()); + _workflowInstanceRepository.Setup(w => w.UpdateTaskStatusAsync(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(true); + _artifactMapper.Setup(a => a.ConvertArtifactVariablesToPath(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(new Dictionary()); + + var result = await WorkflowExecuterService.ProcessPayload(workflowRequest, new Payload() { Id = Guid.NewGuid().ToString() }); + + _messageBrokerPublisherService.Verify(w => w.Publish(_configuration.Value.Messaging.Topics.TaskDispatchRequest, It.IsAny()), Times.Exactly(2)); + + Assert.True(result); + } + [Fact] public async Task ProcessPayload_RouterTaskWithMultipleDestinations_DispatchesMultiple() { From 8379d69fa25f6af687b47da0d5eaa7d3e0007859 Mon Sep 17 00:00:00 2001 From: Jack Schofield Date: Mon, 5 Sep 2022 12:26:10 +0100 Subject: [PATCH 7/7] add argo documentation Signed-off-by: Jack Schofield --- guidelines/mwm-workflow-spec.md | 20 +++++ .../Database/packages.lock.json | 14 +-- .../Logging/packages.lock.json | 8 -- .../PayloadListener/packages.lock.json | 89 +++++++------------ .../Storage/packages.lock.json | 14 +-- .../WorkflowExecuter/packages.lock.json | 72 +++++++-------- 6 files changed, 91 insertions(+), 126 deletions(-) diff --git a/guidelines/mwm-workflow-spec.md b/guidelines/mwm-workflow-spec.md index 4ad9f8e81..8a451059f 100644 --- a/guidelines/mwm-workflow-spec.md +++ b/guidelines/mwm-workflow-spec.md @@ -223,6 +223,26 @@ Example: ] ``` +Artifacts also support path suffixes after the variables like so, these can be used to further dictate an artifact path: + +Example: +```json +"input": [ + { + "name": "input_dicom", + "value": "{{ context.input.dicom }}/study1", + "mandatory": true + } +], +"output": [ + { + "name": "fracture_report", + "mandatory": true + } +] +``` + + > ##### Creating artifacts: > How artifacts are created is beyond the scope of this document. The specifics differ depending on which Task Plugin is being used. > diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index 6ba0aa106..374d309e4 100644 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -807,27 +807,19 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { -<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", "Newtonsoft.Json": "[13.0.1, )" -======= - "AWSSDK.SecurityToken": "3.7.1.191", - "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "MongoDB.Bson": "2.17.1", - "Newtonsoft.Json": "13.0.1" ->>>>>>> 723aa6b2 (fix misc issues) } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "2.2.5", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" + "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } } } diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index 36b4fad40..3a9d39658 100644 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -741,19 +741,11 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { -<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", "Newtonsoft.Json": "[13.0.1, )" -======= - "AWSSDK.SecurityToken": "3.7.1.191", - "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "MongoDB.Bson": "2.17.1", - "Newtonsoft.Json": "13.0.1" ->>>>>>> 723aa6b2 (fix misc issues) } } } diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index 2265ca29f..de9573d6d 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -896,91 +896,82 @@ "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "3.3.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "Monai.Deploy.Storage": "0.2.5", - "Newtonsoft.Json": "13.0.1", - "System.IO.Abstractions": "17.1.1" + "Karambolo.Extensions.Logging.File": "[3.3.1, )", + "Microsoft.Extensions.Configuration": "[6.0.1, )", + "Microsoft.Extensions.Logging": "[6.0.0, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Newtonsoft.Json": "[13.0.1, )", + "System.IO.Abstractions": "[17.1.1, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { -<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", "Newtonsoft.Json": "[13.0.1, )" -======= - "AWSSDK.SecurityToken": "3.7.1.191", - "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "MongoDB.Bson": "2.17.1", - "Newtonsoft.Json": "13.0.1" ->>>>>>> 723aa6b2 (fix misc issues) } }, "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "MongoDB.Bson": "2.17.1", - "MongoDB.Driver": "2.17.1" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", + "MongoDB.Bson": "[2.17.1, )", + "MongoDB.Driver": "[2.17.1, )" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "2.2.5", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" + "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Storage": "0.2.5", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } }, "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { -<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", + "Monai.Deploy.Storage": "[0.2.5, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", @@ -989,20 +980,6 @@ "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )", "Newtonsoft.Json": "[13.0.1, )" -======= - "AWSSDK.SecurityToken": "3.7.1.191", - "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "Monai.Deploy.Storage": "0.2.5", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0", - "Newtonsoft.Json": "13.0.1" ->>>>>>> 723aa6b2 (fix misc issues) } } } diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index e341db33a..141f744b8 100644 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -779,27 +779,19 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { -<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", "Newtonsoft.Json": "[13.0.1, )" -======= - "AWSSDK.SecurityToken": "3.7.1.191", - "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "MongoDB.Bson": "2.17.1", - "Newtonsoft.Json": "13.0.1" ->>>>>>> 723aa6b2 (fix misc issues) } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "2.2.5", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" + "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } } } diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index 4ed627ed4..2133608e9 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -898,81 +898,73 @@ "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "3.3.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "Monai.Deploy.Storage": "0.2.5", - "Newtonsoft.Json": "13.0.1", - "System.IO.Abstractions": "17.1.1" + "Karambolo.Extensions.Logging.File": "[3.3.1, )", + "Microsoft.Extensions.Configuration": "[6.0.1, )", + "Microsoft.Extensions.Logging": "[6.0.0, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Newtonsoft.Json": "[13.0.1, )", + "System.IO.Abstractions": "[17.1.1, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { -<<<<<<< HEAD "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", "Newtonsoft.Json": "[13.0.1, )" -======= - "AWSSDK.SecurityToken": "3.7.1.191", - "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "MongoDB.Bson": "2.17.1", - "Newtonsoft.Json": "13.0.1" ->>>>>>> 723aa6b2 (fix misc issues) } }, "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "MongoDB.Bson": "2.17.1", - "MongoDB.Driver": "2.17.1" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", + "MongoDB.Bson": "[2.17.1, )", + "MongoDB.Driver": "[2.17.1, )" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "2.2.5", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" + "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Storage": "0.2.5", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } } }