fix for global args overwritting all of plugin args + fix for invalid plugin

Author: alexandraBara

nodescraper/cli/cli.py

@@ -327,6 +327,7 @@ def process_args(
         plugin_arg_index = -1
 
     plugin_arg_map = {}
+    invalid_plugins = []
     if plugin_arg_index != -1 and plugin_arg_index != len(raw_arg_input) - 1:
         top_level_args = raw_arg_input[: plugin_arg_index + 1]
         plugin_args = raw_arg_input[plugin_arg_index + 1 :]
@@ -342,7 +343,10 @@ def process_args(
                     cur_plugin = arg
                 elif cur_plugin:
                     plugin_arg_map[cur_plugin].append(arg)
-    return (top_level_args, plugin_arg_map)
+                elif not arg.startswith("-"):
+                    # Track invalid plugin names to log event later
+                    invalid_plugins.append(arg)
+    return (top_level_args, plugin_arg_map, invalid_plugins)
 
 
 def main(arg_input: Optional[list[str]] = None):
@@ -360,7 +364,9 @@ def main(arg_input: Optional[list[str]] = None):
     parser, plugin_subparser_map = build_parser(plugin_reg, config_reg)
 
     try:
-        top_level_args, plugin_arg_map = process_args(arg_input, list(plugin_subparser_map.keys()))
+        top_level_args, plugin_arg_map, invalid_plugins = process_args(
+            arg_input, list(plugin_subparser_map.keys())
+        )
 
         parsed_args = parser.parse_args(top_level_args)
         system_info = get_system_info(parsed_args)
@@ -380,6 +386,13 @@ def main(arg_input: Optional[list[str]] = None):
         if log_path:
             logger.info("Log path: %s", log_path)
 
+        # Log warning if invalid plugin names were provided
+        if invalid_plugins:
+            logger.warning(
+                "Invalid plugin name(s) ignored: %s. Use 'describe plugin' to list available plugins.",
+                ", ".join(invalid_plugins),
+            )
+
         if parsed_args.subcmd == "summary":
             generate_summary(parsed_args.search_path, parsed_args.output_path, logger)
             sys.exit(0)

nodescraper/pluginexecutor.py

@@ -33,6 +33,7 @@
 from pydantic import BaseModel
 
 from nodescraper.constants import DEFAULT_LOGGER
+from nodescraper.enums import ExecutionStatus
 from nodescraper.interfaces import ConnectionManager, DataPlugin, PluginInterface
 from nodescraper.models import PluginConfig, SystemInfo
 from nodescraper.models.pluginresult import PluginResult
@@ -119,6 +120,13 @@ def run_queue(self) -> list[PluginResult]:
                 plugin_name, plugin_args = plugin_queue.popleft()
                 if plugin_name not in self.plugin_registry.plugins:
                     self.logger.error("Unable to find registered plugin for name %s", plugin_name)
+                    plugin_results.append(
+                        PluginResult(
+                            status=ExecutionStatus.ERROR,
+                            source=plugin_name,
+                            message=f"Plugin '{plugin_name}' not found in registry",
+                        )
+                    )
                     continue
 
                 plugin_class = self.plugin_registry.plugins[plugin_name]
@@ -140,6 +148,13 @@ def run_queue(self) -> list[PluginResult]:
                             "Unable to find registered connection manager class for %s that is required by",
                             connection_manager_class.__name__,
                         )
+                        plugin_results.append(
+                            PluginResult(
+                                status=ExecutionStatus.ERROR,
+                                source=plugin_name,
+                                message=f"Connection manager '{connection_manager_class.__name__}' not found in registry",
+                            )
+                        )
                         continue
 
                     if connection_manager_class not in self.connection_library:
@@ -173,13 +188,26 @@ def run_queue(self) -> list[PluginResult]:
                         global_run_args = self.apply_global_args_to_plugin(
                             plugin_inst, plugin_class, self.plugin_config.global_args
                         )
+                        # Merge analysis_args and collection_args
+                        for args_key in ["analysis_args", "collection_args"]:
+                            if args_key in global_run_args and args_key in run_payload:
+                                # Merge: global args override plugin-specific args keys specified in both global and plugin-specific args
+                                run_payload[args_key].update(global_run_args[args_key])
+                                del global_run_args[args_key]
                         run_payload.update(global_run_args)
                     except ValueError as ve:
                         self.logger.error(
                             "Invalid global_args for plugin %s: %s. Skipping plugin.",
                             plugin_name,
                             str(ve),
                         )
+                        plugin_results.append(
+                            PluginResult(
+                                status=ExecutionStatus.ERROR,
+                                source=plugin_name,
+                                message=f"Invalid global_args for plugin: {str(ve)}",
+                            )
+                        )
                         continue
 
                     self.logger.info("-" * 50)

test/functional/test_run_plugins.py

@@ -88,9 +88,15 @@ def test_run_all_plugins_together(run_cli_command, all_plugins, tmp_path):
 
 
 def test_run_plugin_with_invalid_name(run_cli_command):
-    """Test that running a non-existent plugin fails gracefully."""
+    """Test that running a non-existent plugin logs a warning and falls back to default config."""
     result = run_cli_command(["run-plugins", "NonExistentPlugin"], check=False)
 
-    assert result.returncode != 0
-    output = (result.stdout + result.stderr).lower()
-    assert "error" in output or "invalid" in output or "not found" in output
+    # Invalid plugin is ignored and default config runs instead
+    # Exit code depends on whether default config plugins succeed
+    output = result.stdout + result.stderr
+    # Check that warning was logged for invalid plugin
+    assert "Invalid plugin name(s) ignored: NonExistentPlugin" in output
+    # Check that default config was used
+    assert "running default config" in output.lower() or "NodeStatus" in output
+    # Verify it didn't crash
+    assert "Data written to csv file" in output

test/unit/framework/test_cli.py

@@ -115,12 +115,12 @@ def test_system_info_builder():
         (
             ["--sys-name", "test-sys", "--sys-sku", "test-sku"],
             ["TestPlugin1", "TestPlugin2"],
-            (["--sys-name", "test-sys", "--sys-sku", "test-sku"], {}),
+            (["--sys-name", "test-sys", "--sys-sku", "test-sku"], {}, []),
         ),
         (
             ["--sys-name", "test-sys", "--sys-sku", "test-sku", "run-plugins", "-h"],
             ["TestPlugin1", "TestPlugin2"],
-            (["--sys-name", "test-sys", "--sys-sku", "test-sku", "run-plugins", "-h"], {}),
+            (["--sys-name", "test-sys", "--sys-sku", "test-sku", "run-plugins", "-h"], {}, []),
         ),
         (
             [
@@ -143,6 +143,7 @@ def test_system_info_builder():
                     "TestPlugin1": ["--plugin1_arg", "test-val1"],
                     "TestPlugin2": ["--plugin2_arg", "test-val2"],
                 },
+                [],
             ),
         ),
     ],