S3 Store Cleanup/ Leak close

modules/dataverse-parent/pom.xml

@@ -153,7 +153,7 @@
         <postgresql.version>42.7.7</postgresql.version>
         <solr.version>9.8.0</solr.version>
         <postgresql.server.version>16</postgresql.server.version>
-        <aws.version>2.33.0</aws.version>
+        <aws.version>2.41.10</aws.version>
         <google.library.version>26.30.0</google.library.version>
 
         <!-- Basic libs, logging -->

src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java

@@ -120,7 +120,6 @@ public S3AccessIO(T dvObject, DataAccessRequest req, String driverId) {
         try {
             bucketName = getBucketName(driverId);
             minPartSize = getMinPartSize(driverId);
-            credentialsProvider = getCredentialsProvider(driverId);
             s3 = getClient(driverId);
             tm = getTransferManager(driverId);
             s3Presigner = getPresigner(driverId);
@@ -156,7 +155,6 @@ public S3AccessIO(T dvObject, DataAccessRequest req, @NotNull S3AsyncClient s3cl
 
     private S3AsyncClient s3 = null;
     private S3Presigner s3Presigner = null;
-    private AwsCredentialsProvider credentialsProvider;
     private S3TransferManager tm = null;
     private String bucketName = null;
     private String key = null;
@@ -1014,8 +1012,6 @@ public String generateTemporaryDownloadUrl(String auxiliaryTag, String auxiliary
             } catch (S3Exception e) {
                 logger.warning("Exception generating temporary S3 url for " + key + " (" + e.getMessage() + ")");
                 return null;
-            } finally {
-                s3Presigner.close();
             }
 
             if (presignedRequest != null) {
@@ -1072,8 +1068,6 @@ private String generateTemporaryS3UploadUrl(String key, Date expiration) throws
         } catch (S3Exception e) {
             logger.warning("Exception generating temporary S3 upload url for " + key + " (" + e.getMessage() + ")");
             return null;
-        } finally {
-            s3Presigner.close();
         }
 
         String urlString = presignedRequest.url().toString();
@@ -1134,8 +1128,6 @@ public JsonObjectBuilder generateTemporaryS3UploadUrls(String globalId, String s
                     + "&storageidentifier=" + storageIdentifier);
             response.add("complete", "/api/datasets/mpupload?globalid=" + globalId + "&uploadid=" + uploadId
                     + "&storageidentifier=" + storageIdentifier);
-
-            s3Presigner.close();
         }
 
         response.add("partSize", minPartSize);
@@ -1566,4 +1558,16 @@ public static String getNewIdentifier(String driverId) {
         return driverId + DataAccess.SEPARATOR + getConfigParamForDriver(driverId, BUCKET_NAME) + ":"
                 + FileUtil.generateStorageIdentifier();
     }
+
+    public static void closeAll() {
+        logger.info("Closing all S3 clients and transfer managers.");
+        driverTMMap.values().forEach(S3TransferManager::close);
+        driverTMMap.clear();
+        driverClientMap.values().forEach(S3AsyncClient::close);
+        driverClientMap.clear();
+        driverPresignerMap.values().forEach(S3Presigner::close);
+        driverPresignerMap.clear();
+        // AwsCredentialsProvider does not need to be closed unless it's a specific implementation that requires it.
+        driverCredentialsProviderMap.clear();
+    }
 }

src/main/java/edu/harvard/iq/dataverse/dataaccess/S3LifecycleBean.java

@@ -0,0 +1,15 @@
+package edu.harvard.iq.dataverse.dataaccess;
+
+import jakarta.annotation.PreDestroy;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+
+@Singleton
+@Startup
+public class S3LifecycleBean {
+
+    @PreDestroy
+    public void cleanup() {
+        S3AccessIO.closeAll();
+    }
+}