From 1372cb8eed8950c14301950219d0f8d223ae37a6 Mon Sep 17 00:00:00 2001 From: Matt Metcalf Date: Wed, 23 Oct 2024 15:47:48 -0700 Subject: [PATCH 1/3] updated calc to sort keys --- .../azure/appconfiguration/provider/_client_manager_base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_client_manager_base.py b/sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_client_manager_base.py index 32d4c7aaf771..7ad64a1a21bf 100644 --- a/sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_client_manager_base.py +++ b/sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_client_manager_base.py @@ -108,7 +108,9 @@ def _generate_allocation_id(feature_flag_value: Dict[str, JSON]) -> Optional[str for v in sorted_variants: allocation_id += f"{base64.b64encode(v.get('name', '').encode()).decode()}," if "configuration_value" in v: - allocation_id += f"{json.dumps(v.get('configuration_value', ''), separators=(',', ':'))}" + allocation_id += ( + f"{json.dumps(v.get('configuration_value', ''), separators=(',', ':'), sort_keys=True)}," + ) allocation_id += ";" if sorted_variants: allocation_id = allocation_id[:-1] From f2030e2127e6c8b9362995127c2a383807b372c4 Mon Sep 17 00:00:00 2001 From: Matt Metcalf Date: Wed, 23 Oct 2024 15:50:35 -0700 Subject: [PATCH 2/3] Update CHANGELOG.md --- .../azure-appconfiguration-provider/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/appconfiguration/azure-appconfiguration-provider/CHANGELOG.md b/sdk/appconfiguration/azure-appconfiguration-provider/CHANGELOG.md index d49e4ac9f539..a4c8df026bbf 100644 --- a/sdk/appconfiguration/azure-appconfiguration-provider/CHANGELOG.md +++ b/sdk/appconfiguration/azure-appconfiguration-provider/CHANGELOG.md @@ -6,6 +6,8 @@ ### Breaking Changes +* Allocation Id value changed so other providers can match the value. + ### Bugs Fixed ### Other Changes From e8f436ad9c9b12288d6343f4f92840d050ab9d3b Mon Sep 17 00:00:00 2001 From: Matt Metcalf Date: Thu, 31 Oct 2024 12:00:34 -0700 Subject: [PATCH 3/3] Update _client_manager_base.py --- .../azure/appconfiguration/provider/_client_manager_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_client_manager_base.py b/sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_client_manager_base.py index 7ad64a1a21bf..cb5bd5de89f2 100644 --- a/sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_client_manager_base.py +++ b/sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_client_manager_base.py @@ -109,7 +109,7 @@ def _generate_allocation_id(feature_flag_value: Dict[str, JSON]) -> Optional[str allocation_id += f"{base64.b64encode(v.get('name', '').encode()).decode()}," if "configuration_value" in v: allocation_id += ( - f"{json.dumps(v.get('configuration_value', ''), separators=(',', ':'), sort_keys=True)}," + f"{json.dumps(v.get('configuration_value', ''), separators=(',', ':'), sort_keys=True)}" ) allocation_id += ";" if sorted_variants: