fix: properly close S3 client (#1531)

aws-greengrass · Oct 2, 2023 · be9a3d7 · be9a3d7
1 parent 17494e9
commit be9a3d7
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main/java/com/aws/greengrass/util/S3SdkClientFactory.java b/src/main/java/com/aws/greengrass/util/S3SdkClientFactory.java
@@ -79,7 +79,6 @@ public S3Client getS3Client() throws DeviceConfigurationException {
         if (configValidationError != null) {
             throw configValidationError;
         }
-        setS3EndpointType(Coerce.toString(deviceConfiguration.gets3EndpointType()));
         return getClientForRegion(region);
     }
 
@@ -90,6 +89,7 @@ public S3Client getS3Client() throws DeviceConfigurationException {
      * @return s3client
      */
     public S3Client getClientForRegion(Region r) {
+        setS3EndpointType(Coerce.toString(deviceConfiguration.gets3EndpointType()));
         return clientCache.computeIfAbsent(r, (region) -> S3Client.builder()
                 .httpClientBuilder(ProxyUtils.getSdkHttpClientBuilder())
                 .serviceConfiguration(S3Configuration.builder().useArnRegionEnabled(true).build())
@@ -118,7 +118,15 @@ private void setS3EndpointType(String type) {
         }
     }
 
+    /**
+     * Remove the cached client and close it.
+     *
+     */
+    @SuppressWarnings({"PMD.CloseResource"})
     private void refreshClientCache() {
-        clientCache.remove(region);
+        S3Client clientToRemove = clientCache.remove(region);
+        if (clientToRemove != null) {
+            clientToRemove.close();
+        }
     }
 }