ominfra 0.0.0.dev192__tar.gz → 0.0.0.dev194__tar.gz

{ominfra-0.0.0.dev192/ominfra.egg-info → ominfra-0.0.0.dev194}/PKG-INFO

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

{ominfra-0.0.0.dev192 → ominfra-0.0.0.dev194}/ominfra/clouds/aws/journald2aws/main.py

@@ -5,9 +5,9 @@ import dataclasses as dc
 import os.path
 import sys
 
+from omlish.lite.configs import load_config_file_obj
 from omlish.logs.standard import configure_standard_logging
 
-from ....configs import read_config_file
 from .driver import JournalctlToAwsDriver
 
 
@@ -36,7 +36,10 @@ def _main() -> None:
 
     config: JournalctlToAwsDriver.Config
     if args.config_file:
-        config = read_config_file(os.path.expanduser(args.config_file), JournalctlToAwsDriver.Config)
+        config = load_config_file_obj(
+            os.path.expanduser(args.config_file),
+            JournalctlToAwsDriver.Config,
+        )
     else:
         config = JournalctlToAwsDriver.Config()
 

{ominfra-0.0.0.dev192 → ominfra-0.0.0.dev194}/ominfra/manage/deploy/conf/manager.py

@@ -26,10 +26,10 @@ 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 omlish.configs.nginx import NginxConfigItems
+from omlish.configs.nginx 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))

{ominfra-0.0.0.dev192 → ominfra-0.0.0.dev194}/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-0.0.0.dev192 → ominfra-0.0.0.dev194}/ominfra/manage/main.py

@@ -17,12 +17,12 @@ from omlish.argparse.cli import argparse_arg
 from omlish.argparse.cli import argparse_cmd
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
+from omlish.lite.configs import load_config_file_obj
 from omlish.lite.logs import log  # noqa
 from omlish.lite.marshal import ObjMarshalerManager
 from omlish.lite.marshal import ObjMarshalOptions
 from omlish.lite.pycharm import PycharmRemoteDebug
 
-from ..configs import read_config_file
 from .bootstrap import MainBootstrap
 from .bootstrap_ import main_bootstrap
 from .commands.base import Command
@@ -51,7 +51,7 @@ class MainCli(ArgparseCli):
         if cf is None:
             return ManageConfig()
         else:
-            return read_config_file(cf, ManageConfig)
+            return load_config_file_obj(cf, ManageConfig)
 
     #
 
@@ -122,7 +122,7 @@ class MainCli(ArgparseCli):
             cmds.append(cmd)
 
         for cf in self.args.command_file or []:
-            cmd = read_config_file(cf, Command, msh=msh)
+            cmd = load_config_file_obj(cf, Command, msh=msh)
             cmds.append(cmd)
 
         #