ominfra 0.0.0.dev191__py3-none-any.whl → 0.0.0.dev193__py3-none-any.whl

ominfra/configs.py

@@ -1,11 +1,10 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
-import io
 import json
 import os.path
 import typing as ta
 
-from omdev.toml.parser import toml_loads
+from omlish.formats.toml.parser import toml_loads
 from omlish.lite.check import check
 from omlish.lite.marshal import OBJ_MARSHALER_MANAGER
 from omlish.lite.marshal import ObjMarshalerManager
@@ -15,8 +14,6 @@ T = ta.TypeVar('T')
 
 ConfigMapping = ta.Mapping[str, ta.Any]
 
-IniConfigSectionSettingsMap = ta.Mapping[str, ta.Mapping[str, ta.Union[str, ta.Sequence[str]]]]  # ta.TypeAlias
-
 
 ##
 
@@ -103,27 +100,3 @@ def build_config_named_children(
         seen.add(n)
 
     return lst
-
-
-##
-
-
-def render_ini_config(
-        settings_by_section: IniConfigSectionSettingsMap,
-) -> str:
-    out = io.StringIO()
-
-    for i, (section, settings) in enumerate(settings_by_section.items()):
-        if i:
-            out.write('\n')
-
-        out.write(f'[{section}]\n')
-
-        for k, v in settings.items():
-            if isinstance(v, str):
-                out.write(f'{k}={v}\n')
-            else:
-                for vv in v:
-                    out.write(f'{k}={vv}\n')
-
-    return out.getvalue()

ominfra/manage/deploy/apps.py

@@ -84,6 +84,8 @@ class DeployAppManager(DeployPathOwner):
             spec: DeployAppSpec,
             home: DeployHome,
             tags: DeployTagMap,
+            *,
+            conf_string_ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
     ) -> PreparedApp:
         spec_json = json_dumps_pretty(self._msh.marshal_obj(spec))
 
@@ -140,9 +142,17 @@ class DeployAppManager(DeployPathOwner):
         if spec.conf is not None:
             conf_dir = os.path.join(app_dir, 'conf')
             rkw.update(conf_dir=conf_dir)
+
+            conf_ns: ta.Dict[str, ta.Any] = dict(
+                **(conf_string_ns or {}),
+                app=spec.app.s,
+                app_dir=app_dir.rstrip('/'),
+            )
+
             await self._conf.write_app_conf(
                 spec.conf,
                 conf_dir,
+                string_ns=conf_ns,
             )
 
         #

ominfra/manage/deploy/conf/manager.py

@@ -29,7 +29,7 @@ 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 omlish.formats.ini.sections import render_ini_sections
 from ..paths.paths import DeployPath
 from ..tags import DEPLOY_TAG_SEPARATOR
 from ..tags import DeployApp
@@ -100,7 +100,7 @@ class DeployConfManager:
 
         elif isinstance(ac, IniDeployAppConfContent):
             ini_sections = pcc(ac.sections)
-            return strip_with_newline(render_ini_config(ini_sections))
+            return strip_with_newline(render_ini_sections(ini_sections))
 
         elif isinstance(ac, NginxDeployAppConfContent):
             nginx_items = NginxConfigItems.of(pcc(ac.items))
@@ -133,9 +133,15 @@ class DeployConfManager:
             self,
             spec: DeployAppConfSpec,
             app_conf_dir: str,
+            *,
+            string_ns: ta.Optional[ta.Mapping[str, ta.Any]] = None,
     ) -> None:
-        def process_str(s: str) -> str:
-            return s
+        process_str: ta.Any
+        if string_ns is not None:
+            def process_str(s: str) -> str:
+                return s.format(**string_ns)
+        else:
+            process_str = None
 
         for acf in spec.files or []:
             await self._write_app_conf_file(

ominfra/manage/deploy/conf/specs.py

@@ -6,7 +6,7 @@ import typing as ta
 from omlish.lite.check import check
 from omlish.lite.marshal import register_single_field_type_obj_marshaler
 
-from ....configs import IniConfigSectionSettingsMap
+from omlish.formats.ini.sections import IniSectionSettingsMap
 from ..paths.specs import check_valid_deploy_spec_path
 
 
@@ -41,7 +41,7 @@ class JsonDeployAppConfContent(DeployAppConfContent):
 @register_single_field_type_obj_marshaler('sections')
 @dc.dataclass(frozen=True)
 class IniDeployAppConfContent(DeployAppConfContent):
-    sections: IniConfigSectionSettingsMap
+    sections: IniSectionSettingsMap
 
 
 #

ominfra/manage/deploy/deploy.py

@@ -30,7 +30,7 @@ from .types import DeployHome
 ##
 
 
-DEPLOY_TAG_DATETIME_FMT = '%Y%m%dT%H%M%SZ'
+DEPLOY_TAG_DATETIME_FMT = '%Y-%m-%d-T-%H-%M-%S-%f-Z'
 
 
 DeployManagerUtcClock = ta.NewType('DeployManagerUtcClock', Func0[datetime.datetime])
@@ -183,8 +183,9 @@ class DeployDriver:
 
         das: ta.Set[DeployApp] = {a.app for a in self._spec.apps}
         las: ta.Set[DeployApp] = set(self._spec.app_links.apps)
-        if (ras := das & las):
-            raise RuntimeError(f'Must not specify apps as both deploy and link: {sorted(a.s for a in ras)}')
+        ras: ta.Set[DeployApp] = set(self._spec.app_links.removed_apps)
+        check.empty(das & (las | ras))
+        check.empty(las & ras)
 
         #
 
@@ -230,10 +231,10 @@ class DeployDriver:
             cad = abs_real_path(os.path.join(current_link, 'apps'))
             if os.path.exists(cad):
                 for d in os.listdir(cad):
-                    if (da := DeployApp(d)) not in das:
+                    if (da := DeployApp(d)) not in das and da not in ras:
                         las.add(da)
 
-        for la in self._spec.app_links.apps:
+        for la in las:
             await self._drive_app_link(
                 la,
                 current_link,
@@ -263,10 +264,16 @@ class DeployDriver:
     #
 
     async def _drive_app_deploy(self, app: DeployAppSpec) -> None:
+        current_deploy_link = os.path.join(self._home, self._deploys.CURRENT_DEPLOY_LINK.render())
+
         pa = await self._apps.prepare_app(
             app,
             self._home,
             self.tags,
+            conf_string_ns=dict(
+                deploy_home=self._home,
+                current_deploy_link=current_deploy_link,
+            ),
         )
 
         #

ominfra/manage/deploy/git.py

@@ -91,7 +91,9 @@ class DeployGitManager(SingleDirDeployPathOwner):
 
         async def fetch(self, rev: DeployRev) -> None:
             await self.init()
-            await self._call('git', 'fetch', '--depth=1', 'origin', rev)
+
+            # This fetch shouldn't be depth=1 - git doesn't reuse local data with shallow fetches.
+            await self._call('git', 'fetch', 'origin', rev)
 
         #
 

ominfra/manage/deploy/specs.py

@@ -95,6 +95,8 @@ class DeployAppSpec(DeploySpecKeyed[DeployAppKey]):
 class DeployAppLinksSpec:
     apps: ta.Sequence[DeployApp] = ()
 
+    removed_apps: ta.Sequence[DeployApp] = ()
+
     exclude_unspecified: bool = False
 
 

ominfra/manage/deploy/systemd.py

@@ -8,6 +8,7 @@ TODO:
   - ominfra.systemd / x.sd_orphans
 """
 import os.path
+import shutil
 import sys
 import typing as ta
 
@@ -101,7 +102,7 @@ class DeploySystemdManager:
 
         #
 
-        if sys.platform == 'linux':
+        if sys.platform == 'linux' and shutil.which('systemctl') is not None:
             async def reload() -> None:
                 await asyncio_subprocesses.check_call('systemctl', '--user', 'daemon-reload')
 

ominfra/scripts/journald2aws.py

@@ -52,7 +52,7 @@ if sys.version_info < (3, 8):
 ########################################
 
 
-# ../../../../omdev/toml/parser.py
+# ../../../../omlish/formats/toml/parser.py
 TomlParseFloat = ta.Callable[[str], ta.Any]
 TomlKey = ta.Tuple[str, ...]
 TomlPos = int  # ta.TypeAlias
@@ -74,7 +74,6 @@ ExitStackedT = ta.TypeVar('ExitStackedT', bound='ExitStacked')
 
 # ../../../configs.py
 ConfigMapping = ta.Mapping[str, ta.Any]
-IniConfigSectionSettingsMap = ta.Mapping[str, ta.Mapping[str, ta.Union[str, ta.Sequence[str]]]]  # ta.TypeAlias
 
 # ../../../threadworkers.py
 ThreadWorkerT = ta.TypeVar('ThreadWorkerT', bound='ThreadWorker')
@@ -84,7 +83,7 @@ SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlia
 
 
 ########################################
-# ../../../../../omdev/toml/parser.py
+# ../../../../../omlish/formats/toml/parser.py
 # SPDX-License-Identifier: MIT
 # SPDX-FileCopyrightText: 2021 Taneli Hukkinen
 # Licensed to PSF under a Contributor Agreement.
@@ -3371,30 +3370,6 @@ def build_config_named_children(
     return lst
 
 
-##
-
-
-def render_ini_config(
-        settings_by_section: IniConfigSectionSettingsMap,
-) -> str:
-    out = io.StringIO()
-
-    for i, (section, settings) in enumerate(settings_by_section.items()):
-        if i:
-            out.write('\n')
-
-        out.write(f'[{section}]\n')
-
-        for k, v in settings.items():
-            if isinstance(v, str):
-                out.write(f'{k}={v}\n')
-            else:
-                for vv in v:
-                    out.write(f'{k}={vv}\n')
-
-    return out.getvalue()
-
-
 ########################################
 # ../../../../journald/messages.py