Throw any error from MinIO with ListObject APIs (#214)

* Throw any error from MinIO when listing objects * Capture ListObjectsAsync exceptions in VerifyObjectExistsAsync * Configure minio client timeout * Throw VerifyObjectsException on error * Convert MinIO exception with custom exceptions * Update API doc Signed-off-by: Victor Chang <[email protected]>
Project-MONAI · Jan 2, 2024 · e6d1220 · e6d1220
1 parent 8a74e9f
commit e6d1220
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/Plugins/MinIO/Tests/Unit/MinIoStorageServiceTest.cs b/src/Plugins/MinIO/Tests/Unit/MinIoStorageServiceTest.cs
@@ -98,7 +98,11 @@ await Assert.ThrowsAsync<OperationCanceledException>(async () =>
                             break;
                         }
                     }
+<<<<<<< HEAD
                     return await Task.FromResult(Disposable.Empty).ConfigureAwait(false);
+=======
+                    return Disposable.Empty;
+>>>>>>> 1757165 (Throw any error from MinIO with ListObject APIs (#214))
                 });
                 var service = new MinIoStorageService(_minIoClientFactory.Object, _amazonStsClient.Object, _options, _logger.Object);
                 _bucketOperations.Setup(p => p.ListObjectsAsync(It.IsAny<ListObjectsArgs>(), It.IsAny<CancellationToken>()))
@@ -121,7 +125,11 @@ await Assert.ThrowsAsync<ListObjectException>(async () =>
                     obs.OnNext(new Item { Key = "key", ETag = "etag", Size = 1, IsDir = false });
                     obs.OnError(new Exception("error"));
                     obs.OnCompleted();
+<<<<<<< HEAD
                     return await Task.FromResult(Disposable.Empty).ConfigureAwait(false);
+=======
+                    return Disposable.Empty;
+>>>>>>> 1757165 (Throw any error from MinIO with ListObject APIs (#214))
                 });
                 var service = new MinIoStorageService(_minIoClientFactory.Object, _amazonStsClient.Object, _options, _logger.Object);
                 _bucketOperations.Setup(p => p.ListObjectsAsync(It.IsAny<ListObjectsArgs>(), It.IsAny<CancellationToken>()))

diff --git a/src/Storage/API/StorageConnectionException.cs b/src/Storage/API/StorageConnectionException.cs
@@ -20,7 +20,11 @@ namespace Monai.Deploy.Storage.API
 {
     public class StorageConnectionException : Exception
     {
+<<<<<<< HEAD
         public string ServerMessage { get; set; } = default!;
+=======
+        public string ServerMessage { get; set; }
+>>>>>>> 1757165 (Throw any error from MinIO with ListObject APIs (#214))
         public List<string> Errors { get; set; }
 
         public StorageConnectionException()
@@ -40,7 +44,10 @@ public StorageConnectionException(string message, Exception innerException) : ba
 
         protected StorageConnectionException(SerializationInfo info, StreamingContext context) : base(info, context)
         {
+<<<<<<< HEAD
             Errors = new List<string>();
+=======
+>>>>>>> 1757165 (Throw any error from MinIO with ListObject APIs (#214))
         }
     }
 }