Added core S3 region override

Author: gmsdelmundo

src/main/java/com/uid2/shared/Const.java

@@ -52,6 +52,7 @@ public static class Config {
         public static final String CloudDownloadThreadsProp = "cloud_download_threads";
         public static final String CloudUploadThreadsProp = "cloud_upload_threads";
         public static final String CoreS3BucketProp = "core_s3_bucket";
+        public static final String CoreS3RegionProp = "core_s3_aws_region";
         public static final String OptOutS3BucketProp = "optout_s3_bucket";
         public static final String ClientsMetadataPathProp = "clients_metadata_path";
         public static final String KeysMetadataPathProp = "keys_metadata_path";

src/main/java/com/uid2/shared/cloud/CloudUtils.java

@@ -29,9 +29,14 @@ public class CloudUtils {
     public static TaggableCloudStorage createStorage(String cloudBucket, JsonObject jsonConfig) {
         var accessKeyId = jsonConfig.getString(Const.Config.AccessKeyIdProp);
         var secretAccessKey = jsonConfig.getString(Const.Config.SecretAccessKeyProp);
-        var region = jsonConfig.getString(Const.Config.AwsRegionProp);
         var s3Endpoint = jsonConfig.getString(Const.Config.S3EndpointProp, "");
 
+        var region = jsonConfig.getString(Const.Config.AwsRegionProp);
+        var regionOverride = jsonConfig.getString(Const.Config.CoreS3RegionProp);
+        if (regionOverride == null || regionOverride.isBlank()) {
+            region = regionOverride;
+        }
+
         if (accessKeyId == null || secretAccessKey == null) {
             // IAM authentication
             return new CloudStorageS3(region, cloudBucket, s3Endpoint);