diff --git a/.editorconfig b/.editorconfig index b0ed567c9..07c149dc0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,7 +18,6 @@ root = true # Copyright File Header -file_header_template = SPDX-FileCopyrightText: � [year file created] - [last year file modified], MONAI Consortium\nSPDX-License-Identifier: Apache License 2.0 dotnet_diagnostic.IDE0073.severity = error # Default settings: diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..93cb9cd98 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,20 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": ".NET Core Launch (console)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + "program": "${workspaceFolder}/src/TaskManager/Runner/bin/Debug/net6.0/Monai.Deploy.WorkflowManager.TaskManager.Runner", + "args": ["http://10.97.150.146"], + "cwd": "${workspaceFolder}/src/TaskManager/Runner/", + "stopAtEntry": false, + "console": "internalConsole" + } + + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 000000000..2f37bedea --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,25 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "shell", + "args": [ + "build", + // Ask dotnet build to generate full paths for file names. + "/property:GenerateFullPaths=true", + // Do not generate summary otherwise it leads to duplicate errors in Problems panel + "/consoleloggerparameters:NoSummary", + "src/TaskManager/Runner/" + ], + "group": "build", + "presentation": { + "reveal": "silent" + }, + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj index a7c82754f..9c1a3a9a5 100644 --- a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj +++ b/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj @@ -28,9 +28,9 @@ - + - + diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json index 3ab8485f9..c0d0918e9 100644 --- a/src/Configuration/packages.lock.json +++ b/src/Configuration/packages.lock.json @@ -37,44 +37,20 @@ "System.IO.Abstractions": "17.0.18" } }, - "Monai.Deploy.Messaging.RabbitMQ": { - "type": "Direct", - "requested": "[0.1.3-rc0010, )", - "resolved": "0.1.3-rc0010", - "contentHash": "kbyUmtm3j1/Le4c34W6rIDZ01vb9n+DbmhwhxZ+WiyNXJ0JMubZ/2Vto7NrQSXhSoMMOgXAPA606GKpcaRvVSQ==", - "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0010" - } - }, "Monai.Deploy.Storage": { "type": "Direct", - "requested": "[0.2.0-rc0009, )", - "resolved": "0.2.0-rc0009", - "contentHash": "YOdGLuSQwR4QtktmIhpee/+gNs5cgGGBYax9xLun7kr1Og751v12aH33Fn2Vu88L3gDvYGMkB/2UjdI0k61ldQ==", + "requested": "[0.2.0-rc0012, )", + "resolved": "0.2.0-rc0012", + "contentHash": "Ib7NQKYW8coarE8y5z9rNgU3Ry1/PSepr5yvm6ttdKmZ4+SS9D3UhnosLWIWNqNCID7VFXVRbgPmT1OJsKiAGw==", "dependencies": { "AWSSDK.SecurityToken": "3.7.1.165", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0009", + "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0012", "System.IO.Abstractions": "17.0.18" } }, - "Monai.Deploy.Storage.MinIO": { - "type": "Direct", - "requested": "[0.2.0-rc0009, )", - "resolved": "0.2.0-rc0009", - "contentHash": "muor/mSIGF72HK3nQdLHNa7k468p5BcnC0rkVe/FtBH4H82UpIgMuY8SoauF9L+HgRS2U2d0W1HPoNfqusp+MQ==", - "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.165", - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Minio": "4.0.4", - "Monai.Deploy.Storage": "0.2.0-rc0009", - "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0009" - } - }, "Newtonsoft.Json": { "type": "Direct", "requested": "[13.0.1, )", @@ -83,9 +59,9 @@ }, "System.IO.Abstractions": { "type": "Direct", - "requested": "[17.0.18, )", - "resolved": "17.0.18", - "contentHash": "x0iIMdP+PCLIkz8h13xHCecaiysFgHPe9mM3FdyfSmkl5+MtMCmgFFIe38Aibkzd0UAY/OMoXMKGR2RK10rebQ==" + "requested": "[17.0.24, )", + "resolved": "17.0.24", + "contentHash": "hA7bacntMiZv1Yf9xtjwl/GP3GT1mG84QxhAk7ijAUD0pJhJaVVwXScE13vMpXnNtlaRDW6SeyZdWg2j2qrh4w==" }, "Ardalis.GuardClauses": { "type": "Transitive", @@ -108,24 +84,11 @@ "AWSSDK.Core": "[3.7.12, 4.0.0)" } }, - "Crc32.NET": { - "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "wNW/huzolu8MNKUnwCVKxjfAlCFpeI8AZVfF46iAWJ1+P6bTU1AZct7VAkDDEjgeeTJCVTkGZaD6jSd/fOiUkA==", - "dependencies": { - "NETStandard.Library": "2.0.0" - } - }, "JetBrains.Annotations": { "type": "Transitive", "resolved": "2021.3.0", "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" - }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -173,47 +136,15 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.3", - "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" - }, - "Minio": { - "type": "Transitive", - "resolved": "4.0.4", - "contentHash": "nd8cZhmS8DxUQ9WRY1bxeerdYm6TiJxMOSEpyRVUgeg+O9Kig+e5soBswkKMBECND3Iew3Wt4gcfFtSrK/SgMw==", - "dependencies": { - "Crc32.NET": "1.2.0", - "Microsoft.CSharp": "4.7.0", - "Newtonsoft.Json": "13.0.1", - "System.Net.Http": "4.3.4", - "System.Net.Primitives": "4.3.1", - "System.Reactive.Linq": "5.0.0", - "System.ValueTuple": "4.4.0" - } - }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.0-rc0009", - "contentHash": "IgiC87hJJLP+azRiLcJVD7Vqb6pfU36enhDgoUJT+YSFdhAFCrGAiPsYOyGc3NiH+YsEhxbUTJhJm3O3Mx4PMA==", + "resolved": "0.2.0-rc0012", + "contentHash": "K91EJk66ipEr1kvauMpr6GNIPMUmso+8KGWSI/6S5ps+gAHzCAbIsVecNslhaK804y0dM8btj8u6QBvqN4I/rQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" } }, - "NETStandard.Library": { - "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, "RabbitMQ.Client": { "type": "Transitive", "resolved": "6.4.0", @@ -223,146 +154,11 @@ "System.Threading.Channels": "4.7.1" } }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" - }, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" - }, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" - }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", - "dependencies": { - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" - } - }, - "runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", - "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" - }, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" - }, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" - }, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" - }, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" - }, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" - }, - "System.Collections": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Collections.Concurrent": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, "System.ComponentModel.Annotations": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" }, - "System.Diagnostics.Debug": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", "resolved": "6.0.0", @@ -371,439 +167,20 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Diagnostics.Tracing": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Calendars": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, "System.Memory": { "type": "Transitive", "resolved": "4.5.4", "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.DiagnosticSource": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "System.Net.Primitives": { - "type": "Transitive", - "resolved": "4.3.1", - "contentHash": "OHzPhSme78BbmLe9UBxHM69ZYjClS5URuhce6Ta4ikiLgaUGiG/X84fZpI6zy7CsUH5R9cYzI2tv9dWPqdTkUg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3", - "System.Runtime": "4.3.1", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Reactive": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==" - }, - "System.Reactive.Linq": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "IB4/qlV4T1WhZvM11RVoFUSZXPow9VWVeQ1uDkSKgz6bAO+gCf65H/vjrYlwyXmojSSxvfHndF9qdH43P/IuAw==", - "dependencies": { - "System.Reactive": "5.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Resources.ResourceManager": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.1", - "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3" - } - }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "System.Runtime.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Runtime.Numerics": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", - "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.Apple": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "03idZOqFlsKRL4W+LuCpJ6dBYDUWReug6lZjBa3uJWnk5sPCUXckocevTaUA8iT/MFSrY/2HXkOt753xQ/cf8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Security.Cryptography.Csp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", - "dependencies": { - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Cng": "4.3.0", - "System.Security.Cryptography.Csp": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Threading": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, "System.Threading.Channels": { "type": "Transitive", "resolved": "4.7.1", "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ==" } } } diff --git a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index 964fb5bb5..8bfa25170 100644 --- a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj +++ b/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj @@ -28,9 +28,8 @@ - - - + + diff --git a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj b/src/Database/Monai.Deploy.WorkflowManager.Database.csproj index 970ddb4ca..6de35023b 100644 --- a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj +++ b/src/Database/Monai.Deploy.WorkflowManager.Database.csproj @@ -1,4 +1,4 @@ - + + + + + net6.0 + enable + enable + + + + + + + + + + + + + + + + + + + + + + true + true + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + + diff --git a/src/TaskManager/Database/Options/TaskManagerDatabaseSettings.cs b/src/TaskManager/Database/Options/TaskManagerDatabaseSettings.cs new file mode 100644 index 000000000..b4ec29681 --- /dev/null +++ b/src/TaskManager/Database/Options/TaskManagerDatabaseSettings.cs @@ -0,0 +1,32 @@ +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Microsoft.Extensions.Configuration; + +namespace Monai.Deploy.WorkflowManager.Database.Options +{ + public class TaskManagerDatabaseSettings + { + [ConfigurationKeyName("ConnectionString")] + public string ConnectionString { get; set; } = null!; + + [ConfigurationKeyName("DatabaseName")] + public string DatabaseName { get; set; } = null!; + + [ConfigurationKeyName("TaskDispatchEventCollectionName")] + public string TaskDispatchEventCollectionName { get; set; } = null!; + } +} diff --git a/src/TaskManager/Database/TaskDispatchEventRepository.cs b/src/TaskManager/Database/TaskDispatchEventRepository.cs new file mode 100644 index 000000000..7b5740366 --- /dev/null +++ b/src/TaskManager/Database/TaskDispatchEventRepository.cs @@ -0,0 +1,97 @@ +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Ardalis.GuardClauses; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Monai.Deploy.WorkflowManager.Database.Options; +using Monai.Deploy.WorkflowManager.TaskManager.API.Models; +using Monai.Deploy.WorkflowManager.TaskManager.Logging; +using MongoDB.Driver; + +namespace Monai.Deploy.WorkflowManager.TaskManager.Database +{ + public class TaskDispatchEventRepository : ITaskDispatchEventRepository + { + private readonly IMongoCollection _taskDispatchEventCollection; + private readonly ILogger _logger; + + public TaskDispatchEventRepository( + IMongoClient client, + IOptions databaseSettings, + ILogger logger) + { + if (client == null) + { + throw new ArgumentNullException(nameof(client)); + } + + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + var mongoDatabase = client.GetDatabase(databaseSettings.Value.DatabaseName); + _taskDispatchEventCollection = mongoDatabase.GetCollection(databaseSettings.Value.TaskDispatchEventCollectionName); + } + + public async Task CreateAsync(TaskDispatchEventInfo taskDispatchEventInfo) + { + Guard.Against.Null(taskDispatchEventInfo, nameof(taskDispatchEventInfo)); + + try + { + await _taskDispatchEventCollection.InsertOneAsync(taskDispatchEventInfo).ConfigureAwait(false); + return await GetByTaskExecutionIdAsync(taskDispatchEventInfo.Event.ExecutionId).ConfigureAwait(false); + } + catch (Exception e) + { + _logger.DatabaseException(nameof(CreateAsync), e); + return default; + } + } + + public async Task GetByTaskExecutionIdAsync(string taskExecutionId) + { + Guard.Against.NullOrWhiteSpace(taskExecutionId, nameof(taskExecutionId)); + + try + { + return await _taskDispatchEventCollection + .Find(x => x.Event.ExecutionId == taskExecutionId) + .FirstOrDefaultAsync().ConfigureAwait(false); + } + catch (Exception e) + { + _logger.DatabaseException(nameof(GetByTaskExecutionIdAsync), e); + return default; + } + } + + public async Task RemoveAsync(string taskExecutionId) + { + Guard.Against.NullOrWhiteSpace(taskExecutionId, nameof(taskExecutionId)); + + try + { + await _taskDispatchEventCollection.DeleteOneAsync( + Builders.Filter.Eq(p => p.Event.ExecutionId, taskExecutionId)).ConfigureAwait(false); + return true; + } + catch (Exception e) + { + _logger.DatabaseException(nameof(RemoveAsync), e); + return false; + } + } + } +} diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json new file mode 100644 index 000000000..a8c5a6b10 --- /dev/null +++ b/src/TaskManager/Database/packages.lock.json @@ -0,0 +1,306 @@ +{ + "version": 1, + "dependencies": { + "net6.0": { + "Ardalis.GuardClauses": { + "type": "Direct", + "requested": "[4.0.1, )", + "resolved": "4.0.1", + "contentHash": "RemnImQf/BWR8oYqFpdw+hn+b4Q1w+pGujkRiSfjQhMPuiERwGn4UMmQv+6UDE4qbPlnIN+e3e40JkvBhzgfzg==", + "dependencies": { + "JetBrains.Annotations": "2021.3.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Direct", + "requested": "[6.0.1, )", + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + }, + "Microsoft.Extensions.Options": { + "type": "Direct", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Monai.Deploy.Messaging": { + "type": "Direct", + "requested": "[0.1.3-rc0010, )", + "resolved": "0.1.3-rc0010", + "contentHash": "xbmEq4bQVaffLed/TVi8ircJEK45Yxz+NPLjABfYva5aGD9Jp14lQr56l1RP4YWtEihn0AkFlbpPU3nnvHd9Og==", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Newtonsoft.Json": "13.0.1", + "RabbitMQ.Client": "6.4.0", + "System.ComponentModel.Annotations": "5.0.0", + "System.IO.Abstractions": "17.0.18" + } + }, + "MongoDB.Bson": { + "type": "Direct", + "requested": "[2.17.0, )", + "resolved": "2.17.0", + "contentHash": "wGUX8GMQ0DYG68u1ENAUtJTx6cmQTt6/BfMjqB+Q+aWu2ZkBZ09mA1QbBU5mcbVqulF5U72bGzxChtjYxaS9Dg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "MongoDB.Driver": { + "type": "Direct", + "requested": "[2.17.0, )", + "resolved": "2.17.0", + "contentHash": "NFqjuDNrGNGEsblqoKBoOSUU8vx1UbZjKP3nVhxhGnK9p8ef0t3fyPcjxmYbO5vdFpDQw2A0Ly4dPzyRW3QEug==", + "dependencies": { + "MongoDB.Bson": "2.17.0", + "MongoDB.Driver.Core": "2.17.0", + "MongoDB.Libmongocrypt": "1.5.4" + } + }, + "AWSSDK.Core": { + "type": "Transitive", + "resolved": "3.7.12.11", + "contentHash": "Tb6llf5tUU8FiptuB6Xq8vaJpxXDRcWL39nkEiHkDhdctj9l2kPL0DydrCNCAVwLWWTlPXyLUD8i37Rm0mRjaw==" + }, + "AWSSDK.SecurityToken": { + "type": "Transitive", + "resolved": "3.7.1.176", + "contentHash": "VrUC7q6XTUUNVFlMxPKXKNRdXcZm+I7qOj3EFGOmNXVwmIGM4IsV1V5sCCb2KWZ9Thv/RlR3dA+YxjFP3a/3vw==", + "dependencies": { + "AWSSDK.Core": "[3.7.12.11, 4.0.0)" + } + }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0" + } + }, + "JetBrains.Annotations": { + "type": "Transitive", + "resolved": "2021.3.0", + "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg==" + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "BUyFU9t+HzlSE7ri4B+AQN2BgTgHv/uM82s5ZkgU1BApyzWzIl48nDsG5wR1t0pniNuuyTBzG3qCW8152/NtSw==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "6.0.0", + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "6.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "k6PWQMuoBDGGHOQTtyois2u4AwyVcIwL2LaSLlTZQm2CYcJ1pxbt6jfAnpWmzENA/wfrYRI/X9DTLoUkE4AsLw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + }, + "Microsoft.Extensions.Logging": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "eIbyj40QDg1NDz0HBW0S5f3wrLVnKWnDJ/JtZ+yJDFnDj90VoPuoPmFkeaXrtu+0cKm5GRAwoDf+dBWXK0TUdg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "6.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Microsoft.Extensions.Options": "6.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "Monai.Deploy.Storage": { + "type": "Transitive", + "resolved": "0.2.0-rc0012", + "contentHash": "Ib7NQKYW8coarE8y5z9rNgU3Ry1/PSepr5yvm6ttdKmZ4+SS9D3UhnosLWIWNqNCID7VFXVRbgPmT1OJsKiAGw==", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.1.165", + "Ardalis.GuardClauses": "4.0.1", + "Microsoft.Extensions.Configuration": "6.0.1", + "Microsoft.Extensions.Logging": "6.0.0", + "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0012", + "System.IO.Abstractions": "17.0.18" + } + }, + "Monai.Deploy.Storage.S3Policy": { + "type": "Transitive", + "resolved": "0.2.0-rc0012", + "contentHash": "K91EJk66ipEr1kvauMpr6GNIPMUmso+8KGWSI/6S5ps+gAHzCAbIsVecNslhaK804y0dM8btj8u6QBvqN4I/rQ==", + "dependencies": { + "Ardalis.GuardClauses": "4.0.1", + "Newtonsoft.Json": "13.0.1" + } + }, + "MongoDB.Driver.Core": { + "type": "Transitive", + "resolved": "2.17.0", + "contentHash": "bQLdFZNywlApJ5H5KnFXxGik3dZ/VOIUQ7YQniZd9eNmNZFEwEMr+/yoCJ8FigyzOd7iKYOLpmUWGwG2M2e2aQ==", + "dependencies": { + "DnsClient": "1.6.1", + "MongoDB.Bson": "2.17.0", + "MongoDB.Libmongocrypt": "1.5.4", + "SharpCompress": "0.30.1", + "System.Buffers": "4.5.1" + } + }, + "MongoDB.Libmongocrypt": { + "type": "Transitive", + "resolved": "1.5.4", + "contentHash": "JQrfonPIGey2n38tYmhkYOjmoHeGCwvbEru/G7zciYcx198neZerSPylIt6kTGtpGQDMhjCg0Nvt9eCBm6TWZQ==" + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + }, + "RabbitMQ.Client": { + "type": "Transitive", + "resolved": "6.4.0", + "contentHash": "1znR1gGU+xYVSpO5z8nQolcUKA/yydnxQn7Ug9+RUXxTSLMm/eE58VKGwahPBjELXvDnX0k/kBrAitFLRjx9LA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Threading.Channels": "4.7.1" + } + }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.IO.Abstractions": { + "type": "Transitive", + "resolved": "17.0.18", + "contentHash": "x0iIMdP+PCLIkz8h13xHCecaiysFgHPe9mM3FdyfSmkl5+MtMCmgFFIe38Aibkzd0UAY/OMoXMKGR2RK10rebQ==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "4.7.1", + "contentHash": "6akRtHK/wab3246t4p5v3HQrtQk8LboOt5T4dtpNgsp3zvDeM4/Gx8V12t0h+c/W9/enUrilk8n6EQqdQorZAA==" + }, + "monai.deploy.workflowmanager.contracts": { + "type": "Project", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.1.176", + "Microsoft.Extensions.Configuration": "6.0.1", + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "MongoDB.Bson": "2.17.0", + "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.Messaging": "0.1.3-rc0010", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", + "Monai.Deploy.WorkflowManager.Logging": "1.0.0", + "MongoDB.Bson": "2.17.0", + "MongoDB.Driver": "2.17.0" + } + }, + "monai.deploy.workflowmanager.logging": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" + } + }, + "monai.deploy.workflowmanager.taskmanager.api": { + "type": "Project", + "dependencies": { + "Monai.Deploy.Messaging": "0.1.3-rc0010", + "Monai.Deploy.Storage": "0.2.0-rc0012", + "MongoDB.Bson": "2.17.0" + } + } + } + } +} \ No newline at end of file diff --git a/src/TaskManager/Logging/Log.cs b/src/TaskManager/Logging/Log.cs index cb51c99ff..e98568f27 100644 --- a/src/TaskManager/Logging/Log.cs +++ b/src/TaskManager/Logging/Log.cs @@ -110,5 +110,14 @@ public static partial class Log [LoggerMessage(EventId = 116, Level = LogLevel.Error, Message = "Metadata retrieval failed.")] public static partial void MetadataRetrievalFailed(this ILogger logger, Exception ex); + + [LoggerMessage(EventId = 117, Level = LogLevel.Warning, Message = "Metadata feature unavailable for {plugin}.")] + public static partial void MetadataPluginUndefined(this ILogger logger, string plugin); + + [LoggerMessage(EventId = 118, Level = LogLevel.Error, Message = "Error removing storage user account {username}.")] + public static partial void ErrorRemovingStorageUserAccount(this ILogger logger, string username, Exception exception); + + [LoggerMessage(EventId = 119, Level = LogLevel.Error, Message = "Error removing dispatch event {executionId} from the database.")] + public static partial void ErrorRemovingDispatchEventFromDatabase(this ILogger logger, string executionId, Exception exception); } } diff --git a/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index 47bb4a062..9e02b0e78 100644 --- a/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -40,6 +40,12 @@ + + + + + + @@ -49,7 +55,7 @@ - + @@ -59,6 +65,7 @@ + diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj b/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj index 79f6e7386..1e9331abb 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj @@ -1,4 +1,4 @@ - - + + @@ -32,24 +32,24 @@ - + - + - - + + - - - - + + + + @@ -67,38 +67,38 @@ PayloadCollection.feature - + - PreserveNewest + Always PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest PreserveNewest - + PreserveNewest - + PreserveNewest @@ -111,7 +111,7 @@ $(UsingMicrosoftNETSdk) %(RelativeDir)%(Filename).feature$(DefaultLanguageSourceExtension) - + diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadCollectionStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadCollectionStepDefinitions.cs index 3c54fa9dc..7fc2f3668 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadCollectionStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadCollectionStepDefinitions.cs @@ -15,9 +15,6 @@ */ using BoDi; -using Monai.Deploy.Messaging.Events; -using Monai.Deploy.Messaging.Messages; -using Monai.Deploy.WorkflowManager.IntegrationTests.Models; using Monai.Deploy.WorkflowManager.IntegrationTests.Support; using TechTalk.SpecFlow.Infrastructure; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs index 8b8fb5365..4846d5a3e 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs @@ -48,7 +48,7 @@ private static IHostBuilder CreateHostBuilder() => .ConfigureAppConfiguration((builderContext, config) => { var env = builderContext.HostingEnvironment; - config.AddJsonFile($"appsettings.Test.json", optional: true, reloadOnChange: true); + config.AddJsonFile("appsettings.Test.json", optional: false, reloadOnChange: false); }) .ConfigureLogging((builderContext, configureLogging) => { @@ -115,7 +115,6 @@ private static IHostBuilder CreateHostBuilder() => var newUri = new Uri(uri); return new UriService(newUri); }); - }) .ConfigureWebHostDefaults(webBuilder => { diff --git a/tests/UnitTests/CLI.Tests/Monai.Deploy.WorkflowManager.CLI.Tests.csproj b/tests/UnitTests/CLI.Tests/Monai.Deploy.WorkflowManager.CLI.Tests.csproj index 395cda254..6656efaf7 100644 --- a/tests/UnitTests/CLI.Tests/Monai.Deploy.WorkflowManager.CLI.Tests.csproj +++ b/tests/UnitTests/CLI.Tests/Monai.Deploy.WorkflowManager.CLI.Tests.csproj @@ -24,7 +24,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/UnitTests/CLI.Tests/packages.lock.json b/tests/UnitTests/CLI.Tests/packages.lock.json index 404768701..9d14e64bf 100644 --- a/tests/UnitTests/CLI.Tests/packages.lock.json +++ b/tests/UnitTests/CLI.Tests/packages.lock.json @@ -10,12 +10,12 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.1.0, )", - "resolved": "17.1.0", - "contentHash": "MVKvOsHIfrZrvg+8aqOF5dknO/qWrR1sWZjMPQ1N42MKMlL/zQL30FQFZxPeWfmVKWUWAOmAHYsqB5OerTKziw==", + "requested": "[17.2.0, )", + "resolved": "17.2.0", + "contentHash": "kYmkDYbcDd+jNvmMH4TMtgHjsUYbIsWENM2VcjB0X7TawXbehL5I8OIsu2TgFS/nQCgZE94InrqMxrm7WDy+Lw==", "dependencies": { - "Microsoft.CodeCoverage": "17.1.0", - "Microsoft.TestPlatform.TestHost": "17.1.0" + "Microsoft.CodeCoverage": "17.2.0", + "Microsoft.TestPlatform.TestHost": "17.2.0" } }, "xunit": { @@ -37,8 +37,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "0N/ZJ71ncCxQWhgtkEYKOgu2oMHa8h1tsOUbhmIKXF8UwtSUCe4vHAsJ3DVcNWRwNfQzSTy263ZE+QF6MdIhhQ==" + "resolved": "17.2.0", + "contentHash": "MsKhJmwIfHxNDbTIlgQy29UpWSWPpbZOQPhQ7xalRy+ABnl8/neFHZGzSP3XlpW2dKAXHTFrtIcKzW/kopY2Bg==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -75,8 +75,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "OMo/FYnKGy3lZEK0gfitskRM3ga/YBt6MyCyFPq0xNLeybGOQ6HnYNAAvzyePo5WPuMiw3LX+HiuRWNjnas1fA==", + "resolved": "17.2.0", + "contentHash": "7j1KYDHLhU98XnCEbECMncXLydI9fNiFLcFsiBsP3lV6EkHOaj5kTPAWHYkKnPGRC9TbZUboSQq8rWI4dTQsxg==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -84,10 +84,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "JS0JDLniDhIzkSPLHz7N/x1CG8ywJOtwInFDYA3KQvbz+ojGoT5MT2YDVReL1b86zmNRV8339vsTSm/zh0RcMg==", + "resolved": "17.2.0", + "contentHash": "bI67J+hers241h7eD2eecS02p9CbKcQDIeoRvO4FgMlTWg2ZTzc0D3uWLYr5U+K5x9O1pNmyMoMDbYIeWY/TWw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.1.0", + "Microsoft.TestPlatform.ObjectModel": "17.2.0", "Newtonsoft.Json": "9.0.1" } }, diff --git a/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj b/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj index bf54c8042..90fb21f7e 100644 --- a/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj +++ b/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj @@ -24,13 +24,13 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj index 06012f6a1..e9e1fbbfe 100644 --- a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj +++ b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj @@ -28,11 +28,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj b/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj index bf7af7295..4ac214a64 100644 --- a/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj +++ b/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj @@ -24,8 +24,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj index ab7eab575..ee9509da2 100644 --- a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj +++ b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj @@ -24,12 +24,14 @@ - - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj b/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj index 01a2742e3..0fe4f30e9 100644 --- a/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj +++ b/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj @@ -24,11 +24,11 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/TaskManager.AideClinicalReview.Tests.csproj b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/TaskManager.AideClinicalReview.Tests.csproj index b53e7036d..b69ca5e7f 100644 --- a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/TaskManager.AideClinicalReview.Tests.csproj +++ b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/TaskManager.AideClinicalReview.Tests.csproj @@ -25,10 +25,10 @@ - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj b/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj index 6593ec439..5aae3618a 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj +++ b/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj @@ -28,8 +28,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj index fb1a22166..10c60d231 100644 --- a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj +++ b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj @@ -26,8 +26,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs b/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs index 359f51ab9..7601a1013 100644 --- a/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs +++ b/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs @@ -26,6 +26,8 @@ using Monai.Deploy.Messaging.Events; using Monai.Deploy.Messaging.Messages; using Monai.Deploy.Storage.API; +using Monai.Deploy.Storage.S3Policy.Policies; +using Monai.Deploy.TaskManager.API; using Monai.Deploy.WorkflowManager.Configuration; using Monai.Deploy.WorkflowManager.Contracts.Rest; using Monai.Deploy.WorkflowManager.TaskManager.API; @@ -101,11 +103,12 @@ public class TaskManagerTest private readonly Mock _serviceScopeFactory; private readonly Mock _serviceScope; private readonly Mock _storageService; - private readonly Mock _minioAdmin; + private readonly Mock _storageAdminService; private readonly Mock _messageBrokerPublisherService; private readonly Mock _messageBrokerSubscriberService; private readonly Mock _testRunnerCallback; private readonly Mock _testMetadataRepositoryCallback; + private readonly Mock _taskDispatchEventService; private readonly CancellationTokenSource _cancellationTokenSource; public TaskManagerTest() @@ -117,9 +120,10 @@ public TaskManagerTest() _storageService = new Mock(); _messageBrokerPublisherService = new Mock(); _messageBrokerSubscriberService = new Mock(); - _minioAdmin = new Mock(); + _storageAdminService = new Mock(); _testRunnerCallback = new Mock(); _testMetadataRepositoryCallback = new Mock(); + _taskDispatchEventService = new Mock(); _cancellationTokenSource = new CancellationTokenSource(); _serviceScopeFactory.Setup(p => p.CreateScope()).Returns(_serviceScope.Object); @@ -142,7 +146,10 @@ public TaskManagerTest() .Returns(_storageService.Object); serviceProvider .Setup(x => x.GetService(typeof(IStorageAdminService))) - .Returns(_minioAdmin.Object); + .Returns(_storageAdminService.Object); + serviceProvider + .Setup(x => x.GetService(typeof(ITaskDispatchEventService))) + .Returns(_taskDispatchEventService.Object); _serviceScope.Setup(x => x.ServiceProvider).Returns(serviceProvider.Object); _logger.Setup(p => p.IsEnabled(It.IsAny())).Returns(true); @@ -276,6 +283,16 @@ public async Task TaskManager_TaskDispatchEvent_UnsupportedRunner() { await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(false); }); + + _storageAdminService.Setup(a => a.CreateUserAsync( + It.IsAny(), + It.IsAny() + )).ReturnsAsync(new Amazon.SecurityToken.Model.Credentials() + { + AccessKeyId = "a", + SecretAccessKey = "b", + }); + _messageBrokerSubscriberService .Setup(p => p.Reject(It.IsAny(), It.IsAny())) .Callback(() => resetEvent.Set()); @@ -305,6 +322,15 @@ public async Task TaskManager_TaskDispatchEvent_ExceptionExecutingRunner() message.Body.TaskPluginType = PluginStrings.Argo; var resetEvent = new ManualResetEvent(false); + _storageAdminService.Setup(a => a.CreateUserAsync( + It.IsAny(), + It.IsAny() + )).ReturnsAsync(new Amazon.SecurityToken.Model.Credentials() + { + AccessKeyId = "a", + SecretAccessKey = "b", + }); + _messageBrokerSubscriberService.Setup( p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskDispatchRequest, StringComparison.OrdinalIgnoreCase)), It.IsAny(), @@ -334,6 +360,55 @@ public async Task TaskManager_TaskDispatchEvent_ExceptionExecutingRunner() _messageBrokerSubscriberService.Verify(p => p.Reject(It.Is(m => message.MessageId == m.MessageId), It.Is(b => !b)), Times.Once()); } + [Fact(DisplayName = "Task Manager - TaskDispatchEvent rejects message when unable to create user accounts")] + public async Task TaskManager_TaskDispatchEvent_RejectWhenUnalbeToCreateUserAccounts() + { + _options.Value.TaskManager.MaximumNumberOfConcurrentJobs = 1; + _testRunnerCallback + .Setup(p => p.GenerateExecuteTaskResult()) + .Returns(new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None }); + + var message = GenerateTaskDispatchEvent(); + message.Body.TaskPluginType = PluginStrings.Argo; + var resetEvent = new CountdownEvent(2); + + _storageAdminService.Setup(a => a.CreateUserAsync( + It.IsAny(), + It.IsAny() + )).ReturnsAsync(() => null); + + _messageBrokerSubscriberService.Setup( + p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskDispatchRequest, StringComparison.OrdinalIgnoreCase)), + It.IsAny(), + It.IsAny>(), + It.IsAny())) + .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => + { + await Task.Run(() => messageReceivedCallback(CreateMessageReceivedEventArgs(message))).ConfigureAwait(false); + }); + _messageBrokerSubscriberService + .Setup(p => p.RequeueWithDelay(It.IsAny())) + .Callback(() => resetEvent.Signal()); + _messageBrokerPublisherService + .Setup(p => p.Publish(It.IsAny(), It.IsAny())) + .Callback(() => resetEvent.Signal()); + _storageService.Setup(p => p.CreateTemporaryCredentialsAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .ReturnsAsync(new Amazon.SecurityToken.Model.Credentials + { + AccessKeyId = Guid.NewGuid().ToString(), + SecretAccessKey = Guid.NewGuid().ToString() + }); + + var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); + await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); + Assert.Equal(ServiceStatus.Running, service.Status); + + Assert.True(resetEvent.Wait(5000)); + + _messageBrokerSubscriberService.Verify(p => p.RequeueWithDelay(It.Is(m => message.MessageId == m.MessageId)), Times.Once()); + _messageBrokerPublisherService.Verify(p => p.Publish(It.Is(m => m == _options.Value.Messaging.Topics.TaskUpdateRequest), It.IsAny()), Times.Once()); + } + [Fact(DisplayName = "Task Manager - TaskDispatchEvent executes runner and accepts task")] public async Task TaskManager_TaskDispatchEvent_ExecutesRunner() { @@ -346,6 +421,15 @@ public async Task TaskManager_TaskDispatchEvent_ExecutesRunner() message.Body.TaskPluginType = PluginStrings.Argo; var resetEvent = new CountdownEvent(2); + _storageAdminService.Setup(a => a.CreateUserAsync( + It.IsAny(), + It.IsAny() + )).ReturnsAsync(new Amazon.SecurityToken.Model.Credentials() + { + AccessKeyId = "a", + SecretAccessKey = "b", + }); + _messageBrokerSubscriberService.Setup( p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskDispatchRequest, StringComparison.OrdinalIgnoreCase)), It.IsAny(), @@ -455,6 +539,7 @@ public async Task TaskManager_TaskCallbackEvent_NoMatchingExecutionId() public async Task TaskManager_TaskCallbackEvent_ExceptionGettingStatus() { _options.Value.TaskManager.MaximumNumberOfConcurrentJobs = 1; + _testRunnerCallback .Setup(p => p.GenerateExecuteTaskResult()) .Returns(new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None }); @@ -475,9 +560,19 @@ public async Task TaskManager_TaskCallbackEvent_ExceptionGettingStatus() AccessKeyId = Guid.NewGuid().ToString(), SecretAccessKey = Guid.NewGuid().ToString() }); + _storageAdminService.Setup(a => a.CreateUserAsync( + It.IsAny(), + It.IsAny() + )).ReturnsAsync(new Amazon.SecurityToken.Model.Credentials() + { + AccessKeyId = "a", + SecretAccessKey = "b", + }); var taskDispatchEventMessage = GenerateTaskDispatchEvent(); taskDispatchEventMessage.Body.TaskPluginType = PluginStrings.Argo; + _taskDispatchEventService.Setup(p => p.GetByTaskExecutionIdAsync(It.IsAny())) + .ReturnsAsync(new API.Models.TaskDispatchEventInfo(taskDispatchEventMessage.Body)); _ = _messageBrokerSubscriberService.Setup( p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskDispatchRequest, StringComparison.OrdinalIgnoreCase)), @@ -552,125 +647,36 @@ public async Task TaskManager_TaskCallbackEvent_CompletesWorkflow() }; taskDispatchEventMessage.Body.TaskPluginType = PluginStrings.Argo; + _taskDispatchEventService.Setup(p => p.GetByTaskExecutionIdAsync(It.IsAny())) + .ReturnsAsync(new API.Models.TaskDispatchEventInfo(taskDispatchEventMessage.Body)); _messageBrokerSubscriberService.Setup( p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskDispatchRequest, StringComparison.OrdinalIgnoreCase)), It.IsAny(), It.IsAny>(), It.IsAny())) - .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => - { - await Task.Run(() => - { - messageReceivedCallback(CreateMessageReceivedEventArgs(taskDispatchEventMessage)); - }).ConfigureAwait(false); - }); - - var TaskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); - _messageBrokerSubscriberService.Setup( - p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskCallbackRequest, StringComparison.OrdinalIgnoreCase)), - It.IsAny(), - It.IsAny>(), - It.IsAny())) - .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => - { - Assert.True(resetEvent.Wait(5000)); - resetEvent.Reset(2); - await Task.Run(() => - { - messageReceivedCallback(CreateMessageReceivedEventArgs(TaskCallbackEventMessage)); - }).ConfigureAwait(false); - }); - _messageBrokerSubscriberService - .Setup(p => p.Acknowledge(It.IsAny())) - .Callback(() => - resetEvent.Signal() - ); - _messageBrokerPublisherService - .Setup(p => p.Publish(It.IsAny(), It.IsAny())) - .Callback(() => - resetEvent.Signal() - ); - _storageService.Setup(p => p.CreateTemporaryCredentialsAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .ReturnsAsync(new Amazon.SecurityToken.Model.Credentials - { - AccessKeyId = Guid.NewGuid().ToString(), - SecretAccessKey = Guid.NewGuid().ToString() - }); -#pragma warning disable SecurityTokenService1000 // Property value too short - _minioAdmin.Setup(a => a.CreateUserAsync( - It.IsAny(), - It.IsAny() - )).ReturnsAsync(new Amazon.SecurityToken.Model.Credentials() - { - AccessKeyId = "accesskeyidtesttest", - SecretAccessKey = "b", - }); -#pragma warning restore SecurityTokenService1000 // Property value too short - - var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); - await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); - Assert.Equal(ServiceStatus.Running, service.Status); - - Assert.True(resetEvent.Wait(5000)); - - _testRunnerCallback.Verify(p => p.GenerateExecuteTaskResult(), Times.Once()); - _testRunnerCallback.Verify(p => p.GenerateGetStatusResult(), Times.Once()); - _messageBrokerSubscriberService.Verify(p => p.Acknowledge(It.Is(m => m.MessageId == taskDispatchEventMessage.MessageId)), Times.Once()); - _messageBrokerSubscriberService.Verify(p => p.Acknowledge(It.Is(m => m.MessageId == TaskCallbackEventMessage.MessageId)), Times.Once()); - _messageBrokerPublisherService.Verify(p => p.Publish(It.Is(m => m == _options.Value.Messaging.Topics.TaskUpdateRequest), It.IsAny()), Times.Exactly(2)); - } - - [Fact(DisplayName = "Task Manager - TaskCallbackEvent completes workflow even when minioadmin doesnt create credentials")] - public async Task TaskManager_TaskCallbackEvent_CompletesWorkflow_WHenMinionAdminCreateReadOnlyUserReturnsNull() - { - _options.Value.TaskManager.MaximumNumberOfConcurrentJobs = 1; - _testRunnerCallback - .Setup(p => p.GenerateExecuteTaskResult()) - .Returns(new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None }); - _testRunnerCallback - .Setup(p => p.GenerateGetStatusResult()) - .Returns(new ExecutionStatus { Status = TaskExecutionStatus.Succeeded, FailureReason = FailureReason.None }); - - var resetEvent = new CountdownEvent(2); - - var taskDispatchEventMessage = GenerateTaskDispatchEvent(); - taskDispatchEventMessage.Body.IntermediateStorage = new Messaging.Common.Storage() - { - Bucket = "testBucket", - Endpoint = "testEndpoind", - Name = "test", - RelativeRootPath = "/test/path" - }; - - taskDispatchEventMessage.Body.TaskPluginType = PluginStrings.Argo; - _messageBrokerSubscriberService.Setup( - p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskDispatchRequest, StringComparison.OrdinalIgnoreCase)), - It.IsAny(), - It.IsAny>(), - It.IsAny())) - .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => - { - await Task.Run(() => + .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => { - messageReceivedCallback(CreateMessageReceivedEventArgs(taskDispatchEventMessage)); - }).ConfigureAwait(false); - }); + await Task.Run(() => + { + messageReceivedCallback(CreateMessageReceivedEventArgs(taskDispatchEventMessage)); + }).ConfigureAwait(false); + }); - var TaskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); + var taskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); _messageBrokerSubscriberService.Setup( p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskCallbackRequest, StringComparison.OrdinalIgnoreCase)), It.IsAny(), It.IsAny>(), It.IsAny())) - .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => - { - Assert.True(resetEvent.Wait(5000)); - resetEvent.Reset(2); - await Task.Run(() => + .Callback, ushort>(async (topic, queue, messageReceivedCallback, prefetchCount) => { - messageReceivedCallback(CreateMessageReceivedEventArgs(TaskCallbackEventMessage)); - }).ConfigureAwait(false); - }); + Assert.True(resetEvent.Wait(5000)); + resetEvent.Reset(2); + await Task.Run(() => + { + messageReceivedCallback(CreateMessageReceivedEventArgs(taskCallbackEventMessage)); + }).ConfigureAwait(false); + }); _messageBrokerSubscriberService .Setup(p => p.Acknowledge(It.IsAny())) .Callback(() => resetEvent.Signal()); @@ -683,12 +689,14 @@ await Task.Run(() => AccessKeyId = Guid.NewGuid().ToString(), SecretAccessKey = Guid.NewGuid().ToString() }); -#pragma warning disable CS8603 // Possible null reference return. - _minioAdmin.Setup(a => a.CreateUserAsync( - It.IsAny(), - It.IsAny() - )).ReturnsAsync(() => null); -#pragma warning restore CS8603 // Possible null reference return. + _storageAdminService.Setup(a => a.CreateUserAsync( + It.IsAny(), + It.IsAny() + )).ReturnsAsync(new Amazon.SecurityToken.Model.Credentials() + { + AccessKeyId = "a", + SecretAccessKey = "b", + }); var service = new TaskManager(_logger.Object, _options, _serviceScopeFactory.Object); await service.StartAsync(_cancellationTokenSource.Token).ConfigureAwait(false); @@ -699,7 +707,7 @@ await Task.Run(() => _testRunnerCallback.Verify(p => p.GenerateExecuteTaskResult(), Times.Once()); _testRunnerCallback.Verify(p => p.GenerateGetStatusResult(), Times.Once()); _messageBrokerSubscriberService.Verify(p => p.Acknowledge(It.Is(m => m.MessageId == taskDispatchEventMessage.MessageId)), Times.Once()); - _messageBrokerSubscriberService.Verify(p => p.Acknowledge(It.Is(m => m.MessageId == TaskCallbackEventMessage.MessageId)), Times.Once()); + _messageBrokerSubscriberService.Verify(p => p.Acknowledge(It.Is(m => m.MessageId == taskCallbackEventMessage.MessageId)), Times.Once()); _messageBrokerPublisherService.Verify(p => p.Publish(It.Is(m => m == _options.Value.Messaging.Topics.TaskUpdateRequest), It.IsAny()), Times.Exactly(2)); } @@ -719,6 +727,8 @@ public async Task TaskManager_NonArgoTaskCallbackEvent_CompletesWorkflow() var taskDispatchEventMessage = GenerateTaskDispatchEvent(); taskDispatchEventMessage.Body.TaskPluginType = NOT_ARGO; + _taskDispatchEventService.Setup(p => p.GetByTaskExecutionIdAsync(It.IsAny())) + .ReturnsAsync(new API.Models.TaskDispatchEventInfo(taskDispatchEventMessage.Body)); _messageBrokerSubscriberService.Setup( p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskDispatchRequest, StringComparison.OrdinalIgnoreCase)), It.IsAny(), @@ -792,6 +802,8 @@ public async Task TaskManager_TaskCallbackEventMetadataFails_FailsWorkflow() var taskDispatchEventMessage = GenerateTaskDispatchEvent(); taskDispatchEventMessage.Body.TaskPluginType = "argo"; + _taskDispatchEventService.Setup(p => p.GetByTaskExecutionIdAsync(It.IsAny())) + .ReturnsAsync(new API.Models.TaskDispatchEventInfo(taskDispatchEventMessage.Body)); _messageBrokerSubscriberService.Setup( p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskDispatchRequest, StringComparison.OrdinalIgnoreCase)), It.IsAny(), @@ -805,7 +817,7 @@ await Task.Run(() => }).ConfigureAwait(false); }); - var TaskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); + var taskCallbackEventMessage = GenerateTaskCallbackEvent(taskDispatchEventMessage); _messageBrokerSubscriberService.Setup( p => p.SubscribeAsync(It.Is(p => p.Equals(_options.Value.Messaging.Topics.TaskCallbackRequest, StringComparison.OrdinalIgnoreCase)), It.IsAny(), @@ -817,7 +829,7 @@ await Task.Run(() => resetEvent.Reset(2); await Task.Run(() => { - messageReceivedCallback(CreateMessageReceivedEventArgs(TaskCallbackEventMessage)); + messageReceivedCallback(CreateMessageReceivedEventArgs(taskCallbackEventMessage)); }).ConfigureAwait(false); }); _messageBrokerSubscriberService @@ -835,6 +847,14 @@ await Task.Run(() => AccessKeyId = Guid.NewGuid().ToString(), SecretAccessKey = Guid.NewGuid().ToString() }); + _storageAdminService.Setup(a => a.CreateUserAsync( + It.IsAny(), + It.IsAny() + )).ReturnsAsync(new Amazon.SecurityToken.Model.Credentials() + { + AccessKeyId = "a", + SecretAccessKey = "b", + }); _testMetadataRepositoryCallback.Setup(p => p.GenerateRetrieveMetadataResult()).Throws(new Exception()); @@ -847,7 +867,7 @@ await Task.Run(() => _testRunnerCallback.Verify(p => p.GenerateExecuteTaskResult(), Times.Once()); _testRunnerCallback.Verify(p => p.GenerateGetStatusResult(), Times.Once()); _messageBrokerSubscriberService.Verify(p => p.Acknowledge(It.Is(m => m.MessageId == taskDispatchEventMessage.MessageId)), Times.Once()); - _messageBrokerSubscriberService.Verify(p => p.Reject(It.Is(m => m.MessageId == TaskCallbackEventMessage.MessageId), false), Times.Once()); + _messageBrokerSubscriberService.Verify(p => p.Reject(It.Is(m => m.MessageId == taskCallbackEventMessage.MessageId), false), Times.Once()); _messageBrokerPublisherService.Verify(p => p.Publish(It.Is(m => m == _options.Value.Messaging.Topics.TaskUpdateRequest), It.IsAny()), Times.Exactly(2)); } diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj index b6d2c4ed4..7e01e82fa 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj +++ b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj @@ -24,9 +24,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/UnitTests/WorkflowManager.Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj b/tests/UnitTests/WorkflowManager.Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj index 12a8a9f01..d0e6cd398 100644 --- a/tests/UnitTests/WorkflowManager.Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj +++ b/tests/UnitTests/WorkflowManager.Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj @@ -25,11 +25,11 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj b/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj index 182c5d037..ca066e72c 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj +++ b/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj @@ -25,11 +25,11 @@ - + - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 612b6cba6..787d4c4aa 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -20,20 +20,20 @@ }, "FluentAssertions": { "type": "Direct", - "requested": "[6.6.0, )", - "resolved": "6.6.0", - "contentHash": "gBsgPrNRkzUQfnxZSKnU0oVILIc5dr+dmdKXscyYKD5URcwNVQ72a7uuCvTyBzRZW98MZQNolSYC0y/MQTJ03A==", + "requested": "[6.7.0, )", + "resolved": "6.7.0", + "contentHash": "PWbow/R3MnYDP8UW7zh/w80rGb+1NufGoNJeuzouTo2bqpvwNTFxbDwF6XWfFZ5IuquL2225Um+qSyZ8jVsT+w==", "dependencies": { "System.Configuration.ConfigurationManager": "4.4.0" } }, "Microsoft.AspNetCore.Mvc.Testing": { "type": "Direct", - "requested": "[6.0.3, )", - "resolved": "6.0.3", - "contentHash": "+NhhbRzLVZ97rEWw+euUC0dxCq87uLScTYDeFxY/lTFXDOY3kwd1LNTaLV+dRq/Wfmkg5Lq/i9YitDoWjsruig==", + "requested": "[6.0.7, )", + "resolved": "6.0.7", + "contentHash": "zG6ufsuqxIohA+gOy8blipc4sN/Qx56s8Zlf1vmlPO9tC9tXESg+QiOkWuxgCxh4rmyfKTbpeJVhF88asqouIQ==", "dependencies": { - "Microsoft.AspNetCore.TestHost": "6.0.3", + "Microsoft.AspNetCore.TestHost": "6.0.7", "Microsoft.Extensions.DependencyModel": "6.0.0", "Microsoft.Extensions.Hosting": "6.0.1" } @@ -46,21 +46,21 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.1.0, )", - "resolved": "17.1.0", - "contentHash": "MVKvOsHIfrZrvg+8aqOF5dknO/qWrR1sWZjMPQ1N42MKMlL/zQL30FQFZxPeWfmVKWUWAOmAHYsqB5OerTKziw==", + "requested": "[17.2.0, )", + "resolved": "17.2.0", + "contentHash": "kYmkDYbcDd+jNvmMH4TMtgHjsUYbIsWENM2VcjB0X7TawXbehL5I8OIsu2TgFS/nQCgZE94InrqMxrm7WDy+Lw==", "dependencies": { - "Microsoft.CodeCoverage": "17.1.0", - "Microsoft.TestPlatform.TestHost": "17.1.0" + "Microsoft.CodeCoverage": "17.2.0", + "Microsoft.TestPlatform.TestHost": "17.2.0" } }, "Moq": { "type": "Direct", - "requested": "[4.17.2, )", - "resolved": "4.17.2", - "contentHash": "HytUPJ3/uks2UgJ9hIcyXm3YxpFAR4OJzbQwTHltbKGun3lFLhEHs97hiiPj1dY8jV/kasXeihTzDxct6Zf3iQ==", + "requested": "[4.18.1, )", + "resolved": "4.18.1", + "contentHash": "MmZIKNyvn8VrivSaqA8tqy5DmwUievC9zsuNTrcb00oY4IeGq6fXT5BQK329lZ05/tyi5vp30AWe9fl0d2PZQg==", "dependencies": { - "Castle.Core": "4.4.1", + "Castle.Core": "5.0.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, @@ -109,32 +109,23 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.2", - "contentHash": "P0VKY4Y3/UWaj7Spn/q/A2utEu5NMuJ7tHWLAB7rcTubsPR7LCuIzBlIypSUgDyS4OWnFxwB1hBHF2iklAR0KA==" + "resolved": "3.7.12.11", + "contentHash": "Tb6llf5tUU8FiptuB6Xq8vaJpxXDRcWL39nkEiHkDhdctj9l2kPL0DydrCNCAVwLWWTlPXyLUD8i37Rm0mRjaw==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.167", - "contentHash": "ITsuRFaz3qSsWKrjsjOMFeOEp8+7EFdQbg/GXk6YuBKuPurmBCz+ydaLNfbe5Imc+NdG1A/4vCebYFBghZIEWg==", + "resolved": "3.7.1.176", + "contentHash": "VrUC7q6XTUUNVFlMxPKXKNRdXcZm+I7qOj3EFGOmNXVwmIGM4IsV1V5sCCb2KWZ9Thv/RlR3dA+YxjFP3a/3vw==", "dependencies": { - "AWSSDK.Core": "[3.7.12.2, 4.0.0)" + "AWSSDK.Core": "[3.7.12.11, 4.0.0)" } }, "Castle.Core": { "type": "Transitive", - "resolved": "4.4.1", - "contentHash": "zanbjWC0Y05gbx4eGXkzVycOQqVOFVeCjVsDSyuao9P4mtN1w3WxxTo193NGC7j3o2u3AJRswaoC6hEbnGACnQ==", + "resolved": "5.0.0", + "contentHash": "edc8jjyXqzzy8jFdhs36FZdwmlDDTgqPb2Zy1Q5F/f2uAc88bu/VS/0Tpvgupmpl9zJOvOo5ZizVANb0ltN1NQ==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections.Specialized": "4.3.0", - "System.ComponentModel": "4.3.0", - "System.ComponentModel.TypeConverter": "4.3.0", - "System.Diagnostics.TraceSource": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" + "System.Diagnostics.EventLog": "6.0.0" } }, "Crc32.NET": { @@ -147,8 +138,8 @@ }, "DnsClient": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "kVd3IxAs5EQZSKTQhMUaJmuOQ1n2VWKExatdqNszsxxKzTB+Toaxx3M1DsN3yKfHloMXPmt6fgfcOqRwKheoUQ==", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", "dependencies": { "Microsoft.Win32.Registry": "5.0.0" } @@ -190,8 +181,8 @@ }, "Karambolo.Extensions.Logging.File": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "d5COomaWp+1Eu5D0ivnuXy14GfgygzSUD7XIFtW8v2+2gCSCrZjuZVwMkQP9nQav9gt98iBh7F10HKePlPkLbQ==", + "resolved": "3.3.1", + "contentHash": "wkPTc/UEuSAwbO3/Ee+oCdotxncmc/DKwjM533Z0BKvJm94NLOvU2i7pifgMd6uAUJ8jy69OcFZRu7hXKbMW6g==", "dependencies": { "Microsoft.Extensions.FileProviders.Physical": "3.0.0", "Microsoft.Extensions.Logging.Configuration": "3.0.0", @@ -233,8 +224,8 @@ }, "Microsoft.AspNetCore.JsonPatch": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "eObF1OgvkQHJXmDMcMYM/oRZ1Vk939UZr2QShBsXoY01AkS+7nczgzzWdNd2TutlNx6AWZKBizg/sBCOXQDPbg==", + "resolved": "6.0.7", + "contentHash": "ybv3udO2SaGW74NKIxj06ozTtcEJf2yOCNj4OGY/ZvB+LG/mZGBVKrwZYaZBXaWR9dakrf4+M3LiMAhasTEamg==", "dependencies": { "Microsoft.CSharp": "4.7.0", "Newtonsoft.Json": "13.0.1" @@ -242,10 +233,10 @@ }, "Microsoft.AspNetCore.Mvc.NewtonsoftJson": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "h0ZMz0yR6HiqjKo2wrZP4WWBaioelPDljvCewdl6Qo7n2iTZpIRjukB0O5idyzATUJRDKltBDex0pGLH3Q0utQ==", + "resolved": "6.0.7", + "contentHash": "zkt7EFRR5fZQUc6taa8sO8aG+EF7XQ6Z7+fPW3gXCh6l7+vyDpZ9PbTODYMsXaS1tOjP1b+jJgf7hY/kaciO4Q==", "dependencies": { - "Microsoft.AspNetCore.JsonPatch": "6.0.3", + "Microsoft.AspNetCore.JsonPatch": "6.0.7", "Newtonsoft.Json": "13.0.1", "Newtonsoft.Json.Bson": "1.0.2" } @@ -265,16 +256,16 @@ }, "Microsoft.AspNetCore.TestHost": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "oeK3KFtoLslFbKyQEiQ8HgKWAmTXUlp8vtYByUmC5ysWVrNEpCrQOKACGV/uYSeC9aFvEIvVyFTcommnxrsyiA==", + "resolved": "6.0.7", + "contentHash": "R6bQLifCI9YrHLNjyvvxxBFw0f10sejkNR1P6p5jgZkAu5qbQDVMaxZL0wIUtYY8imdyygQ3KjHHq3tJqxbl/A==", "dependencies": { - "System.IO.Pipelines": "6.0.2" + "System.IO.Pipelines": "6.0.3" } }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "0N/ZJ71ncCxQWhgtkEYKOgu2oMHa8h1tsOUbhmIKXF8UwtSUCe4vHAsJ3DVcNWRwNfQzSTy263ZE+QF6MdIhhQ==" + "resolved": "17.2.0", + "contentHash": "MsKhJmwIfHxNDbTIlgQy29UpWSWPpbZOQPhQ7xalRy+ABnl8/neFHZGzSP3XlpW2dKAXHTFrtIcKzW/kopY2Bg==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -283,11 +274,11 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "f7ZlNOI1wPg/r0zRgvmcLAM3kwuCVGe5cZc8rYoKPDGZs5dgRFe5a43H9FnCXsyFAF6FILB08Nr9RkuNMwd3TQ==", + "resolved": "6.0.7", + "contentHash": "9BsvGSpTzxvqnxH19wLBFivK5TzWmsHZQc/1cQ4b2e+k85aIG9R4FYewQLHZdPrAxNQImXjTyW5nRI3s1rpt6A==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.3", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.3", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.7", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.7", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", @@ -297,18 +288,18 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "7c6wJtTFj7FDe20IVPDKeCzxWIMu+XDpYi7aYuUo6knu4vDeB3N3F0pjAZgXJ96GwTZYBrjOEwnbpYmfapEz/w==" + "resolved": "6.0.7", + "contentHash": "bjU0CkTqldgpVPTSj9M+R/3EaTz+u0jMeQMIC91YdGYDbpX/tAN5UYx+Ihzk4AtP8gmhburQUgMTdnmCE9c5sA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.3", - "contentHash": "Ld9HyVABYor3Tq43/sG2JERL94UnDHJPg5PwpkCW4CWsf/CbxHetdecv+bCXA/Hg4q+44sov0GVl4Ywjk4PnyA==" + "resolved": "6.0.7", + "contentHash": "VAOrGma8mRspUb/9quwIr21UZVqfWOcRQqhcYNkHBUD7woenwFTBvntiC9h2Ebtvj/BrRfezqjaHpWVvPSg4dw==" }, "Microsoft.Extensions.ApiDescription.Server": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "LH4OE/76F6sOCslif7+Xh3fS/wUUrE5ryeXAMcoCnuwOQGT5Smw0p57IgDh/pHgHaGz/e+AmEQb7pRgb++wt0w==" + "resolved": "6.0.5", + "contentHash": "Ckb5EDBUNJdFWyajfXzUIMRkhf52fHZOQuuZg/oiu8y7zDCVwD0iHhew6MnThjHmevanpxL3f5ci2TtHQEN6bw==" }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", @@ -650,8 +641,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "OMo/FYnKGy3lZEK0gfitskRM3ga/YBt6MyCyFPq0xNLeybGOQ6HnYNAAvzyePo5WPuMiw3LX+HiuRWNjnas1fA==", + "resolved": "17.2.0", + "contentHash": "7j1KYDHLhU98XnCEbECMncXLydI9fNiFLcFsiBsP3lV6EkHOaj5kTPAWHYkKnPGRC9TbZUboSQq8rWI4dTQsxg==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -659,10 +650,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.1.0", - "contentHash": "JS0JDLniDhIzkSPLHz7N/x1CG8ywJOtwInFDYA3KQvbz+ojGoT5MT2YDVReL1b86zmNRV8339vsTSm/zh0RcMg==", + "resolved": "17.2.0", + "contentHash": "bI67J+hers241h7eD2eecS02p9CbKcQDIeoRvO4FgMlTWg2ZTzc0D3uWLYr5U+K5x9O1pNmyMoMDbYIeWY/TWw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.1.0", + "Microsoft.TestPlatform.ObjectModel": "17.2.0", "Newtonsoft.Json": "9.0.1" } }, @@ -713,35 +704,35 @@ }, "Monai.Deploy.Storage": { "type": "Transitive", - "resolved": "0.2.0-rc0009", - "contentHash": "YOdGLuSQwR4QtktmIhpee/+gNs5cgGGBYax9xLun7kr1Og751v12aH33Fn2Vu88L3gDvYGMkB/2UjdI0k61ldQ==", + "resolved": "0.2.0-rc0012", + "contentHash": "Ib7NQKYW8coarE8y5z9rNgU3Ry1/PSepr5yvm6ttdKmZ4+SS9D3UhnosLWIWNqNCID7VFXVRbgPmT1OJsKiAGw==", "dependencies": { "AWSSDK.SecurityToken": "3.7.1.165", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", - "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0009", + "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0012", "System.IO.Abstractions": "17.0.18" } }, "Monai.Deploy.Storage.MinIO": { "type": "Transitive", - "resolved": "0.2.0-rc0009", - "contentHash": "muor/mSIGF72HK3nQdLHNa7k468p5BcnC0rkVe/FtBH4H82UpIgMuY8SoauF9L+HgRS2U2d0W1HPoNfqusp+MQ==", + "resolved": "0.2.0-rc0012", + "contentHash": "dzHB2zrNlTbUrE+DyBtiYY0Vz+R34L2qLUAuZX1QINhKsswCqdy5kcgmLf6DJEKVx089WMPxWt0kCuPTCPFiAg==", "dependencies": { "AWSSDK.SecurityToken": "3.7.1.165", "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Logging": "6.0.0", "Microsoft.Extensions.Options": "6.0.0", "Minio": "4.0.4", - "Monai.Deploy.Storage": "0.2.0-rc0009", - "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0009" + "Monai.Deploy.Storage": "0.2.0-rc0012", + "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0012" } }, "Monai.Deploy.Storage.S3Policy": { "type": "Transitive", - "resolved": "0.2.0-rc0009", - "contentHash": "IgiC87hJJLP+azRiLcJVD7Vqb6pfU36enhDgoUJT+YSFdhAFCrGAiPsYOyGc3NiH+YsEhxbUTJhJm3O3Mx4PMA==", + "resolved": "0.2.0-rc0012", + "contentHash": "K91EJk66ipEr1kvauMpr6GNIPMUmso+8KGWSI/6S5ps+gAHzCAbIsVecNslhaK804y0dM8btj8u6QBvqN4I/rQ==", "dependencies": { "Ardalis.GuardClauses": "4.0.1", "Newtonsoft.Json": "13.0.1" @@ -749,38 +740,38 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "2.15.0", - "contentHash": "5uPSADVLydGJ4CbmjrsQn7v3NugSdx6htJ4cMNbo8youlfBa5v6YbEqztbipnl+dT1L/YBkJKZ1DDp6LWl0Hqw==", + "resolved": "2.17.0", + "contentHash": "wGUX8GMQ0DYG68u1ENAUtJTx6cmQTt6/BfMjqB+Q+aWu2ZkBZ09mA1QbBU5mcbVqulF5U72bGzxChtjYxaS9Dg==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "MongoDB.Driver": { "type": "Transitive", - "resolved": "2.15.0", - "contentHash": "MaDExORt2JLBHFlG3dJZIdQlZsfK8YjfEbXJECqAU/Ez8BwbJwjHS0AjOBQZPj3U4UDU5pnGYiQn4P0dM9DnMw==", + "resolved": "2.17.0", + "contentHash": "NFqjuDNrGNGEsblqoKBoOSUU8vx1UbZjKP3nVhxhGnK9p8ef0t3fyPcjxmYbO5vdFpDQw2A0Ly4dPzyRW3QEug==", "dependencies": { - "MongoDB.Bson": "2.15.0", - "MongoDB.Driver.Core": "2.15.0", - "MongoDB.Libmongocrypt": "1.3.0" + "MongoDB.Bson": "2.17.0", + "MongoDB.Driver.Core": "2.17.0", + "MongoDB.Libmongocrypt": "1.5.4" } }, "MongoDB.Driver.Core": { "type": "Transitive", - "resolved": "2.15.0", - "contentHash": "oEfGhyxHDmH3KhRHPZqVEYSfLqFwOLrY5zMszbELKNxrgkJj82MNJ8AzGVOsayaxtrQqqcAGfyQK8Ecc1yoc0Q==", + "resolved": "2.17.0", + "contentHash": "bQLdFZNywlApJ5H5KnFXxGik3dZ/VOIUQ7YQniZd9eNmNZFEwEMr+/yoCJ8FigyzOd7iKYOLpmUWGwG2M2e2aQ==", "dependencies": { - "DnsClient": "1.6.0", - "MongoDB.Bson": "2.15.0", - "MongoDB.Libmongocrypt": "1.3.0", + "DnsClient": "1.6.1", + "MongoDB.Bson": "2.17.0", + "MongoDB.Libmongocrypt": "1.5.4", "SharpCompress": "0.30.1", "System.Buffers": "4.5.1" } }, "MongoDB.Libmongocrypt": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "BAvqY/otOsmAGTsmzIYXRFysvpu8X7rYkDzEBX4iBlrF57SB+fD5px9sCPR6sETgfZ6k98qUNS6go5wtY9WOBA==" + "resolved": "1.5.4", + "contentHash": "JQrfonPIGey2n38tYmhkYOjmoHeGCwvbEru/G7zciYcx198neZerSPylIt6kTGtpGQDMhjCg0Nvt9eCBm6TWZQ==" }, "NETStandard.Library": { "type": "Transitive", @@ -930,35 +921,35 @@ }, "Swashbuckle.AspNetCore": { "type": "Transitive", - "resolved": "6.3.0", - "contentHash": "3TAV6JqsJF2F5e5d/tiQuW/TlzKXB/n2IcL5QR1FP8ArmLhmPkpeHiLZ3+1YnJ5840/X5ApvpRRJpM9809IjTg==", + "resolved": "6.4.0", + "contentHash": "eUBr4TW0up6oKDA5Xwkul289uqSMgY0xGN4pnbOIBqCcN9VKGGaPvHX3vWaG/hvocfGDP+MGzMA0bBBKz2fkmQ==", "dependencies": { - "Microsoft.Extensions.ApiDescription.Server": "3.0.0", - "Swashbuckle.AspNetCore.Swagger": "6.3.0", - "Swashbuckle.AspNetCore.SwaggerGen": "6.3.0", - "Swashbuckle.AspNetCore.SwaggerUI": "6.3.0" + "Microsoft.Extensions.ApiDescription.Server": "6.0.5", + "Swashbuckle.AspNetCore.Swagger": "6.4.0", + "Swashbuckle.AspNetCore.SwaggerGen": "6.4.0", + "Swashbuckle.AspNetCore.SwaggerUI": "6.4.0" } }, "Swashbuckle.AspNetCore.Swagger": { "type": "Transitive", - "resolved": "6.3.0", - "contentHash": "+taHh7kowNF+tQo9a82avwDtfqhAC82jTZTqZwypDpauPvwavyVtJ7+ERxE+yDb6U/nOcMicMmDAGbqbJ2Pc+Q==", + "resolved": "6.4.0", + "contentHash": "nl4SBgGM+cmthUcpwO/w1lUjevdDHAqRvfUoe4Xp/Uvuzt9mzGUwyFCqa3ODBAcZYBiFoKvrYwz0rabslJvSmQ==", "dependencies": { "Microsoft.OpenApi": "1.2.3" } }, "Swashbuckle.AspNetCore.SwaggerGen": { "type": "Transitive", - "resolved": "6.3.0", - "contentHash": "8PRLtqCXTIfc+W/pcyab8GqHzHuFRZ3L+9/fix/ssVknwy/pbgkOqgzq9DGWfKz+MZReIp5ajZLR7bXioDdacQ==", + "resolved": "6.4.0", + "contentHash": "lXhcUBVqKrPFAQF7e/ZeDfb5PMgE8n5t6L5B6/BQSpiwxgHzmBcx8Msu42zLYFTvR5PIqE9Q9lZvSQAcwCxJjw==", "dependencies": { - "Swashbuckle.AspNetCore.Swagger": "6.3.0" + "Swashbuckle.AspNetCore.Swagger": "6.4.0" } }, "Swashbuckle.AspNetCore.SwaggerUI": { "type": "Transitive", - "resolved": "6.3.0", - "contentHash": "OmVLGzyeNBFUAx6E/bqrZW4uxfv9q2MtegYzeHv5Dj8N34ry8104d6OcyRIV4BhwHBSFD1rMvDlPciguFMtQ5w==" + "resolved": "6.4.0", + "contentHash": "1Hh3atb3pi8c+v7n4/3N80Jj8RvLOXgWxzix6w3OZhB7zBGRwsy7FWr4e3hwgPweSBpwfElqj4V4nkjYabH9nQ==" }, "System.Buffers": { "type": "Transitive", @@ -1000,78 +991,11 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Collections.NonGeneric": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Collections.Specialized": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", - "dependencies": { - "System.Collections.NonGeneric": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.ComponentModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, "System.ComponentModel.Annotations": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" }, - "System.ComponentModel.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", - "dependencies": { - "System.ComponentModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.TypeConverter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Collections.Specialized": "4.3.0", - "System.ComponentModel": "4.3.0", - "System.ComponentModel.Primitives": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, "System.Configuration.ConfigurationManager": { "type": "Transitive", "resolved": "4.4.0", @@ -1103,22 +1027,6 @@ "resolved": "6.0.0", "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw==" }, - "System.Diagnostics.TraceSource": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VnYp1NxGx8Ww731y2LJ1vpfb/DKVNKEZ8Jsh5SgQTZREL/YpWRArgh9pI8CDLmgHspZmLL697CaLvH85qQpRiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.3.0", @@ -1129,27 +1037,6 @@ "System.Runtime": "4.3.0" } }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, "System.Globalization": { "type": "Transitive", "resolved": "4.3.0", @@ -1207,8 +1094,8 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.0.18", - "contentHash": "x0iIMdP+PCLIkz8h13xHCecaiysFgHPe9mM3FdyfSmkl5+MtMCmgFFIe38Aibkzd0UAY/OMoXMKGR2RK10rebQ==" + "resolved": "17.0.24", + "contentHash": "hA7bacntMiZv1Yf9xtjwl/GP3GT1mG84QxhAk7ijAUD0pJhJaVVwXScE13vMpXnNtlaRDW6SeyZdWg2j2qrh4w==" }, "System.IO.FileSystem": { "type": "Transitive", @@ -1235,8 +1122,8 @@ }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "cb5OfQjnz+zjpJJei+f3QYK7+wWZrDdNHf3DykO6QCacpNZ80tuNgq1DC2kqlrjfEu+cMUTvulxPIrCMbBkjqg==" + "resolved": "6.0.3", + "contentHash": "ryTgF+iFkpGZY1vRQhfCzX0xTdlV3pyaTTqRu2ETbEv+HlV7O6y7hyQURnghNIXvctl5DuZ//Dpks6HdL/Txgw==" }, "System.Linq": { "type": "Transitive", @@ -1250,30 +1137,6 @@ "System.Runtime.Extensions": "4.3.0" } }, - "System.Linq.Expressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, "System.Memory": { "type": "Transitive", "resolved": "4.5.4", @@ -1323,18 +1186,6 @@ "System.Runtime.Handles": "4.3.0" } }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, "System.Reactive": { "type": "Transitive", "resolved": "5.0.0", @@ -1366,38 +1217,6 @@ "resolved": "4.7.0", "contentHash": "VR4kk8XLKebQ4MZuKuIni/7oh+QGFmZW3qORd1GvBq/8026OpW501SzT/oypwiQl4TvT8ErnReh/NzY9u+C6wQ==" }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, "System.Reflection.Metadata": { "type": "Transitive", "resolved": "1.6.0", @@ -1413,15 +1232,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, "System.Resources.ResourceManager": { "type": "Transitive", "resolved": "4.3.0", @@ -1652,17 +1462,6 @@ "System.Runtime": "4.3.0" } }, - "System.Text.Encoding.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "6.0.0", @@ -1680,14 +1479,6 @@ "System.Text.Encodings.Web": "6.0.0" } }, - "System.Text.RegularExpressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, "System.Threading": { "type": "Transitive", "resolved": "4.3.0", @@ -1722,45 +1513,6 @@ "resolved": "4.4.0", "contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ==" }, - "System.Xml.ReaderWriter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Extensions": "4.3.0" - } - }, - "System.Xml.XmlDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, "xunit.abstractions": { "type": "Transitive", "resolved": "2.0.3", @@ -1815,11 +1567,11 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "4.0.1", - "Karambolo.Extensions.Logging.File": "3.3.0", - "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "6.0.3", + "Karambolo.Extensions.Logging.File": "3.3.1", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "6.0.7", "Microsoft.AspNetCore.Mvc.Versioning": "5.0.0", "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer": "5.0.0", - "Microsoft.EntityFrameworkCore": "6.0.3", + "Microsoft.EntityFrameworkCore": "6.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", "Microsoft.Extensions.Hosting": "6.0.1", "Microsoft.Extensions.Logging": "6.0.0", @@ -1827,6 +1579,7 @@ "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", + "Monai.Deploy.Storage.MinIO": "0.2.0-rc0012", "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", @@ -1836,9 +1589,10 @@ "Monai.Deploy.WorkflowManager.TaskManager": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.Argo": "1.0.0", + "Monai.Deploy.WorkflowManager.TaskManager.Database": "1.0.0", "Monai.Deploy.WorkflowManager.TaskManager.TestPlugin": "1.0.0", "Newtonsoft.Json": "13.0.1", - "Swashbuckle.AspNetCore": "6.3.0" + "Swashbuckle.AspNetCore": "6.4.0" } }, "monai.deploy.workflowmanager.common": { @@ -1867,21 +1621,18 @@ "Microsoft.Extensions.Configuration": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", - "Monai.Deploy.Storage": "0.2.0-rc0009", - "Monai.Deploy.Storage.MinIO": "0.2.0-rc0009", + "Monai.Deploy.Storage": "0.2.0-rc0012", "Newtonsoft.Json": "13.0.1", - "System.IO.Abstractions": "17.0.18" + "System.IO.Abstractions": "17.0.24" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.167", + "AWSSDK.SecurityToken": "3.7.1.176", "Microsoft.Extensions.Configuration": "6.0.1", "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", - "MongoDB.Bson": "2.15.0", + "MongoDB.Bson": "2.17.0", "Newtonsoft.Json": "13.0.1" } }, @@ -1892,11 +1643,10 @@ "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "MongoDB.Bson": "2.15.0", - "MongoDB.Driver": "2.15.0" + "MongoDB.Bson": "2.17.0", + "MongoDB.Driver": "2.17.0" } }, "monai.deploy.workflowmanager.logging": { @@ -1912,9 +1662,7 @@ "Ardalis.GuardClauses": "4.0.1", "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", - "Monai.Deploy.Storage": "0.2.0-rc0009", - "Monai.Deploy.Storage.MinIO": "0.2.0-rc0009", + "Monai.Deploy.Storage": "0.2.0-rc0012", "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", @@ -1926,7 +1674,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Storage.MinIO": "0.2.0-rc0009", + "Monai.Deploy.Storage": "0.2.0-rc0012", "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", "Monai.Deploy.WorkflowManager.Logging": "1.0.0" } @@ -1939,12 +1687,11 @@ "Microsoft.Extensions.Logging.Abstractions": "6.0.1", "Microsoft.Extensions.Options": "6.0.0", "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", - "Monai.Deploy.Storage": "0.2.0-rc0009", - "Monai.Deploy.Storage.MinIO": "0.2.0-rc0009", + "Monai.Deploy.Storage": "0.2.0-rc0012", "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0" + "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", + "Monai.Deploy.WorkflowManager.TaskManager.Database": "1.0.0" } }, "monai.deploy.workflowmanager.taskmanager.aideclinicalreview": { @@ -1959,9 +1706,8 @@ "type": "Project", "dependencies": { "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", - "Monai.Deploy.Storage": "0.2.0-rc0009", - "Monai.Deploy.Storage.MinIO": "0.2.0-rc0009" + "Monai.Deploy.Storage": "0.2.0-rc0012", + "MongoDB.Bson": "2.17.0" } }, "monai.deploy.workflowmanager.taskmanager.argo": { @@ -1970,15 +1716,26 @@ "IdentityModel.OidcClient": "5.0.0", "KubernetesClient": "7.2.19", "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", - "Monai.Deploy.Storage": "0.2.0-rc0009", - "Monai.Deploy.Storage.MinIO": "0.2.0-rc0009", + "Monai.Deploy.Storage": "0.2.0-rc0012", "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.ConditionsResolver": "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.Messaging": "0.1.3-rc0010", + "Monai.Deploy.WorkflowManager.Database": "1.0.0", + "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", + "MongoDB.Bson": "2.17.0", + "MongoDB.Driver": "2.17.0" + } + }, "monai.deploy.workflowmanager.taskmanager.testplugin": { "type": "Project", "dependencies": { @@ -1988,12 +1745,10 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.167", + "AWSSDK.SecurityToken": "3.7.1.176", "Ardalis.GuardClauses": "4.0.1", "Monai.Deploy.Messaging": "0.1.3-rc0010", - "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0010", - "Monai.Deploy.Storage": "0.2.0-rc0009", - "Monai.Deploy.Storage.MinIO": "0.2.0-rc0009", + "Monai.Deploy.Storage": "0.2.0-rc0012", "Monai.Deploy.WorkflowManager.Common": "1.0.0", "Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0", "Monai.Deploy.WorkflowManager.Configuration": "1.0.0",