Skip to content

Commit

Permalink
Undo removal of runtime config values from config files
Browse files Browse the repository at this point in the history
  • Loading branch information
BehnamMozafari committed Feb 3, 2025
1 parent 6f87884 commit b47557e
Show file tree
Hide file tree
Showing 19 changed files with 106 additions and 104 deletions.
1 change: 1 addition & 0 deletions conf/default-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@
"optout_inmem_cache": false,
"enclave_platform": null,
"failure_shutdown_wait_hours": 120,
"sharing_token_expiry_seconds": 2592000,
"operator_type": "public"
}
3 changes: 3 additions & 0 deletions conf/docker-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"service_verbose": true,
"service_instances": 1,
"storage_mock": true,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"refresh_token_v3": false,
"identity_v3": false,
"identity_scope": "uid2",
Expand Down Expand Up @@ -29,6 +31,7 @@
"salts_metadata_path": "/com.uid2.core/test/salts/metadata.json",
"services_metadata_path": "/com.uid2.core/test/services/metadata.json",
"service_links_metadata_path": "/com.uid2.core/test/service_links/metadata.json",
"identity_token_expires_after_seconds": 3600,
"optout_metadata_path": null,
"optout_inmem_cache": false,
"enclave_platform": null,
Expand Down
12 changes: 1 addition & 11 deletions conf/feat-flag/feat-flag.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"remote_config": {
"enabled": true,
"runtime_config_store": {
"type": "json",
"config": {
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"sharing_token_expiry_seconds": 2592000
},
"config_scan_period_ms": -1
}
"enabled": true
}
}
4 changes: 4 additions & 0 deletions conf/local-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@
"salts_metadata_path": "/com.uid2.core/test/salts/metadata.json",
"services_metadata_path": "/com.uid2.core/test/services/metadata.json",
"service_links_metadata_path": "/com.uid2.core/test/service_links/metadata.json",
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"refresh_token_v3": false,
"identity_v3": false,
"identity_scope": "uid2",
"enable_v2_encryption": false,
"sharing_token_expiry_seconds": 2592000,
"cloud_download_threads": 8,
"cloud_upload_threads": 2,
"cloud_refresh_interval": 60,
Expand Down
3 changes: 3 additions & 0 deletions conf/local-e2e-docker-private-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"keysets_metadata_path": "http://core:8088/key/keyset/refresh",
"keyset_keys_metadata_path": "http://core:8088/key/keyset-keys/refresh",
"salts_metadata_path": "http://core:8088/salt/refresh",
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"refresh_token_v3": true,
"identity_v3": false,
"identity_scope": "uid2",
Expand Down
3 changes: 3 additions & 0 deletions conf/local-e2e-docker-public-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"salts_metadata_path": "http://core:8088/salt/refresh",
"services_metadata_path": "http://core:8088/services/refresh",
"service_links_metadata_path": "http://core:8088/service_links/refresh",
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"refresh_token_v3": true,
"identity_v3": false,
"identity_scope": "uid2",
Expand Down
4 changes: 4 additions & 0 deletions conf/local-e2e-private-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@
"salts_metadata_path": "http://localhost:8088/salt/refresh",
"services_metadata_path": "http://localhost:8088/services/refresh",
"service_links_metadata_path": "http://localhost:8088/service_links/refresh",
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"refresh_token_v3": true,
"identity_v3": false,
"identity_scope": "uid2",
"enable_v2_encryption": true,
"sharing_token_expiry_seconds": 2592000,
"cloud_download_threads": 8,
"cloud_upload_threads": 2,
"cloud_refresh_interval": 60,
Expand Down
4 changes: 4 additions & 0 deletions conf/local-e2e-public-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@
"salts_metadata_path": "http://localhost:8088/salt/refresh",
"services_metadata_path": "http://localhost:8088/services/refresh",
"service_links_metadata_path": "http://localhost:8088/service_links/refresh",
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"refresh_token_v3": true,
"identity_v3": false,
"identity_scope": "uid2",
"enable_v2_encryption": true,
"sharing_token_expiry_seconds": 2592000,
"cloud_download_threads": 8,
"cloud_upload_threads": 2,
"cloud_refresh_interval": 60,
Expand Down
3 changes: 3 additions & 0 deletions conf/validator-latest-e2e-docker-public-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
"salts_metadata_path": "http://core:8088/salt/refresh",
"services_metadata_path": "http://core:8088/services/refresh",
"service_links_metadata_path": "http://core:8088/service_links/refresh",
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"refresh_token_v3": true,
"identity_v3": false,
"identity_scope": "uid2",
Expand Down
1 change: 1 addition & 0 deletions scripts/aws/conf/default-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"optout_inmem_cache": false,
"enclave_platform": null,
"failure_shutdown_wait_hours": 120,
"sharing_token_expiry_seconds": 2592000,
"validate_service_links": false,
"operator_type": "private"
}
3 changes: 3 additions & 0 deletions scripts/aws/conf/euid-prod-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
"optout_synthetic_logs_count": 0,
"optout_inmem_cache": true,
"optout_s3_folder": "optout/",
"identity_token_expires_after_seconds": 259200,
"refresh_token_expires_after_seconds": 2592000,
"refresh_identity_token_after_seconds": 3600,
"allow_legacy_api": false,
"identity_scope": "euid",
"refresh_token_v3": true,
Expand Down
12 changes: 1 addition & 11 deletions scripts/aws/conf/feat-flag/feat-flag.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"remote_config": {
"enabled": false,
"runtime_config_store": {
"type": "json",
"config": {
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"sharing_token_expiry_seconds": 2592000
},
"config_scan_period_ms": -1
}
"enabled": false
}
}
3 changes: 3 additions & 0 deletions scripts/aws/conf/uid2-prod-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
"optout_synthetic_logs_count": 0,
"optout_inmem_cache": true,
"optout_s3_folder": "optout-v2/",
"identity_token_expires_after_seconds": 259200,
"refresh_token_expires_after_seconds": 2592000,
"refresh_identity_token_after_seconds": 3600,
"allow_legacy_api": false,
"runtime_config_store": {
"type": "http",
Expand Down
4 changes: 4 additions & 0 deletions scripts/azure-cc/conf/default-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@
"optout_metadata_path": null,
"enclave_platform": "azure-cc",
"optout_inmem_cache": true,
"identity_token_expires_after_seconds": 86400,
"refresh_token_expires_after_seconds": 2592000,
"refresh_identity_token_after_seconds": 3600,
"allow_legacy_api": false,
"failure_shutdown_wait_hours": 120,
"sharing_token_expiry_seconds": 2592000,
"validate_service_links": false,
"operator_type": "private"
}
12 changes: 1 addition & 11 deletions scripts/azure-cc/conf/feat-flag/feat-flag.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"remote_config": {
"enabled": false,
"runtime_config_store": {
"type": "json",
"config": {
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"sharing_token_expiry_seconds": 2592000
},
"config_scan_period_ms": -1
}
"enabled": false
}
}
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 @@ -11,6 +11,7 @@
"core_attest_url": "https://core-prod.uidapi.com/attest",
"optout_api_uri": "https://optout-prod.uidapi.com/optout/replicate",
"optout_s3_folder": "optout-v2/",
"identity_token_expires_after_seconds": 259200,
"runtime_config_store": {
"type": "http",
"config" : {
Expand Down
76 changes: 40 additions & 36 deletions scripts/gcp-oidc/conf/default-config.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,42 @@
{
"service_verbose": true,
"service_instances": 12,
"core_s3_bucket": null,
"core_attest_url": null,
"core_api_token": null,
"storage_mock": false,
"optout_s3_bucket": null,
"optout_s3_folder": "optout/",
"optout_s3_path_compat": false,
"optout_data_dir": "/opt/uid2/operator-optout/",
"optout_api_token": null,
"optout_api_uri": null,
"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": "sites/metadata.json",
"clients_metadata_path": "clients/metadata.json",
"client_side_keypairs_metadata_path": "client_side_keypairs/metadata.json",
"keysets_metadata_path": "keysets/metadata.json",
"keyset_keys_metadata_path": "keyset_keys/metadata.json",
"salts_metadata_path": "salts/metadata.json",
"services_metadata_path": "services/metadata.json",
"service_links_metadata_path": "service_links/metadata.json",
"optout_metadata_path": null,
"enclave_platform": "gcp-oidc",
"optout_inmem_cache": true,
"allow_legacy_api": false,
"failure_shutdown_wait_hours": 120,
"validate_service_links": false,
"operator_type": "private"
"service_verbose": true,
"service_instances": 12,
"core_s3_bucket": null,
"core_attest_url": null,
"core_api_token": null,
"storage_mock": false,
"optout_s3_bucket": null,
"optout_s3_folder": "optout/",
"optout_s3_path_compat": false,
"optout_data_dir": "/opt/uid2/operator-optout/",
"optout_api_token": null,
"optout_api_uri": null,
"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": "sites/metadata.json",
"clients_metadata_path": "clients/metadata.json",
"client_side_keypairs_metadata_path": "client_side_keypairs/metadata.json",
"keysets_metadata_path": "keysets/metadata.json",
"keyset_keys_metadata_path": "keyset_keys/metadata.json",
"salts_metadata_path": "salts/metadata.json",
"services_metadata_path": "services/metadata.json",
"service_links_metadata_path": "service_links/metadata.json",
"optout_metadata_path": null,
"enclave_platform": "gcp-oidc",
"optout_inmem_cache": true,
"identity_token_expires_after_seconds": 86400,
"refresh_token_expires_after_seconds": 2592000,
"refresh_identity_token_after_seconds": 3600,
"allow_legacy_api": false,
"failure_shutdown_wait_hours": 120,
"sharing_token_expiry_seconds": 2592000,
"validate_service_links": false,
"operator_type": "private"
}
12 changes: 1 addition & 11 deletions scripts/gcp-oidc/conf/feat-flag/feat-flag.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"remote_config": {
"enabled": false,
"runtime_config_store": {
"type": "json",
"config": {
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"sharing_token_expiry_seconds": 2592000
},
"config_scan_period_ms": -1
}
"enabled": false
}
}
49 changes: 25 additions & 24 deletions scripts/gcp-oidc/conf/prod-config.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{
"sites_metadata_path": "https://core.uidapi.com/sites/refresh",
"clients_metadata_path": "https://core.uidapi.com/clients/refresh",
"keysets_metadata_path": "https://core.uidapi.com/key/keyset/refresh",
"keyset_keys_metadata_path": "https://core.uidapi.com/key/keyset-keys/refresh",
"client_side_keypairs_metadata_path": "https://core.uidapi.com/client_side_keypairs/refresh",
"salts_metadata_path": "https://core.uidapi.com/salt/refresh",
"services_metadata_path": "https://core.uidapi.com/services/refresh",
"service_links_metadata_path": "https://core.uidapi.com/service_links/refresh",
"optout_metadata_path": "https://optout.uidapi.com/optout/refresh",
"core_attest_url": "https://core.uidapi.com/attest",
"optout_api_uri": "https://optout.uidapi.com/optout/replicate",
"optout_s3_folder": "optout-v2/",
"runtime_config_store": {
"type": "http",
"config" : {
"host": "core.uidapi.com",
"port": 443,
"ssl": true,
"path": "/operator/config"
},
"config_scan_period_ms": 300000
}
}
{
"sites_metadata_path": "https://core.uidapi.com/sites/refresh",
"clients_metadata_path": "https://core.uidapi.com/clients/refresh",
"keysets_metadata_path": "https://core.uidapi.com/key/keyset/refresh",
"keyset_keys_metadata_path": "https://core.uidapi.com/key/keyset-keys/refresh",
"client_side_keypairs_metadata_path": "https://core.uidapi.com/client_side_keypairs/refresh",
"salts_metadata_path": "https://core.uidapi.com/salt/refresh",
"services_metadata_path": "https://core.uidapi.com/services/refresh",
"service_links_metadata_path": "https://core.uidapi.com/service_links/refresh",
"optout_metadata_path": "https://optout.uidapi.com/optout/refresh",
"core_attest_url": "https://core.uidapi.com/attest",
"optout_api_uri": "https://optout.uidapi.com/optout/replicate",
"optout_s3_folder": "optout-v2/",
"identity_token_expires_after_seconds": 259200,
"runtime_config_store": {
"type": "http",
"config" : {
"host": "core.uidapi.com",
"port": 443,
"ssl": true,
"path": "/operator/config"
},
"config_scan_period_ms": 300000
}
}

0 comments on commit b47557e

Please sign in to comment.