Project-MONAI · mocsharp · Jun 23, 2022 · Jun 22, 2022 · Jun 22, 2022 · Jun 22, 2022
diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml
@@ -390,6 +390,12 @@
     :why: Dotnet - http://go.microsoft.com/fwlink/?LinkId=329770
     :versions: []
     :when: 2022-04-14 10:32:31.000000000 +01:00
+- - :approve
+  - System.ValueTuple
+  - :who: Victor Chang (mocsharp)
+    :why: Dotnet - https://github.com/dotnet/corefx/blob/master/LICENSE.TXT
+    :versions: []
+    :when: 2022-06-22 14:36:31.000000000 +07:00
 - - :approve
   - System.Xml.XDocument
   - :who: Joss Sparkes (RemakingEden)
@@ -1026,6 +1032,18 @@
     :why: Apache 2.0 - https://licenses.nuget.org/Apache-2.0
     :versions: []
     :when: 2022-05-09 14:46:00.000000000 +01:00
+- - :approve
+  - Monai.Deploy.Storage.MinIO
+  - :who: Victor Chang (mocsharp)
+    :why: Apache 2.0 - https://licenses.nuget.org/Apache-2.0
+    :versions: []
+    :when: 2022-06-22 13:18:00.000000000 +07:00
+- - :approve
+  - Monai.Deploy.Storage.S3Policy
+  - :who: Victor Chang (mocsharp)
+    :why: Apache 2.0 - https://licenses.nuget.org/Apache-2.0
+    :versions: []
+    :when: 2022-06-22 13:18:00.000000000 +07:00
 - - :approve
   - System.Security.Principal.Windows
   - :who: Jack Schofield (JackSchofield23)
@@ -1220,49 +1238,49 @@
     :when: 2022-05-11 11:00:00.000000000 +01:00
 - - :approve
   - IdentityModel
-  - :who: Victor Chang
+  - :who: Victor Chang (mocsharp)
     :why: Apache 2.0 - https://licenses.nuget.org/Apache-2.0
     :versions: []
     :when: 2022-05-16 20:36:08.189955789 Z
 - - :approve
   - IdentityModel.OidcClient
-  - :who: Victor Chang
+  - :who: Victor Chang (mocsharp)
     :why: Apache 2.0 - https://licenses.nuget.org/Apache-2.0
     :versions: []
     :when: 2022-05-16 20:36:08.594911480 Z
 - - :approve
   - KubernetesClient
-  - :who: Victor Chang
+  - :who: Victor Chang (mocsharp)
     :why: Apache 2.0 - https://licenses.nuget.org/Apache-2.0
     :versions: []
     :when: 2022-05-16 20:36:09.013355762 Z
 - - :approve
   - KubernetesClient.Basic
-  - :who: Victor Chang
+  - :who: Victor Chang (mocsharp)
     :why: Apache 2.0 - https://licenses.nuget.org/Apache-2.0
     :versions: []
     :when: 2022-05-16 20:36:09.429917058 Z
 - - :approve
   - KubernetesClient.Models
-  - :who: Victor Chang
+  - :who: Victor Chang (mocsharp)
     :why: Apache 2.0 - https://licenses.nuget.org/Apache-2.0
     :versions: []
     :when: 2022-05-16 20:36:09.848173630 Z
 - - :approve
   - Microsoft.Extensions.Http
-  - :who: Victor Chang
+  - :who: Victor Chang (mocsharp)
     :why: Apache 2.0 - https://licenses.nuget.org/Apache-2.0
     :versions: []
     :when: 2022-05-16 20:36:10.277235933 Z
 - - :approve
   - Fractions
-  - :who: Victor Chang
+  - :who: Victor Chang (mocsharp)
     :why: BSD 2-Clause Simplified License - https://github.com/danm-de/Fractions/blob/master/license.txt
     :versions: []
     :when: 2022-05-16 20:39:54.749024684 Z
 - - :approve
   - YamlDotNet
-  - :who: Victor Chang
+  - :who: Victor Chang (mocsharp)
     :why: MIT - https://github.com/aaubry/YamlDotNet/blob/master/LICENSE.txt
     :versions: []
     :when: 2022-05-16 20:42:18.749052054 Z

diff --git a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj
@@ -15,9 +15,9 @@ SPDX-License-Identifier: Apache License 2.0
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Monai.Deploy.Storage" Version="0.1.0-rc0033" />
+    <PackageReference Include="Monai.Deploy.Storage" Version="0.1.0-rc0058" />
     <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.0-rc0044" />
-    <PackageReference Include="System.IO.Abstractions" Version="16.1.25" />
+    <PackageReference Include="System.IO.Abstractions" Version="17.0.18" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json
@@ -38,16 +38,16 @@
       },
       "Monai.Deploy.Storage": {
         "type": "Direct",
-        "requested": "[0.1.0-rc0033, )",
-        "resolved": "0.1.0-rc0033",
-        "contentHash": "GP5/OnrRsstJF8/2hJK2s98diQiH/fn3x/jBhPEXzuoqXGYIsEdfKSz7SLqY0tiWqLafqbZt+q8avguJZ6qxGg==",
+        "requested": "[0.1.0-rc0058, )",
+        "resolved": "0.1.0-rc0058",
+        "contentHash": "F4WgwfQyuj88Aka54XWGfSWLKrVhf4w5hSjUPnzsrHTGfr7QPrjRRRGilShhuYGv6VY1WBH9zhitku5plaFYfw==",
         "dependencies": {
-          "AWSSDK.SecurityToken": "3.7.1.141",
-          "Ardalis.GuardClauses": "4.0.0",
+          "AWSSDK.SecurityToken": "3.7.1.165",
+          "Ardalis.GuardClauses": "4.0.1",
           "Microsoft.Extensions.Configuration": "6.0.1",
           "Microsoft.Extensions.Logging": "6.0.0",
-          "Minio": "3.1.13",
-          "Newtonsoft.Json": "13.0.1"
+          "Monai.Deploy.Storage.S3Policy": "0.1.0-rc0058",
+          "System.IO.Abstractions": "17.0.18"
         }
       },
       "Newtonsoft.Json": {
@@ -58,9 +58,9 @@
       },
       "System.IO.Abstractions": {
         "type": "Direct",
-        "requested": "[16.1.25, )",
-        "resolved": "16.1.25",
-        "contentHash": "PZ3y8SgASqtIlJyhss47FGLwBMXMWvxL9MKk9dEqIZT/vrfQr5yhKwdJ/vNm2H8FqsWJoxu0P12nYGXFj0irkA=="
+        "requested": "[17.0.18, )",
+        "resolved": "17.0.18",
+        "contentHash": "x0iIMdP+PCLIkz8h13xHCecaiysFgHPe9mM3FdyfSmkl5+MtMCmgFFIe38Aibkzd0UAY/OMoXMKGR2RK10rebQ=="
       },
       "Ardalis.GuardClauses": {
         "type": "Transitive",
@@ -72,35 +72,22 @@
       },
       "AWSSDK.Core": {
         "type": "Transitive",
-        "resolved": "3.7.10.10",
-        "contentHash": "eieuNNym2E63hAnUwZiEQtNCNT5knh2PTqcFVuFQsZpYCw22cGXLq9miC8TDENLFRHh2I1mkTBRiC9E8UlKQhw=="
+        "resolved": "3.7.12",
+        "contentHash": "mIQRvJhLwIB90hxMaRBMOs9FKd8fHZcOKIToYELupCMOPzkwthh0S4y674ExL8n5f+wQ/5m4U26lm1yBkHtqtA=="
       },
       "AWSSDK.SecurityToken": {
         "type": "Transitive",
-        "resolved": "3.7.1.141",
-        "contentHash": "paspGCeiN5Qjl6vJanqP1Ll8l3t9hqUmVWmeHMELXyvUgozvVzaSh+PTQ/gj6gmFQ64Us7aeCFSQlfBPZag+vQ==",
+        "resolved": "3.7.1.165",
+        "contentHash": "vz0ryVyjs6r9FD2cy9yzujNR5MKesRivfEJJ6tOaSNcw1gw268fq9dXBLD70H/Ppdw++xxMD9HuFwANj7d8mUg==",
         "dependencies": {
-          "AWSSDK.Core": "[3.7.10.10, 4.0.0)"
-        }
-      },
-      "Crc32.NET": {
-        "type": "Transitive",
-        "resolved": "1.2.0",
-        "contentHash": "wNW/huzolu8MNKUnwCVKxjfAlCFpeI8AZVfF46iAWJ1+P6bTU1AZct7VAkDDEjgeeTJCVTkGZaD6jSd/fOiUkA==",
-        "dependencies": {
-          "NETStandard.Library": "2.0.0"
+          "AWSSDK.Core": "[3.7.12, 4.0.0)"
         }
       },
       "JetBrains.Annotations": {
         "type": "Transitive",
         "resolved": "2021.3.0",
         "contentHash": "Ddxjs5RRjf+c8m9m++WvhW1lz1bqNhsTjWvCLbQN9bvKbkJeR9MhtfNwKgBRRdG2yLHcXFr5Lf7fsvvkiPaDRg=="
       },
-      "Microsoft.CSharp": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ=="
-      },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -148,33 +135,13 @@
           "System.Runtime.CompilerServices.Unsafe": "6.0.0"
         }
       },
-      "Microsoft.NETCore.Platforms": {
-        "type": "Transitive",
-        "resolved": "1.1.0",
-        "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
-      },
-      "Microsoft.NETCore.Targets": {
-        "type": "Transitive",
-        "resolved": "1.1.0",
-        "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
-      },
-      "Minio": {
-        "type": "Transitive",
-        "resolved": "3.1.13",
-        "contentHash": "i4h+gXs7kFHn1QUP0ZcuZz4Xa/PgNzZo+QRmi0WbFG5TYec7ozhrV+/cq7zfJbLOgcB89XwieASLLiduGNuwdA==",
-        "dependencies": {
-          "Crc32.NET": "1.2.0",
-          "Microsoft.CSharp": "4.5.0",
-          "RestSharp": "106.10.1",
-          "System.Reactive.Linq": "4.0.0"
-        }
-      },
-      "NETStandard.Library": {
+      "Monai.Deploy.Storage.S3Policy": {
         "type": "Transitive",
-        "resolved": "2.0.0",
-        "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==",
+        "resolved": "0.1.0-rc0058",
+        "contentHash": "tenVz2ciLkY+XJR/twKhHO+6JftT55kS0CrgCOsgYt3/ydiiUjifpU8SjkGV1KCKEWTxkIs/KP7vSmh2f84xAQ==",
         "dependencies": {
-          "Microsoft.NETCore.Platforms": "1.1.0"
+          "Ardalis.GuardClauses": "4.0.1",
+          "Newtonsoft.Json": "13.0.1"
         }
       },
       "RabbitMQ.Client": {
@@ -186,11 +153,6 @@
           "System.Threading.Channels": "4.7.1"
         }
       },
-      "RestSharp": {
-        "type": "Transitive",
-        "resolved": "106.10.1",
-        "contentHash": "MhR4w8LbArVaRA5T/oAR3ZnF852QXtDXRBO84GsvyYzsm7FsjXHJ+JaM8x/nR/B/OCB1WbolGH7hqMT1GZpNJw=="
-      },
       "System.ComponentModel.Annotations": {
         "type": "Transitive",
         "resolved": "5.0.0",
@@ -209,44 +171,11 @@
         "resolved": "4.5.4",
         "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw=="
       },
-      "System.Reactive": {
-        "type": "Transitive",
-        "resolved": "4.0.0",
-        "contentHash": "yaVAxT2Yl28p9+DupGwj2oPbIOYZUQimOQ+n7N7vML2oofIRj9BmcfD7DHc6FLrNah65EigOgG6U9VnwWEyz5g==",
-        "dependencies": {
-          "System.Runtime.InteropServices.WindowsRuntime": "4.3.0"
-        }
-      },
-      "System.Reactive.Linq": {
-        "type": "Transitive",
-        "resolved": "4.0.0",
-        "contentHash": "LaYTtUoOtQJ7SBb1/tfM/kcIHy0dsA7E+31/739HyTyGg9uSGzP/fV4VFI3/Atg7MQiks+JbEAwcoTDJY0pJoA==",
-        "dependencies": {
-          "System.Reactive": "4.0.0"
-        }
-      },
-      "System.Runtime": {
-        "type": "Transitive",
-        "resolved": "4.3.0",
-        "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "1.1.0",
-          "Microsoft.NETCore.Targets": "1.1.0"
-        }
-      },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
         "resolved": "6.0.0",
         "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
       },
-      "System.Runtime.InteropServices.WindowsRuntime": {
-        "type": "Transitive",
-        "resolved": "4.3.0",
-        "contentHash": "J4GUi3xZQLUBasNwZnjrffN8i5wpHrBtZoLG+OhRyGo/+YunMRWWtwoMDlUAIdmX0uRfpHIBDSV6zyr3yf00TA==",
-        "dependencies": {
-          "System.Runtime": "4.3.0"
-        }
-      },
       "System.Threading.Channels": {
         "type": "Transitive",
         "resolved": "4.7.1",

diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Monai.Deploy.WorkflowManager.Storage.csproj b/src/Monai.Deploy.WorkflowManager.Storage/Monai.Deploy.WorkflowManager.Storage.csproj
@@ -18,7 +18,7 @@ SPDX-License-Identifier: Apache License 2.0
 
   <ItemGroup>
     <PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
-    <PackageReference Include="Monai.Deploy.Storage" Version="0.1.0-rc0033" />
+    <PackageReference Include="Monai.Deploy.Storage" Version="0.1.0-rc0058" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Services/DicomService.cs b/src/Monai.Deploy.WorkflowManager.Storage/Services/DicomService.cs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache License 2.0
 
 using Ardalis.GuardClauses;
-using Monai.Deploy.Storage;
+using Monai.Deploy.Storage.API;
 
 namespace Monai.Deploy.WorkflowManager.Storage.Services
 {
@@ -15,12 +15,12 @@ public DicomService(IStorageService storageService)
             _storageService = storageService ?? throw new ArgumentNullException(nameof(storageService));
         }
 
-        public IEnumerable<string> GetDicomPathsForTask(string outputDirectory, string bucketName)
+        public async Task<IEnumerable<string>> GetDicomPathsForTask(string outputDirectory, string bucketName)
         {
             Guard.Against.NullOrWhiteSpace(outputDirectory);
             Guard.Against.NullOrWhiteSpace(bucketName);
 
-            var files = _storageService.ListObjects(bucketName, outputDirectory, true);
+            var files = await _storageService.ListObjectsAsync(bucketName, outputDirectory, true);
 
             var dicomFiles = files?.Where(f => f.FilePath.EndsWith(".dcm"));
 

diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Services/IDicomService.cs b/src/Monai.Deploy.WorkflowManager.Storage/Services/IDicomService.cs
@@ -10,6 +10,6 @@ public interface IDicomService
         /// </summary>
         /// <param name="outputDirectory">Output dir of the task.</param>
         /// <param name="bucketName">Name of the bucket.</param>
-        IEnumerable<string> GetDicomPathsForTask(string outputDirectory, string bucketName);
+        Task<IEnumerable<string>> GetDicomPathsForTask(string outputDirectory, string bucketName);
     }
 }