Skip to content

Commit 468b17b

Browse files
sophia-chen-ttdRelease Workflow
andauthored
sch-UID2-5966 added identity_environment to configs (#1988)
* added identity environment scope to remote config * made public property private * added identity_environment to configs * [CI Pipeline] Released Snapshot version: 5.58.2-alpha-453-SNAPSHOT * added identity_environment to private operator configs * [CI Pipeline] Released Snapshot version: 5.58.3-alpha-454-SNAPSHOT * reverted operator version * enabled remote config in all operator configs * [CI Pipeline] Released Snapshot version: 5.58.2-alpha-455-SNAPSHOT * added runtime config metadata path to private operator configs * added identity_environment to test runtime_config * [CI Pipeline] Released Snapshot version: 5.58.3-alpha-456-SNAPSHOT * added runtime config metadata path * [CI Pipeline] Released Snapshot version: 5.58.4-alpha-457-SNAPSHOT --------- Co-authored-by: Release Workflow <[email protected]>
1 parent 5da837e commit 468b17b

21 files changed

+48
-26
lines changed

conf/default-config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@
3131
"services_metadata_path": "services/metadata.json",
3232
"service_links_metadata_path": "service_links/metadata.json",
3333
"cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json",
34+
"runtime_config_metadata_path": "runtime_config/metadata.json",
3435
"encrypted_files": false,
3536
"optout_metadata_path": null,
3637
"optout_inmem_cache": false,
3738
"enclave_platform": null,
3839
"failure_shutdown_wait_hours": 120,
3940
"sharing_token_expiry_seconds": 2592000,
4041
"operator_type": "public",
41-
"enable_remote_config": false,
42+
"enable_remote_config": true,
4243
"uid_instance_id_prefix": "local-operator"
4344
}

conf/docker-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
"salts_expired_shutdown_hours": 12,
4343
"operator_type": "public",
4444
"disable_optout_token": true,
45-
"enable_remote_config": false,
45+
"enable_remote_config": true,
4646
"uid_instance_id_prefix": "local-operator"
4747
}

conf/local-config.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"operator_type": "public",
4242
"encrypted_files": false,
4343
"disable_optout_token": true,
44-
"enable_remote_config": false,
45-
"uid_instance_id_prefix": "local-operator",
46-
"identity_environment": "test"
44+
"enable_remote_config": true,
45+
"uid_instance_id_prefix": "local-operator"
4746
}

conf/local-e2e-docker-private-config.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"cloud_refresh_interval": 30,
3232
"salts_expired_shutdown_hours": 12,
3333
"operator_type": "private",
34-
"enable_remote_config": false,
35-
"uid_instance_id_prefix": "local-private-operator",
36-
"identity_environment": "test"
34+
"enable_remote_config": true,
35+
"uid_instance_id_prefix": "local-private-operator"
3736
}

conf/local-e2e-docker-public-config.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"salts_expired_shutdown_hours": 12,
3939
"operator_type": "public",
4040
"disable_optout_token": true,
41-
"enable_remote_config": false,
42-
"uid_instance_id_prefix": "local-public-operator",
43-
"identity_environment": "test"
41+
"enable_remote_config": true,
42+
"uid_instance_id_prefix": "local-public-operator"
4443
}

conf/local-e2e-private-config.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"client_side_token_generate_log_invalid_http_origins": true,
4343
"salts_expired_shutdown_hours": 12,
4444
"operator_type": "private",
45-
"enable_remote_config": false,
46-
"uid_instance_id_prefix": "local-private-operator",
47-
"identity_environment": "test"
45+
"enable_remote_config": true,
46+
"uid_instance_id_prefix": "local-private-operator"
4847
}

conf/local-e2e-public-config.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"salts_expired_shutdown_hours": 12,
4545
"operator_type": "public",
4646
"disable_optout_token": true,
47-
"enable_remote_config": false,
48-
"uid_instance_id_prefix": "local-public-operator",
49-
"identity_environment": "test"
47+
"enable_remote_config": true,
48+
"uid_instance_id_prefix": "local-public-operator"
5049
}

conf/validator-latest-e2e-docker-public-config.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"config_scan_period_ms": 300000
4444
},
4545
"disable_optout_token": true,
46-
"enable_remote_config": false,
47-
"uid_instance_id_prefix": "local-public-operator",
48-
"identity_environment": "test"
46+
"enable_remote_config": true,
47+
"uid_instance_id_prefix": "local-public-operator"
4948
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.uid2</groupId>
88
<artifactId>uid2-operator</artifactId>
9-
<version>5.58.1</version>
9+
<version>5.58.4-alpha-457-SNAPSHOT</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

scripts/aws/conf/default-config.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"salts_metadata_path": "salts/metadata.json",
2929
"services_metadata_path": "services/metadata.json",
3030
"service_links_metadata_path": "service_links/metadata.json",
31+
"runtime_config_metadata_path": "runtime_config/metadata.json",
3132
"optout_metadata_path": null,
3233
"optout_inmem_cache": false,
3334
"enclave_platform": "aws-nitro",
@@ -38,5 +39,6 @@
3839
"refresh_token_expires_after_seconds": 2592000,
3940
"refresh_identity_token_after_seconds": 3600,
4041
"operator_type": "private",
42+
"enable_remote_config": true,
4143
"uid_instance_id_prefix": "unknown"
4244
}

0 commit comments

Comments
 (0)