[AppConfiguration] Appconfig consistency

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

@@ -3,6 +3,7 @@
 # Licensed under the MIT License.
 # ------------------------------------
 import json
+from typing import Dict, Union, List, Any, Optional
 from msrest.serialization import Model
 from ._generated.models import KeyValue
 
@@ -63,9 +64,12 @@ def _from_generated(cls, key_value):
             if key_value.content_type.startswith(
                 FeatureFlagConfigurationSetting._feature_flag_content_type  # pylint:disable=protected-access
             ) and key_value.key.startswith(FeatureFlagConfigurationSetting.key_prefix):
-                return FeatureFlagConfigurationSetting._from_generated(  # pylint: disable=protected-access
-                    key_value
-                )
+                try:
+                    return FeatureFlagConfigurationSetting._from_generated(  # pylint: disable=protected-access
+                        key_value
+                    )
+                except (KeyError, AttributeError, TypeError):
+                    pass
             if key_value.content_type.startswith(
                 SecretReferenceConfigurationSetting._secret_reference_content_type  # pylint:disable=protected-access
             ):
@@ -143,7 +147,7 @@ class FeatureFlagConfigurationSetting(
     kind = "FeatureFlag"
 
     def __init__(self, feature_id, enabled, filters=[], **kwargs):  # pylint: disable=dangerous-default-value
-        # type: (str, bool, Optional[List[Dict[str, Any]]]) -> None
+        # type: (str, bool, Optional[List[Dict[str, Any]]], Any) -> None
         super(FeatureFlagConfigurationSetting, self).__init__(**kwargs)
         if not feature_id.startswith(self.key_prefix):
             feature_id = self.key_prefix + feature_id
@@ -236,19 +240,12 @@ def _from_generated(cls, key_value):
             return ConfigurationSetting._from_generated(key_value)
 
     def _to_generated(self):
-        # type: (...) -> KeyValue
-        # value = {
-        #     u"id": self.key,
-        #     u"description": self.description,
-        #     u"enabled": self._enabled,
-        #     u"conditions": {u"client_filters": self._filters},
-        # }
-        # value = json.dumps(value)
+        # type: () -> KeyValue
 
         return KeyValue(
             key=self.key,
             label=self.label,
-            value=self.value,
+            value=json.dumps(self.value),  # NOTE: This has to be added for valid json
             content_type=self.content_type,
             last_modified=self.last_modified,
             tags=self.tags,
@@ -334,26 +331,23 @@ def _validate(self):
     @classmethod
     def _from_generated(cls, key_value):
         # type: (KeyValue) -> SecretReferenceConfigurationSetting
-        try:
-            if key_value is None:
-                return None
-            if key_value.value:
-                try:
-                    key_value.value = json.loads(key_value.value)
-                except json.decoder.JSONDecodeError:
-                    pass
-            return cls(
-                key=key_value.key,
-                secret_uri=key_value.value[u"secret_uri"],
-                label=key_value.label,
-                secret_id=key_value.value,
-                last_modified=key_value.last_modified,
-                tags=key_value.tags,
-                read_only=key_value.locked,
-                etag=key_value.etag,
-            )
-        except (KeyError, AttributeError):
-            return ConfigurationSetting._from_generated(key_value)
+        if key_value is None:
+            return None
+        if key_value.value:
+            try:
+                key_value.value = json.loads(key_value.value)
+            except json.decoder.JSONDecodeError:
+                pass
+        return cls(
+            key=key_value.key,
+            secret_uri=key_value.value[u"secret_uri"],
+            label=key_value.label,
+            secret_id=key_value.value,
+            last_modified=key_value.last_modified,
+            tags=key_value.tags,
+            read_only=key_value.locked,
+            etag=key_value.etag,
+        )
 
     def _to_generated(self):
         # type: (...) -> KeyValue