chore: consolidate schema generation

Author: bchampp

schema/make_schema.py

@@ -9,7 +9,6 @@
 import click
 
 from samcli.cli.command import _SAM_CLI_COMMAND_PACKAGES
-from samcli.cli.lazy_group import LazyGroup
 from samcli.lib.config.samconfig import SamConfig
 from schema.exceptions import SchemaGenerationException
 
@@ -199,15 +198,10 @@ def create_command_schema(module, subcommand):
     command = []
 
     if isinstance(module.cli, click.core.Group):  # command has subcommands (e.g. local invoke)
-        # For LazyGroup, load lazy commands first (preserving definition order)
-        if isinstance(module.cli, LazyGroup) and module.cli.lazy_subcommands:
-            for subcommand_name in module.cli.lazy_subcommands.keys():
-                subcommand = module.cli.get_command(None, subcommand_name)
-                if subcommand:
-                    command.append(create_command_schema(module, subcommand))
-        else:
-            # For regular Groups, use commands dict
-            for subcommand in module.cli.commands.values():
+        ctx = click.Context(module.cli)
+        for subcommand_name in module.cli.list_commands(ctx):
+            subcommand = module.cli.get_command(ctx, subcommand_name)
+            if subcommand:
                 command.append(create_command_schema(module, subcommand))
     else:
         cmd_name = SamConfig.to_key([module.__name__.split(".")[-1]])

schema/samcli.json

@@ -408,6 +408,21 @@
             "parameters"
           ]
         },
+        "local_generate_event": {
+          "title": "Local Generate Event command",
+          "description": "Generate events for Lambda functions.",
+          "properties": {
+            "parameters": {
+              "title": "Parameters for the local generate event command",
+              "description": "Available parameters for the local generate event command:\n* ",
+              "type": "object",
+              "properties": {}
+            }
+          },
+          "required": [
+            "parameters"
+          ]
+        },
         "local_invoke": {
           "title": "Local Invoke command",
           "description": "Invoke AWS serverless functions locally.",
@@ -1024,21 +1039,6 @@
             "parameters"
           ]
         },
-        "local_generate_event": {
-          "title": "Local Generate Event command",
-          "description": "Generate events for Lambda functions.",
-          "properties": {
-            "parameters": {
-              "title": "Parameters for the local generate event command",
-              "description": "Available parameters for the local generate event command:\n* ",
-              "type": "object",
-              "properties": {}
-            }
-          },
-          "required": [
-            "parameters"
-          ]
-        },
         "package": {
           "title": "Package command",
           "description": "Package an AWS SAM application.",