Skip to content

Commit 3d92065

Browse files
committed
Allow setting the bucket region with Cloudflare auto as default
1 parent 008135f commit 3d92065

File tree

5 files changed

+6
-1
lines changed

5 files changed

+6
-1
lines changed

src/inttest/resources/config/application.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ faf-api:
103103
access-key: admin
104104
secret-key: banana123
105105
endpoint: http://minio
106+
region: auto
106107
user-upload-bucket: user-uploads
107108

108109
logging:

src/main/java/com/faforever/api/config/FafApiProperties.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ public static class Coturn {
303303
@Data
304304
public static class S3 {
305305
private String endpoint;
306+
private String region;
306307
private String userUploadBucket;
307308
private String accessKey;
308309
private String secretKey;

src/main/java/com/faforever/api/config/S3Config.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public S3Client s3Client() {
3636
public S3Presigner s3Presigner() {
3737
return S3Presigner.builder()
3838
.endpointOverride(URI.create(properties.getS3().getEndpoint()))
39-
.region(Region.EU_CENTRAL_1) // region must be non-null but is ignored by some S3-compatible services
39+
// Cloudflare has different regions as AWS: wnam, enam, weur, eeur, apac, oc, auto
40+
.region(Region.of(properties.getS3().getRegion())) // region must be non-null but is ignored by some S3-compatible services
4041
.credentialsProvider(StaticCredentialsProvider.create(
4142
AwsBasicCredentials.create(properties.getS3().getAccessKey(), properties.getS3().getSecretKey())
4243
))

src/main/resources/config/application-local.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ faf-api:
6161
access-key: ${S3_ACCESS_KEY:admin}
6262
secret-key: ${S3_SECRET_KEY:banana123}
6363
user-upload-bucket: ${S3_USER_UPLOADS_BUCKET:user-uploads}
64+
region: ${S3_REGION:auto} # auto is a Cloudflare value
6465

6566
spring:
6667
datasource:

src/main/resources/config/application.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ faf-api:
9292
access-key: ${S3_ACCESS_KEY:admin}
9393
secret-key: ${S3_SECRET_KEY:banana123}
9494
endpoint: ${S3_ENDPOINT:http://minio}
95+
region: ${S3_REGION:auto} # auto is a Cloudflare value
9596
user-upload-bucket: ${S3_USER_UPLOAD_BUCKET:user-uploads}
9697

9798
spring:

0 commit comments

Comments
 (0)