resolve code conflicts

Author: yanzhudd

.github/CODEOWNERS

@@ -1,70 +1,70 @@
 # See for instructions on this file https://help.github.com/articles/about-codeowners/
 
-*help.py @kairu-ms @jiasli @jsntcy
-*help.yaml @kairu-ms @jiasli @jsntcy
-*help.yml @kairu-ms @jiasli @jsntcy
+*help.py @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan
+*help.yaml @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan
+*help.yml @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan
 
-/linter_exclusions.yml @jsntcy @kairu-ms @yanzhudd
+/linter_exclusions.yml @naganandyala @bebound @YanaXu @yonzhan @wangzelin007
 
-/doc/ @jiasli @kairu-ms @jsntcy @necusjz @yanzhudd
-/tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
-/tools/aaz-flow @a0x1ab @necusjz @yanzhudd
-/scripts/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound @naga-nandyala
-/scripts/live_test @kairu-ms @wangzelin007 @naga-nandyala
-/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @wangzelin007 @bebound
+/doc/ @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan
+/tools/ @naganandyala @bebound @YanaXu @yonzhan @wangzelin007
+/tools/aaz-flow @a0x1ab @necusjz @yanzhudd @naganandyala
+/scripts/ @naganandyala @bebound @YanaXu @yonzhan @wangzelin007
+/scripts/live_test @naganandyala @bebound @YanaXu @yonzhan @wangzelin007
+/src/azure-cli-testsdk/ @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan
 
-/src/azure-cli-core/ @jiasli @jsntcy @kairu-ms @yanzhudd @calvinhzy @necusjz @bebound @DanielMicrosoft @ReaNAiveD
-/src/azure-cli-core/azure/cli/core/_profile.py @jiasli @bebound
-/src/azure-cli-core/azure/cli/core/auth/ @jiasli @bebound
-/src/azure-cli-core/azure/cli/core/extension/ @jsntcy @kairu-ms
-/src/azure-cli-core/azure/cli/core/style.py @jiasli @yanzhudd
-/src/azure-cli-core/azure/cli/core/aaz/ @kairu-ms @necusjz @calvinhzy @jsntcy @DanielMicrosoft @ReaNAiveD
+/src/azure-cli-core/ @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan
+/src/azure-cli-core/azure/cli/core/_profile.py @isra-fel @notyashhh @xuming-ms @teresaritorto
+/src/azure-cli-core/azure/cli/core/auth/ @isra-fel @notyashhh @xuming-ms @teresaritorto
+/src/azure-cli-core/azure/cli/core/extension/ @VeryEarly @Pan-Qi @jsntcy @necusjz
+/src/azure-cli-core/azure/cli/core/style.py @NoriZC @yanzhudd @teresaritorto
+/src/azure-cli-core/azure/cli/core/aaz/ @VeryEarly @Pan-Qi @jsntcy @necusjz
 
-/src/azure-cli/azure/cli/command_modules/acr/ @northtyphoon @rosanch @jsntcy @yanzhudd
-/src/azure-cli/azure/cli/command_modules/acs/ @zqingqing1 @gtracer @xizhamsft @andyliuliming @fumingzhang @jsntcy @yanzhudd
-/src/azure-cli/azure/cli/command_modules/advisor/ @jsntcy @Prasanna-Padmanabhan
-/src/azure-cli/azure/cli/command_modules/apim/ @jsntcy @kevinhillinger @jonlester
-/src/azure-cli/azure/cli/command_modules/appconfig/ @jsntcy @yanzhudd @ChristineWanjau @albertofori @avanigupta @mrm9084
-/src/azure-cli/azure/cli/command_modules/appservice/ @jsntcy @yanzhudd @panchagnula
-/src/azure-cli/azure/cli/command_modules/aro/ @jsntcy @bennerv @hawkowl @jewzaam @rogbas @necusjz
-/src/azure-cli/azure/cli/command_modules/backup/ @jsntcy @yanzhudd @dragonfly91 @akshayneema
-/src/azure-cli/azure/cli/command_modules/batch/ @jsntcy @yanzhudd @cRui861 @wanghoppe @dpwatrous @wiboris
-/src/azure-cli/azure/cli/command_modules/batchai/ @jsntcy @AlexanderYukhanov
-/src/azure-cli/azure/cli/command_modules/botservice/ @jsntcy @jiaxuwu2021 @luhan2017
-/src/azure-cli/azure/cli/command_modules/cdn/ @jsntcy @kairu-ms @wangzelin007 @necusjz @t-bzhan
-/src/azure-cli/azure/cli/command_modules/cloud/ @jiasli @calvinhzy
-/src/azure-cli/azure/cli/command_modules/consumption/ @jsntcy @sandeepnl
-/src/azure-cli/azure/cli/command_modules/container/ @jsntcy @joseph-porter
-/src/azure-cli/azure/cli/command_modules/cosmosdb/ @calvinhzy @dmakwana @kristynhamasaki
-/src/azure-cli/azure/cli/command_modules/databoxedge/ @calvinhzy
-/src/azure-cli/azure/cli/command_modules/dls/ @jsntcy @calvinhzy @akharit @rahuldutta90
-/src/azure-cli/azure/cli/command_modules/dms/ @jsntcy @necusjz @temandr @binuj
-/src/azure-cli/azure/cli/command_modules/eventgrid/ @calvinhzy @VidyaKukke
-/src/azure-cli/azure/cli/command_modules/eventhubs/ @jsntcy @v-ajnava @calvinhzy
-/src/azure-cli/azure/cli/command_modules/extension/ @jsntcy @kairu-ms
-/src/azure-cli/azure/cli/command_modules/feedback/ @jiasli @kairu-ms
-/src/azure-cli/azure/cli/command_modules/hdinsight/ @kairu-ms @aim-for-better
-/src/azure-cli/azure/cli/command_modules/identity/ @jiasli @yanzhudd
-/src/azure-cli/azure/cli/command_modules/iot/ @yanzhudd @digimaun
-/src/azure-cli/azure/cli/command_modules/keyvault/ @notyashhh @jiasli @calvinhzy
-/src/azure-cli/azure/cli/command_modules/monitor/ @jsntcy @kairu-ms @necusjz @yanzhudd
-/src/azure-cli/azure/cli/command_modules/mysql/ @calvinhzy @honghr
-/src/azure-cli/azure/cli/command_modules/natgateway/ @jsntcy @kairu-ms @necusjz @khannarheams
-/src/azure-cli/azure/cli/command_modules/network/ @jsntcy @kairu-ms @wangzelin007 @necusjz @DanielMicrosoft @ReaNAiveD
-/src/azure-cli/azure/cli/command_modules/policyinsights/ @jsntcy @cheggert
-/src/azure-cli/azure/cli/command_modules/postgresql/ @calvinhzy @arde0708
-/src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @kairu-ms @necusjz
-/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @bebound
-/src/azure-cli/azure/cli/command_modules/rdbms/ @calvinhzy @arde0708 @alanenriqueo
-/src/azure-cli/azure/cli/command_modules/resource/ @jsntcy @yanzhudd
-/src/azure-cli/azure/cli/command_modules/role/ @jiasli @bebound
-/src/azure-cli/azure/cli/command_modules/search/ @kairu-ms @necusjz @huangbolun
-/src/azure-cli/azure/cli/command_modules/servicebus/ @yanzhudd @jsntcy @calvinhzy @v-ajnava
-/src/azure-cli/azure/cli/command_modules/serviceconnector/ @kairu-ms @yanzhudd @yungezz @houk-ms @xfz11
-/src/azure-cli/azure/cli/command_modules/servicefabric/ @jsntcy @yanzhudd @QingChenmsft
-/src/azure-cli/azure/cli/command_modules/sql/ @calvinhzy @jaredmoo
-/src/azure-cli/azure/cli/command_modules/storage/ @jsntcy @yanzhudd @calvinhzy
-/src/azure-cli/azure/cli/command_modules/synapse/ @jsntcy @idear1203 @zesluo @calvinhzy
-/src/azure-cli/azure/cli/command_modules/util/ @jiasli @yanzhudd @calvinhzy
-/src/azure-cli/azure/cli/command_modules/vm/ @jsntcy @wangzelin007 @yanzhudd @Drewm3 @TravisCragg-MSFT @nikhilpatel909 @sandeepraichura @hilaryw29 @GabstaMSFT @ramankumarlive @ushnaarshadkhan
-/src/azure-cli/azure/cli/command_modules/containerapp/ @yanzhudd @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre @ShichaoQiu
+/src/azure-cli/azure/cli/command_modules/acr/ @NoriZC @yanzhudd @teresaritorto @northtyphoon @rosanch
+/src/azure-cli/azure/cli/command_modules/acs/ @NoriZC @yanzhudd @teresaritorto @zqingqing1 @gtracer @xizhamsft @andyliuliming @fumingzhang
+/src/azure-cli/azure/cli/command_modules/advisor/ @VeryEarly @Pan-Qi @jsntcy @Prasanna-Padmanabhan
+/src/azure-cli/azure/cli/command_modules/apim/ @NoriZC @yanzhudd @teresaritorto @kevinhillinger @jonlester
+/src/azure-cli/azure/cli/command_modules/appconfig/ @VeryEarly @Pan-Qi @jsntcy @ChristineWanjau @albertofori @avanigupta @mrm9084
+/src/azure-cli/azure/cli/command_modules/appservice/ @NoriZC @yanzhudd @teresaritorto @panchagnula
+/src/azure-cli/azure/cli/command_modules/aro/ @VeryEarly @Pan-Qi @jsntcy @bennerv @hawkowl @jewzaam @rogbas @necusjz
+/src/azure-cli/azure/cli/command_modules/backup/ @NoriZC @yanzhudd @teresaritorto @dragonfly91 @akshayneema
+/src/azure-cli/azure/cli/command_modules/batch/ @NoriZC @yanzhudd @teresaritorto @cRui861 @wanghoppe @dpwatrous @wiboris
+/src/azure-cli/azure/cli/command_modules/batchai/ @VeryEarly @Pan-Qi @jsntcy @AlexanderYukhanov
+/src/azure-cli/azure/cli/command_modules/botservice/ @VeryEarly @Pan-Qi @jsntcy @jiaxuwu2021 @luhan2017
+/src/azure-cli/azure/cli/command_modules/cdn/ @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan @t-bzhan
+/src/azure-cli/azure/cli/command_modules/cloud/ @isra-fel @notyashhh @xuming-ms @teresaritorto
+/src/azure-cli/azure/cli/command_modules/consumption/ @VeryEarly @Pan-Qi @jsntcy @sandeepnl
+/src/azure-cli/azure/cli/command_modules/container/ @NoriZC @yanzhudd @teresaritorto @joseph-porter
+/src/azure-cli/azure/cli/command_modules/cosmosdb/ @VeryEarly @Pan-Qi @jsntcy @dmakwana @kristynhamasaki
+/src/azure-cli/azure/cli/command_modules/databoxedge/ @VeryEarly @Pan-Qi @jsntcy
+/src/azure-cli/azure/cli/command_modules/dls/ @VeryEarly @Pan-Qi @jsntcy @akharit @rahuldutta90
+/src/azure-cli/azure/cli/command_modules/dms/ @VeryEarly @Pan-Qi @jsntcy @temandr @binuj
+/src/azure-cli/azure/cli/command_modules/eventgrid/ @VeryEarly @Pan-Qi @jsntcy @VidyaKukke
+/src/azure-cli/azure/cli/command_modules/eventhubs/ @VeryEarly @Pan-Qi @jsntcy @v-ajnava @calvinhzy
+/src/azure-cli/azure/cli/command_modules/extension/ @VeryEarly @Pan-Qi @jsntcy
+/src/azure-cli/azure/cli/command_modules/feedback/ @VeryEarly @Pan-Qi @jsntcy
+/src/azure-cli/azure/cli/command_modules/hdinsight/ @VeryEarly @Pan-Qi @jsntcy @aim-for-better
+/src/azure-cli/azure/cli/command_modules/identity/ @isra-fel @notyashhh @xuming-ms @teresaritorto
+/src/azure-cli/azure/cli/command_modules/iot/ @NoriZC @yanzhudd @teresaritorto @digimaun
+/src/azure-cli/azure/cli/command_modules/keyvault/ @notyashhh @isra-fel @xuming-ms @teresaritorto
+/src/azure-cli/azure/cli/command_modules/monitor/ @NoriZC @yanzhudd @teresaritorto
+/src/azure-cli/azure/cli/command_modules/mysql/ @VeryEarly @Pan-Qi @calvinhzy @jsntcy @honghr
+/src/azure-cli/azure/cli/command_modules/natgateway/ @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan @khannarheams
+/src/azure-cli/azure/cli/command_modules/network/ @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan
+/src/azure-cli/azure/cli/command_modules/policyinsights/ @isra-fel @notyashhh @xuming-ms @teresaritorto @cheggert
+/src/azure-cli/azure/cli/command_modules/postgresql/ @VeryEarly @Pan-Qi @calvinhzy @jsntcy @arde0708
+/src/azure-cli/azure/cli/command_modules/privatedns/ @necusjz @DanielMicrosoft @ReaNAiveD @yonzhan
+/src/azure-cli/azure/cli/command_modules/profile/ @isra-fel @notyashhh @xuming-ms @teresaritorto
+/src/azure-cli/azure/cli/command_modules/rdbms/ @VeryEarly @Pan-Qi @calvinhzy @jsntcy @arde0708 @alanenriqueo
+/src/azure-cli/azure/cli/command_modules/resource/ @isra-fel @notyashhh @xuming-ms @teresaritorto @ReaNAiveD
+/src/azure-cli/azure/cli/command_modules/role/ @isra-fel @notyashhh @xuming-ms @teresaritorto
+/src/azure-cli/azure/cli/command_modules/search/ @VeryEarly @Pan-Qi @jsntcy @huangbolun
+/src/azure-cli/azure/cli/command_modules/servicebus/ @NoriZC @yanzhudd @teresaritorto @v-ajnava
+/src/azure-cli/azure/cli/command_modules/serviceconnector/ @VeryEarly @Pan-Qi @jsntcy @yungezz @houk-ms @xfz11
+/src/azure-cli/azure/cli/command_modules/servicefabric/ @NoriZC @yanzhudd @teresaritorto @QingChenmsft
+/src/azure-cli/azure/cli/command_modules/sql/ @VeryEarly @Pan-Qi @calvinhzy @jsntcy @jaredmoo
+/src/azure-cli/azure/cli/command_modules/storage/ @VeryEarly @Pan-Qi @calvinhzy @jsntcy
+/src/azure-cli/azure/cli/command_modules/synapse/ @VeryEarly @Pan-Qi @jsntcy @idear1203 @zesluo @calvinhzy
+/src/azure-cli/azure/cli/command_modules/util/ @naganandyala @bebound @YanaXu @yonzhan @wangzelin007
+/src/azure-cli/azure/cli/command_modules/vm/ @NoriZC @yanzhudd @teresaritorto @Drewm3 @TravisCragg-MSFT @nikhilpatel909 @sandeepraichura @hilaryw29 @GabstaMSFT @ramankumarlive @ushnaarshadkhan
+/src/azure-cli/azure/cli/command_modules/containerapp/ @NoriZC @yanzhudd @teresaritorto @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre @ShichaoQiu

src/azure-cli-core/azure/cli/core/__init__.py

@@ -792,7 +792,8 @@ def get(self, args):
             return None
 
         # Get the top-level command, like `network` in `network vnet create -h`
-        top_command = args[0]
+        # Normalize top-level command for index lookup so mixed-case commands hit key
+        top_command = args[0].lower()
         index = self.INDEX[self._COMMAND_INDEX]
         # Check the command index for (command: [module]) mapping, like
         # "network": ["azure.cli.command_modules.natgateway", "azure.cli.command_modules.network", "azext_firewall"]

src/azure-cli-core/azure/cli/core/commands/__init__.py

@@ -512,14 +512,11 @@ def execute(self, args):
                                   EVENT_INVOKER_FILTER_RESULT)
         from azure.cli.core.commands.events import (
             EVENT_INVOKER_PRE_CMD_TBL_TRUNCATE, EVENT_INVOKER_PRE_LOAD_ARGUMENTS, EVENT_INVOKER_POST_LOAD_ARGUMENTS)
-        from azure.cli.core.util import roughly_parse_command_with_casing
 
-        # TODO: Can't simply be invoked as an event because args are transformed
-        command_preserve_casing = roughly_parse_command_with_casing(args)
         args = _pre_command_table_create(self.cli_ctx, args)
 
         if self._should_show_cached_help(args):
-            result = self._try_show_cached_help(command_preserve_casing, args)
+            result = self._try_show_cached_help(args)
             if result:
                 return result
 
@@ -593,7 +590,7 @@ def execute(self, args):
                     logger.debug("Failed to cache help data: %s", ex)
 
             # TODO: No event in base with which to target
-            telemetry.set_command_details('az', command_preserve_casing=command_preserve_casing)
+            telemetry.set_command_details('az')
             telemetry.set_success(summary='welcome')
             return CommandResultItem(None, exit_code=0)
 
@@ -648,8 +645,7 @@ def execute(self, args):
             pass
         telemetry.set_command_details(self.cli_ctx.data['command'], self.data['output'],
                                       self.cli_ctx.data['safe_params'],
-                                      extension_name=extension_name, extension_version=extension_version,
-                                      command_preserve_casing=command_preserve_casing)
+                                      extension_name=extension_name, extension_version=extension_version)
         if extension_name:
             self.data['command_extension_name'] = extension_name
             self.cli_ctx.logging.log_cmd_metadata_extension_info(extension_name, extension_version)
@@ -740,7 +736,7 @@ def _should_show_cached_help(self, args):
                 self._is_top_level_help_request(args) and
                 not self.cli_ctx.data.get('completer_active'))
 
-    def _try_show_cached_help(self, command_preserve_casing, args):
+    def _try_show_cached_help(self, args):
         """Try to show cached help for top-level help request.
 
         Returns CommandResultItem if cached help was shown, None otherwise.
@@ -752,7 +748,7 @@ def _try_show_cached_help(self, command_preserve_casing, args):
         if help_index:
             # Display cached help using the help system
             self.help.show_cached_help(help_index, args)
-            telemetry.set_command_details('az', command_preserve_casing=command_preserve_casing, parameters=['--help'])
+            telemetry.set_command_details('az', parameters=['--help'])
             telemetry.set_success(summary='show help')
             return CommandResultItem(None, exit_code=0)
 

src/azure-cli-core/azure/cli/core/commands/arm.py

@@ -227,10 +227,8 @@ def __call__(self, parser, namespace, value, option_string=None):
             command.add_argument('_change_reference', '--change-reference', **change_reference_kwargs)
             command.add_argument('_acquire_policy_token', '--acquire-policy-token', **acquire_policy_token_kwargs)
 
-    policy_token_feature_enabled = cli_ctx.config.getboolean('core', 'enable_policy_token', False)
-    if policy_token_feature_enabled:
-        from knack import events
-        cli_ctx.register_event(events.EVENT_INVOKER_POST_CMD_TBL_CREATE, add_global_policy_argument)
+    from knack import events
+    cli_ctx.register_event(events.EVENT_INVOKER_POST_CMD_TBL_CREATE, add_global_policy_argument)
 
 
 # pylint: disable=too-many-statements

src/azure-cli-core/azure/cli/core/extension/dynamic_install.py

@@ -194,7 +194,6 @@ def _check_value_in_extensions(cli_ctx, parser, args, no_prompt):  # pylint: dis
     # extension is already installed and return if yes as the error is not caused by extension not installed.
     from azure.cli.core.extension import get_extension, ExtensionNotInstalledException
     from azure.cli.core.extension._resolve import resolve_from_index, NoExtensionCandidatesError
-    from azure.cli.core.util import roughly_parse_command_with_casing
     extension_allow_preview = _get_extension_allow_preview_install_config(cli_ctx)
     try:
         ext = get_extension(ext_name)
@@ -209,8 +208,7 @@ def _check_value_in_extensions(cli_ctx, parser, args, no_prompt):  # pylint: dis
 
     telemetry.set_command_details(command_str,
                                   parameters=AzCliCommandInvoker._extract_parameter_names(args),  # pylint: disable=protected-access
-                                  extension_name=ext_name,
-                                  command_preserve_casing=roughly_parse_command_with_casing(args))
+                                  extension_name=ext_name)
     run_after_extension_installed = _get_extension_run_after_dynamic_install_config(cli_ctx)
     prompt_info = ""
     if no_prompt:

src/azure-cli-core/azure/cli/core/telemetry.py

@@ -51,7 +51,6 @@ def __init__(self, correlation_id=None, application=None):
         self.feedback = None
         self.extension_management_detail = None
         self.raw_command = None
-        self.command_preserve_casing = None
         self.is_cmd_idx_rebuild_triggered = False
         self.show_survey_message = False
         self.region_input = None
@@ -209,8 +208,6 @@ def _get_azure_cli_properties(self):
         set_custom_properties(result, 'InvokeTimeElapsed', str(self.invoke_time_elapsed))
         set_custom_properties(result, 'OutputType', self.output_type)
         set_custom_properties(result, 'RawCommand', self.raw_command)
-        set_custom_properties(result, 'CommandPreserveCasing',
-                              self.command_preserve_casing or '')
         set_custom_properties(result, 'IsCmdIdxRebuildTriggered', str(self.is_cmd_idx_rebuild_triggered))
         set_custom_properties(result, 'Params', ','.join(self.parameters or []))
         set_custom_properties(result, 'PythonVersion', platform.python_version())
@@ -448,13 +445,12 @@ def set_command_index_rebuild_triggered(is_cmd_idx_rebuild_triggered=False):
 
 @decorators.suppress_all_exceptions()
 def set_command_details(command, output_type=None, parameters=None, extension_name=None,
-                        extension_version=None, command_preserve_casing=None):
+                        extension_version=None):
     _session.command = command
     _session.output_type = output_type
     _session.parameters = parameters
     _session.extension_name = extension_name
     _session.extension_version = extension_version
-    _session.command_preserve_casing = command_preserve_casing
 
 
 @decorators.suppress_all_exceptions()

src/azure-cli-core/azure/cli/core/tests/test_command_registration.py

@@ -371,6 +371,11 @@ def update_and_check_index():
         cmd_tbl = loader.load_command_table(["hello", "mod-only"])
         self.assertEqual(['hello mod-only', 'hello overridden', 'hello ext-only'], list(cmd_tbl.keys()))
 
+        # Test mixed-case top-level command still uses command index
+        _set_index(self.expected_command_index)
+        cmd_tbl = loader.load_command_table(["HELLO", "mod-only"])
+        self.assertEqual(['hello mod-only', 'hello overridden', 'hello ext-only'], list(cmd_tbl.keys()))
+
         # Full scenario test 1: Installing an extension 'azext_hello1' that extends 'hello' group
         outdated_command_index = {'hello': ['azure.cli.command_modules.hello'],
                                   'extra': ['azure.cli.command_modules.extra']}