Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public class AwsStorageService implements IStorageService {
boolean pathStyleAccess;

private S3Client s3Client;
private S3Presigner s3Presigner;

public AwsStorageService(FileCacheDurationConfig fileCacheDurationConfig, FilesCacheKeyGenerator filesCacheKeyGenerator) {
this.fileCacheDurationConfig = fileCacheDurationConfig;
Expand Down Expand Up @@ -110,24 +111,27 @@ public S3Client getS3Client() {
}

private S3Presigner getS3Presigner() {
var builder = S3Presigner.builder()
.region(Region.of(region))
.credentialsProvider(getCredentialsProvider());

if(StringUtils.isNotEmpty(serviceEndpoint)) {
var endpointParams = S3EndpointParams.builder()
.endpoint(serviceEndpoint)
if (s3Presigner == null) {
var builder = S3Presigner.builder()
.region(Region.of(region))
.build();
.credentialsProvider(getCredentialsProvider());

var endpoint = S3EndpointProvider
.defaultProvider()
.resolveEndpoint(endpointParams).join();
if(StringUtils.isNotEmpty(serviceEndpoint)) {
var endpointParams = S3EndpointParams.builder()
.endpoint(serviceEndpoint)
.region(Region.of(region))
.build();

builder = builder.endpointOverride(endpoint.url());
}
var endpoint = S3EndpointProvider
.defaultProvider()
.resolveEndpoint(endpointParams).join();

return builder.build();
builder = builder.endpointOverride(endpoint.url());
}

s3Presigner = builder.build();
}
return s3Presigner;
}

private AwsCredentialsProvider getCredentialsProvider() {
Expand Down Expand Up @@ -240,10 +244,8 @@ private URI getLocation(String objectKey) {
.getObjectRequest(objectRequest)
.build();

try (var presigner = getS3Presigner()) {
var presignedRequest = presigner.presignGetObject(presignRequest);
return presignedRequest.httpRequest().getUri();
}
var presignedRequest = getS3Presigner().presignGetObject(presignRequest);
return presignedRequest.httpRequest().getUri();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,25 @@ void testAuthenticationMethodDetection() {
assertFalse((Boolean) ReflectionTestUtils.invokeMethod(storageService, "hasStaticCredentials"));
assertFalse((Boolean) ReflectionTestUtils.invokeMethod(storageService, "hasSessionToken"));
}

@Test
void testPresignerIsCachedAsSingleton() {
// Only region is needed to construct the presigner builder
ReflectionTestUtils.setField(storageService, "region", "us-east-1");
ReflectionTestUtils.setField(storageService, "serviceEndpoint", "");

var presigner1 = ReflectionTestUtils.invokeMethod(storageService, "getS3Presigner");
var presigner2 = ReflectionTestUtils.invokeMethod(storageService, "getS3Presigner");

assertNotNull(presigner1);
assertSame(presigner1, presigner2,
"S3Presigner must be cached as a singleton; recreating it on each call " +
"destroys the HTTP connection pool needed for IRSA credential refresh");
}

@Test
void testPresignerFieldInitiallyNull() {
assertNull(ReflectionTestUtils.getField(storageService, "s3Presigner"),
"S3Presigner should be lazily initialized");
}
}
Loading