ominfra 0.0.0.dev181__tar.gz → 0.0.0.dev183__tar.gz

{ominfra-0.0.0.dev181/ominfra.egg-info → ominfra-0.0.0.dev183}/PKG-INFO

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

{ominfra-0.0.0.dev181 → ominfra-0.0.0.dev183}/ominfra/configs.py

@@ -1,5 +1,6 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
+import io
 import json
 import os.path
 import typing as ta
@@ -14,6 +15,11 @@ 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
+
+
+##
+
 
 def parse_config_file(
         name: str,
@@ -58,6 +64,9 @@ def read_config_file(
     return msh.unmarshal_obj(config_dct, cls)
 
 
+##
+
+
 def build_config_named_children(
         o: ta.Union[
             ta.Sequence[ConfigMapping],
@@ -94,3 +103,27 @@ 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-0.0.0.dev181 → ominfra-0.0.0.dev183}/ominfra/manage/deploy/apps.py

@@ -6,7 +6,7 @@ from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.os.paths import relative_symlink
 
-from .conf import DeployConfManager
+from .conf.manager import DeployConfManager
 from .git import DeployGitManager
 from .paths.owners import DeployPathOwner
 from .paths.paths import DeployPath

ominfra-0.0.0.dev183/ominfra/manage/deploy/conf/inject.py

@@ -0,0 +1,17 @@
+# ruff: noqa: UP006 UP007
+import typing as ta
+
+from omlish.lite.inject import InjectorBindingOrBindings
+from omlish.lite.inject import InjectorBindings
+from omlish.lite.inject import inj
+
+from ..inject_ import bind_deploy_manager
+from .manager import DeployConfManager
+
+
+def bind_deploy_conf() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        bind_deploy_manager(DeployConfManager),
+    ]
+
+    return inj.as_bindings(*lst)

ominfra-0.0.0.dev181/ominfra/manage/deploy/conf.py → ominfra-0.0.0.dev183/ominfra/manage/deploy/conf/manager.py

@@ -20,20 +20,40 @@ import os.path
 import typing as ta
 
 from omlish.lite.check import check
+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 .paths.paths import DeployPath
+from ....configs import render_ini_config
+from ..paths.paths import DeployPath
+from ..tags import DEPLOY_TAG_SEPARATOR
+from ..tags import DeployApp
+from ..tags import DeployConf
+from ..tags import DeployTagMap
+from .specs import DeployAppConfContent
 from .specs import DeployAppConfFile
 from .specs import DeployAppConfLink
 from .specs import DeployAppConfSpec
-from .tags import DEPLOY_TAG_SEPARATOR
-from .tags import DeployApp
-from .tags import DeployConf
-from .tags import DeployTagMap
+from .specs import IniDeployAppConfContent
+from .specs import JsonDeployAppConfContent
+from .specs import RawDeployAppConfContent
 
 
 class DeployConfManager:
+    def _render_app_conf_content(self, ac: DeployAppConfContent) -> str:
+        if isinstance(ac, RawDeployAppConfContent):
+            return ac.body
+
+        elif isinstance(ac, JsonDeployAppConfContent):
+            return strip_with_newline(json_dumps_pretty(ac.obj))
+
+        elif isinstance(ac, IniDeployAppConfContent):
+            return strip_with_newline(render_ini_config(ac.sections))
+
+        else:
+            raise TypeError(ac)
+
     async def _write_app_conf_file(
             self,
             acf: DeployAppConfFile,
@@ -42,10 +62,12 @@ class DeployConfManager:
         conf_file = os.path.join(app_conf_dir, acf.path)
         check.arg(is_path_in_dir(app_conf_dir, conf_file))
 
+        body = self._render_app_conf_content(acf.content)
+
         os.makedirs(os.path.dirname(conf_file), exist_ok=True)
 
         with open(conf_file, 'w') as f:  # noqa
-            f.write(acf.body)
+            f.write(body)
 
     #
 

ominfra-0.0.0.dev183/ominfra/manage/deploy/conf/specs.py

@@ -0,0 +1,95 @@
+# ruff: noqa: UP006 UP007
+import abc
+import dataclasses as dc
+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 ..paths.specs import check_valid_deploy_spec_path
+
+
+##
+
+
+class DeployAppConfContent(abc.ABC):  # noqa
+    pass
+
+
+#
+
+
+@register_single_field_type_obj_marshaler('body')
+@dc.dataclass(frozen=True)
+class RawDeployAppConfContent(DeployAppConfContent):
+    body: str
+
+
+#
+
+
+@register_single_field_type_obj_marshaler('obj')
+@dc.dataclass(frozen=True)
+class JsonDeployAppConfContent(DeployAppConfContent):
+    obj: ta.Any
+
+
+#
+
+
+@register_single_field_type_obj_marshaler('sections')
+@dc.dataclass(frozen=True)
+class IniDeployAppConfContent(DeployAppConfContent):
+    sections: IniConfigSectionSettingsMap
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DeployAppConfFile:
+    path: str
+    content: DeployAppConfContent
+
+    def __post_init__(self) -> None:
+        check_valid_deploy_spec_path(self.path)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DeployAppConfLink:  # noqa
+    """
+    May be either:
+     - @conf(.ext)* - links a single file in root of app conf dir to conf/@conf/@dst(.ext)*
+     - @conf/file - links a single file in a single subdir to conf/@conf/@dst--file
+     - @conf/ - links a directory in root of app conf dir to conf/@conf/@dst/
+    """
+
+    src: str
+
+    kind: ta.Literal['current_only', 'all_active'] = 'current_only'
+
+    def __post_init__(self) -> None:
+        check_valid_deploy_spec_path(self.src)
+        if '/' in self.src:
+            check.equal(self.src.count('/'), 1)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DeployAppConfSpec:
+    files: ta.Optional[ta.Sequence[DeployAppConfFile]] = None
+
+    links: ta.Optional[ta.Sequence[DeployAppConfLink]] = None
+
+    def __post_init__(self) -> None:
+        if self.files:
+            seen: ta.Set[str] = set()
+            for f in self.files:
+                check.not_in(f.path, seen)
+                seen.add(f.path)

{ominfra-0.0.0.dev181 → ominfra-0.0.0.dev183}/ominfra/manage/deploy/inject.py

@@ -14,16 +14,16 @@ from ..commands.inject import bind_command
 from .apps import DeployAppManager
 from .commands import DeployCommand
 from .commands import DeployCommandExecutor
-from .conf import DeployConfManager
+from .conf.inject import bind_deploy_conf
 from .config import DeployConfig
 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 .paths.owners import DeployPathOwner
 from .specs import DeploySpec
 from .tags import DeployTime
 from .tmp import DeployHomeAtomics
@@ -90,6 +90,8 @@ def bind_deploy(
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind(deploy_config),
 
+        bind_deploy_conf(),
+
         bind_deploy_paths(),
 
         bind_deploy_scope(),
@@ -97,27 +99,16 @@ def bind_deploy(
 
     #
 
-    def bind_manager(cls: type) -> InjectorBindings:
-        return inj.as_bindings(
-            inj.bind(cls, singleton=True),
-
-            *([inj.bind(DeployPathOwner, to_key=cls, array=True)] if issubclass(cls, DeployPathOwner) else []),
-        )
-
-    #
-
     lst.extend([
-        bind_manager(DeployAppManager),
-
-        bind_manager(DeployConfManager),
+        bind_deploy_manager(DeployAppManager),
 
-        bind_manager(DeployGitManager),
+        bind_deploy_manager(DeployGitManager),
 
-        bind_manager(DeployManager),
+        bind_deploy_manager(DeployManager),
 
-        bind_manager(DeployTmpManager),
+        bind_deploy_manager(DeployTmpManager),
 
-        bind_manager(DeployVenvManager),
+        bind_deploy_manager(DeployVenvManager),
     ])
 
     #

ominfra-0.0.0.dev183/ominfra/manage/deploy/inject_.py

@@ -0,0 +1,13 @@
+# ruff: noqa: UP006 UP007
+from omlish.lite.inject import InjectorBindings
+from omlish.lite.inject import inj
+
+from .paths.owners import DeployPathOwner
+
+
+def bind_deploy_manager(cls: type) -> InjectorBindings:
+    return inj.as_bindings(
+        inj.bind(cls, singleton=True),
+
+        *([inj.bind(DeployPathOwner, to_key=cls, array=True)] if issubclass(cls, DeployPathOwner) else []),
+    )

ominfra-0.0.0.dev183/ominfra/manage/deploy/paths/specs.py

@@ -0,0 +1,10 @@
+# ruff: noqa: UP006 UP007
+from omlish.lite.check import check
+
+
+def check_valid_deploy_spec_path(s: str) -> str:
+    check.non_empty_str(s)
+    for c in ['..', '//']:
+        check.not_in(c, s)
+    check.arg(not s.startswith('/'))
+    return s

{ominfra-0.0.0.dev181 → ominfra-0.0.0.dev183}/ominfra/manage/deploy/specs.py

@@ -7,6 +7,7 @@ import typing as ta
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 
+from .conf.specs import DeployAppConfSpec
 from .tags import DeployApp
 from .tags import DeployAppKey
 from .tags import DeployKey
@@ -21,14 +22,6 @@ KeyDeployTagT = ta.TypeVar('KeyDeployTagT', bound='KeyDeployTag')
 ##
 
 
-def check_valid_deploy_spec_path(s: str) -> str:
-    check.non_empty_str(s)
-    for c in ['..', '//']:
-        check.not_in(c, s)
-    check.arg(not s.startswith('/'))
-    return s
-
-
 class DeploySpecKeyed(ta.Generic[KeyDeployTagT]):
     @cached_nullary
     def _key_str(self) -> str:
@@ -83,57 +76,6 @@ class DeployVenvSpec:
 ##
 
 
-@dc.dataclass(frozen=True)
-class DeployAppConfFile:
-    path: str
-    body: str
-
-    def __post_init__(self) -> None:
-        check_valid_deploy_spec_path(self.path)
-
-
-#
-
-
-@dc.dataclass(frozen=True)
-class DeployAppConfLink:  # noqa
-    """
-    May be either:
-     - @conf(.ext)* - links a single file in root of app conf dir to conf/@conf/@dst(.ext)*
-     - @conf/file - links a single file in a single subdir to conf/@conf/@dst--file
-     - @conf/ - links a directory in root of app conf dir to conf/@conf/@dst/
-    """
-
-    src: str
-
-    kind: ta.Literal['current_only', 'all_active'] = 'current_only'
-
-    def __post_init__(self) -> None:
-        check_valid_deploy_spec_path(self.src)
-        if '/' in self.src:
-            check.equal(self.src.count('/'), 1)
-
-
-#
-
-
-@dc.dataclass(frozen=True)
-class DeployAppConfSpec:
-    files: ta.Optional[ta.Sequence[DeployAppConfFile]] = None
-
-    links: ta.Optional[ta.Sequence[DeployAppConfLink]] = None
-
-    def __post_init__(self) -> None:
-        if self.files:
-            seen: ta.Set[str] = set()
-            for f in self.files:
-                check.not_in(f.path, seen)
-                seen.add(f.path)
-
-
-##
-
-
 @dc.dataclass(frozen=True)
 class DeployAppSpec(DeploySpecKeyed[DeployAppKey]):
     app: DeployApp

{ominfra-0.0.0.dev181 → ominfra-0.0.0.dev183}/ominfra/manage/deploy/tags.py

@@ -4,8 +4,7 @@ import dataclasses as dc
 import typing as ta
 
 from omlish.lite.check import check
-from omlish.lite.marshal import SingleFieldObjMarshaler
-from omlish.lite.marshal import register_type_obj_marshaler
+from omlish.lite.marshal import register_single_field_type_obj_marshaler
 
 
 ##
@@ -84,7 +83,7 @@ def _register_deploy_tag(cls):
     _DEPLOY_TAGS_BY_NAME[cls.tag_name] = cls
     _DEPLOY_TAGS_BY_KWARG[cls.tag_kwarg] = cls
 
-    register_type_obj_marshaler(cls, SingleFieldObjMarshaler(cls, 's'))
+    register_single_field_type_obj_marshaler('s', cls)
 
     return cls
 

{ominfra-0.0.0.dev181 → ominfra-0.0.0.dev183}/ominfra/scripts/journald2aws.py

@@ -74,6 +74,7 @@ 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')
@@ -2804,6 +2805,17 @@ def register_type_obj_marshaler(ty: type, om: ObjMarshaler) -> None:
     _REGISTERED_OBJ_MARSHALERS_BY_TYPE[ty] = om
 
 
+def register_single_field_type_obj_marshaler(fld, ty=None):
+    def inner(ty):  # noqa
+        register_type_obj_marshaler(ty, SingleFieldObjMarshaler(ty, fld))
+        return ty
+
+    if ty is not None:
+        return inner(ty)
+    else:
+        return inner
+
+
 ##
 
 
@@ -3261,6 +3273,9 @@ class AwsLogMessageBuilder:
 # ../../../../configs.py
 
 
+##
+
+
 def parse_config_file(
         name: str,
         f: ta.TextIO,
@@ -3304,6 +3319,9 @@ def read_config_file(
     return msh.unmarshal_obj(config_dct, cls)
 
 
+##
+
+
 def build_config_named_children(
         o: ta.Union[
             ta.Sequence[ConfigMapping],
@@ -3342,6 +3360,30 @@ 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