dissect.target 3.23.dev18__tar.gz → 3.23.dev19__tar.gz

{dissect_target-3.23.dev18 → dissect_target-3.23.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.23.dev18
+Version: 3.23.dev19
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect_target-3.23.dev18 → dissect_target-3.23.dev19}/dissect/target/tools/dump/run.py

@@ -67,7 +67,7 @@ def execute_function(target: Target, function: FunctionDescriptor) -> TargetReco
     local_log.debug("Function execution")
 
     try:
-        output_type, target_attr, _ = execute_function_on_target(target, function)
+        output_type, target_attr = execute_function_on_target(target, function)
     except UnsupportedPluginError:
         local_log.error("Function is not supported for target", exc_info=True)
         return

{dissect_target-3.23.dev18 → dissect_target-3.23.dev19}/dissect/target/tools/query.py

@@ -311,7 +311,7 @@ def main() -> int:
                     continue
 
                 try:
-                    output_type, result, rest = execute_function_on_target(target, func_def, rest)
+                    output_type, result = execute_function_on_target(target, func_def, rest)
                 except UnsupportedPluginError as e:
                     target.log.error(  # noqa: TRY400
                         "Unsupported plugin for %s: %s",

{dissect_target-3.23.dev18 → dissect_target-3.23.dev19}/dissect/target/tools/shell.py

@@ -461,7 +461,7 @@ class TargetCmd(ExtendedCmd):
 
         def _exec_(argparts: list[str], stdout: TextIO) -> None:
             try:
-                output, value, _ = execute_function_on_target(self.target, func, argparts)
+                output, value = execute_function_on_target(self.target, func, argparts)
             except SystemExit:
                 return
 

{dissect_target-3.23.dev18 → dissect_target-3.23.dev19}/dissect/target/tools/utils.py

@@ -188,7 +188,7 @@ def execute_function_on_target(
     target: Target,
     func: FunctionDescriptor,
     arguments: list[str] | None = None,
-) -> tuple[str, Any, list[str]]:
+) -> tuple[str, Any]:
     """Execute function on provided target with provided arguments."""
 
     arguments = arguments or []
@@ -197,17 +197,15 @@ def execute_function_on_target(
     plugin_method, parser = plugin_function_with_argparser(func_obj)
 
     if parser:
-        known_args, rest = parser.parse_known_args(arguments)
+        known_args, _ = parser.parse_known_args(arguments)
         value = plugin_method(**vars(known_args))
     elif isinstance(func_obj, property):
-        rest = arguments
         value = func_obj.__get__(func_cls)
     else:
-        rest = arguments
         value = func_obj
 
     output_type = getattr(plugin_method, "__output__", "default") if plugin_method else "default"
-    return (output_type, value, rest)
+    return (output_type, value)
 
 
 def plugin_function_with_argparser(

{dissect_target-3.23.dev18 → dissect_target-3.23.dev19}/dissect.target.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.23.dev18
+Version: 3.23.dev19
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect_target-3.23.dev18 → dissect_target-3.23.dev19}/tests/tools/test_query.py

@@ -377,3 +377,19 @@ def test_record_stream_write_exception_handling(
             target_query()
 
     assert "Exception occurred while processing output of WalkFSPlugin.walkfs:" in caplog.text
+
+
+def test_arguments_passed_correctly(monkeypatch: pytest.MonkeyPatch) -> None:
+    with monkeypatch.context() as m:
+        m.setattr(
+            "sys.argv", ["target-query", "-fprefetch,mft", "tests/_data/loaders/tar/test-archive.tar.gz", "--compact"]
+        )
+
+        with patch(
+            "dissect.target.tools.query.execute_function_on_target", side_effect=mock_execute_function
+        ) as mocked_execute:
+            target_query()
+
+        assert len(mocked_execute.mock_calls) == 2
+        for call in mocked_execute.mock_calls:
+            assert call.args[2] == ["--compact"]

{dissect_target-3.23.dev18 → dissect_target-3.23.dev19}/tests/tools/test_utils.py

@@ -173,7 +173,6 @@ def test_namespace_plugin_args() -> None:
 
     mock_target.get_function.return_value = Fake, obj
 
-    _, result, rest = execute_function_on_target(mock_target, Mock(), ["--a", "asdf", "--b", "123"])
+    _, result = execute_function_on_target(mock_target, Mock(), ["--a", "asdf", "--b", "123"])
 
     assert result == "asdf"
-    assert rest == ["--b", "123"]