fix: remove command arg reference breaking tests

Author: JigyasuRajput

cve_bin_tool/cli.py

@@ -173,14 +173,6 @@ def main(argv=None):
         default="",
     )
 
-    # Add command argument before directory to ensure proper parsing order
-    parser.add_argument(
-        "command",
-        nargs="?",
-        choices=["vex-validate"],
-        help="Command to run: vex-validate to validate VEX files",
-    )
-
     input_group = parser.add_argument_group("Input")
     input_group.add_argument(
         "directory", help="directory to scan", nargs="?", default=""
@@ -583,27 +575,27 @@ def main(argv=None):
     )
 
     with ErrorHandler(mode=ErrorMode.NoTrace):
-        raw_args = parser.parse_args(argv[1:])
-        args = {key: value for key, value in vars(raw_args).items() if value}
-        defaults = {key: parser.get_default(key) for key in vars(raw_args)}
-
-    # Handle vex-validate command early
-    if raw_args.command == "vex-validate":
-        if not raw_args.vex_file_to_validate and not raw_args.directory:
-            parser.error(
-                "vex-validate command requires either --vex-file-to-validate or a VEX file path as directory argument"
-            )
+        # Check if this is a vex-validate command first
+        if len(argv) >= 2 and argv[1] == "vex-validate":
+            # For vex-validate, parse known args to avoid issues with extra arguments
+            raw_args, unknown_args = parser.parse_known_args(argv[1:])
+            # The VEX file should be the first unknown argument
+            if unknown_args:
+                vex_file_path = unknown_args[0]
+            else:
+                parser.error("vex-validate command requires a VEX file path")
 
-        # Use directory as file path if vex_file_to_validate not provided
-        vex_file_path = raw_args.vex_file_to_validate or raw_args.directory
+            # Import and run validation immediately
+            from cve_bin_tool.vex_manager.validate import validate_vex_file
 
-        # Import and run validation locally to avoid scope issues
-        from cve_bin_tool.vex_manager.validate import validate_vex_file
+            exit_code = validate_vex_file(vex_file_path, logger=None, offline=False)
+            return exit_code
+        else:
+            # Normal parsing for all other commands
+            raw_args = parser.parse_args(argv[1:])
 
-        exit_code = validate_vex_file(
-            vex_file_path, logger=None, offline=args.get("offline", False)
-        )
-        return exit_code
+        args = {key: value for key, value in vars(raw_args).items() if value}
+        defaults = {key: parser.get_default(key) for key in vars(raw_args)}
 
     configs = {}
     if args.get("config"):
@@ -774,8 +766,8 @@ def main(argv=None):
 
         return 0
 
-    # Handle vex-validate command
-    if args.get("command") == "vex-validate":
+    # Handle vex-validate command (this should not be reached due to early return)
+    if args.get("directory") == "vex-validate":
         from cve_bin_tool.vex_manager.validate import validate_vex_file
 
         # Determine VEX file path
@@ -1020,7 +1012,6 @@ def main(argv=None):
         and not args["merge"]
         and not args["sbom_file"]
         and not args["vex_file"]
-        and not raw_args.command
     ):
         parser.print_usage()
         with ErrorHandler(logger=LOGGER, mode=ErrorMode.NoTrace):