fix(s3): always get a new S3 client for retries (#1534)

aws-greengrass · Oct 2, 2023 · 17494e9 · 17494e9
1 parent 8a08a8a
commit 17494e9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/aws/greengrass/componentmanager/builtins/S3Downloader.java b/src/main/java/com/aws/greengrass/componentmanager/builtins/S3Downloader.java
@@ -90,7 +90,6 @@ protected long download(long rangeStart, long rangeEnd, MessageDigest messageDig
         String bucket = s3ObjectPath.bucket;
         String key = s3ObjectPath.key;
 
-        S3Client regionClient = getRegionClientForBucket(bucket);
         GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(bucket).key(key)
                 .range(String.format(HTTP_RANGE_HEADER_FORMAT, rangeStart, rangeEnd)).build();
         logger.atDebug().kv("bucket", getObjectRequest.bucket()).kv("s3-key", getObjectRequest.key())
@@ -99,6 +98,7 @@ protected long download(long rangeStart, long rangeEnd, MessageDigest messageDig
         try {
             return RetryUtils.runWithRetry(s3ClientExceptionRetryConfig, () -> {
                 long downloaded = 0;
+                S3Client regionClient = getRegionClientForBucket(bucket);
                 try (InputStream inputStream = regionClient.getObject(getObjectRequest)) {
                     downloaded = download(inputStream, messageDigest);
                     if (downloaded == 0) {
@@ -148,11 +148,11 @@ public Long getDownloadSize() throws InterruptedException, PackageDownloadExcept
         // Parse artifact path
         String key = s3ObjectPath.key;
         String bucket = s3ObjectPath.bucket;
-        S3Client regionClient = getRegionClientForBucket(bucket);
         try {
             HeadObjectRequest headObjectRequest = HeadObjectRequest.builder().bucket(bucket).key(key).build();
             return RetryUtils.runWithRetry(s3ClientExceptionRetryConfig, () -> {
                 try {
+                    S3Client regionClient = getRegionClientForBucket(bucket);
                     HeadObjectResponse headObjectResponse = regionClient.headObject(headObjectRequest);
                     return headObjectResponse.contentLength();
                 } catch (S3Exception e) {