ominfra 0.0.0.dev189__tar.gz → 0.0.0.dev190__tar.gz

{ominfra-0.0.0.dev189/ominfra.egg-info → ominfra-0.0.0.dev190}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev189
+Version: 0.0.0.dev190
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev189
-Requires-Dist: omlish==0.0.0.dev189
+Requires-Dist: omdev==0.0.0.dev190
+Requires-Dist: omlish==0.0.0.dev190
+Requires-Dist: omserv==0.0.0.dev190
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev189 → ominfra-0.0.0.dev190}/ominfra/__about__.py

@@ -10,6 +10,7 @@ class Project(ProjectBase):
     dependencies = [
         f'omdev == {__version__}',
         f'omlish == {__version__}',
+        f'omserv == {__version__}',
     ]
 
     optional_dependencies = {

ominfra-0.0.0.dev190/ominfra/manage/deploy/apps.py

@@ -0,0 +1,129 @@
+# ruff: noqa: UP006 UP007
+import dataclasses as dc
+import os.path
+import typing as ta
+
+from omlish.lite.cached import cached_nullary
+from omlish.lite.check import check
+from omlish.lite.json import json_dumps_pretty
+from omlish.lite.marshal import ObjMarshalerManager
+
+from .conf.manager import DeployConfManager
+from .git import DeployGitManager
+from .paths.owners import DeployPathOwner
+from .paths.paths import DeployPath
+from .specs import DeployAppSpec
+from .tags import DeployTagMap
+from .types import DeployHome
+from .venvs import DeployVenvManager
+
+
+class DeployAppManager(DeployPathOwner):
+    def __init__(
+            self,
+            *,
+            git: DeployGitManager,
+            venvs: DeployVenvManager,
+            conf: DeployConfManager,
+
+            msh: ObjMarshalerManager,
+    ) -> None:
+        super().__init__()
+
+        self._git = git
+        self._venvs = venvs
+        self._conf = conf
+
+        self._msh = msh
+
+    #
+
+    APP_DIR = DeployPath.parse('apps/@app/@time--@app-rev--@app-key/')
+
+    @cached_nullary
+    def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:
+        return {
+            self.APP_DIR,
+
+            *[
+                DeployPath.parse(f'{self.APP_DIR}{sfx}/')
+                for sfx in [
+                    'conf',
+                    'git',
+                    'venv',
+                ]
+            ],
+        }
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class PreparedApp:
+        app_dir: str
+
+        git_dir: ta.Optional[str] = None
+        venv_dir: ta.Optional[str] = None
+        conf_dir: ta.Optional[str] = None
+
+    async def prepare_app(
+            self,
+            spec: DeployAppSpec,
+            home: DeployHome,
+            tags: DeployTagMap,
+    ) -> PreparedApp:
+        spec_json = json_dumps_pretty(self._msh.marshal_obj(spec))
+
+        #
+
+        check.non_empty_str(home)
+
+        app_dir = os.path.join(home, self.APP_DIR.render(tags))
+
+        os.makedirs(app_dir, exist_ok=True)
+
+        #
+
+        rkw: ta.Dict[str, ta.Any] = dict(
+            app_dir=app_dir,
+        )
+
+        #
+
+        spec_file = os.path.join(app_dir, 'spec.json')
+        with open(spec_file, 'w') as f:  # noqa
+            f.write(spec_json)
+
+        #
+
+        git_dir = os.path.join(app_dir, 'git')
+        rkw.update(git_dir=git_dir)
+        await self._git.checkout(
+            spec.git,
+            home,
+            git_dir,
+        )
+
+        #
+
+        if spec.venv is not None:
+            venv_dir = os.path.join(app_dir, 'venv')
+            rkw.update(venv_dir=venv_dir)
+            await self._venvs.setup_venv(
+                spec.venv,
+                git_dir,
+                venv_dir,
+            )
+
+        #
+
+        if spec.conf is not None:
+            conf_dir = os.path.join(app_dir, 'conf')
+            rkw.update(conf_dir=conf_dir)
+            await self._conf.write_app_conf(
+                spec.conf,
+                conf_dir,
+            )
+
+        #
+
+        return DeployAppManager.PreparedApp(**rkw)

{ominfra-0.0.0.dev189 → ominfra-0.0.0.dev190}/ominfra/manage/deploy/commands.py

@@ -5,7 +5,7 @@ from omlish.lite.logs import log
 
 from ..commands.base import Command
 from ..commands.base import CommandExecutor
-from .driver import DeployDriverFactory
+from .deploy import DeployDriverFactory
 from .specs import DeploySpec
 
 

{ominfra-0.0.0.dev189 → ominfra-0.0.0.dev190}/ominfra/manage/deploy/conf/manager.py

@@ -24,6 +24,8 @@ from omlish.lite.json import json_dumps_pretty
 from omlish.lite.strings import strip_with_newline
 from omlish.os.paths import is_path_in_dir
 from omlish.os.paths import relative_symlink
+from omserv.nginx.configs import NginxConfigItems
+from omserv.nginx.configs import render_nginx_config_str
 
 from ....configs import render_ini_config
 from ..paths.paths import DeployPath
@@ -37,6 +39,7 @@ from .specs import DeployAppConfLink
 from .specs import DeployAppConfSpec
 from .specs import IniDeployAppConfContent
 from .specs import JsonDeployAppConfContent
+from .specs import NginxDeployAppConfContent
 from .specs import RawDeployAppConfContent
 
 
@@ -51,6 +54,10 @@ class DeployConfManager:
         elif isinstance(ac, IniDeployAppConfContent):
             return strip_with_newline(render_ini_config(ac.sections))
 
+        elif isinstance(ac, NginxDeployAppConfContent):
+            ni = NginxConfigItems.of(ac.items)
+            return strip_with_newline(render_nginx_config_str(ni))
+
         else:
             raise TypeError(ac)
 
@@ -69,6 +76,17 @@ class DeployConfManager:
         with open(conf_file, 'w') as f:  # noqa
             f.write(body)
 
+    async def write_app_conf(
+            self,
+            spec: DeployAppConfSpec,
+            app_conf_dir: str,
+    ) -> None:
+        for acf in spec.files or []:
+            await self._write_app_conf_file(
+                acf,
+                app_conf_dir,
+            )
+
     #
 
     class _ComputedConfLink(ta.NamedTuple):
@@ -178,23 +196,13 @@ class DeployConfManager:
             make_dirs=True,
         )
 
-    #
-
-    async def write_app_conf(
+    async def link_app_conf(
             self,
             spec: DeployAppConfSpec,
             tags: DeployTagMap,
             app_conf_dir: str,
             conf_link_dir: str,
-    ) -> None:
-        for acf in spec.files or []:
-            await self._write_app_conf_file(
-                acf,
-                app_conf_dir,
-            )
-
-        #
-
+    ):
         for link in spec.links or []:
             await self._make_app_conf_link(
                 link,

{ominfra-0.0.0.dev189 → ominfra-0.0.0.dev190}/ominfra/manage/deploy/conf/specs.py

@@ -44,6 +44,15 @@ class IniDeployAppConfContent(DeployAppConfContent):
     sections: IniConfigSectionSettingsMap
 
 
+#
+
+
+@register_single_field_type_obj_marshaler('items')
+@dc.dataclass(frozen=True)
+class NginxDeployAppConfContent(DeployAppConfContent):
+    items: ta.Any
+
+
 ##
 
 

ominfra-0.0.0.dev190/ominfra/manage/deploy/deploy.py

@@ -0,0 +1,239 @@
+# ruff: noqa: UP006 UP007
+import datetime
+import os.path
+import typing as ta
+
+from omlish.lite.cached import cached_nullary
+from omlish.lite.check import check
+from omlish.lite.json import json_dumps_pretty
+from omlish.lite.marshal import ObjMarshalerManager
+from omlish.lite.typing import Func0
+from omlish.lite.typing import Func1
+from omlish.os.paths import relative_symlink
+
+from .apps import DeployAppManager
+from .conf.manager import DeployConfManager
+from .paths.manager import DeployPathsManager
+from .paths.owners import DeployPathOwner
+from .paths.paths import DeployPath
+from .specs import DeployAppSpec
+from .specs import DeploySpec
+from .systemd import DeploySystemdManager
+from .tags import DeployAppRev
+from .tags import DeployTagMap
+from .tags import DeployTime
+from .types import DeployHome
+
+
+##
+
+
+DEPLOY_TAG_DATETIME_FMT = '%Y%m%dT%H%M%SZ'
+
+
+DeployManagerUtcClock = ta.NewType('DeployManagerUtcClock', Func0[datetime.datetime])
+
+
+class DeployManager(DeployPathOwner):
+    def __init__(
+            self,
+            *,
+            utc_clock: ta.Optional[DeployManagerUtcClock] = None,
+    ):
+        super().__init__()
+
+        self._utc_clock = utc_clock
+
+    #
+
+    DEPLOYS_DIR = DeployPath.parse('deploys/')
+
+    CURRENT_DEPLOY_LINK = DeployPath.parse(f'{DEPLOYS_DIR}current')
+    DEPLOYING_DEPLOY_LINK = DeployPath.parse(f'{DEPLOYS_DIR}deploying')
+
+    DEPLOY_DIR = DeployPath.parse(f'{DEPLOYS_DIR}@time--@deploy-key/')
+    DEPLOY_SPEC_FILE = DeployPath.parse(f'{DEPLOY_DIR}spec.json')
+
+    APPS_DEPLOY_DIR = DeployPath.parse(f'{DEPLOY_DIR}apps/')
+    APP_DEPLOY_LINK = DeployPath.parse(f'{APPS_DEPLOY_DIR}@app')
+
+    CONFS_DEPLOY_DIR = DeployPath.parse(f'{DEPLOY_DIR}conf/')
+    CONF_DEPLOY_DIR = DeployPath.parse(f'{CONFS_DEPLOY_DIR}@conf/')
+
+    @cached_nullary
+    def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:
+        return {
+            self.DEPLOYS_DIR,
+
+            self.CURRENT_DEPLOY_LINK,
+            self.DEPLOYING_DEPLOY_LINK,
+
+            self.DEPLOY_DIR,
+            self.DEPLOY_SPEC_FILE,
+
+            self.APPS_DEPLOY_DIR,
+            self.APP_DEPLOY_LINK,
+
+            self.CONFS_DEPLOY_DIR,
+            self.CONF_DEPLOY_DIR,
+        }
+
+    #
+
+    def _utc_now(self) -> datetime.datetime:
+        if self._utc_clock is not None:
+            return self._utc_clock()  # noqa
+        else:
+            return datetime.datetime.now(tz=datetime.timezone.utc)  # noqa
+
+    def make_deploy_time(self) -> DeployTime:
+        return DeployTime(self._utc_now().strftime(DEPLOY_TAG_DATETIME_FMT))
+
+
+##
+
+
+class DeployDriverFactory(Func1[DeploySpec, ta.ContextManager['DeployDriver']]):
+    pass
+
+
+class DeployDriver:
+    def __init__(
+            self,
+            *,
+            spec: DeploySpec,
+            home: DeployHome,
+            time: DeployTime,
+
+            deploys: DeployManager,
+            paths: DeployPathsManager,
+            apps: DeployAppManager,
+            conf: DeployConfManager,
+            systemd: DeploySystemdManager,
+
+            msh: ObjMarshalerManager,
+    ) -> None:
+        super().__init__()
+
+        self._spec = spec
+        self._home = home
+        self._time = time
+
+        self._deploys = deploys
+        self._paths = paths
+        self._apps = apps
+        self._conf = conf
+        self._systemd = systemd
+
+        self._msh = msh
+
+    #
+
+    @property
+    def deploy_tags(self) -> DeployTagMap:
+        return DeployTagMap(
+            self._time,
+            self._spec.key(),
+        )
+
+    def render_deploy_path(self, pth: DeployPath, tags: ta.Optional[DeployTagMap] = None) -> str:
+        return os.path.join(self._home, pth.render(tags if tags is not None else self.deploy_tags))
+
+    @property
+    def deploy_dir(self) -> str:
+        return self.render_deploy_path(self._deploys.DEPLOY_DIR)
+
+    #
+
+    async def drive_deploy(self) -> None:
+        spec_json = json_dumps_pretty(self._msh.marshal_obj(self._spec))
+
+        #
+
+        self._paths.validate_deploy_paths()
+
+        #
+
+        os.makedirs(self.deploy_dir)
+
+        #
+
+        spec_file = self.render_deploy_path(self._deploys.DEPLOY_SPEC_FILE)
+        with open(spec_file, 'w') as f:  # noqa
+            f.write(spec_json)
+
+        #
+
+        deploying_link = self.render_deploy_path(self._deploys.DEPLOYING_DEPLOY_LINK)
+        if os.path.exists(deploying_link):
+            os.unlink(deploying_link)
+        relative_symlink(
+            self.deploy_dir,
+            deploying_link,
+            target_is_directory=True,
+            make_dirs=True,
+        )
+
+        #
+
+        for md in [
+            self._deploys.APPS_DEPLOY_DIR,
+            self._deploys.CONFS_DEPLOY_DIR,
+        ]:
+            os.makedirs(self.render_deploy_path(md))
+
+        #
+
+        for app in self._spec.apps:
+            await self.drive_app_deploy(app)
+
+        #
+
+        current_link = self.render_deploy_path(self._deploys.CURRENT_DEPLOY_LINK)
+        os.replace(deploying_link, current_link)
+
+        #
+
+        await self._systemd.sync_systemd(
+            self._spec.systemd,
+            self._home,
+            os.path.join(self.deploy_dir, 'conf', 'systemd'),  # FIXME
+        )
+
+    #
+
+    async def drive_app_deploy(self, app: DeployAppSpec) -> None:
+        app_tags = self.deploy_tags.add(
+            app.app,
+            app.key(),
+            DeployAppRev(app.git.rev),
+        )
+
+        #
+
+        da = await self._apps.prepare_app(
+            app,
+            self._home,
+            app_tags,
+        )
+
+        #
+
+        app_link = self.render_deploy_path(self._deploys.APP_DEPLOY_LINK, app_tags)
+        relative_symlink(
+            da.app_dir,
+            app_link,
+            target_is_directory=True,
+            make_dirs=True,
+        )
+
+        #
+
+        deploy_conf_dir = self.render_deploy_path(self._deploys.CONFS_DEPLOY_DIR)
+        if app.conf is not None:
+            await self._conf.link_app_conf(
+                app.conf,
+                app_tags,
+                check.non_empty_str(da.conf_dir),
+                deploy_conf_dir,
+            )

{ominfra-0.0.0.dev189 → ominfra-0.0.0.dev190}/ominfra/manage/deploy/inject.py

@@ -16,15 +16,16 @@ from .commands import DeployCommand
 from .commands import DeployCommandExecutor
 from .conf.inject import bind_deploy_conf
 from .config import DeployConfig
+from .deploy import DeployDriver
+from .deploy import DeployDriverFactory
 from .deploy import DeployManager
-from .driver import DeployDriver
-from .driver import DeployDriverFactory
 from .git import DeployGitManager
 from .inject_ import bind_deploy_manager
 from .interp import InterpCommand
 from .interp import InterpCommandExecutor
 from .paths.inject import bind_deploy_paths
 from .specs import DeploySpec
+from .systemd import DeploySystemdManager
 from .tags import DeployTime
 from .tmp import DeployHomeAtomics
 from .tmp import DeployTmpManager
@@ -101,13 +102,10 @@ def bind_deploy(
 
     lst.extend([
         bind_deploy_manager(DeployAppManager),
-
         bind_deploy_manager(DeployGitManager),
-
         bind_deploy_manager(DeployManager),
-
+        bind_deploy_manager(DeploySystemdManager),
         bind_deploy_manager(DeployTmpManager),
-
         bind_deploy_manager(DeployVenvManager),
     ])
 

ominfra-0.0.0.dev190/ominfra/manage/deploy/nginx.py

@@ -0,0 +1,8 @@
+# ruff: noqa: UP006 UP007
+"""
+verify - nginx -t
+"""
+
+
+class DeployNginxManager:
+    pass

{ominfra-0.0.0.dev189 → ominfra-0.0.0.dev190}/ominfra/manage/deploy/paths/paths.py

@@ -33,6 +33,10 @@ class DeployPathError(Exception):
 
 
 class DeployPathRenderable(abc.ABC):
+    @cached_nullary
+    def __str__(self) -> str:
+        return self.render(None)
+
     @abc.abstractmethod
     def render(self, tags: ta.Optional[DeployTagMap] = None) -> str:
         raise NotImplementedError
@@ -174,7 +178,7 @@ class FileDeployPathPart(DeployPathPart):
 
 
 @dc.dataclass(frozen=True)
-class DeployPath:
+class DeployPath(DeployPathRenderable):
     parts: ta.Sequence[DeployPathPart]
 
     @property

{ominfra-0.0.0.dev189 → ominfra-0.0.0.dev190}/ominfra/manage/deploy/specs.py

@@ -94,11 +94,22 @@ class DeployAppSpec(DeploySpecKeyed[DeployAppKey]):
 ##
 
 
+@dc.dataclass(frozen=True)
+class DeploySystemdSpec:
+    # ~/.config/systemd/user/
+    unit_dir: ta.Optional[str] = None
+
+
+##
+
+
 @dc.dataclass(frozen=True)
 class DeploySpec(DeploySpecKeyed[DeployKey]):
     home: DeployHome
 
-    apps: ta.Sequence[DeployAppSpec]
+    apps: ta.Sequence[DeployAppSpec] = ()
+
+    systemd: ta.Optional[DeploySystemdSpec] = None
 
     def __post_init__(self) -> None:
         check.non_empty_str(self.home)

ominfra-0.0.0.dev190/ominfra/manage/deploy/systemd.py

@@ -0,0 +1,110 @@
+# ruff: noqa: UP006 UP007
+"""
+~/.config/systemd/user/
+
+verify - systemd-analyze
+
+sudo loginctl enable-linger "$USER"
+
+cat ~/.config/systemd/user/sleep-infinity.service
+    [Unit]
+    Description=User-specific service to run 'sleep infinity'
+    After=default.target
+
+    [Service]
+    ExecStart=/bin/sleep infinity
+    Restart=always
+    RestartSec=5
+
+    [Install]
+    WantedBy=default.target
+
+systemctl --user daemon-reload
+
+systemctl --user enable sleep-infinity.service
+systemctl --user start sleep-infinity.service
+
+systemctl --user status sleep-infinity.service
+"""
+import os.path
+import typing as ta
+
+from omlish.lite.check import check
+from omlish.os.paths import abs_real_path
+from omlish.os.paths import is_path_in_dir
+
+from .specs import DeploySystemdSpec
+from .tmp import DeployHomeAtomics
+from .types import DeployHome
+
+
+class DeploySystemdManager:
+    def __init__(
+            self,
+            *,
+            atomics: DeployHomeAtomics,
+    ) -> None:
+        super().__init__()
+
+        self._atomics = atomics
+
+    def _scan_link_dir(
+            self,
+            d: str,
+            *,
+            strict: bool = False,
+    ) -> ta.Dict[str, str]:
+        o: ta.Dict[str, str] = {}
+        for f in os.listdir(d):
+            fp = os.path.join(d, f)
+            if strict:
+                check.state(os.path.islink(fp))
+            o[f] = abs_real_path(fp)
+        return o
+
+    async def sync_systemd(
+            self,
+            spec: ta.Optional[DeploySystemdSpec],
+            home: DeployHome,
+            conf_dir: str,
+    ) -> None:
+        check.non_empty_str(home)
+
+        if not spec:
+            return
+
+        if not (ud := spec.unit_dir):
+            return
+
+        ud = abs_real_path(os.path.expanduser(ud))
+
+        os.makedirs(ud, exist_ok=True)
+
+        uld = {
+            n: p
+            for n, p in self._scan_link_dir(ud).items()
+            if is_path_in_dir(home, p)
+        }
+
+        if os.path.exists(conf_dir):
+            cld = self._scan_link_dir(conf_dir, strict=True)
+        else:
+            cld = {}
+
+        for n in sorted(set(uld) | set(cld)):
+            ul = uld.get(n)  # noqa
+            cl = cld.get(n)
+            if cl is None:
+                os.unlink(os.path.join(ud, n))
+            else:
+                with self._atomics(home).begin_atomic_path_swap(  # noqa
+                        'file',
+                        os.path.join(ud, n),
+                        auto_commit=True,
+                        skip_root_dir_check=True,
+                ) as dst_swap:
+                    os.unlink(dst_swap.tmp_path)
+                    os.symlink(
+                        os.path.relpath(cl, os.path.dirname(dst_swap.dst_path)),
+                        dst_swap.tmp_path,
+                    )

{ominfra-0.0.0.dev189 → ominfra-0.0.0.dev190}/ominfra/manage/deploy/venvs.py

@@ -12,14 +12,12 @@ from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.check import check
 
 from .specs import DeployVenvSpec
-from .types import DeployHome
 
 
 class DeployVenvManager:
     async def setup_venv(
             self,
             spec: DeployVenvSpec,
-            home: DeployHome,
             git_dir: str,
             venv_dir: str,
     ) -> None: