refactor: use craft-cli command groups

CommandGroups can be used now that craft-application will accept a
sequence of commands.
See canonical/craft-application#359

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

snapcraft/cli.py

@@ -20,7 +20,6 @@
 import contextlib
 import os
 import sys
-from dataclasses import dataclass
 from typing import Any, Dict
 
 import craft_application.commands
@@ -37,16 +36,7 @@
 from . import commands
 from .legacy_cli import run_legacy
 
-
-@dataclass
-class CommandGroup:
-    """Dataclass to hold a command group."""
-
-    name: str
-    commands: list
-
-
-CORE22_LIFECYCLE_COMMAND_GROUP = CommandGroup(
+CORE22_LIFECYCLE_COMMAND_GROUP = craft_cli.CommandGroup(
     "Lifecycle",
     [
         commands.core22.CleanCommand,
@@ -60,7 +50,7 @@ class CommandGroup:
     ],
 )
 
-CORE24_LIFECYCLE_COMMAND_GROUP = CommandGroup(
+CORE24_LIFECYCLE_COMMAND_GROUP = craft_cli.CommandGroup(
     "Lifecycle",
     [
         craft_application.commands.lifecycle.CleanCommand,
@@ -76,22 +66,22 @@ class CommandGroup:
 )
 
 COMMAND_GROUPS = [
-    CommandGroup(
+    craft_cli.CommandGroup(
         "Plugins",
         [
             commands.PluginsCommand,
             commands.ListPluginsCommand,
         ],
     ),
-    CommandGroup(
+    craft_cli.CommandGroup(
         "Extensions",
         [
             commands.ListExtensionsCommand,
             commands.ExtensionsCommand,  # hidden (alias to list-extensions)
             commands.ExpandExtensionsCommand,
         ],
     ),
-    CommandGroup(
+    craft_cli.CommandGroup(
         "Store Account",
         [
             commands.StoreLoginCommand,
@@ -100,7 +90,7 @@ class CommandGroup:
             commands.StoreWhoAmICommand,
         ],
     ),
-    CommandGroup(
+    craft_cli.CommandGroup(
         "Store Snap Names",
         [
             commands.StoreRegisterCommand,
@@ -111,7 +101,7 @@ class CommandGroup:
             commands.StoreLegacyUploadMetadataCommand,
         ],
     ),
-    CommandGroup(
+    craft_cli.CommandGroup(
         "Store Snap Release Management",
         [
             commands.StoreReleaseCommand,
@@ -124,15 +114,15 @@ class CommandGroup:
             commands.StoreRevisionsCommand,  # hidden (alias to list-revisions)
         ],
     ),
-    CommandGroup(
+    craft_cli.CommandGroup(
         "Store Snap Tracks",
         [
             commands.StoreListTracksCommand,
             commands.StoreTracksCommand,  # hidden (alias to list-tracks)
             commands.StoreLegacySetDefaultTrackCommand,
         ],
     ),
-    CommandGroup(
+    craft_cli.CommandGroup(
         "Store Key Management",
         [
             commands.StoreLegacyCreateKeyCommand,
@@ -141,7 +131,7 @@ class CommandGroup:
             commands.StoreLegacyListKeysCommand,
         ],
     ),
-    CommandGroup(
+    craft_cli.CommandGroup(
         "Store Validation Sets",
         [
             commands.StoreEditValidationSetsCommand,
@@ -150,7 +140,7 @@ class CommandGroup:
             commands.StoreLegacyGatedCommand,
         ],
     ),
-    CommandGroup(
+    craft_cli.CommandGroup(
         "Other",
         [
             *craft_application.commands.get_other_command_group().commands,
@@ -206,10 +196,7 @@ def get_verbosity() -> EmitterMode:
 
 def get_dispatcher() -> craft_cli.Dispatcher:
     """Return an instance of Dispatcher."""
-    craft_cli_command_groups = [
-        craft_cli.CommandGroup(group.name, group.commands)
-        for group in COMMAND_GROUPS + [CORE22_LIFECYCLE_COMMAND_GROUP]
-    ]
+    craft_cli_command_groups = [*COMMAND_GROUPS, CORE22_LIFECYCLE_COMMAND_GROUP]
 
     return craft_cli.Dispatcher(
         "snapcraft",