Skip to content

Commit d562d66

Browse files
committed
Removed redundant S3 override
1 parent a79616e commit d562d66

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff 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

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff 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);

0 commit comments

Comments
 (0)