Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f1969cc
added identity environment scope to remote config
sophia-chen-ttd Sep 2, 2025
c5a7a57
made public property private
sophia-chen-ttd Sep 3, 2025
eb45082
Merge branch 'main' into sch-UID2-5966-retrieve-environment-from-core
sophia-chen-ttd Sep 4, 2025
29da8c4
added identity_environment to configs
sophia-chen-ttd Sep 4, 2025
0f9c373
[CI Pipeline] Released Snapshot version: 5.58.2-alpha-453-SNAPSHOT
Sep 4, 2025
86da6f9
added identity_environment to private operator configs
sophia-chen-ttd Sep 4, 2025
c9f9981
Merge branch 'sch-UID2-5966-retrieve-environment-from-core' of github…
sophia-chen-ttd Sep 4, 2025
bf00664
[CI Pipeline] Released Snapshot version: 5.58.3-alpha-454-SNAPSHOT
Sep 4, 2025
bb30e0b
reverted operator version
sophia-chen-ttd Sep 4, 2025
85f5624
reverted operator version
sophia-chen-ttd Sep 4, 2025
a1040a9
enabled remote config in all operator configs
sophia-chen-ttd Sep 4, 2025
61961a2
[CI Pipeline] Released Snapshot version: 5.58.2-alpha-455-SNAPSHOT
Sep 4, 2025
bd57296
added runtime config metadata path to private operator configs
sophia-chen-ttd Sep 4, 2025
27ff1ca
Merge branch 'sch-UID2-5966-retrieve-environment-from-core' of github…
sophia-chen-ttd Sep 4, 2025
d34cfbf
added identity_environment to test runtime_config
sophia-chen-ttd Sep 4, 2025
e424e7c
[CI Pipeline] Released Snapshot version: 5.58.3-alpha-456-SNAPSHOT
Sep 4, 2025
f6a6e5c
added runtime config metadata path
sophia-chen-ttd Sep 4, 2025
5ea0768
Merge branch 'sch-UID2-5966-retrieve-environment-from-core' of github…
sophia-chen-ttd Sep 4, 2025
8f617c7
[CI Pipeline] Released Snapshot version: 5.58.4-alpha-457-SNAPSHOT
Sep 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion conf/default-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@
"services_metadata_path": "services/metadata.json",
"service_links_metadata_path": "service_links/metadata.json",
"cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json",
"runtime_config_metadata_path": "runtime_config/metadata.json",
"encrypted_files": false,
"optout_metadata_path": null,
"optout_inmem_cache": false,
"enclave_platform": null,
"failure_shutdown_wait_hours": 120,
"sharing_token_expiry_seconds": 2592000,
"operator_type": "public",
"enable_remote_config": false,
"enable_remote_config": true,
"uid_instance_id_prefix": "local-operator"
}
2 changes: 1 addition & 1 deletion conf/docker-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
"salts_expired_shutdown_hours": 12,
"operator_type": "public",
"disable_optout_token": true,
"enable_remote_config": false,
"enable_remote_config": true,
"uid_instance_id_prefix": "local-operator"
}
5 changes: 2 additions & 3 deletions conf/local-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"operator_type": "public",
"encrypted_files": false,
"disable_optout_token": true,
"enable_remote_config": false,
"uid_instance_id_prefix": "local-operator",
"identity_environment": "test"
"enable_remote_config": true,
"uid_instance_id_prefix": "local-operator"
}
5 changes: 2 additions & 3 deletions conf/local-e2e-docker-private-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"cloud_refresh_interval": 30,
"salts_expired_shutdown_hours": 12,
"operator_type": "private",
"enable_remote_config": false,
"uid_instance_id_prefix": "local-private-operator",
"identity_environment": "test"
"enable_remote_config": true,
"uid_instance_id_prefix": "local-private-operator"
}
5 changes: 2 additions & 3 deletions conf/local-e2e-docker-public-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"salts_expired_shutdown_hours": 12,
"operator_type": "public",
"disable_optout_token": true,
"enable_remote_config": false,
"uid_instance_id_prefix": "local-public-operator",
"identity_environment": "test"
"enable_remote_config": true,
"uid_instance_id_prefix": "local-public-operator"
}
5 changes: 2 additions & 3 deletions conf/local-e2e-private-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"client_side_token_generate_log_invalid_http_origins": true,
"salts_expired_shutdown_hours": 12,
"operator_type": "private",
"enable_remote_config": false,
"uid_instance_id_prefix": "local-private-operator",
"identity_environment": "test"
"enable_remote_config": true,
"uid_instance_id_prefix": "local-private-operator"
}
5 changes: 2 additions & 3 deletions conf/local-e2e-public-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
"salts_expired_shutdown_hours": 12,
"operator_type": "public",
"disable_optout_token": true,
"enable_remote_config": false,
"uid_instance_id_prefix": "local-public-operator",
"identity_environment": "test"
"enable_remote_config": true,
"uid_instance_id_prefix": "local-public-operator"
}
5 changes: 2 additions & 3 deletions conf/validator-latest-e2e-docker-public-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"config_scan_period_ms": 300000
},
"disable_optout_token": true,
"enable_remote_config": false,
"uid_instance_id_prefix": "local-public-operator",
"identity_environment": "test"
"enable_remote_config": true,
"uid_instance_id_prefix": "local-public-operator"
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.uid2</groupId>
<artifactId>uid2-operator</artifactId>
<version>5.58.1</version>
<version>5.58.4-alpha-457-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 2 additions & 0 deletions scripts/aws/conf/default-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"salts_metadata_path": "salts/metadata.json",
"services_metadata_path": "services/metadata.json",
"service_links_metadata_path": "service_links/metadata.json",
"runtime_config_metadata_path": "runtime_config/metadata.json",
"optout_metadata_path": null,
"optout_inmem_cache": false,
"enclave_platform": "aws-nitro",
Expand All @@ -38,5 +39,6 @@
"refresh_token_expires_after_seconds": 2592000,
"refresh_identity_token_after_seconds": 3600,
"operator_type": "private",
"enable_remote_config": true,
"uid_instance_id_prefix": "unknown"
}
10 changes: 9 additions & 1 deletion scripts/aws/conf/euid-integ-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
"core_attest_url": "https://core.integ.euid.eu/attest",
"optout_api_uri": "https://optout.integ.euid.eu/optout/replicate",
"cloud_encryption_keys_metadata_path": "https://core.integ.euid.eu/cloud_encryption_keys/retrieve",
"runtime_config_metadata_path": "https://core.integ.euid.eu/operator/config",
"optout_s3_folder": "optout/",
"identity_scope": "euid"
"identity_scope": "euid",
"runtime_config_store": {
"type": "http",
"config" : {
"url": "https://core.integ.euid.eu/operator/config"
},
"config_scan_period_ms": 300000
}
}
1 change: 1 addition & 0 deletions scripts/aws/conf/euid-prod-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"optout_metadata_path": "https://optout.prod.euid.eu/optout/refresh",
"core_attest_url": "https://core.prod.euid.eu/attest",
"cloud_encryption_keys_metadata_path": "https://core.prod.euid.eu/cloud_encryption_keys/retrieve",
"runtime_config_metadata_path": "https://core.prod.euid.eu/operator/config",
"core_api_token": "your-api-token",
"optout_s3_path_compat": false,
"optout_api_uri": "https://optout.prod.euid.eu/optout/replicate",
Expand Down
11 changes: 9 additions & 2 deletions scripts/aws/conf/uid2-integ-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
"service_links_metadata_path": "https://core-integ.uidapi.com/service_links/refresh",
"optout_metadata_path": "https://optout-integ.uidapi.com/optout/refresh",
"cloud_encryption_keys_metadata_path": "https://core-integ.uidapi.com/cloud_encryption_keys/retrieve",
"runtime_config_metadata_path": "https://core-integ.uidapi.com/operator/config",
"optout_s3_folder": "uid-optout-integ/",
"identity_scope": "uid2"
}
"identity_scope": "uid2",
"runtime_config_store": {
"type": "http",
"config" : {
"url": "https://core-integ.uidapi.com/operator/config"
},
"config_scan_period_ms": 300000
}}
1 change: 1 addition & 0 deletions scripts/aws/conf/uid2-prod-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"optout_metadata_path": "https://optout-prod.uidapi.com/optout/refresh",
"core_attest_url": "https://core-prod.uidapi.com/attest",
"cloud_encryption_keys_metadata_path": "https://core-prod.uidapi.com/cloud_encryption_keys/retrieve",
"runtime_config_metadata_path": "https://core-prod.uidapi.com/operator/config",
"core_api_token": "your-api-token",
"optout_s3_path_compat": false,
"optout_api_uri": "https://optout-prod.uidapi.com/optout/replicate",
Expand Down
3 changes: 2 additions & 1 deletion scripts/azure-cc/conf/default-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"salts_metadata_path": "salts/metadata.json",
"services_metadata_path": "services/metadata.json",
"service_links_metadata_path": "service_links/metadata.json",
"runtime_config_metadata_path": "runtime_config/metadata.json",
"optout_metadata_path": null,
"enclave_platform": "azure-cc",
"optout_inmem_cache": true,
Expand All @@ -38,6 +39,6 @@
"sharing_token_expiry_seconds": 2592000,
"validate_service_links": false,
"operator_type": "private",
"enable_remote_config": false,
"enable_remote_config": true,
"uid_instance_id_prefix": "unknown"
}
1 change: 1 addition & 0 deletions scripts/azure-cc/conf/integ-uid2-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"core_attest_url": "https://core.uidapi.com/attest",
"optout_api_uri": "https://optout.uidapi.com/optout/replicate",
"cloud_encryption_keys_metadata_path": "https://core.uidapi.com/cloud_encryption_keys/retrieve",
"runtime_config_metadata_path": "https://core.uidapi.com/operator/config",
"optout_s3_folder": "uid-optout-integ/",
"uid_instance_id_prefix": "unknown",
"runtime_config_store": {
Expand Down
1 change: 1 addition & 0 deletions scripts/azure-cc/conf/prod-uid2-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"optout_metadata_path": "https://optout.uidapi.com/optout/refresh",
"core_attest_url": "https://core.uidapi.com/attest",
"cloud_encryption_keys_metadata_path": "https://core.uidapi.com/cloud_encryption_keys/retrieve",
"runtime_config_metadata_path": "https://core.uidapi.com/operator/config",
"optout_api_uri": "https://optout.uidapi.com/optout/replicate",
"optout_s3_folder": "optout-v2/",
"identity_token_expires_after_seconds": 259200,
Expand Down
2 changes: 2 additions & 0 deletions scripts/gcp-oidc/conf/default-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"salts_metadata_path": "salts/metadata.json",
"services_metadata_path": "services/metadata.json",
"service_links_metadata_path": "service_links/metadata.json",
"runtime_config_metadata_path": "runtime_config/metadata.json",
"optout_metadata_path": null,
"enclave_platform": "gcp-oidc",
"optout_inmem_cache": true,
Expand All @@ -38,5 +39,6 @@
"sharing_token_expiry_seconds": 2592000,
"validate_service_links": false,
"operator_type": "private",
"enable_remote_config": true,
"uid_instance_id_prefix": "unknown"
}
1 change: 1 addition & 0 deletions scripts/gcp-oidc/conf/integ-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"optout_metadata_path": "https://optout.uidapi.com/optout/refresh",
"core_attest_url": "https://core.uidapi.com/attest",
"cloud_encryption_keys_metadata_path": "https://core.uidapi.com/cloud_encryption_keys/retrieve",
"runtime_config_metadata_path": "https://core.uidapi.com/operator/config",
"optout_api_uri": "https://optout.uidapi.com/optout/replicate",
"uid_instance_id_prefix": "unknown",
"optout_s3_folder": "uid-optout-integ/",
Expand Down
1 change: 1 addition & 0 deletions scripts/gcp-oidc/conf/prod-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"optout_metadata_path": "https://optout.uidapi.com/optout/refresh",
"core_attest_url": "https://core.uidapi.com/attest",
"cloud_encryption_keys_metadata_path": "https://core.uidapi.com/cloud_encryption_keys/retrieve",
"runtime_config_metadata_path": "https://core.uidapi.com/operator/config",
"optout_api_uri": "https://optout.uidapi.com/optout/replicate",
"optout_s3_folder": "optout-v2/",
"identity_token_expires_after_seconds": 259200,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"sharing_token_expiry_seconds": 2592000
"sharing_token_expiry_seconds": 2592000,
"identity_environment": "test"
}
}