ominfra 0.0.0.dev174__py3-none-any.whl → 0.0.0.dev175__py3-none-any.whl

ominfra/manage/deploy/conf.py

@@ -24,13 +24,12 @@ from omlish.os.paths import is_path_in_dir
 from omlish.os.paths import relative_symlink
 
 from .paths.paths import DeployPath
-from .specs import AllActiveDeployAppConfLink
-from .specs import CurrentOnlyDeployAppConfLink
 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 .types import DeployHome
 
@@ -63,6 +62,7 @@ class DeployConfManager:
     #
 
     class _ComputedConfLink(ta.NamedTuple):
+        conf: DeployConf
         is_dir: bool
         link_src: str
         link_dst: str
@@ -70,8 +70,9 @@ class DeployConfManager:
     _UNIQUE_LINK_NAME_STR = '@app--@time--@app-key'
     _UNIQUE_LINK_NAME = DeployPath.parse(_UNIQUE_LINK_NAME_STR)
 
+    @classmethod
     def _compute_app_conf_link_dst(
-            self,
+            cls,
             link: DeployAppConfLink,
             tags: DeployTagMap,
             app_conf_dir: str,
@@ -85,6 +86,7 @@ class DeployConfManager:
         if (is_dir := link.src.endswith('/')):
             # @conf/ - links a directory in root of app conf dir to conf/@conf/@dst/
             check.arg(link.src.count('/') == 1)
+            conf = DeployConf(link.src.split('/')[0])
             link_dst_pfx = link.src
             link_dst_sfx = ''
 
@@ -92,6 +94,7 @@ class DeployConfManager:
             # @conf/file - links a single file in a single subdir to conf/@conf/@dst--file
             d, f = os.path.split(link.src)
             # TODO: check filename :|
+            conf = DeployConf(d)
             link_dst_pfx = d + '/'
             link_dst_sfx = DEPLOY_TAG_SEPARATOR + f
 
@@ -99,18 +102,20 @@ class DeployConfManager:
             # @conf(.ext)* - links a single file in root of app conf dir to conf/@conf/@dst(.ext)*
             if '.' in link.src:
                 l, _, r = link.src.partition('.')
+                conf = DeployConf(l)
                 link_dst_pfx = l + '/'
                 link_dst_sfx = '.' + r
             else:
+                conf = DeployConf(link.src)
                 link_dst_pfx = link.src + '/'
                 link_dst_sfx = ''
 
         #
 
-        if isinstance(link, CurrentOnlyDeployAppConfLink):
+        if link.kind == 'current_only':
             link_dst_mid = str(tags[DeployApp].s)
-        elif isinstance(link, AllActiveDeployAppConfLink):
-            link_dst_mid = self._UNIQUE_LINK_NAME.render(tags)
+        elif link.kind == 'all_active':
+            link_dst_mid = cls._UNIQUE_LINK_NAME.render(tags)
         else:
             raise TypeError(link)
 
@@ -124,6 +129,7 @@ class DeployConfManager:
         link_dst = os.path.join(conf_link_dir, link_dst_name)
 
         return DeployConfManager._ComputedConfLink(
+            conf=conf,
             is_dir=is_dir,
             link_src=link_src,
             link_dst=link_dst,

ominfra/manage/deploy/paths/paths.py

@@ -170,7 +170,7 @@ class FileDeployPathPart(DeployPathPart):
         return 'file'
 
 
-#
+##
 
 
 @dc.dataclass(frozen=True)
@@ -197,7 +197,7 @@ class DeployPath:
         return pd
 
     @property
-    def kind(self) -> ta.Literal['file', 'dir']:
+    def kind(self) -> DeployPathKind:
         return self.parts[-1].kind
 
     def render(self, tags: ta.Optional[DeployTagMap] = None) -> str:

ominfra/manage/deploy/specs.py

@@ -95,7 +95,7 @@ class DeployAppConfFile:
 
 
 @dc.dataclass(frozen=True)
-class DeployAppConfLink(abc.ABC):  # noqa
+class DeployAppConfLink:  # noqa
     """
     May be either:
      - @conf(.ext)* - links a single file in root of app conf dir to conf/@conf/@dst(.ext)*
@@ -105,20 +105,14 @@ class DeployAppConfLink(abc.ABC):  # noqa
 
     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)
 
 
-class CurrentOnlyDeployAppConfLink(DeployAppConfLink):
-    pass
-
-
-class AllActiveDeployAppConfLink(DeployAppConfLink):
-    pass
-
-
 #
 
 

ominfra/scripts/manage.py

@@ -7084,7 +7084,7 @@ class FileDeployPathPart(DeployPathPart):
         return 'file'
 
 
-#
+##
 
 
 @dc.dataclass(frozen=True)
@@ -7111,7 +7111,7 @@ class DeployPath:
         return pd
 
     @property
-    def kind(self) -> ta.Literal['file', 'dir']:
+    def kind(self) -> DeployPathKind:
         return self.parts[-1].kind
 
     def render(self, tags: ta.Optional[DeployTagMap] = None) -> str:
@@ -7206,7 +7206,7 @@ class DeployAppConfFile:
 
 
 @dc.dataclass(frozen=True)
-class DeployAppConfLink(abc.ABC):  # noqa
+class DeployAppConfLink:  # noqa
     """
     May be either:
      - @conf(.ext)* - links a single file in root of app conf dir to conf/@conf/@dst(.ext)*
@@ -7216,20 +7216,14 @@ class DeployAppConfLink(abc.ABC):  # noqa
 
     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)
 
 
-class CurrentOnlyDeployAppConfLink(DeployAppConfLink):
-    pass
-
-
-class AllActiveDeployAppConfLink(DeployAppConfLink):
-    pass
-
-
 #
 
 
@@ -7917,6 +7911,7 @@ class DeployConfManager:
     #
 
     class _ComputedConfLink(ta.NamedTuple):
+        conf: DeployConf
         is_dir: bool
         link_src: str
         link_dst: str
@@ -7924,8 +7919,9 @@ class DeployConfManager:
     _UNIQUE_LINK_NAME_STR = '@app--@time--@app-key'
     _UNIQUE_LINK_NAME = DeployPath.parse(_UNIQUE_LINK_NAME_STR)
 
+    @classmethod
     def _compute_app_conf_link_dst(
-            self,
+            cls,
             link: DeployAppConfLink,
             tags: DeployTagMap,
             app_conf_dir: str,
@@ -7939,6 +7935,7 @@ class DeployConfManager:
         if (is_dir := link.src.endswith('/')):
             # @conf/ - links a directory in root of app conf dir to conf/@conf/@dst/
             check.arg(link.src.count('/') == 1)
+            conf = DeployConf(link.src.split('/')[0])
             link_dst_pfx = link.src
             link_dst_sfx = ''
 
@@ -7946,6 +7943,7 @@ class DeployConfManager:
             # @conf/file - links a single file in a single subdir to conf/@conf/@dst--file
             d, f = os.path.split(link.src)
             # TODO: check filename :|
+            conf = DeployConf(d)
             link_dst_pfx = d + '/'
             link_dst_sfx = DEPLOY_TAG_SEPARATOR + f
 
@@ -7953,18 +7951,20 @@ class DeployConfManager:
             # @conf(.ext)* - links a single file in root of app conf dir to conf/@conf/@dst(.ext)*
             if '.' in link.src:
                 l, _, r = link.src.partition('.')
+                conf = DeployConf(l)
                 link_dst_pfx = l + '/'
                 link_dst_sfx = '.' + r
             else:
+                conf = DeployConf(link.src)
                 link_dst_pfx = link.src + '/'
                 link_dst_sfx = ''
 
         #
 
-        if isinstance(link, CurrentOnlyDeployAppConfLink):
+        if link.kind == 'current_only':
             link_dst_mid = str(tags[DeployApp].s)
-        elif isinstance(link, AllActiveDeployAppConfLink):
-            link_dst_mid = self._UNIQUE_LINK_NAME.render(tags)
+        elif link.kind == 'all_active':
+            link_dst_mid = cls._UNIQUE_LINK_NAME.render(tags)
         else:
             raise TypeError(link)
 
@@ -7978,6 +7978,7 @@ class DeployConfManager:
         link_dst = os.path.join(conf_link_dir, link_dst_name)
 
         return DeployConfManager._ComputedConfLink(
+            conf=conf,
             is_dir=is_dir,
             link_src=link_src,
             link_dst=link_dst,

{ominfra-0.0.0.dev174.dist-info → ominfra-0.0.0.dev175.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev174
+Version: 0.0.0.dev175
 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.dev174
-Requires-Dist: omlish==0.0.0.dev174
+Requires-Dist: omdev==0.0.0.dev175
+Requires-Dist: omlish==0.0.0.dev175
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev174.dist-info → ominfra-0.0.0.dev175.dist-info}/RECORD

@@ -46,13 +46,13 @@ ominfra/manage/commands/types.py,sha256=XFZPeqeIBAaIIQF3pdPbGxLlb-LCrz6WtlDWO2q_
 ominfra/manage/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/deploy/apps.py,sha256=4qcUi7Zxd2Sgfb8ZQSbjiMv1ppkHpJ37zJJMeDs6_xo,4738
 ominfra/manage/deploy/commands.py,sha256=fKFKhFwqIqC_PsgA-W66qIJ5S32xRgBBaRt3lbPX5Zg,763
-ominfra/manage/deploy/conf.py,sha256=C2eLMuB2BVi7RM-7aPvZvlZbAgQVDunDD0AehJ11Kog,5511
+ominfra/manage/deploy/conf.py,sha256=cGu9q-mtbBsBXydTGrNE11NGyYdxbn7aPiGx28rxhsg,5639
 ominfra/manage/deploy/config.py,sha256=aR6ubMEWqkTI55XtcG1Cczn6YhCVN6eSL8DT5EHQJN0,166
 ominfra/manage/deploy/deploy.py,sha256=zEcuwH7Sj3Z5Wb5U9RDqEG8CHaOZVhGpPBBTGGER2j4,1672
 ominfra/manage/deploy/git.py,sha256=cfTCx1qD-FQPFkbYW28tkU8nVxQbnfnWxpuJuGQHtBw,3753
 ominfra/manage/deploy/inject.py,sha256=kzGl2N2jhijUw4-PYUK1LNG8_MJD7BMgCbi6nDViMWg,1965
 ominfra/manage/deploy/interp.py,sha256=OKkenH8YKEW_mEDR6X7_ZLxK9a1Ox6KHSwFPTHT6OzA,1029
-ominfra/manage/deploy/specs.py,sha256=13QLTShAyt-tT0i85Cf_L6GsPZvVKnYShk2EMrLBdj8,3726
+ominfra/manage/deploy/specs.py,sha256=XIEOdLwULFprLajjzX6Qf_T3wVvEWeC4tIZgYbycCHI,3656
 ominfra/manage/deploy/tags.py,sha256=f2gTcV9aOGv5A6-6ZESHzeQ47TcLTkaEXe60_JyvqQo,4977
 ominfra/manage/deploy/tmp.py,sha256=dFJuqGfSf5otCxSaCI01a5UOSaArMlU4MzzYcyr74-s,1237
 ominfra/manage/deploy/types.py,sha256=ZcIoheZ3zW7n0IZiqTRW_Uo3JyWWeWg5nyKGryvGc2I,112
@@ -61,7 +61,7 @@ ominfra/manage/deploy/paths/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 ominfra/manage/deploy/paths/inject.py,sha256=X81C-Qhef1LQ7tILWvkomBwFTvgooLVmWRnKL7TeVoI,596
 ominfra/manage/deploy/paths/manager.py,sha256=gxr_CsjLmjxXx8w3J8ookJk9OGltCpyBFYBnxXaw5lg,1050
 ominfra/manage/deploy/paths/owners.py,sha256=GmLy0E70C8CF3eYIdkAhBtYaZXW4QWmSzvgts5l1i_4,1379
-ominfra/manage/deploy/paths/paths.py,sha256=_zFXTeiACLkC9i289rQlqkPg_U8nHWWpuShW29-STSs,5541
+ominfra/manage/deploy/paths/paths.py,sha256=i7g8YdYOh4M_jgJXtafTbFkRhlu469cfGxAJAuB3fVY,5531
 ominfra/manage/deploy/paths/types.py,sha256=TGgtSASmdyuZ2maZnvahfA0QxPLWlHBtpDeIEoEDGxk,112
 ominfra/manage/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/remote/_main.py,sha256=p5KoiS2WMw6QAqlDl_Zun-JybmCsy8awIfpBMLBjGMY,4356
@@ -86,7 +86,7 @@ ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhh
 ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/scripts/journald2aws.py,sha256=fbs8jZCsnwi5vF8Bg892wu3rscHCHeLQlvsDs6oAZBs,156681
-ominfra/scripts/manage.py,sha256=jzClDt2zLKySdtAvo1vvis8bJaYVY44KB_jZ6ePY4ho,316667
+ominfra/scripts/manage.py,sha256=K9Z5QjGH3maQYwRnW3UbvL7dkdAk4-mLwvgWVC8TLSg,316780
 ominfra/scripts/supervisor.py,sha256=CD8o9RktPyB3L8nMBa6rabWE0tZlti6dmzoEEKRPWvY,275447
 ominfra/supervisor/LICENSE.txt,sha256=yvqaMNsDhWxziHa9ien6qCW1SkZv-DQlAg96XjfSee8,1746
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -129,9 +129,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=h6akQJMl0KuWLHS7Ur6WcBZ2JwF0DJQhsPTnFBdGyNk,3571
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev174.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev174.dist-info/METADATA,sha256=qeVp2nf876Zeu0NurT7Qldb4EuRYsIuTY9jAFc51DXo,731
-ominfra-0.0.0.dev174.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ominfra-0.0.0.dev174.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev174.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev174.dist-info/RECORD,,
+ominfra-0.0.0.dev175.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev175.dist-info/METADATA,sha256=mSx5m3-8qdibsCJFkrdMM2Z7H2DonPWOBSnJFlETz2M,731
+ominfra-0.0.0.dev175.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ominfra-0.0.0.dev175.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev175.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev175.dist-info/RECORD,,