Merge branch 'cwanjau/supportFFV2Schema' of https://github.com/ChristineWanjau/azure-cli into cwanjau/supportFFV2Schema

Author: Christine WANJAU

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

@@ -117,6 +117,7 @@ def __export_features(retrieved_features, naming_convention, compatibility_mode)
     new_ms_featuremanagement_keyword = FeatureManagementReservedKeywords.UNDERSCORE.feature_management
     feature_flags_keyword = FeatureFlagConstants.FEATURE_FLAGS_KEY
     try:
+        compatibility_mode = str(compatibility_mode).lower() in ['true']
         if compatibility_mode:
             feature_reserved_keywords = FeatureManagementReservedKeywords.get_keywords(naming_convention)
             exported_dict = {}

src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/test_appconfig_commands.py

@@ -1498,7 +1498,7 @@ def test_azconfig_import_export_naming_conventions(self, resource_group, locatio
         self.cmd(
             'appconfig kv import -n {config_store_name} -s {import_source} --path "{imported_file_both_schemas_fm_path}" --format {imported_format} --label {label} -y')
         self.cmd(
-            'appconfig kv export -n {config_store_name} -d {import_source} --path "{exported_file_both_schemas_fm_path}" --format {imported_format} --naming-convention {naming_convention} --label {label} -y')
+            'appconfig kv export -n {config_store_name} -d {import_source} --path "{exported_file_both_schemas_fm_path}" --format {imported_format} --label {label} -y')
         with open(exported_both_schemas_camel_case_file_path) as json_file:
             exported_camel_case_kvs = json.load(json_file)
         with open(expected_exported_both_schemas_file_path) as json_file:
@@ -1520,7 +1520,7 @@ def test_azconfig_import_export_naming_conventions(self, resource_group, locatio
         self.cmd(
             'appconfig kv import -n {config_store_name} -s {import_source} --path "{imported_file_both_schemas_fm_path}" --format {imported_format} --label {label} -y')
         self.cmd(
-            'appconfig kv export -n {config_store_name} -d {import_source} --path "{exported_file_both_schemas_fm_path}" --format {imported_format} --naming-convention {naming_convention} --label {label} -y')
+            'appconfig kv export -n {config_store_name} -d {import_source} --path "{exported_file_both_schemas_fm_path}" --format {imported_format} --label {label} -y')
         with open(exported_both_schemas_pascal_case_file_path) as json_file:
             exported_pascal_case_kvs = json.load(json_file)
         with open(expected_exported_both_schemas_file_path) as json_file:
@@ -1542,7 +1542,7 @@ def test_azconfig_import_export_naming_conventions(self, resource_group, locatio
         self.cmd(
             'appconfig kv import -n {config_store_name} -s {import_source} --path "{imported_file_both_schemas_fm_path}" --format {imported_format} --label {label} -y')
         self.cmd(
-            'appconfig kv export -n {config_store_name} -d {import_source} --path "{exported_file_both_schemas_fm_path}" --format {imported_format} --naming-convention {naming_convention} --label {label} -y')
+            'appconfig kv export -n {config_store_name} -d {import_source} --path "{exported_file_both_schemas_fm_path}" --format {imported_format} --label {label} -y')
         with open(exported_both_schemas_hyphen_case_file_path) as json_file:
             exported_hyphen_case_kvs = json.load(json_file)
         with open(expected_exported_both_schemas_file_path) as json_file: