x

Author: fopina

defectdojo_api_generated/cli/commands/apis.py

@@ -39,10 +39,23 @@ class ApiGroup(CLI.SubGroup, classyclick.Group):
             name=group_name,
             help=f'`{api_class.__name__}`.',
         )
-        client: DefectDojo = classyclick.ContextMeta('client')
 
     methods = sorted(name for name, member in inspect.getmembers(api_class, callable) if not name.startswith('_'))
     method_set = set(methods)
+
+    def _build_api_command(command_name: str, target_method: str):
+        class ApiCommand(ApiGroup.Command, classyclick.Command):
+            __config__ = classyclick.Command.Config(
+                name=command_name,
+                help=f'`{target_method}`.',
+            )
+            client: DefectDojo = classyclick.ContextMeta('client')
+
+            def __call__(self):
+                print(getattr(api_class(self.client.api_client), target_method)())
+
+        return ApiCommand
+
     for method in methods:
         if method.endswith('_with_http_info') or method.endswith('_without_preload_content'):
             continue
@@ -51,15 +64,7 @@ class ApiGroup(CLI.SubGroup, classyclick.Group):
         method_name = method
         if method.endswith('_iterator') and method[:-9] in method_set:
             method_name = method[:-9]
-
-        class ApiCommand(ApiGroup.Command, classyclick.Command):
-            __config__ = classyclick.Command.Config(
-                name=method_name,
-                help=f'`{method}`.',
-            )
-
-            def __call__(self):
-                pass
+        _build_api_command(method_name, method)
 
     return ApiGroup
 

tests/unit/test_cli.py

@@ -23,3 +23,17 @@ def test_findings_list_command_runs(self):
         expected_exit_code = 2 if click_version >= (8, 2) else 0
         self.assertEqual(result.exit_code, expected_exit_code)
         self.assertRegex(result.output, r'findings\s+`FindingsApi`\.')
+
+    def test_api_commands_capture_their_own_method(self):
+        runner = CliRunner()
+        with runner.isolated_filesystem():
+            config_path = Path('config.toml')
+            config_path.write_text("host = 'https://example.com'\ntoken = 'token'\n")
+
+            list_result = runner.invoke(CLI.click, ['--config', str(config_path), 'findings', 'list'])
+            create_result = runner.invoke(CLI.click, ['--config', str(config_path), 'findings', 'create'])
+
+        self.assertEqual(list_result.exit_code, 0)
+        self.assertEqual(create_result.exit_code, 0)
+        self.assertIn('FindingsApi.list_iterator', list_result.output)
+        self.assertIn('FindingsApi.create', create_result.output)