fix: remove normalize_args method

Author: DanielMicrosoft

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

@@ -459,7 +459,7 @@ def _get_extension_suppressions(mod_loaders):
 
         if use_command_index:
             command_index = CommandIndex(self.cli_ctx)
-            lookup_args = command_index._normalize_args_for_index_lookup(args)  # pylint: disable=protected-access
+            lookup_args = args
             index_result = command_index.get(args)
             if index_result:
                 index_modules, index_extensions = index_result
@@ -754,8 +754,6 @@ class CommandIndex:
     _HELP_INDEX = 'helpIndex'
     _PACKAGED_COMMAND_INDEX_LATEST = 'commandIndex.latest.json'
     _PACKAGED_HELP_INDEX_LATEST = 'helpIndex.latest.json'
-    _LEADING_GLOBAL_OPTS_WITH_VALUE = {'--output', '-o', '--query', '--subscription', '-s', '--tenant', '-t'}
-    _LEADING_GLOBAL_FLAG_OPTS = {'--debug', '--verbose', '--only-show-errors', '--help', '-h'}
 
     def __init__(self, cli_ctx=None):
         """Class to manage command index.
@@ -998,59 +996,14 @@ def _get_blended_latest_index(self):
             logger.debug("Blending packaged core index with local extension index.")
         return self._blend_command_indices(core_index, extension_index), extension_index_available, has_non_always_loaded_extensions
 
-    @classmethod
-    def _normalize_args_for_index_lookup(cls, args):
-        """Trim leading global options so index lookup can find the top-level command."""
-        if not args:
-            return args
-
-        i = 0
-        while i < len(args):
-            token = args[i]
-            if token == '--':
-                return args[i + 1:]
-
-            if not token.startswith('-'):
-                return args[i:]
-
-            if token.startswith('--'):
-                opt_name = token.split('=', 1)[0]
-                if '=' in token:
-                    i += 1
-                    continue
-                if opt_name in cls._LEADING_GLOBAL_OPTS_WITH_VALUE:
-                    i += 2
-                    continue
-                # Unknown long options are treated as flags here. If invalid, normal parser flow will raise later.
-                i += 1
-                continue
-
-            if token in cls._LEADING_GLOBAL_OPTS_WITH_VALUE:
-                i += 2
-                continue
-
-            if token in cls._LEADING_GLOBAL_FLAG_OPTS:
-                i += 1
-                continue
-
-            # Handle compact short options where value is attached, e.g. -ojson.
-            if len(token) > 2 and token[:2] in {'-o', '-s', '-t'}:
-                i += 1
-                continue
-
-            # Unknown short options are treated as flags here.
-            i += 1
-
-        return []
-
     def get(self, args):
         """Get the corresponding module and extension list of a command.
 
         :param args: command arguments, like ['network', 'vnet', 'create', '-h']
         :return: a tuple containing a list of modules and a list of extensions.
         """
-        normalized_args = self._normalize_args_for_index_lookup(args)
-        top_command = normalized_args[0] if normalized_args else None
+
+        top_command = args[0] if args else None
 
         # Resolve effective index.
         # For latest profile, blend packaged core index with local extension index.
@@ -1060,23 +1013,23 @@ def get(self, args):
             if index is not None:
                 force_load_all_extensions = has_non_always_loaded_extensions and not extension_index_available and \
                     not force_packaged_for_version
-                result = self._lookup_command_in_index(index, normalized_args,
+                result = self._lookup_command_in_index(index, args,
                                                        force_load_all_extensions=force_load_all_extensions)
                 if result:
                     return result
 
-                if normalized_args and not normalized_args[0].startswith('-') and \
+                if args and not args[0].startswith('-') and \
                     not self.cli_ctx.data['completer_active'] and not force_packaged_for_version and \
                     top_command != 'help':
                     # Unknown top-level command on latest should prefer extension-only retry and avoid
                     # full core module rebuild to preserve packaged-index startup benefit.
                     if has_non_always_loaded_extensions:
                         logger.debug("No match found in blended latest index for '%s'. Loading all extensions.",
-                                     normalized_args[0])
+                                     args[0])
                         return [], None
 
                     logger.debug("No match found in latest index for '%s' and no dynamic extensions are installed. "
-                                 "Skipping core module rebuild.", normalized_args[0])
+                                 "Skipping core module rebuild.", args[0])
                     return [], []
 
                 logger.debug("No match found in blended latest index. Falling back to local command index.")

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

@@ -471,75 +471,21 @@ def test_command_index_uses_packaged_latest_without_seeding(self):
         self.assertEqual(list(cmd_tbl), ['hello mod-only', 'hello overridden'])
         self.assertEqual(INDEX[CommandIndex._COMMAND_INDEX], {})
 
-    @mock.patch('importlib.import_module', _mock_import_lib)
-    @mock.patch('pkgutil.iter_modules', _mock_iter_modules)
-    @mock.patch('azure.cli.core.commands._load_command_loader', _mock_load_command_loader)
-    @mock.patch('azure.cli.core.extension.get_extensions', _mock_no_extensions)
-    def test_command_index_handles_leading_debug_flag(self):
-        from azure.cli.core._session import INDEX
-        from azure.cli.core import CommandIndex, __version__
-
-        cli = DummyCli()
-        loader = cli.commands_loader
-
-        INDEX[CommandIndex._COMMAND_INDEX_VERSION] = ""
-        INDEX[CommandIndex._COMMAND_INDEX_CLOUD_PROFILE] = ""
-        INDEX[CommandIndex._COMMAND_INDEX] = {}
-
-        packaged_index = {
-            CommandIndex._COMMAND_INDEX_VERSION: __version__,
-            CommandIndex._COMMAND_INDEX_CLOUD_PROFILE: cli.cloud.profile,
-            CommandIndex._COMMAND_INDEX: {
-                'hello': ['azure.cli.command_modules.hello']
-            }
-        }
-
-        with mock.patch.object(CommandIndex, '_load_packaged_command_index', return_value=packaged_index):
-            cmd_tbl = loader.load_command_table(["--debug", "hello", "mod-only"])
-
-        self.assertEqual(list(cmd_tbl), ['hello mod-only', 'hello overridden'])
-        self.assertEqual(INDEX[CommandIndex._COMMAND_INDEX], {})
-
-    @mock.patch('importlib.import_module', _mock_import_lib)
-    @mock.patch('pkgutil.iter_modules', _mock_iter_modules)
-    @mock.patch('azure.cli.core.commands._load_command_loader', _mock_load_command_loader)
-    @mock.patch('azure.cli.core.extension.get_extensions', _mock_no_extensions)
-    def test_command_index_handles_leading_output_option(self):
-        from azure.cli.core._session import INDEX
-        from azure.cli.core import CommandIndex, __version__
-
-        cli = DummyCli()
-        loader = cli.commands_loader
-
-        INDEX[CommandIndex._COMMAND_INDEX_VERSION] = ""
-        INDEX[CommandIndex._COMMAND_INDEX_CLOUD_PROFILE] = ""
-        INDEX[CommandIndex._COMMAND_INDEX] = {}
-
-        packaged_index = {
-            CommandIndex._COMMAND_INDEX_VERSION: __version__,
-            CommandIndex._COMMAND_INDEX_CLOUD_PROFILE: cli.cloud.profile,
-            CommandIndex._COMMAND_INDEX: {
-                'hello': ['azure.cli.command_modules.hello']
-            }
-        }
-
-        with mock.patch.object(CommandIndex, '_load_packaged_command_index', return_value=packaged_index):
-            cmd_tbl = loader.load_command_table(["-o", "json", "hello", "mod-only"])
-
-        self.assertEqual(list(cmd_tbl), ['hello mod-only', 'hello overridden'])
-        self.assertEqual(INDEX[CommandIndex._COMMAND_INDEX], {})
-
     @mock.patch('importlib.import_module', _mock_import_lib)
     @mock.patch('pkgutil.iter_modules', _mock_iter_modules)
     @mock.patch('azure.cli.core.commands._load_command_loader', _mock_load_command_loader)
     @mock.patch('azure.cli.core.extension.get_extension_modname', _mock_get_extension_modname)
     @mock.patch('azure.cli.core.extension.get_extensions', _mock_get_extensions)
     def test_command_index_loads_all_extensions_when_overlay_missing(self):
-        from azure.cli.core._session import INDEX, EXTENSION_INDEX, EXTENSION_HELP_INDEX
+        from azure.cli.core._session import INDEX, EXTENSION_INDEX
         from azure.cli.core import CommandIndex, __version__
 
         cli = DummyCli()
         loader = cli.commands_loader
+        cli.invocation = cli.invocation_cls(cli_ctx=cli,
+                            commands_loader_cls=cli.commands_loader_cls,
+                            parser_cls=cli.parser_cls,
+                            help_cls=cli.help_cls)
 
         INDEX[CommandIndex._COMMAND_INDEX_VERSION] = ""
         INDEX[CommandIndex._COMMAND_INDEX_CLOUD_PROFILE] = ""
@@ -565,10 +511,6 @@ def test_command_index_loads_all_extensions_when_overlay_missing(self):
         self.assertIn('hello', EXTENSION_INDEX[CommandIndex._COMMAND_INDEX])
         self.assertIn('azext_hello1', EXTENSION_INDEX[CommandIndex._COMMAND_INDEX]['hello'])
         self.assertIn('azext_hello2', EXTENSION_INDEX[CommandIndex._COMMAND_INDEX]['hello'])
-        self.assertEqual(EXTENSION_HELP_INDEX[CommandIndex._COMMAND_INDEX_VERSION], __version__)
-        self.assertEqual(EXTENSION_HELP_INDEX[CommandIndex._COMMAND_INDEX_CLOUD_PROFILE], cli.cloud.profile)
-        self.assertIn('groups', EXTENSION_HELP_INDEX[CommandIndex._HELP_INDEX])
-        self.assertIn('commands', EXTENSION_HELP_INDEX[CommandIndex._HELP_INDEX])
 
     @mock.patch('importlib.import_module', _mock_import_lib)
     @mock.patch('pkgutil.iter_modules', _mock_iter_modules)