Merge pull request #399 from IABTechLab/gdm-UID2-4959-aws-region

Rearranged consts for readability

Author: gmsdelmundo

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-shared</artifactId>
-    <version>8.1.25</version>
+    <version>8.1.27-alpha-204-SNAPSHOT</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Library for all the shared uid2 operations</description>
     <url>https://github.com/IABTechLab/uid2docs</url>

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

@@ -30,29 +30,25 @@ public static class Config {
         // this file stores integration config values, e.g. it communicates with other uid2 services that runs locally.
         public static final String INTEG_CONFIG_PATH = "conf" + File.separator + "integ-config.json";
 
+        // GCP
         public static final String GoogleCredentialsProp = "google_credentials";
         public static final String GcpEnclaveParamsProp = "gcp_enclave_params";
+
+        // Azure
+        public static final String MaaServerBaseUrlProp = "maa_server_base_url";
+
+        // AWS S3
         public static final String AwsRegionProp = "aws_region";
         public static final String AccessKeyIdProp = "aws_access_key_id";
         public static final String SecretAccessKeyProp = "aws_secret_access_key";
         public static final String S3EndpointProp = "aws_s3_endpoint";
-        public static final String OptOutDataDirProp = "optout_data_dir";
-        public static final String OptOutReplicaUris = "optout_replica_uris";
-        public static final String OptOutSyntheticLogsEnabledProp = "optout_synthetic_logs_enabled";
-        public static final String OptOutSyntheticLogsCountProp = "optout_synthetic_logs_count";
-        public static final String OptOutProducerReplicaIdProp = "optout_producer_replica_id";
-        public static final String OptOutProducerReplicaIdOffsetProp = "optout_producer_replica_id_offset";
-        public static final String OptOutProducerMaxReplicasProp = "optout_producer_max_replicas";
-        public static final String OptOutDeltaRotateIntervalProp = "optout_delta_rotate_interval";
-        public static final String OptOutDeltaBacktrackInDaysProp = "optout_delta_backtrack_in_days";
-        public static final String OptOutPartitionIntervalProp = "optout_partition_interval";
-        public static final String OptOutMaxPartitionsProp = "optout_max_partitions";
-        public static final String OptOutS3FolderProp = "optout_s3_folder";
+        public static final String CoreS3BucketProp = "core_s3_bucket";
+        public static final String OptOutS3BucketProp = "optout_s3_bucket";
+
+        // Config stores
         public static final String CloudRefreshIntervalProp = "cloud_refresh_interval";
         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 OptOutS3BucketProp = "optout_s3_bucket";
         public static final String ClientsMetadataPathProp = "clients_metadata_path";
         public static final String KeysMetadataPathProp = "keys_metadata_path";
         public static final String KeysAclMetadataPathProp = "keys_acl_metadata_path";
@@ -66,14 +62,31 @@ public static class Config {
         public static final String CloudEncryptionKeysMetadataPathProp = "cloud_encryption_keys_metadata_path";
         public static final String SaltsMetadataPathProp = "salts_metadata_path";
         public static final String OptOutMetadataPathProp = "optout_metadata_path";
-        public static final String CoreAttestUrlProp = "core_attest_url";
+
+        // Attestation
         public static final String CoreApiTokenProp = "core_api_token";
-        public static final String AwsKmsJwtSigningKeyIdProp = "aws_kms_jwt_signing_key_id";
+        public static final String CoreAttestUrlProp = "core_attest_url";
         public static final String CorePublicUrlProp = "core_public_url";
         public static final String OptOutUrlProp = "optout_url";
+        public static final String AwsKmsJwtSigningKeyIdProp = "aws_kms_jwt_signing_key_id";
         public static final String AwsKmsJwtSigningPublicKeysProp = "aws_kms_jwt_signing_public_keys";
         public static final String EnforceJwtProp = "enforceJwt";
-        public static final String MaaServerBaseUrlProp = "maa_server_base_url";
+
+        // Optout
+        public static final String OptOutS3FolderProp = "optout_s3_folder";
+        public static final String OptOutDataDirProp = "optout_data_dir";
+        public static final String OptOutReplicaUris = "optout_replica_uris";
+        public static final String OptOutSyntheticLogsEnabledProp = "optout_synthetic_logs_enabled";
+        public static final String OptOutSyntheticLogsCountProp = "optout_synthetic_logs_count";
+        public static final String OptOutProducerReplicaIdProp = "optout_producer_replica_id";
+        public static final String OptOutProducerReplicaIdOffsetProp = "optout_producer_replica_id_offset";
+        public static final String OptOutProducerMaxReplicasProp = "optout_producer_max_replicas";
+        public static final String OptOutDeltaRotateIntervalProp = "optout_delta_rotate_interval";
+        public static final String OptOutDeltaBacktrackInDaysProp = "optout_delta_backtrack_in_days";
+        public static final String OptOutPartitionIntervalProp = "optout_partition_interval";
+        public static final String OptOutMaxPartitionsProp = "optout_max_partitions";
+
+        // Others
         public static final String SaltsExpiredShutdownHours = "salts_expired_shutdown_hours";
         public static final String encryptionSupportVersion = "encryption_support_version";
     }

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

@@ -27,9 +27,9 @@ public class CloudUtils {
     public static Proxy defaultProxy = getDefaultProxy();
 
     public static TaggableCloudStorage createStorage(String cloudBucket, JsonObject jsonConfig) {
+        var region = jsonConfig.getString(Const.Config.AwsRegionProp);
         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, "");
 
         if (accessKeyId == null || secretAccessKey == null) {