Skip to content

Commit 0a3671f

Browse files
abuabraham-ttdabuabraham-ttd
committed
update euid
1 parent af81d04 commit 0a3671f

File tree

3 files changed

+32
-8
lines changed

3 files changed

+32
-8
lines changed

‎scripts/aws/conf/euid-integ-config.json‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,42 @@
11
{
2+
"service_verbose": true,
3+
"service_instances": 4,
4+
"core_s3_bucket": null,
5+
"core_attest_url": "https://core.integ.euid.eu/attest",
6+
"core_api_token": null,
7+
"storage_mock": false,
8+
"optout_s3_bucket": null,
9+
"optout_s3_folder": "optout/",
10+
"optout_s3_path_compat": false,
11+
"optout_data_dir": "/opt/uid2/operator-optout/",
12+
"optout_api_token": null,
13+
"optout_api_uri": "https://optout.integ.euid.eu/optout/replicate",
14+
"optout_bloom_filter_size": 8192,
15+
"optout_delta_rotate_interval": 300,
16+
"optout_delta_backtrack_in_days": 1,
17+
"optout_partition_interval": 86400,
18+
"optout_max_partitions": 30,
19+
"optout_heap_default_capacity": 8192,
20+
"cloud_download_threads": 8,
21+
"cloud_upload_threads": 2,
22+
"cloud_refresh_interval": 60,
223
"sites_metadata_path": "https://core.integ.euid.eu/sites/refresh",
324
"clients_metadata_path": "https://core.integ.euid.eu/clients/refresh",
25+
"client_side_keypairs_metadata_path": "https://core.integ.euid.eu/client_side_keypairs/refresh",
426
"keysets_metadata_path": "https://core.integ.euid.eu/key/keyset/refresh",
527
"keyset_keys_metadata_path": "https://core.integ.euid.eu/key/keyset-keys/refresh",
6-
"client_side_keypairs_metadata_path": "https://core.integ.euid.eu/client_side_keypairs/refresh",
728
"salts_metadata_path": "https://core.integ.euid.eu/salt/refresh",
829
"services_metadata_path": "https://core.integ.euid.eu/services/refresh",
930
"service_links_metadata_path": "https://core.integ.euid.eu/service_links/refresh",
1031
"optout_metadata_path": "https://optout.integ.euid.eu/optout/refresh",
11-
"core_attest_url": "https://core.integ.euid.eu/attest",
12-
"optout_api_uri": "https://optout.integ.euid.eu/optout/replicate",
13-
"optout_s3_folder": "optout/",
32+
"optout_inmem_cache": false,
33+
"enclave_platform": "aws-nitro",
34+
"failure_shutdown_wait_hours": 120,
35+
"sharing_token_expiry_seconds": 2592000,
36+
"validate_service_links": false,
37+
"identity_token_expires_after_seconds": 86400,
38+
"refresh_token_expires_after_seconds": 2592000,
39+
"refresh_identity_token_after_seconds": 3600,
40+
"operator_type": "private",
1441
"allow_legacy_api": false
1542
}

‎src/main/java/com/uid2/operator/service/ConfigService.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ public JsonObject getConfig() {
4646
}
4747

4848
private JsonObject configValidationHandler(JsonObject config) {
49-
logger.error("ABU ADDED");
50-
logger.error(config.toString());
5149
boolean isValid = true;
5250
Integer identityExpiresAfter = config.getInteger(IDENTITY_TOKEN_EXPIRES_AFTER_SECONDS);
5351
Integer refreshExpiresAfter = config.getInteger(REFRESH_TOKEN_EXPIRES_AFTER_SECONDS);
@@ -74,3 +72,4 @@ private JsonObject configValidationHandler(JsonObject config) {
7472
return config;
7573
}
7674
}
75+
"core_api_token\":\"UID2-O-I-18-Fk6QJg.ochtgQKdO6Z0N3AkuBftWLiItOKP5CNRk9QsY=\",\"storage_mock\":false,\"optout_s3_bucket\":null,\"optout_s3_folder\":\"uid-optout-integ/\",\"optout_s3_path_compat\":false,\"optout_data_dir\":\"/opt/uid2/operator-optout/\",\"optout_api_token\":\"UID2-O-I-18-Fk6QJg.ochtgQKdO6Z0N3AkuBftWLiItOKP5CNRk9QsY=\",\"optout_api_uri\":\"https://optout-integ.uidapi.com/optout/replicate\",\"optout_bloom_filter_size\":8192,\"optout_delta_rotate_interval\":300,\"optout_delta_backtrack_in_days\":1,\"optout_partition_interval\":86400,\"optout_max_partitions\":30,\"optout_heap_default_capacity\":8192,\"cloud_download_threads\":8,\"cloud_upload_threads\":2,\"cloud_refresh_interval\":60,\"sites_metadata_path\":\"https://core-integ.uidapi.com/sites/refresh\",\"clients_metadata_path\":\"https://core-integ.uidapi.com/clients/refresh\",\"client_side_keypairs_metadata_path\":\"https://core-integ.uidapi.com/client_side_keypairs/refresh\",\"keysets_metadata_path\":\"https://core-integ.uidapi.com/key/keyset/refresh\",\"keyset_keys_metadata_path\":\"https://core-integ.uidapi.com/key/keyset-keys/refresh\",\"salts_metadata_path\":\"https://core-integ.uidapi.com/salt/refresh\",\"services_metadata_path\":\"https://core-integ.uidapi.com/services/refresh\",\"service_links_metadata_path\":\"https://core-integ.uidapi.com/service_links/refresh\",\"optout_metadata_path\":\"https://optout-integ.uidapi.com/optout/refresh\",\"optout_inmem_cache\":false,\"enclave_platform\":null,\"failure_shutdown_wait_hours\":120,\"sharing_token_expiry_seconds\":2592000,\"validate_service_links\":false,\"operator_type\":\"private\",\"java.specification.version\":21,\"sun.jnu.encoding\":\"UTF-8\",\"java.class.path\":\"/app/uid2-operator-5.47.61-alpha-171-SNAPSHOT.jar\",\"java.vm.vendor\":\"Eclipse Adoptium\",\"sun.arch.data.model\":64,\"vertx-config-path\":\"/tmp/final-config.json\",\"java.vendor.url\":\"https://adoptium.net/\",\"user.timezone\":\"Etc/UTC\",\"java.vm.specification.version\":21,\"os.name\":\"Linux\",\"sun.java.launcher\":\"SUN_STANDARD\",\"user.country\":\"US\",\"sun.boot.library.path\":\"/opt/java/openjdk/lib\",\"sun.java.command\":\"/app/uid2-operator-5.47.61-alpha-171-SNAPSHOT.jar\",\"jdk.debug\":\"release\",\"sun.cpu.endian\":\"little\",\"user.home\":\"/root\",\"user.language\":\"en\",\"java.specification.vendor\":\"Oracle Corporation\",\"java.version.date\":\"2025-01-21\",\"java.home\":\"/opt/java/openjdk\",\"file.separator\":\"/\",\"line.separator\":\"\\n\",\"java.vm.specification.vendor\":\"Oracle Corporation\",\"java.specification.name\":\"Java Platform API Specification\",\"logback.configurationFile\":\"./conf/logback-debug.xml\",\"sun.management.compiler\":\"HotSpot 64-Bit Tiered Compilers\",\"java.runtime.version\":\"21.0.6+7-LTS\",\"user.name\":\"root\",\"stdout.encoding\":\"UTF-8\",\"path.separator\":\":\",\"java.security.egd\":\"file:/dev/./urandom\",\"os.version\":\"4.14.256-209.484.amzn2.x86_64\",\"java.runtime.name\":\"OpenJDK Runtime Environment\",\"file.encoding\":\"UTF-8\",\"java.vm.name\":\"OpenJDK 64-Bit Server VM\",\"java.vendor.version\":\"Temurin-21.0.6+7\",\"http_proxy\":\"socks5://127.0.0.1:3305\",\"java.vendor.url.bug\":\"https://github.com/adoptium/adoptium-support/issues\",\"java.io.tmpdir\":\"/tmp\",\"java.version\":\"21.0.6\",\"user.dir\":\"/app\",\"os.arch\":\"amd64\",\"java.vm.specification.name\":\"Java Virtual Machine Specification\",\"native.encoding\":\"UTF-8\",\"java.library.path\":\"/app/lib\",\"java.vm.info\":\"mixed mode, sharing\",\"stderr.encoding\":\"UTF-8\",\"java.vendor\":\"Eclipse Adoptium\",\"java.vm.version\":\"21.0.6+7-LTS\",\"vertx.logger-delegate-factory-class-name\":\"io.vertx.core.logging.SLF4JLogDelegateFactory\",\"sun.io.unicode.encoding\":\"UnicodeLittle\",\"java.class.version\":65.0,\"SHLVL\":1,\"LANGUAGE\":\"en_US:en\",\"JAVA_HOME\":\"/opt/java/openjdk\",\"IMAGE_VERSION\":\"5.47.61-alpha-171-SNAPSHOT-722bdd17\",\"LC_ALL\":\"en_US.UTF-8\",\"JAR_NAME\":\"uid2-operator\",\"OLDPWD\":\"/\",\"PATH\":\"/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"JAVA_VERSION\":\"jdk-21.0.6+7\",\"IDENTITY_SCOPE\":\"UID2\",\"ENCLAVE_ENVIRONMENT\":\"aws-nitro\",\"JAR_VERSION\":\"5.47.61-alpha-171-SNAPSHOT\",\"PWD\":\"/app\",\"_\":\"/opt/java/openjdk/bin/java\",\"UID2_CONFIG_SECRET_KEY\":\"uid2-operator-config-key\",\"LANG\":\"en_US.UTF-8\",\"allow_legacy_api\":false,\"runtime_config_store\":{\"type\":\"http\",\"config\":{\"url\":\"https://core-integ.uidapi.com/operator/config\"},\"config_scan_period_ms\":300000},\"identity_token_expires_after_seconds\":86400,\"refresh_token_expires_after_seconds\":2592000,\"refresh_identity_token_after_seconds\":3600,\"optout_base_url\":\"https://optout-integ.uidapi.com\",\"core_base_url\":\"https://core-integ.uidapi.com\",\"environment\":\"integ\",\"debug_mode\":true}","logger_name":"com.uid2.operator.service.ConfigService","thread_name":"vert.x-eventloop-thread-0","level":"ERROR","level_value":40000}

‎src/main/java/com/uid2/operator/service/ConfigValidatorUtil.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
public class ConfigValidatorUtil {
1111
private static final Logger logger = LoggerFactory.getLogger(ConfigValidatorUtil.class);
12-
public static final String VALUES_ARE_NULL = "ABU ADDED One or more of the following required config values are null: ";
13-
1412
public static Boolean validateIdentityRefreshTokens(Integer identityExpiresAfter, Integer refreshExpiresAfter, Integer refreshIdentityAfter) {
1513
boolean isValid = true;
1614

0 commit comments

Comments
 (0)