From a6351c70b93471c3a5879758759262db605c3b5b Mon Sep 17 00:00:00 2001 From: way zheng Date: Thu, 4 Dec 2025 14:44:19 -0800 Subject: [PATCH 01/10] turn encyroted fiels field into false to test E2E test --- conf/local-e2e-docker-private-config.json | 2 +- conf/local-e2e-docker-public-config.json | 2 +- conf/local-e2e-private-config.json | 2 +- conf/local-e2e-public-config.json | 2 +- scripts/aws/conf/euid-integ-config.json | 2 +- scripts/aws/conf/euid-prod-config.json | 2 +- scripts/aws/conf/uid2-integ-config.json | 2 +- scripts/aws/conf/uid2-prod-config.json | 2 +- scripts/azure-cc/conf/integ-uid2-config.json | 2 +- scripts/azure-cc/conf/prod-uid2-config.json | 2 +- scripts/gcp-oidc/conf/integ-config.json | 2 +- scripts/gcp-oidc/conf/prod-config.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/conf/local-e2e-docker-private-config.json b/conf/local-e2e-docker-private-config.json index 629a2c998..51209fcc3 100644 --- a/conf/local-e2e-docker-private-config.json +++ b/conf/local-e2e-docker-private-config.json @@ -13,7 +13,7 @@ "salts_metadata_path": "http://core:8088/salt/refresh", "cloud_encryption_keys_metadata_path": "http://core:8088/cloud_encryption_keys/retrieve", "runtime_config_metadata_path": "http://core:8088/operator/config", - "encrypted_files": true, + "encrypted_files": false, "identity_token_expires_after_seconds": 3600, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, diff --git a/conf/local-e2e-docker-public-config.json b/conf/local-e2e-docker-public-config.json index 7610e9bc7..86ccf32fc 100644 --- a/conf/local-e2e-docker-public-config.json +++ b/conf/local-e2e-docker-public-config.json @@ -15,7 +15,7 @@ "service_links_metadata_path": "http://core:8088/service_links/refresh", "cloud_encryption_keys_metadata_path": "http://core:8088/cloud_encryption_keys/retrieve", "runtime_config_metadata_path": "http://core:8088/operator/config", - "encrypted_files": true, + "encrypted_files": false, "identity_token_expires_after_seconds": 3600, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, diff --git a/conf/local-e2e-private-config.json b/conf/local-e2e-private-config.json index 5e3c39a0e..6950aa361 100644 --- a/conf/local-e2e-private-config.json +++ b/conf/local-e2e-private-config.json @@ -15,7 +15,7 @@ "service_links_metadata_path": "http://localhost:8088/service_links/refresh", "cloud_encryption_keys_metadata_path": "http://localhost:8088/cloud_encryption_keys/retrieve", "runtime_config_metadata_path": "http://localhost:8088/operator/config", - "encrypted_files": true, + "encrypted_files": false, "identity_token_expires_after_seconds": 3600, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, diff --git a/conf/local-e2e-public-config.json b/conf/local-e2e-public-config.json index 80459743b..75b2a5eda 100644 --- a/conf/local-e2e-public-config.json +++ b/conf/local-e2e-public-config.json @@ -15,7 +15,7 @@ "service_links_metadata_path": "http://localhost:8088/service_links/refresh", "cloud_encryption_keys_metadata_path": "http://localhost:8088/cloud_encryption_keys/retrieve", "runtime_config_metadata_path": "http://localhost:8088/operator/config", - "encrypted_files": true, + "encrypted_files": false, "identity_token_expires_after_seconds": 3600, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, diff --git a/scripts/aws/conf/euid-integ-config.json b/scripts/aws/conf/euid-integ-config.json index c66c77142..49e54e22c 100644 --- a/scripts/aws/conf/euid-integ-config.json +++ b/scripts/aws/conf/euid-integ-config.json @@ -14,5 +14,5 @@ "runtime_config_metadata_path": "https://core.integ.euid.eu/operator/config", "optout_s3_folder": "optout/", "identity_scope": "euid", - "encrypted_files": true + "encrypted_files": false } \ No newline at end of file diff --git a/scripts/aws/conf/euid-prod-config.json b/scripts/aws/conf/euid-prod-config.json index 17966921e..6b931508b 100644 --- a/scripts/aws/conf/euid-prod-config.json +++ b/scripts/aws/conf/euid-prod-config.json @@ -29,5 +29,5 @@ "enable_phone_support": true, "enable_v1_phone_support": false, "enable_v2_encryption": true, - "encrypted_files": true + "encrypted_files": false } \ No newline at end of file diff --git a/scripts/aws/conf/uid2-integ-config.json b/scripts/aws/conf/uid2-integ-config.json index d29d0803e..eb279a621 100644 --- a/scripts/aws/conf/uid2-integ-config.json +++ b/scripts/aws/conf/uid2-integ-config.json @@ -14,5 +14,5 @@ "runtime_config_metadata_path": "https://core-integ.uidapi.com/operator/config", "optout_s3_folder": "uid-optout-integ/", "identity_scope": "uid2", - "encrypted_files": true + "encrypted_files": false } diff --git a/scripts/aws/conf/uid2-prod-config.json b/scripts/aws/conf/uid2-prod-config.json index 168e195dd..7cef5c1b9 100644 --- a/scripts/aws/conf/uid2-prod-config.json +++ b/scripts/aws/conf/uid2-prod-config.json @@ -25,5 +25,5 @@ "identity_token_expires_after_seconds": 259200, "refresh_token_expires_after_seconds": 2592000, "refresh_identity_token_after_seconds": 3600, - "encrypted_files": true + "encrypted_files": false } \ No newline at end of file diff --git a/scripts/azure-cc/conf/integ-uid2-config.json b/scripts/azure-cc/conf/integ-uid2-config.json index 1b218b833..02afc1f39 100644 --- a/scripts/azure-cc/conf/integ-uid2-config.json +++ b/scripts/azure-cc/conf/integ-uid2-config.json @@ -14,5 +14,5 @@ "runtime_config_metadata_path": "https://core.uidapi.com/operator/config", "optout_s3_folder": "uid-optout-integ/", "uid_instance_id_prefix": "unknown", - "encrypted_files": true + "encrypted_files": false } diff --git a/scripts/azure-cc/conf/prod-uid2-config.json b/scripts/azure-cc/conf/prod-uid2-config.json index a6eeb5b90..994fd90b7 100644 --- a/scripts/azure-cc/conf/prod-uid2-config.json +++ b/scripts/azure-cc/conf/prod-uid2-config.json @@ -15,5 +15,5 @@ "optout_s3_folder": "optout-v2/", "identity_token_expires_after_seconds": 259200, "uid_instance_id_prefix": "unknown", - "encrypted_files": true + "encrypted_files": false } diff --git a/scripts/gcp-oidc/conf/integ-config.json b/scripts/gcp-oidc/conf/integ-config.json index 97d46d2bd..c7aa8193e 100644 --- a/scripts/gcp-oidc/conf/integ-config.json +++ b/scripts/gcp-oidc/conf/integ-config.json @@ -14,5 +14,5 @@ "optout_api_uri": "https://optout.uidapi.com/optout/replicate", "uid_instance_id_prefix": "unknown", "optout_s3_folder": "uid-optout-integ/", - "encrypted_files": true + "encrypted_files": false } diff --git a/scripts/gcp-oidc/conf/prod-config.json b/scripts/gcp-oidc/conf/prod-config.json index a6eeb5b90..994fd90b7 100644 --- a/scripts/gcp-oidc/conf/prod-config.json +++ b/scripts/gcp-oidc/conf/prod-config.json @@ -15,5 +15,5 @@ "optout_s3_folder": "optout-v2/", "identity_token_expires_after_seconds": 259200, "uid_instance_id_prefix": "unknown", - "encrypted_files": true + "encrypted_files": false } From 4a9a1d501273275c4d045428b3f0ba442fe8dd4a Mon Sep 17 00:00:00 2001 From: way zheng Date: Thu, 4 Dec 2025 14:45:19 -0800 Subject: [PATCH 02/10] turn only aws to false --- conf/local-e2e-docker-private-config.json | 2 +- conf/local-e2e-docker-public-config.json | 2 +- conf/local-e2e-private-config.json | 2 +- conf/local-e2e-public-config.json | 2 +- scripts/aws/conf/euid-integ-config.json | 2 +- scripts/aws/conf/euid-prod-config.json | 2 +- scripts/aws/conf/uid2-prod-config.json | 2 +- scripts/azure-cc/conf/integ-uid2-config.json | 2 +- scripts/azure-cc/conf/prod-uid2-config.json | 2 +- scripts/gcp-oidc/conf/integ-config.json | 2 +- scripts/gcp-oidc/conf/prod-config.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/local-e2e-docker-private-config.json b/conf/local-e2e-docker-private-config.json index 51209fcc3..629a2c998 100644 --- a/conf/local-e2e-docker-private-config.json +++ b/conf/local-e2e-docker-private-config.json @@ -13,7 +13,7 @@ "salts_metadata_path": "http://core:8088/salt/refresh", "cloud_encryption_keys_metadata_path": "http://core:8088/cloud_encryption_keys/retrieve", "runtime_config_metadata_path": "http://core:8088/operator/config", - "encrypted_files": false, + "encrypted_files": true, "identity_token_expires_after_seconds": 3600, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, diff --git a/conf/local-e2e-docker-public-config.json b/conf/local-e2e-docker-public-config.json index 86ccf32fc..7610e9bc7 100644 --- a/conf/local-e2e-docker-public-config.json +++ b/conf/local-e2e-docker-public-config.json @@ -15,7 +15,7 @@ "service_links_metadata_path": "http://core:8088/service_links/refresh", "cloud_encryption_keys_metadata_path": "http://core:8088/cloud_encryption_keys/retrieve", "runtime_config_metadata_path": "http://core:8088/operator/config", - "encrypted_files": false, + "encrypted_files": true, "identity_token_expires_after_seconds": 3600, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, diff --git a/conf/local-e2e-private-config.json b/conf/local-e2e-private-config.json index 6950aa361..5e3c39a0e 100644 --- a/conf/local-e2e-private-config.json +++ b/conf/local-e2e-private-config.json @@ -15,7 +15,7 @@ "service_links_metadata_path": "http://localhost:8088/service_links/refresh", "cloud_encryption_keys_metadata_path": "http://localhost:8088/cloud_encryption_keys/retrieve", "runtime_config_metadata_path": "http://localhost:8088/operator/config", - "encrypted_files": false, + "encrypted_files": true, "identity_token_expires_after_seconds": 3600, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, diff --git a/conf/local-e2e-public-config.json b/conf/local-e2e-public-config.json index 75b2a5eda..80459743b 100644 --- a/conf/local-e2e-public-config.json +++ b/conf/local-e2e-public-config.json @@ -15,7 +15,7 @@ "service_links_metadata_path": "http://localhost:8088/service_links/refresh", "cloud_encryption_keys_metadata_path": "http://localhost:8088/cloud_encryption_keys/retrieve", "runtime_config_metadata_path": "http://localhost:8088/operator/config", - "encrypted_files": false, + "encrypted_files": true, "identity_token_expires_after_seconds": 3600, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, diff --git a/scripts/aws/conf/euid-integ-config.json b/scripts/aws/conf/euid-integ-config.json index 49e54e22c..c66c77142 100644 --- a/scripts/aws/conf/euid-integ-config.json +++ b/scripts/aws/conf/euid-integ-config.json @@ -14,5 +14,5 @@ "runtime_config_metadata_path": "https://core.integ.euid.eu/operator/config", "optout_s3_folder": "optout/", "identity_scope": "euid", - "encrypted_files": false + "encrypted_files": true } \ No newline at end of file diff --git a/scripts/aws/conf/euid-prod-config.json b/scripts/aws/conf/euid-prod-config.json index 6b931508b..17966921e 100644 --- a/scripts/aws/conf/euid-prod-config.json +++ b/scripts/aws/conf/euid-prod-config.json @@ -29,5 +29,5 @@ "enable_phone_support": true, "enable_v1_phone_support": false, "enable_v2_encryption": true, - "encrypted_files": false + "encrypted_files": true } \ No newline at end of file diff --git a/scripts/aws/conf/uid2-prod-config.json b/scripts/aws/conf/uid2-prod-config.json index 7cef5c1b9..168e195dd 100644 --- a/scripts/aws/conf/uid2-prod-config.json +++ b/scripts/aws/conf/uid2-prod-config.json @@ -25,5 +25,5 @@ "identity_token_expires_after_seconds": 259200, "refresh_token_expires_after_seconds": 2592000, "refresh_identity_token_after_seconds": 3600, - "encrypted_files": false + "encrypted_files": true } \ No newline at end of file diff --git a/scripts/azure-cc/conf/integ-uid2-config.json b/scripts/azure-cc/conf/integ-uid2-config.json index 02afc1f39..1b218b833 100644 --- a/scripts/azure-cc/conf/integ-uid2-config.json +++ b/scripts/azure-cc/conf/integ-uid2-config.json @@ -14,5 +14,5 @@ "runtime_config_metadata_path": "https://core.uidapi.com/operator/config", "optout_s3_folder": "uid-optout-integ/", "uid_instance_id_prefix": "unknown", - "encrypted_files": false + "encrypted_files": true } diff --git a/scripts/azure-cc/conf/prod-uid2-config.json b/scripts/azure-cc/conf/prod-uid2-config.json index 994fd90b7..a6eeb5b90 100644 --- a/scripts/azure-cc/conf/prod-uid2-config.json +++ b/scripts/azure-cc/conf/prod-uid2-config.json @@ -15,5 +15,5 @@ "optout_s3_folder": "optout-v2/", "identity_token_expires_after_seconds": 259200, "uid_instance_id_prefix": "unknown", - "encrypted_files": false + "encrypted_files": true } diff --git a/scripts/gcp-oidc/conf/integ-config.json b/scripts/gcp-oidc/conf/integ-config.json index c7aa8193e..97d46d2bd 100644 --- a/scripts/gcp-oidc/conf/integ-config.json +++ b/scripts/gcp-oidc/conf/integ-config.json @@ -14,5 +14,5 @@ "optout_api_uri": "https://optout.uidapi.com/optout/replicate", "uid_instance_id_prefix": "unknown", "optout_s3_folder": "uid-optout-integ/", - "encrypted_files": false + "encrypted_files": true } diff --git a/scripts/gcp-oidc/conf/prod-config.json b/scripts/gcp-oidc/conf/prod-config.json index 994fd90b7..a6eeb5b90 100644 --- a/scripts/gcp-oidc/conf/prod-config.json +++ b/scripts/gcp-oidc/conf/prod-config.json @@ -15,5 +15,5 @@ "optout_s3_folder": "optout-v2/", "identity_token_expires_after_seconds": 259200, "uid_instance_id_prefix": "unknown", - "encrypted_files": false + "encrypted_files": true } From 8d1eef4ecb90b4d4dff5a9943aa6388d47f28680 Mon Sep 17 00:00:00 2001 From: way zheng Date: Thu, 4 Dec 2025 14:46:17 -0800 Subject: [PATCH 03/10] turn only aws to false --- scripts/aws/conf/euid-integ-config.json | 2 +- scripts/aws/conf/euid-prod-config.json | 2 +- scripts/azure-cc/conf/integ-uid2-config.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/aws/conf/euid-integ-config.json b/scripts/aws/conf/euid-integ-config.json index c66c77142..49e54e22c 100644 --- a/scripts/aws/conf/euid-integ-config.json +++ b/scripts/aws/conf/euid-integ-config.json @@ -14,5 +14,5 @@ "runtime_config_metadata_path": "https://core.integ.euid.eu/operator/config", "optout_s3_folder": "optout/", "identity_scope": "euid", - "encrypted_files": true + "encrypted_files": false } \ No newline at end of file diff --git a/scripts/aws/conf/euid-prod-config.json b/scripts/aws/conf/euid-prod-config.json index 17966921e..6b931508b 100644 --- a/scripts/aws/conf/euid-prod-config.json +++ b/scripts/aws/conf/euid-prod-config.json @@ -29,5 +29,5 @@ "enable_phone_support": true, "enable_v1_phone_support": false, "enable_v2_encryption": true, - "encrypted_files": true + "encrypted_files": false } \ No newline at end of file diff --git a/scripts/azure-cc/conf/integ-uid2-config.json b/scripts/azure-cc/conf/integ-uid2-config.json index 1b218b833..02afc1f39 100644 --- a/scripts/azure-cc/conf/integ-uid2-config.json +++ b/scripts/azure-cc/conf/integ-uid2-config.json @@ -14,5 +14,5 @@ "runtime_config_metadata_path": "https://core.uidapi.com/operator/config", "optout_s3_folder": "uid-optout-integ/", "uid_instance_id_prefix": "unknown", - "encrypted_files": true + "encrypted_files": false } From 1bff94f3bb0d831502efee56be58de4070cb211f Mon Sep 17 00:00:00 2001 From: way zheng Date: Thu, 4 Dec 2025 14:46:51 -0800 Subject: [PATCH 04/10] turn only aws to false --- scripts/azure-cc/conf/integ-uid2-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-cc/conf/integ-uid2-config.json b/scripts/azure-cc/conf/integ-uid2-config.json index 02afc1f39..1b218b833 100644 --- a/scripts/azure-cc/conf/integ-uid2-config.json +++ b/scripts/azure-cc/conf/integ-uid2-config.json @@ -14,5 +14,5 @@ "runtime_config_metadata_path": "https://core.uidapi.com/operator/config", "optout_s3_folder": "uid-optout-integ/", "uid_instance_id_prefix": "unknown", - "encrypted_files": false + "encrypted_files": true } From 0c3e4f08ac004fc4631ba09b171599ad4615384d Mon Sep 17 00:00:00 2001 From: way zheng Date: Thu, 4 Dec 2025 14:47:17 -0800 Subject: [PATCH 05/10] turn only aws to false --- scripts/aws/conf/uid2-prod-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/aws/conf/uid2-prod-config.json b/scripts/aws/conf/uid2-prod-config.json index 168e195dd..7cef5c1b9 100644 --- a/scripts/aws/conf/uid2-prod-config.json +++ b/scripts/aws/conf/uid2-prod-config.json @@ -25,5 +25,5 @@ "identity_token_expires_after_seconds": 259200, "refresh_token_expires_after_seconds": 2592000, "refresh_identity_token_after_seconds": 3600, - "encrypted_files": true + "encrypted_files": false } \ No newline at end of file From fa49c999316a086ae2d12ad699cacafbaae7f0a2 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Thu, 4 Dec 2025 22:49:24 +0000 Subject: [PATCH 06/10] [CI Pipeline] Released Snapshot version: 5.62.5-alpha-569-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2551ff9e0..a915fda31 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.62.4 + 5.62.5-alpha-569-SNAPSHOT UTF-8 From ff605987e030ed5057e5fee661a7d366426f3720 Mon Sep 17 00:00:00 2001 From: way zheng Date: Thu, 4 Dec 2025 15:10:21 -0800 Subject: [PATCH 07/10] turn off gcp encryted fiels --- scripts/gcp-oidc/conf/integ-config.json | 2 +- scripts/gcp-oidc/conf/prod-config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/gcp-oidc/conf/integ-config.json b/scripts/gcp-oidc/conf/integ-config.json index 97d46d2bd..c7aa8193e 100644 --- a/scripts/gcp-oidc/conf/integ-config.json +++ b/scripts/gcp-oidc/conf/integ-config.json @@ -14,5 +14,5 @@ "optout_api_uri": "https://optout.uidapi.com/optout/replicate", "uid_instance_id_prefix": "unknown", "optout_s3_folder": "uid-optout-integ/", - "encrypted_files": true + "encrypted_files": false } diff --git a/scripts/gcp-oidc/conf/prod-config.json b/scripts/gcp-oidc/conf/prod-config.json index a6eeb5b90..994fd90b7 100644 --- a/scripts/gcp-oidc/conf/prod-config.json +++ b/scripts/gcp-oidc/conf/prod-config.json @@ -15,5 +15,5 @@ "optout_s3_folder": "optout-v2/", "identity_token_expires_after_seconds": 259200, "uid_instance_id_prefix": "unknown", - "encrypted_files": true + "encrypted_files": false } From 342067b1fddd08ee5527aa919afe4425c247d528 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Thu, 4 Dec 2025 23:18:12 +0000 Subject: [PATCH 08/10] [CI Pipeline] Released Snapshot version: 5.62.6-alpha-570-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a915fda31..11d11be78 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.62.5-alpha-569-SNAPSHOT + 5.62.6-alpha-570-SNAPSHOT UTF-8 From 8b7f3a802907559b41a8a7fe583c9a7d07f29779 Mon Sep 17 00:00:00 2001 From: way zheng Date: Thu, 4 Dec 2025 15:36:43 -0800 Subject: [PATCH 09/10] turn off azure --- scripts/azure-cc/conf/integ-uid2-config.json | 2 +- scripts/azure-cc/conf/prod-uid2-config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-cc/conf/integ-uid2-config.json b/scripts/azure-cc/conf/integ-uid2-config.json index 1b218b833..02afc1f39 100644 --- a/scripts/azure-cc/conf/integ-uid2-config.json +++ b/scripts/azure-cc/conf/integ-uid2-config.json @@ -14,5 +14,5 @@ "runtime_config_metadata_path": "https://core.uidapi.com/operator/config", "optout_s3_folder": "uid-optout-integ/", "uid_instance_id_prefix": "unknown", - "encrypted_files": true + "encrypted_files": false } diff --git a/scripts/azure-cc/conf/prod-uid2-config.json b/scripts/azure-cc/conf/prod-uid2-config.json index a6eeb5b90..994fd90b7 100644 --- a/scripts/azure-cc/conf/prod-uid2-config.json +++ b/scripts/azure-cc/conf/prod-uid2-config.json @@ -15,5 +15,5 @@ "optout_s3_folder": "optout-v2/", "identity_token_expires_after_seconds": 259200, "uid_instance_id_prefix": "unknown", - "encrypted_files": true + "encrypted_files": false } From 42f65a87b8104d850fc448fd7c19e08c7d8912c3 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Thu, 4 Dec 2025 23:58:49 +0000 Subject: [PATCH 10/10] [CI Pipeline] Released Snapshot version: 5.62.7-alpha-573-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 11d11be78..37acdcc14 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.62.6-alpha-570-SNAPSHOT + 5.62.7-alpha-573-SNAPSHOT UTF-8