@@ -50,7 +50,7 @@ public class S3Client {
5050
5151 protected S3Client (String bucketName ) {
5252 this .bucketName = bucketName ;
53-
53+ final String defaultRegion = "eu-west-1" ;
5454 S3ClientBuilder builder = software .amazon .awssdk .services .s3 .S3Client .builder ();
5555 S3Presigner .Builder presignerBuilder = S3Presigner .builder ();
5656
@@ -63,23 +63,27 @@ protected S3Client(String bucketName) {
6363 )
6464 )
6565 .endpointOverride (Config .instance .LOCALSTACK_ENDPOINT )
66+ .region (Region .of (defaultRegion ))
6667 .forcePathStyle (true );
6768 presignerBuilder
6869 .endpointOverride (Config .instance .LOCALSTACK_ENDPOINT )
6970 .serviceConfiguration (S3Configuration .builder ().pathStyleAccessEnabled (true ).build ())
71+ .region (Region .of (defaultRegion ))
7072 .credentialsProvider (
7173 software .amazon .awssdk .auth .credentials .StaticCredentialsProvider .create (
7274 software .amazon .awssdk .auth .credentials .AwsBasicCredentials .create ("localstack" , "localstack" )
7375 ));
7476 } else if (Config .instance != null && Config .instance .JOBS_S3_BUCKET .equals (bucketName )) {
75- final String region = Config .instance != null ? Config .instance .AWS_REGION : "eu-west-1" ; //TODO: Remove default value
77+ final String region = Config .instance != null ? Config .instance .AWS_REGION : defaultRegion ; //TODO: Remove default value
7678 builder .region (Region .of (region ));
79+ presignerBuilder .region (Region .of (region ));
7780 } else {
7881 GetBucketLocationResponse bucketLocation = getInstance ().client .getBucketLocation (GetBucketLocationRequest .builder ().bucket (bucketName ).build ());
7982 String bucketRegion = bucketLocation .locationConstraintAsString ();
8083 if (Config .instance .forbiddenSourceRegions ().contains (bucketRegion ))
8184 throw new IllegalArgumentException ("Source bucket region " + bucketRegion + " is not allowed." );
8285 builder .region (Region .of (bucketRegion ));
86+ presignerBuilder .region (Region .of (bucketRegion ));
8387 }
8488
8589 if (Config .instance != null && Config .instance .JOB_BOT_SECRET_ARN != null ) {
0 commit comments