[AppConfig] Update FeatureFlagSetting to enable parsing different id and key name. (#35769)

Author: albertofori

sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md

@@ -7,6 +7,7 @@
 ### Breaking Changes
 
 ### Bugs Fixed
+- Fixed a bug where the `feature_id` of `FeatureFlagConfigurationSetting` will be different from `id` customer field, and may overwrite the original customer-defined value if different from the `FeatureFlagConfigurationSetting` key suffix.
 
 ### Other Changes
 

sdk/appconfiguration/azure-appconfiguration/azure/appconfiguration/_models.py

@@ -173,10 +173,10 @@ def __init__(  # pylint: disable=super-init-not-called
             to be considered enabled.
         :paramtype filters: list[dict[str, Any]] or None
         """
-        if "key" in kwargs or "value" in kwargs:
-            raise TypeError("Unexpected keyword argument, do not provide 'key' or 'value' as a keyword-arg")
+        if "value" in kwargs:
+            raise TypeError("Unexpected keyword argument, do not provide 'value' as a keyword-arg")
         self.feature_id = feature_id
-        self.key = self._key_prefix + self.feature_id
+        self.key = kwargs.get("key", None) or (self._key_prefix + self.feature_id)
         self.label = kwargs.get("label", None)
         self.content_type = kwargs.get("content_type", self._feature_flag_content_type)
         self.last_modified = kwargs.get("last_modified", None)
@@ -235,19 +235,23 @@ def _from_generated(cls, key_value: KeyValue) -> "FeatureFlagConfigurationSettin
         filters = None
         display_name = None
         description = None
+        feature_id = None
         try:
             temp = json.loads(key_value.value)  # type: ignore
             if isinstance(temp, dict):
                 enabled = temp.get("enabled", False)
                 display_name = temp.get("display_name")
                 description = temp.get("description")
+                feature_id = temp.get("id")
+
                 if "conditions" in temp.keys():
                     filters = temp["conditions"].get("client_filters")
         except (ValueError, json.JSONDecodeError):
             pass
 
         return cls(
-            feature_id=key_value.key.lstrip(".appconfig.featureflag").lstrip("/"),  # type: ignore
+            feature_id=feature_id,  # type: ignore
+            key=key_value.key,
             label=key_value.label,
             content_type=key_value.content_type,
             last_modified=key_value.last_modified,

sdk/appconfiguration/azure-appconfiguration/tests/test_azure_appconfiguration_client.py

@@ -1171,8 +1171,6 @@ def test_monitor_configuration_settings_by_page_etag(self, appconfiguration_conn
 
 class TestAppConfigurationClientUnitTest:
     def test_type_error(self):
-        with pytest.raises(TypeError):
-            _ = FeatureFlagConfigurationSetting("blah", key="blah")
         with pytest.raises(TypeError):
             _ = FeatureFlagConfigurationSetting("blah", value="blah")
         with pytest.raises(TypeError):

sdk/appconfiguration/azure-appconfiguration/tests/test_consistency.py

@@ -125,3 +125,11 @@ def test_feature_flag_prefix(self):
         key = self.get_resource_name("key")
         feature_flag = FeatureFlagConfigurationSetting(key, enabled=True)
         assert feature_flag.key.startswith(".appconfig.featureflag/")
+
+    def test_feature_flag_different_key_and_id(self):
+        key = f'.appconfig.featureflag/{self.get_resource_name("key")}'
+        feature_id = self.get_resource_name("id")
+        feature_flag = FeatureFlagConfigurationSetting(feature_id, enabled=True, key=key)
+
+        assert feature_flag.feature_id == feature_id
+        assert feature_flag.key == key