diff --git a/src/inttest/resources/config/application.yml b/src/inttest/resources/config/application.yml index af2f28058..a19bff1dc 100644 --- a/src/inttest/resources/config/application.yml +++ b/src/inttest/resources/config/application.yml @@ -103,6 +103,7 @@ faf-api: access-key: admin secret-key: banana123 endpoint: http://minio + region: auto user-upload-bucket: user-uploads logging: diff --git a/src/main/java/com/faforever/api/config/FafApiProperties.java b/src/main/java/com/faforever/api/config/FafApiProperties.java index 12af9a055..727e22f2a 100644 --- a/src/main/java/com/faforever/api/config/FafApiProperties.java +++ b/src/main/java/com/faforever/api/config/FafApiProperties.java @@ -303,6 +303,7 @@ public static class Coturn { @Data public static class S3 { private String endpoint; + private String region; private String userUploadBucket; private String accessKey; private String secretKey; diff --git a/src/main/java/com/faforever/api/config/S3Config.java b/src/main/java/com/faforever/api/config/S3Config.java index c1b4001b2..a067c846d 100644 --- a/src/main/java/com/faforever/api/config/S3Config.java +++ b/src/main/java/com/faforever/api/config/S3Config.java @@ -36,7 +36,8 @@ public S3Client s3Client() { public S3Presigner s3Presigner() { return S3Presigner.builder() .endpointOverride(URI.create(properties.getS3().getEndpoint())) - .region(Region.EU_CENTRAL_1) // region must be non-null but is ignored by some S3-compatible services + // Cloudflare has different regions as AWS: wnam, enam, weur, eeur, apac, oc, auto + .region(Region.of(properties.getS3().getRegion())) // region must be non-null but is ignored by some S3-compatible services .credentialsProvider(StaticCredentialsProvider.create( AwsBasicCredentials.create(properties.getS3().getAccessKey(), properties.getS3().getSecretKey()) )) diff --git a/src/main/resources/config/application-local.yml b/src/main/resources/config/application-local.yml index 55dbb2f81..947c66423 100644 --- a/src/main/resources/config/application-local.yml +++ b/src/main/resources/config/application-local.yml @@ -61,6 +61,7 @@ faf-api: access-key: ${S3_ACCESS_KEY:admin} secret-key: ${S3_SECRET_KEY:banana123} user-upload-bucket: ${S3_USER_UPLOADS_BUCKET:user-uploads} + region: ${S3_REGION:auto} # auto is a Cloudflare value spring: datasource: diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 99aaa03bf..7dc3c1d7b 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -92,6 +92,7 @@ faf-api: access-key: ${S3_ACCESS_KEY:admin} secret-key: ${S3_SECRET_KEY:banana123} endpoint: ${S3_ENDPOINT:http://minio} + region: ${S3_REGION:auto} # auto is a Cloudflare value user-upload-bucket: ${S3_USER_UPLOAD_BUCKET:user-uploads} spring: