sambacc/commands: makde the dc main command setup less special

Now that the main samba-container entrypoint is cleaned up,
allow the dc script entry point to be a bit more like the regular
commmands when set up.

Signed-off-by: John Mulligan <[email protected]>

Author: phlogistonjohn

sambacc/commands/addc.py

@@ -26,7 +26,7 @@
 from sambacc import smbconf_api
 from sambacc import smbconf_samba
 
-from .cli import best_waiter, CommandBuilder, Context, Fail
+from .cli import Context, Fail, best_waiter, commands
 
 try:
     import dns
@@ -43,10 +43,8 @@
 _populated: str = "/var/lib/samba/POPULATED"
 _provisioned: str = "/etc/samba/smb.conf"
 
-dccommands = CommandBuilder()
 
-
-@dccommands.command(name="summary")
+@commands.command(name="summary")
 def summary(ctx: Context) -> None:
     print("Hello", ctx)
 
@@ -192,7 +190,7 @@ def _prep_krb5_conf(ctx: Context) -> None:
     shutil.copy("/var/lib/samba/private/krb5.conf", "/etc/krb5.conf")
 
 
-@dccommands.command(name="run", arg_func=_run_container_args)
+@commands.command(name="run", arg_func=_run_container_args)
 def run(ctx: Context) -> None:
     _logger.info("Running AD DC container")
     if _dosetup(ctx, "wait-domain"):

sambacc/commands/dcmain.py

@@ -20,7 +20,7 @@
 
 from . import addc
 from . import skips
-from .cli import Fail
+from .cli import Fail, commands
 from .common import (
     CommandContext,
     enable_logging,
@@ -34,7 +34,7 @@
 
 
 def main(args: typing.Optional[typing.Sequence[str]] = None) -> None:
-    cli = addc.dccommands.assemble(arg_func=global_args).parse_args(args)
+    cli = commands.assemble(arg_func=global_args).parse_args(args)
     env_to_cli(cli)
     enable_logging(cli)
     if not cli.identity: