Refactor IMinioAdmin into base project

Signed-off-by: Victor Chang <vicchang@nvidia.com>

Author: mocsharp

.github/workflows/ci.yml

@@ -204,7 +204,6 @@ jobs:
         run: |
           mkdir $PACKAGEDIR
           dotnet pack --no-build -c ${{ env.BUILD_CONFIG }} -o $PACKAGEDIR -p:PackageVersion=${{ steps.gitversion.outputs.nuGetVersionV2 }}
-          rm $PACKAGEDIR/Monai.Deploy.Storage.S3Policy.*.nupkg
           ls -lR $PACKAGEDIR
         working-directory: ./src
 

src/Plugins/AWSS3/EF.Reverse.POCO.v3.ttinclude

@@ -40,4 +40,8 @@
     <ProjectReference Include="..\..\Storage\Monai.Deploy.Storage.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
 </Project>

src/Plugins/AWSS3/Monai.Deploy.Storage.AWSS3.csproj

@@ -0,0 +1,15 @@
+// SPDX-FileCopyrightText: © 2022 MONAI Consortium
+// SPDX-License-Identifier: Apache License 2.0
+
+using System;
+using System.Threading.Tasks;
+using Amazon.SecurityToken.Model;
+using Monai.Deploy.Storage.API;
+
+namespace Monai.Deploy.Storage.AWSS3
+{
+    public class StorageAdminService : IStorageAdminService
+    {
+        public Task<Credentials> CreateUserAsync(string username, AccessPermissions permissions, string[] bucketNames) => throw new NotImplementedException();
+    }
+}

src/Plugins/AWSS3/StorageAdminService.cs

@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: © 2022 MONAI Consortium
+// SPDX-License-Identifier: Apache License 2.0
+
+using Monai.Deploy.Storage.API;
+
+namespace Monai.Deploy.Storage.Minio.Extensions
+{
+    public static class AccessPermissionsExtensions
+    {
+        public static string GetString(this AccessPermissions policy) => policy switch
+        {
+            (AccessPermissions.Read & AccessPermissions.Write) => "readwrite",
+            AccessPermissions.ConsoleAdmin => "consoleAdmin",
+            AccessPermissions.Diagnostics => "diagnostics",
+            AccessPermissions.Read => "readonly",
+            AccessPermissions.Write => "writeonly",
+            _ => "",
+        };
+    }
+}

src/Plugins/MinIO/Extensions/AccessPermissionsExtensions.cs

@@ -12,5 +12,8 @@ public static partial class LoggerMethods
 
         [LoggerMessage(EventId = 20001, Level = LogLevel.Error, Message = "File '{path}' could not be found in '{bucketName}'.")]
         public static partial void FileNotFoundError(this ILogger logger, string bucketName, string path);
+
+        [LoggerMessage(EventId = 20002, Level = LogLevel.Error, Message = "Error verifying objects in bucket '{bucketName}'.")]
+        public static partial void VerifyObjectError(this ILogger logger, string bucketName, Exception ex);
     }
 }

src/Plugins/MinIO/Extensions/MinioPolicyExtensions.cs

@@ -7,7 +7,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Minio;
-using Minio.DataModel;
 using Monai.Deploy.Storage.API;
 using Monai.Deploy.Storage.Configuration;
 using Monai.Deploy.Storage.S3Policy;
@@ -78,7 +77,7 @@ public async Task<IList<VirtualFileInfo>> ListObjectsAsync(string bucketName, st
             Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName));
 
             var client = _minioClientFactory.GetClient();
-            return await ListObjectsUsingClient(client, bucketName, prefix, recursive, cancellationToken);
+            return await ListObjectsUsingClient(client, bucketName, prefix, recursive, cancellationToken).ConfigureAwait(false);
         }
 
         public async Task<Dictionary<string, string>> VerifyObjectsExistAsync(string bucketName, Dictionary<string, string> objectDict)
@@ -92,8 +91,8 @@ public async Task<Dictionary<string, string>> VerifyObjectsExistAsync(string buc
             {
                 try
                 {
-                    var fileObjects = await ListObjectsAsync(bucketName, obj.Value);
-                    var folderObjects = await ListObjectsAsync(bucketName, obj.Value.EndsWith("/") ? obj.Value : $"{obj.Value}/", true);
+                    var fileObjects = await ListObjectsAsync(bucketName, obj.Value).ConfigureAwait(false);
+                    var folderObjects = await ListObjectsAsync(bucketName, obj.Value.EndsWith("/") ? obj.Value : $"{obj.Value}/", true).ConfigureAwait(false);
 
                     if (!folderObjects.Any() && !fileObjects.Any())
                     {
@@ -104,7 +103,7 @@ public async Task<Dictionary<string, string>> VerifyObjectsExistAsync(string buc
                 }
                 catch (Exception e)
                 {
-                    _logger.LogError(e.Message);
+                    _logger.VerifyObjectError(bucketName, e);
 
                     continue;
                 }
@@ -120,8 +119,8 @@ public async Task<KeyValuePair<string, string>> VerifyObjectExistsAsync(string b
             Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName));
             Guard.Against.Null(objectPair, nameof(objectPair));
 
-            var fileObjects = await ListObjectsAsync(bucketName, objectPair.Value);
-            var folderObjects = await ListObjectsAsync(bucketName, objectPair.Value.EndsWith("/") ? objectPair.Value : $"{objectPair.Value}/", true);
+            var fileObjects = await ListObjectsAsync(bucketName, objectPair.Value).ConfigureAwait(false);
+            var folderObjects = await ListObjectsAsync(bucketName, objectPair.Value.EndsWith("/") ? objectPair.Value : $"{objectPair.Value}/", true).ConfigureAwait(false);
 
             if (folderObjects.Any() || fileObjects.Any())
             {
@@ -228,7 +227,7 @@ public async Task<IList<VirtualFileInfo>> ListObjectsWithCredentialsAsync(string
             Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName));
 
             var client = _minioClientFactory.GetClient(credentials, _options.Settings[ConfigurationKeys.Region]);
-            return await ListObjectsUsingClient(client, bucketName, prefix, recursive, cancellationToken);
+            return await ListObjectsUsingClient(client, bucketName, prefix, recursive, cancellationToken).ConfigureAwait(false);
         }
 
         public async Task PutObjectWithCredentialsAsync(string bucketName, string objectName, Stream data, long size, string contentType, Dictionary<string, string> metadata, Credentials credentials, CancellationToken cancellationToken = default)
@@ -312,7 +311,7 @@ private async Task<IList<VirtualFileInfo>> ListObjectsUsingClient(MinioClient cl
 
                 var objservable = client.ListObjectsAsync(listArgs, cancellationToken);
                 var completedEvent = new ManualResetEventSlim(false);
-                objservable.Subscribe<Item>(item =>
+                objservable.Subscribe(item =>
                 {
                     if (!item.IsDir)
                     {
@@ -330,7 +329,7 @@ private async Task<IList<VirtualFileInfo>> ListObjectsUsingClient(MinioClient cl
 
                 completedEvent.Wait(cancellationToken);
                 return files;
-            });
+            }).ConfigureAwait(false);
         }
 
         private static async Task RemoveObjectUsingClient(MinioClient client, string bucketName, string objectName, CancellationToken cancellationToken)
@@ -341,7 +340,7 @@ private static async Task RemoveObjectUsingClient(MinioClient client, string buc
             await client.RemoveObjectAsync(args, cancellationToken).ConfigureAwait(false);
         }
 
-        private async Task PutObjectUsingClient(MinioClient client, string bucketName, string objectName, Stream data, long size, string contentType, Dictionary<string, string>? metadata, CancellationToken cancellationToken)
+        private static async Task PutObjectUsingClient(MinioClient client, string bucketName, string objectName, Stream data, long size, string contentType, Dictionary<string, string>? metadata, CancellationToken cancellationToken)
         {
             var args = new PutObjectArgs()
                                 .WithBucket(bucketName)