MSEARCH-1245: Fix bucket creation

Author: viacheslavkol

NEWS.md

@@ -2,6 +2,7 @@
 
 ### Stories
 * [MSEARCH-1245](https://issues.folio.org/browse/MSEARCH-1245) Provide http client configuration for MinioS3Client/AwsS3Client
+* [MSEARCH-1245](https://issues.folio.org/browse/MSEARCH-1245) Fix bucket creation
 
 ## v3.0.0 - Released
 This release contains improvement client configuration and new features

pom.xml

@@ -28,6 +28,7 @@
     <aws.sdk.version>2.42.34</aws.sdk.version>
     <junit.version>6.0.3</junit.version>
     <testcontainers.version>2.0.4</testcontainers.version>
+    <mockito.version>5.18.0</mockito.version>
     <commons-io.version>2.21.0</commons-io.version>
   </properties>
 
@@ -86,6 +87,12 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>

src/main/java/org/folio/s3/client/MinioS3Client.java

@@ -135,6 +135,7 @@ public void createBucketIfNotExists() {
         .get();
       if (Boolean.TRUE.equals(exists)) {
         log.debug("Bucket already exists.");
+        return;
       }
       client.makeBucket(MakeBucketArgs.builder()
         .bucket(bucket)

src/test/java/org/folio/s3/client/MinioS3ClientCreateBucketTest.java

@@ -0,0 +1,88 @@
+package org.folio.s3.client;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.folio.s3.client.impl.ExtendedMinioAsyncClient;
+import org.folio.s3.exception.S3ClientException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import io.minio.BucketExistsArgs;
+import io.minio.MakeBucketArgs;
+
+@ExtendWith(MockitoExtension.class)
+class MinioS3ClientCreateBucketTest {
+
+  private static final String BUCKET = "test-bucket";
+  private static final String REGION = "us-east-1";
+
+  @Mock
+  private ExtendedMinioAsyncClient minioClient;
+
+  private MinioS3Client buildClient(String bucket) {
+    var props = S3ClientProperties.builder()
+      .endpoint("http://localhost:9000")
+      .region(REGION)
+      .bucket(bucket)
+      .accessKey("ak")
+      .secretKey("sk")
+      .build();
+    return new MinioS3Client(props, minioClient);
+  }
+
+  @Test
+  void createBucketIfNotExists_whenBucketNameIsBlank_doesNothing() throws Exception {
+    var client = buildClient("   ");
+
+    assertDoesNotThrow(client::createBucketIfNotExists);
+
+    verify(minioClient, never()).bucketExists(any(BucketExistsArgs.class));
+    verify(minioClient, never()).makeBucket(any(MakeBucketArgs.class));
+  }
+
+  @Test
+  void createBucketIfNotExists_whenBucketAlreadyExists_doesNotCallMakeBucket() throws Exception {
+    when(minioClient.bucketExists(any(BucketExistsArgs.class)))
+      .thenReturn(CompletableFuture.completedFuture(true));
+
+    var client = buildClient(BUCKET);
+    assertDoesNotThrow(client::createBucketIfNotExists);
+
+    verify(minioClient).bucketExists(any(BucketExistsArgs.class));
+    verify(minioClient, never()).makeBucket(any(MakeBucketArgs.class));
+  }
+
+  @Test
+  void createBucketIfNotExists_whenBucketDoesNotExist_createsBucket() throws Exception {
+    when(minioClient.bucketExists(any(BucketExistsArgs.class)))
+      .thenReturn(CompletableFuture.completedFuture(false));
+    when(minioClient.makeBucket(any(MakeBucketArgs.class)))
+      .thenReturn(CompletableFuture.completedFuture(null));
+
+    var client = buildClient(BUCKET);
+    assertDoesNotThrow(client::createBucketIfNotExists);
+
+    verify(minioClient).bucketExists(any(BucketExistsArgs.class));
+    verify(minioClient).makeBucket(any(MakeBucketArgs.class));
+  }
+
+  @Test
+  void createBucketIfNotExists_whenBucketExistsCheckThrows_throwsS3ClientException() throws Exception {
+    when(minioClient.bucketExists(any(BucketExistsArgs.class)))
+      .thenReturn(CompletableFuture.failedFuture(new RuntimeException("connection refused")));
+
+    var client = buildClient(BUCKET);
+
+    assertThrows(S3ClientException.class, client::createBucketIfNotExists);
+    verify(minioClient, never()).makeBucket(any(MakeBucketArgs.class));
+  }
+}