[AppConfig] appconfig feature list/show and appconfig kv import/export: Support microsoft feature management schema

src/azure-cli/azure/cli/command_modules/appconfig/_constants.py

@@ -21,13 +21,43 @@ class FeatureFlagConstants:
     CLIENT_FILTERS = "client_filters"
     REQUIREMENT_TYPE = "requirement_type"
     DISPLAY_NAME = "display_name"
-    FILTER_NAME = "name"
+    NAME = "name"
     FILTER_PARAMETERS = "parameters"
+    ALLOCATION = "allocation"
+    TELEMETRY = "telemetry"
+    VARIANTS = "variants"
+
+    # allocation properties
+    GROUP = "group"
+    USER = "user"
+    PERCENTILE = "percentile"
+    DEFAULT_WHEN_ENABLED = "default_when_enabled"
+    DEFAULT_WHEN_DISABLED = "default_when_disabled"
+    SEED = "seed"
+
+    # variant properties
+    VARIANT = "variant"
+    VARIANT_CONFIGURATION_VALUE = "configuration_value"
+    VARIANT_STATUS_OVERRIDE = "status_override"
+
+    # percentile properties
+    FROM = "from"
+    TO = "to"
+
+    # allocation user/group properties
+    USERS = "users"
+    GROUPS = "groups"
 
     # Requirement type options
     REQUIREMENT_TYPE_ALL = "all"
     REQUIREMENT_TYPE_ANY = "any"
 
+    # Telemetry properties
+    METADATA = "metadata"
+
+    # feature flags key
+    FEATURE_FLAGS_KEY = "feature_flags"
+
 
 class KeyVaultConstants:
     KEYVAULT_CONTENT_TYPE = "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8"

src/azure-cli/azure/cli/command_modules/appconfig/_diff_utils.py

@@ -6,12 +6,13 @@
 # pylint: disable=line-too-long, too-few-public-methods
 
 import json
+import os
 
 from knack.util import CLIError
 from knack.log import get_logger
 
 from ._constants import CompareFields, JsonDiff, AppServiceConstants
-from ._featuremodels import (map_keyvalue_to_featureflag, custom_serialize_conditions, is_feature_flag)
+from ._featuremodels import (custom_serialize_allocation, custom_serialize_variants, map_keyvalue_to_featureflag, custom_serialize_conditions, custom_serialize_telemetry, is_feature_flag)
 from ._utils import is_json_content_type
 
 logger = get_logger(__name__)
@@ -153,15 +154,37 @@ def serialize(obj):
 
         # Feature flag format: {"feature": <feature-name>, "state": <on/off>, "conditions": <conditions-dict>}
         if is_feature_flag(obj):
-            feature = map_keyvalue_to_featureflag(obj)
+
+            # State property doesn't make sense in feature flag version 2 schema beacuse of the added properties - variants, allocation, telemetry
+            # The State property only exists in the CLI, we should move to showing enabled property instead as the other clients
+            # As we move to showing the enabled property, we will show the state property in the CLI only if compatibility mode is true
+            env_compatibility_mode = os.environ.get("AZURE_APPCONFIG_FM_COMPATIBLE", True)
+            compatibility_mode = str(env_compatibility_mode).lower() == "true"
+
+            feature = map_keyvalue_to_featureflag(obj, hide_enabled=compatibility_mode)
             # name
             feature_json = {'feature': feature.name}
             # state
-            feature_json['state'] = feature.state
+            if hasattr(feature, 'state'):
+                feature_json['state'] = feature.state
+            # enabled
+            if hasattr(feature, 'enabled'):
+                feature_json['enabled'] = feature.enabled
             # description
-            feature_json['description'] = feature.description
+            if feature.description is not None:
+                feature_json['description'] = feature.description
             # conditions
-            feature_json['conditions'] = custom_serialize_conditions(feature.conditions)
+            if feature.conditions:
+                feature_json['conditions'] = custom_serialize_conditions(feature.conditions)
+            # allocation
+            if feature.allocation:
+                feature_json['allocation'] = custom_serialize_allocation(feature.allocation)
+            # variants
+            if feature.variants:
+                feature_json['variants'] = custom_serialize_variants(feature.variants)
+            # telemetry
+            if feature.telemetry:
+                feature_json['telemetry'] = custom_serialize_telemetry(feature.telemetry)
 
             return feature_json