The Great LDAPification

.github/workflows/test.yaml

@@ -10,29 +10,31 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Install apt dependencies
         run: |
+          curl -fsSL https://www.mongodb.org/static/pgp/server-8.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg --dearmor
+          echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/8.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-8.0.list
           sudo apt update
-          sudo apt install libldap-2.5-0 libldap-dev libsasl2-dev
+          sudo apt install -y libldap-2.5-0 libldap-dev libsasl2-dev libkrb5-dev gnupg curl mongodb-org
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
           python-version: 3.12
       - name: cache poetry install
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.local
-          key: poetry-1.8.3-0
+          key: poetry-2.0.1-0
       - uses: snok/install-poetry@v1
         with:
-          version: 1.8.3
+          version: 2.0.1
           virtualenvs-create: true
           virtualenvs-in-project: true
       - name: cache deps
         id: cache-deps
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: .venv
           key: pydeps-${{ hashFiles('**/poetry.lock') }}

.gitignore

@@ -1,3 +1,4 @@
 cheeto/**/__pycache__
 .ipynb_checkpoints
 *.txt
+.vscode

cheeto/__init__.py

@@ -1 +1 @@
-__version__ = '0.9.8'
+__version__ = '1.2.3'

cheeto/args.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# (c) Camille Scott, 2023
+# (c) Camille Scott, 2023-2024
 # (c) The Regents of the University of California, Davis, 2023
 # File   : __main__.py
 # License: Modified BSD
@@ -10,39 +10,59 @@
 # pyright: reportMissingTypeArgument=true
 
 
-from argparse import ArgumentParser, Namespace, _SubParsersAction
-import os
-from functools import wraps
-from pathlib import Path
-from typing import Callable
-from typing_extensions import Concatenate, ParamSpec
+from argparse import (Action,
+                      ArgumentTypeError)
+from enum import Enum
+import re
 
-P = ParamSpec('P')
-Subparsers = _SubParsersAction
-NS = Namespace
-NamespaceFunc = Callable[Concatenate[NS, P], None]
-SubCommandFunc = Callable[Concatenate[Subparsers, P], None]
+from . import __version__
+from .templating import PKG_TEMPLATES
 
 
-def add_common_args(parser):
-    parser.add_argument('--log', type=Path, default=Path(os.devnull),
-                        help='Log to file.')
-    parser.add_argument('--quiet', default=False, action='store_true')
 
+splash = (PKG_TEMPLATES / 'banner.txt').read_text().rstrip('\n').format(version=f'v{__version__}')
+banner = f'''
+\b
+{splash}
+'''
 
-def subcommand(subcommand_name: str, *arg_adders: Callable[[ArgumentParser], None]) \
--> Callable[[NamespaceFunc[P]], SubCommandFunc[P]]:
+def regex_argtype(pattern: re.Pattern[str] | str):
+    _pattern = pattern
+    def inner(value: str | None):
+        if value is None:
+            return value
+        if not isinstance(_pattern, re.Pattern):
+            pattern = re.compile(_pattern)
+        else:
+            pattern = _pattern
+        if not pattern.match(value):
+            raise ArgumentTypeError(f'Invalid value, should match: {pattern.pattern}')
+        return value
+    return inner
 
-    def wrapper(func: NamespaceFunc[P]) -> SubCommandFunc[P]:
-
-        @wraps(func)
-        def wrapped(parent_parser: Subparsers, *args: P.args, **kwargs: P.kwargs) -> None:
-            parser = parent_parser.add_parser(subcommand_name)
-            add_common_args(parser)
-            parser.set_defaults(func=func)
-            for adder in arg_adders:
-                adder(parser)
 
-        return wrapped
+class EnumAction(Action):
+    """
+    Argparse action for handling Enums
+    """
+    def __init__(self, **kwargs):
+        # Pop off the type value
+        enum = kwargs.pop("type", None)
 
-    return wrapper
+        # Ensure an Enum subclass is provided
+        if enum is None:
+            raise ValueError("type must be assigned an Enum when using EnumAction")
+        if not issubclass(enum, Enum):
+            raise TypeError("type must be an Enum when using EnumAction")
+
+        # Generate choices from the Enum
+        kwargs.setdefault("choices", tuple(e.name for e in enum))
+
+        super(EnumAction, self).__init__(**kwargs)
+
+        self._enum = enum
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        # Convert value back into an Enum
+        enum = self._enum[values]
+        setattr(namespace, self.dest, enum)

cheeto/cmds/__init__.py

@@ -0,0 +1,22 @@
+from argparse import Namespace, RawDescriptionHelpFormatter
+import sys
+
+from ponderosa import CmdTree
+
+from .. import __version__
+from ..args import banner
+from ..log import Console
+
+
+commands = CmdTree(description=banner,
+                   formatter_class=RawDescriptionHelpFormatter)
+commands._root.add_argument('--version', action='version', version=f'cheeto {__version__}')
+
+
+@commands.register('help',
+                   help='Show the full subcomamnd tree')
+def help(args: Namespace):
+    console = Console()
+    print(banner, file=sys.stderr)
+    console.print(commands.format_help())
+    return 0

cheeto/cmds/__main__.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# (c) Camille Scott, 2023
+# (c) The Regents of the University of California, Davis, 2023
+# File   : __main__.py
+# License: Modified BSD
+# Author : Camille Scott <[email protected]>
+# Date   : 17.02.2023
+
+import sys
+
+from . import (commands,
+               config,
+               database,
+               hippo,
+               monitor,
+               nocloud,
+               puppet,
+               slurm)
+
+
+def main():
+    return commands.run()
+
+
+if __name__ == '__main__':
+    sys.exit(main())