ominfra 0.0.0.dev96__py3-none-any.whl → 0.0.0.dev98__py3-none-any.whl

ominfra/.manifests.json

@@ -15,7 +15,7 @@
     "module": ".tailscale.cli",
     "attr": "_CLI_MODULE",
     "file": "ominfra/tailscale/cli.py",
-    "line": 110,
+    "line": 118,
     "value": {
       "$omdev.cli.types.CliModule": {
         "cmd_name": [

ominfra/tailscale/cli.py

@@ -6,6 +6,7 @@ import typing as ta
 from omdev.cli import CliModule
 from omlish import argparse as ap
 from omlish import cached
+from omlish import check
 from omlish import collections as col
 from omlish import dataclasses as dc
 from omlish import lang
@@ -16,6 +17,9 @@ from omlish.formats import json
 ##
 
 
+_IP_V4_PAT = re.compile(r'\d{1,3}(\.\d{1,3}){3}')
+
+
 @dc.dataclass(frozen=True)
 @msh.update_object_metadata(field_naming=msh.Naming.CAMEL, unknown_field='x')
 class CliNode:
@@ -27,6 +31,10 @@ class CliNode:
     allowed_ips: ta.Sequence[str] | None = dc.xfield(None) | msh.update_field_metadata(name='AllowedPs')
     tags: ta.Sequence[str] | None = None
 
+    @property
+    def ipv4s(self) -> ta.Sequence[str]:
+        return [i for i in self.tailscale_ips or () if _IP_V4_PAT.fullmatch(i)]
+
     x: ta.Mapping[str, ta.Any] | None = None
 
 
@@ -56,9 +64,6 @@ class CliStatus:
 ##
 
 
-_IP_V4_PAT = re.compile(r'\d{1,3}(\.\d{1,3}){3}')
-
-
 class Cli(ap.Cli):
     @lang.cached_function
     def bin(self) -> str:
@@ -92,19 +97,22 @@ class Cli(ap.Cli):
             out = status
         print(json.dumps_pretty(msh.marshal(out)))
 
+    @ap.command()
+    def ips(self) -> None:
+        print(json.dumps_pretty({
+            hn: node.ipv4s
+            for hn, node in self.status().nodes_by_host_name.items()
+        }))
+
     @ap.command(
         ap.arg('name', nargs='?'),
     )
     def ip(self) -> None:
         status = self.status()
-        ip_lists_by_hostname = {
-            hn: [i for i in node.tailscale_ips or () if _IP_V4_PAT.fullmatch(i)]
-            for hn, node in status.nodes_by_host_name.items()
-        }
         if self.args.name:
-            print(ip_lists_by_hostname[self.args.name][0])
+            print(status.nodes_by_host_name[self.args.name].ipv4s[0])
         else:
-            print(json.dumps_pretty(ip_lists_by_hostname))
+            print(check.not_none(status.self).ipv4s[0])
 
 
 # @omlish-manifest

{ominfra-0.0.0.dev96.dist-info → ominfra-0.0.0.dev98.dist-info}/METADATA

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

{ominfra-0.0.0.dev96.dist-info → ominfra-0.0.0.dev98.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ominfra/.manifests.json,sha256=keLK1pWH0vdH4noGhTQelCFztK3fzbhIcjIcPcFDhF0,589
+ominfra/.manifests.json,sha256=8KREXxMAlsilZOktXPYru1ND3V5hFI22vnrp6hT3bio,589
 ominfra/__about__.py,sha256=6i1AoruFYQCd-PyhhbDQDWY2d1tiQu9nkwWr-fXAqfY,705
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/cmds.py,sha256=E0AfnvEmnKntXWvmLW5L05_NeDpBET1VBXn7vV6EwBQ,2083
@@ -70,12 +70,12 @@ ominfra/supervisor/supervisor.py,sha256=eXmVKX-A3exX8yHmmJEhHVd-3VnjTtrfDCvV7EEb
 ominfra/supervisor/types.py,sha256=ec62QG0CDJc0XNxCnf3lXxhsxrr4CCScLPI-1SpQjlc,1141
 ominfra/tailscale/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
-ominfra/tailscale/cli.py,sha256=2s1T8t6g-fhKF-l58lzVktEl9o5QqD-9FCpuYu5eqD0,3396
+ominfra/tailscale/cli.py,sha256=DSGp4hn5xwOW-l_u_InKlSF6kIobxtUtVssf_73STs0,3567
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=L4t5rszm9ulcdWyr7n48_R9d5Etg4S2a4WQhlbHDtnQ,6106
-ominfra-0.0.0.dev96.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev96.dist-info/METADATA,sha256=4lNnWFc04bgmyYEST3JeoYCTWFy1Bae-rfs6uUgrvVE,739
-ominfra-0.0.0.dev96.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-ominfra-0.0.0.dev96.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev96.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev96.dist-info/RECORD,,
+ominfra-0.0.0.dev98.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev98.dist-info/METADATA,sha256=e4U0sBB9F83WWrPEt2z-XKbtwI-zEkmBskcduenWAwM,739
+ominfra-0.0.0.dev98.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+ominfra-0.0.0.dev98.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev98.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev98.dist-info/RECORD,,