File tree Expand file tree Collapse file tree 2 files changed +2
-8
lines changed
src/main/java/com/uid2/shared Expand file tree Collapse file tree 2 files changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -37,13 +37,12 @@ public static class Config {
3737 // Azure
3838 public static final String MaaServerBaseUrlProp = "maa_server_base_url" ;
3939
40- // AWS
40+ // AWS S3
4141 public static final String AwsRegionProp = "aws_region" ;
4242 public static final String AccessKeyIdProp = "aws_access_key_id" ;
4343 public static final String SecretAccessKeyProp = "aws_secret_access_key" ;
4444 public static final String S3EndpointProp = "aws_s3_endpoint" ;
4545 public static final String CoreS3BucketProp = "core_s3_bucket" ;
46- public static final String CoreS3RegionProp = "core_s3_region" ;
4746 public static final String OptOutS3BucketProp = "optout_s3_bucket" ;
4847
4948 // Config stores
Original file line number Diff line number Diff line change @@ -27,16 +27,11 @@ public class CloudUtils {
2727 public static Proxy defaultProxy = getDefaultProxy ();
2828
2929 public static TaggableCloudStorage createStorage (String cloudBucket , JsonObject jsonConfig ) {
30+ var region = jsonConfig .getString (Const .Config .AwsRegionProp );
3031 var accessKeyId = jsonConfig .getString (Const .Config .AccessKeyIdProp );
3132 var secretAccessKey = jsonConfig .getString (Const .Config .SecretAccessKeyProp );
3233 var s3Endpoint = jsonConfig .getString (Const .Config .S3EndpointProp , "" );
3334
34- var region = jsonConfig .getString (Const .Config .AwsRegionProp );
35- var regionOverride = jsonConfig .getString (Const .Config .CoreS3RegionProp );
36- if (regionOverride != null && !regionOverride .isBlank ()) {
37- region = regionOverride ;
38- }
39-
4035 if (accessKeyId == null || secretAccessKey == null ) {
4136 // IAM authentication
4237 return new CloudStorageS3 (region , cloudBucket , s3Endpoint );
You can’t perform that action at this time.
0 commit comments