ominfra 0.0.0.dev93__py3-none-any.whl → 0.0.0.dev95__py3-none-any.whl

ominfra/.manifests.json

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

ominfra/tailscale/api.py

@@ -0,0 +1,66 @@
+import datetime
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import marshal as msh
+
+
+@dc.dataclass(frozen=True)
+class Device:
+    dc.metadata(msh.ObjectMetadata(
+        field_naming=msh.Naming.LOW_CAMEL,
+        unknown_field='x',
+    ))
+
+    addresses: list[str]
+    authorized: bool
+    blocks_incoming_connections: bool
+    client_version: str
+    created: datetime.datetime
+    expires: datetime.datetime
+    hostname: str
+    id: str
+    is_external: bool
+    key_expiry_disabled: bool
+    last_seen: datetime.datetime
+    machine_key: str
+    name: str
+    node_id: str
+    node_key: str
+    os: str
+    tailnet_lock_error: str
+    tailnet_lock_key: str
+    update_available: bool
+    user: bool
+
+    x: ta.Mapping[str, ta.Any] | None = None
+
+
+@dc.dataclass(frozen=True)
+class CreatedKey:
+    dc.metadata(msh.ObjectMetadata(
+        field_naming=msh.Naming.LOW_CAMEL,
+        unknown_field='x',
+    ))
+
+    id: str
+    key: str
+    created: datetime.datetime
+    expires: datetime.datetime
+    capabilities: ta.Mapping[str, ta.Any]
+    description: str
+
+    x: ta.Mapping[str, ta.Any] | None = None
+
+
+@dc.dataclass(frozen=True)
+class ListedKey:
+    dc.metadata(msh.ObjectMetadata(
+        field_naming=msh.Naming.LOW_CAMEL,
+        unknown_field='x',
+    ))
+
+    id: str
+    description: str
+
+    x: ta.Mapping[str, ta.Any] | None = None

ominfra/tailscale/cli.py

@@ -93,12 +93,18 @@ class Cli(ap.Cli):
         print(json.dumps_pretty(msh.marshal(out)))
 
     @ap.command(
-        ap.arg('name'),
+        ap.arg('name', nargs='?'),
     )
     def ip(self) -> None:
-        node = self.status().nodes_by_host_name[self.args.name]
-        ips = [i for i in node.tailscale_ips or () if _IP_V4_PAT.fullmatch(i)]
-        print(ips[0])
+        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])
+        else:
+            print(json.dumps_pretty(ip_lists_by_hostname))
 
 
 # @omlish-manifest

{ominfra-0.0.0.dev93.dist-info → ominfra-0.0.0.dev95.dist-info}/METADATA

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

{ominfra-0.0.0.dev93.dist-info → ominfra-0.0.0.dev95.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ominfra/.manifests.json,sha256=KjKpu0HX2bG8bASAjq9pt9FLAiDYqS1lZ8x-buseoik,589
+ominfra/.manifests.json,sha256=keLK1pWH0vdH4noGhTQelCFztK3fzbhIcjIcPcFDhF0,589
 ominfra/__about__.py,sha256=6i1AoruFYQCd-PyhhbDQDWY2d1tiQu9nkwWr-fXAqfY,705
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/cmds.py,sha256=E0AfnvEmnKntXWvmLW5L05_NeDpBET1VBXn7vV6EwBQ,2083
@@ -69,12 +69,13 @@ ominfra/supervisor/states.py,sha256=JMxXYTZhJkMNQZ2tTV6wId7wrvnWgiZteskACprKskM,
 ominfra/supervisor/supervisor.py,sha256=eXmVKX-A3exX8yHmmJEhHVd-3VnjTtrfDCvV7EEb7o8,13238
 ominfra/supervisor/types.py,sha256=ec62QG0CDJc0XNxCnf3lXxhsxrr4CCScLPI-1SpQjlc,1141
 ominfra/tailscale/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/tailscale/cli.py,sha256=Ltg6RVFsMLLPjLzoGwM6sxjmwjEVEYHAdrqmCc4N1HM,3174
+ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
+ominfra/tailscale/cli.py,sha256=2s1T8t6g-fhKF-l58lzVktEl9o5QqD-9FCpuYu5eqD0,3396
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=L4t5rszm9ulcdWyr7n48_R9d5Etg4S2a4WQhlbHDtnQ,6106
-ominfra-0.0.0.dev93.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev93.dist-info/METADATA,sha256=5A7GxHniBUUynlh2ABPCiUZ9QIUIglHTN8v_Fme5A7U,739
-ominfra-0.0.0.dev93.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-ominfra-0.0.0.dev93.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev93.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev93.dist-info/RECORD,,
+ominfra-0.0.0.dev95.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev95.dist-info/METADATA,sha256=yJvHyiZmUxIFxMsBJIl48lsCfk91S6pgXfRh3zb1esw,739
+ominfra-0.0.0.dev95.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+ominfra-0.0.0.dev95.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev95.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev95.dist-info/RECORD,,