omdev 0.0.54__tar.gz → 0.0.55__tar.gz

{omdev-0.0.54/omdev.egg-info → omdev-0.0.55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.54
+Version: 0.0.55
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,11 +14,11 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.54
+Requires-Dist: omcore==0.0.55
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.54; extra == "ominfra"
+Requires-Dist: ominfra==0.0.55; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.54; extra == "omllm"
+Requires-Dist: omllm==0.0.55; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c
@@ -59,14 +59,14 @@ Requires-Dist: tree-sitter-toml~=0.7; extra == "tui-syntax"
 Requires-Dist: tree-sitter-xml~=0.7; extra == "tui-syntax"
 Requires-Dist: tree-sitter-yaml~=0.7; extra == "tui-syntax"
 Provides-Extra: cext
-Requires-Dist: omdev-cext==0.0.54; extra == "cext"
+Requires-Dist: omdev-cext==0.0.55; extra == "cext"
 Provides-Extra: rs
-Requires-Dist: omdev-rs==0.0.54; extra == "rs"
+Requires-Dist: omdev-rs==0.0.55; extra == "rs"
 Provides-Extra: cli
-Requires-Dist: omdev-cli==0.0.54; extra == "cli"
+Requires-Dist: omdev-cli==0.0.55; extra == "cli"
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.54; extra == "all"
-Requires-Dist: omllm==0.0.54; extra == "all"
+Requires-Dist: ominfra==0.0.55; extra == "all"
+Requires-Dist: omllm==0.0.55; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -95,9 +95,9 @@ Requires-Dist: tree-sitter-sql~=0.3; extra == "all"
 Requires-Dist: tree-sitter-toml~=0.7; extra == "all"
 Requires-Dist: tree-sitter-xml~=0.7; extra == "all"
 Requires-Dist: tree-sitter-yaml~=0.7; extra == "all"
-Requires-Dist: omdev-cext==0.0.54; extra == "all"
-Requires-Dist: omdev-rs==0.0.54; extra == "all"
-Requires-Dist: omdev-cli==0.0.54; extra == "all"
+Requires-Dist: omdev-cext==0.0.55; extra == "all"
+Requires-Dist: omdev-rs==0.0.55; extra == "all"
+Requires-Dist: omdev-cli==0.0.55; extra == "all"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.54 → omdev-0.0.55}/omdev/.om-manifests.json

@@ -148,6 +148,18 @@
       }
     }
   },
+  {
+    "module": ".js.vendor.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/js/vendor/__main__.py",
+    "line": 4,
+    "value": {
+      "!.cli.types.CliModule": {
+        "name": "jsvendor",
+        "module": "omdev.js.vendor.__main__"
+      }
+    }
+  },
   {
     "module": ".magic.__main__",
     "attr": "_CLI_MODULE",
@@ -339,18 +351,6 @@
       }
     }
   },
-  {
-    "module": ".tools.diff",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tools/diff.py",
-    "line": 24,
-    "value": {
-      "!.cli.types.CliModule": {
-        "name": "diff",
-        "module": "omdev.tools.diff"
-      }
-    }
-  },
   {
     "module": ".tools.doc",
     "attr": "_CLI_MODULE",
@@ -367,7 +367,7 @@
     "module": ".tools.docker",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/docker.py",
-    "line": 288,
+    "line": 318,
     "value": {
       "!.cli.types.CliModule": {
         "name": "docker",
@@ -550,7 +550,7 @@
     "module": ".tools.shell",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/shell.py",
-    "line": 241,
+    "line": 253,
     "value": {
       "!.cli.types.CliModule": {
         "name": [
@@ -572,17 +572,5 @@
         "module": "omdev.tools.sqlrepl"
       }
     }
-  },
-  {
-    "module": ".tui.diff.__main__",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tui/diff/__main__.py",
-    "line": 4,
-    "value": {
-      "!.cli.types.CliModule": {
-        "name": "tui/diff",
-        "module": "omdev.tui.diff.__main__"
-      }
-    }
   }
 ]

{omdev-0.0.54 → omdev-0.0.55}/omdev/dockerdev/cli.py

@@ -168,6 +168,32 @@ class Cli(ap.Cli):
 
         print(out.decode(), end='')
 
+    #
+
+    @ap.cmd(
+        ap.arg('container-id'),
+        ap.arg('secret', nargs='+'),
+        ap.arg('-f', '--secrets-file'),
+    )
+    def inject_secret(self) -> None:
+        secrets: list[str | tuple[str, str]] = []
+        for s in self.args.secret:
+            if '=' in s:
+                k, v = s.split('=')
+                secrets.append((k, v))
+            else:
+                secrets.append(s)
+
+        #
+
+        from .secrets import inject_dockerdev_secrets
+
+        inject_dockerdev_secrets(
+            self.args.container_id,
+            secrets,
+            secrets_file=self.args.secrets_file,
+        )
+
 
 def _main() -> None:
     Cli().cli_run_and_exit()

{omdev-0.0.54 → omdev-0.0.55}/omdev/dockerdev/resources/depsets/system.toml

@@ -75,7 +75,6 @@ deps = [
   'bubblewrap',
 
   # data formats
-  'jq',
   'libxml2-dev',
   'libxslt-dev',
   'libyaml-dev',
@@ -91,15 +90,19 @@ deps = [
   'redis',
   'sqlite3',
 
-  # terminal UX & interactive tools
+  # standard terminal tools
   'btop',
   'htop',
   'less',
   'moreutils',
   'ncdu',
+  'tmux',
+
+  # third-party terminal tools
+  'fd-find',
+  'jq',
   'ripgrep',
   'silversearcher-ag',
-  'tmux',
 
   # shells
   'tcsh',

omdev-0.0.55/omdev/dockerdev/secrets.py

@@ -0,0 +1,160 @@
+import inspect
+import json
+import os.path
+import subprocess
+import typing as ta
+
+from omcore import check
+from omcore import lang
+from omcore.os.pyremote.bestpython import get_best_python_sh
+from omcore.os.pyremote.core import pyremote
+from omcore.secrets import all as sec
+from omcore.subprocesses.wrap import subprocess_maybe_shell_wrap_exec
+
+from ..home import secretinject
+from ..home.paths import DEFAULT_HOME_DIR
+from ..home.paths import HomePaths
+from ..home.secretinject import inject_secrets
+from ..home.secrets import DEFAULT_INJECTED_SECRETS_FILE_NAME
+from ..home.secrets import load_secrets
+from .run import LABEL_PREFIX
+
+
+##
+
+
+def _remote_main() -> None:
+    prt = pyremote.bootstrap_finalize()  # noqa
+
+    #
+
+    import json
+
+    args = json.loads(prt.input.read().decode('utf-8'))
+
+    #
+
+    inject_secrets(
+        os.path.expanduser(args['file_path']),
+        args['update'],
+        make_dirs=True,
+    )
+
+    #
+
+    raise SystemExit(0)
+
+
+def _check_container_id(container_id: str) -> None:
+    out = subprocess.check_output([
+        'docker',
+        'ps',
+        f'--filter=id={container_id}',
+        f'--filter=label={LABEL_PREFIX}',
+        '--format=json',
+    ]).decode('utf-8')
+
+    lines = out.strip().splitlines()
+    line = check.single(lines)
+
+    dct = json.loads(line)
+
+    check.equal(dct['ID'], container_id)
+
+
+def _inject_update(
+        container_id: str,
+        secrets_file: str,
+        update: ta.Mapping[str, ta.Any],
+) -> None:
+    _check_container_id(container_id)
+
+    #
+
+    args_dct = {
+        'file_path': secrets_file,
+        'update': update,
+    }
+
+    args_bytes = json.dumps(args_dct).encode('utf-8')
+
+    #
+
+    payload_src = '\n\n'.join([
+        inspect.getsource(secretinject),
+        check.not_none(pyremote.get_core_source()),
+        inspect.getsource(_remote_main),
+        '_remote_main()',
+    ])
+
+    #
+
+    proc = subprocess.Popen(
+        subprocess_maybe_shell_wrap_exec(
+            'docker',
+            'exec',
+            '-i',
+            container_id,
+            'sh',
+            '-c',
+            get_best_python_sh(),
+            '--',
+            '-c',
+            pyremote.build_bootstrap_source('pyrthing'),
+        ),
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+    )
+
+    stdin = check.not_none(proc.stdin)
+    stdout = check.not_none(proc.stdout)
+
+    #
+
+    pbr = pyremote.make_driver(  # noqa
+        payload_src,
+    ).run(stdout, stdin)
+
+    stdin.write(args_bytes)
+    stdin.close()
+
+    proc.wait()
+
+
+def inject_dockerdev_secrets(
+        container_id: str,
+        secrets: lang.SequenceNotStr[str | tuple[str, ta.Any]],
+        *,
+        secrets_file: str | None = None,
+) -> None:
+    if secrets_file is None:
+        secrets_file = os.path.join(
+            DEFAULT_HOME_DIR,
+            HomePaths.config_subdir,
+            DEFAULT_INJECTED_SECRETS_FILE_NAME,
+        )
+
+    #
+
+    loaded_secrets: sec.Secrets | None = None
+
+    update: dict[str, ta.Any] = {}
+
+    for o in secrets:
+        if isinstance(o, str):
+            if loaded_secrets is None:
+                loaded_secrets = load_secrets()
+
+            update[o] = loaded_secrets.get(o).reveal()
+
+        else:
+            k, v = o
+            update[k] = v
+
+    #
+
+    _inject_update(
+        container_id,
+        secrets_file,
+        update,
+    )

{omdev-0.0.54 → omdev-0.0.55}/omdev/git/vendor/aborting.py

@@ -1,8 +1,9 @@
 import os
 import os.path
 
-from ..status import GitStatusState
-from ..status import get_git_status
+from omcore.git.status import GitStatusState
+from omcore.git.status import get_git_status
+
 from .errors import GitVendorNoMergeInProgressError
 from .journals import GitVendorJournal
 from .journals import delete_vendor_journal

{omdev-0.0.54 → omdev-0.0.55}/omdev/git/vendor/pulling.py

@@ -4,10 +4,10 @@ import typing as ta
 
 from omcore import check
 from omcore import dataclasses as dc
+from omcore.git.status import GitStatusItem
+from omcore.git.status import GitStatusState
+from omcore.git.status import get_git_status
 
-from ..status import GitStatusItem
-from ..status import GitStatusState
-from ..status import get_git_status
 from .errors import GitVendorDirtyError
 from .errors import GitVendorMergeInProgressError
 from .errors import GitVendorSubprocessError

{omdev-0.0.54 → omdev-0.0.55}/omdev/home/secretinject.py

@@ -38,7 +38,6 @@ How the lock and the atomic replace are combined:
 
 Exit status: 0 ok, 1 error, 2 usage, 3 lock timeout.
 """
-import argparse
 import collections
 import errno
 import fcntl
@@ -46,7 +45,6 @@ import json
 import os
 import random
 import stat
-import sys
 import tempfile
 import time
 import typing as ta
@@ -54,6 +52,8 @@ import typing as ta
 
 ##
 
+# seconds
+DEFAULT_TIMEOUT = 30.0
 
 # seconds; jittered so waiters don't wake in lockstep
 POLL_MIN = 0.005
@@ -62,7 +62,8 @@ POLL_MAX = 0.05
 # mode for a file we create; existing files keep theirs
 NEW_FILE_MODE = 0o600
 
-JsonObject = ta.OrderedDict[str, ta.Any]  # ta.TypeAlias
+JsonObject = ta.Mapping[str, ta.Any]  # ta.TypeAlias
+OrderedJsonObject = ta.OrderedDict[str, ta.Any]  # ta.TypeAlias
 
 
 def write_all(fd: int, data: bytes) -> None:
@@ -125,14 +126,14 @@ def write_temp(
     return tmp
 
 
-def parse_object(text: str) -> JsonObject:
+def parse_object(text: str) -> OrderedJsonObject:
     data = json.loads(text, object_pairs_hook=collections.OrderedDict)
     if not isinstance(data, collections.OrderedDict):
         raise ValueError('top-level JSON value is not an object')  # noqa
     return data
 
 
-def load(raw: bytes) -> JsonObject:
+def load(raw: bytes) -> OrderedJsonObject:
     text = raw.decode('utf-8')
     if not text.strip():
         return collections.OrderedDict()  # tolerate an empty/whitespace-only file (e.g. `touch`ed)
@@ -152,16 +153,16 @@ def values_equal(a: ta.Any, b: ta.Any) -> bool:
 
 
 def merge(
-        existing: JsonObject,
-        update: JsonObject,
-) -> ta.Tuple[JsonObject, bool]:
+        existing: OrderedJsonObject,
+        update: OrderedJsonObject,
+) -> ta.Tuple[OrderedJsonObject, bool]:
     """
     Shallowly apply `update` to `existing`: a None value removes the key, any other value replaces it wholesale. Returns
     the merged object -- keys not in `update` first, in their existing order, then every key set by `update` in `update`
     order, even if its value is unchanged -- and whether the result differs from `existing` at all.
     """
 
-    merged: JsonObject = collections.OrderedDict(
+    merged: OrderedJsonObject = collections.OrderedDict(
         (k, v) for k, v in existing.items() if k not in update
     )
     merged.update((k, v) for k, v in update.items() if v is not None)
@@ -172,7 +173,7 @@ def try_create(
         path: str,
         dirname: str,
         basename: str,
-        data: JsonObject,
+        data: OrderedJsonObject,
 ) -> bool:
     """Atomically create `path` with `data` iff it does not exist. True on success."""
 
@@ -206,24 +207,33 @@ def try_create(
     return True
 
 
-def inject(
-        path: str,
+def inject_secrets(
+        file_path: str,
         update: JsonObject,
-        timeout: float,
+        *,
+        make_dirs: bool = False,
+        timeout: float = DEFAULT_TIMEOUT,
 ) -> None:
-    path = os.path.realpath(path)  # operate on the real file if `path` is a symlink
-    dirname, basename = os.path.split(path)
+    if not isinstance(update, collections.OrderedDict):
+        update = collections.OrderedDict(update)
+
+    file_path = os.path.realpath(file_path)  # operate on the real file if `path` is a symlink
+    dirname, basename = os.path.split(file_path)
+
+    if make_dirs:
+        os.makedirs(dirname, exist_ok=True)
+
     deadline = time.monotonic() + timeout
 
     while True:
         try:
-            fd = os.open(path, os.O_RDONLY)
+            fd = os.open(file_path, os.O_RDONLY)
 
         except FileNotFoundError:
             merged, _ = merge(collections.OrderedDict(), update)
 
             if try_create(
-                    path,
+                    file_path,
                     dirname,
                     basename,
                     merged,
@@ -237,28 +247,28 @@ def inject(
                 fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
             except BlockingIOError:
                 if time.monotonic() >= deadline:
-                    raise TimeoutError(f'timed out waiting for lock on {path}') from None
+                    raise TimeoutError(f'timed out waiting for lock on {file_path}') from None
                 time.sleep(random.uniform(POLL_MIN, POLL_MAX))
                 continue
 
-            # We hold a lock on *an* inode. Make sure it is still the one at `path`: a concurrent writer may have
+            # We hold a lock on *an* inode. Make sure it is still the one at `file_path`: a concurrent writer may have
             # rename()d a new file over it while we waited.
             st = os.fstat(fd)
 
             try:
-                cur = os.stat(path)
+                cur = os.stat(file_path)
             except FileNotFoundError:
                 continue  # deleted underneath us; go recreate
 
             if (st.st_dev, st.st_ino) != (cur.st_dev, cur.st_ino):
                 continue  # stale inode; retry against the current file
             if not stat.S_ISREG(st.st_mode):
-                raise OSError(errno.EINVAL, 'not a regular file', path)
+                raise OSError(errno.EINVAL, 'not a regular file', file_path)
 
             try:
                 existing = load(read_all(fd))
             except ValueError as e:
-                raise ValueError(f'{path}: {e}') from None
+                raise ValueError(f'{file_path}: {e}') from None
 
             merged, changed = merge(existing, update)
             if not changed:
@@ -273,7 +283,7 @@ def inject(
             )
 
             try:
-                os.rename(tmp, path)  # atomic replace, done while holding the lock
+                os.rename(tmp, file_path)  # atomic replace, done while holding the lock
             except BaseException:
                 os.unlink(tmp)
                 raise
@@ -286,6 +296,8 @@ def inject(
 
 
 def main(argv: ta.Any = None) -> int:
+    import argparse
+
     ap = argparse.ArgumentParser(
         description='Atomically upsert keys into a JSON object file; the update is a JSON object read from stdin.',
     )
@@ -297,7 +309,7 @@ def main(argv: ta.Any = None) -> int:
     ap.add_argument(
         '--timeout',
         type=float,
-        default=30.0,
+        default=DEFAULT_TIMEOUT,
         help='max seconds to wait for the lock (default: 30)',
     )
     ap.add_argument(
@@ -307,6 +319,10 @@ def main(argv: ta.Any = None) -> int:
 
     args = ap.parse_args(argv)
 
+    #
+
+    import sys
+
     try:
         update = parse_object(sys.stdin.buffer.read().decode('utf-8'))
     except ValueError as e:  # covers UnicodeDecodeError and json.JSONDecodeError
@@ -314,7 +330,11 @@ def main(argv: ta.Any = None) -> int:
         return 1
 
     try:
-        inject(args.file, update, args.timeout)
+        inject_secrets(
+            args.file,
+            update,
+            timeout=args.timeout,
+        )
     except TimeoutError as e:
         print(f'error: {e}', file=sys.stderr)
         return 3
@@ -327,4 +347,4 @@ def main(argv: ta.Any = None) -> int:
 
 
 if __name__ == '__main__':
-    sys.exit(main())
+    raise SystemExit(main())