ominfra 0.0.0.dev93__tar.gz → 0.0.0.dev95__tar.gz

{ominfra-0.0.0.dev93/ominfra.egg-info → ominfra-0.0.0.dev95}/PKG-INFO

@@ -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 → ominfra-0.0.0.dev95}/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-0.0.0.dev95/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-0.0.0.dev93 → ominfra-0.0.0.dev95}/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 → ominfra-0.0.0.dev95/ominfra.egg-info}/PKG-INFO

@@ -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 → ominfra-0.0.0.dev95}/ominfra.egg-info/SOURCES.txt

@@ -79,6 +79,7 @@ ominfra/supervisor/states.py
 ominfra/supervisor/supervisor.py
 ominfra/supervisor/types.py
 ominfra/tailscale/__init__.py
+ominfra/tailscale/api.py
 ominfra/tailscale/cli.py
 ominfra/tools/__init__.py
 ominfra/tools/listresources.py

{ominfra-0.0.0.dev93 → ominfra-0.0.0.dev95}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev93
-omlish==0.0.0.dev93
+omdev==0.0.0.dev95
+omlish==0.0.0.dev95
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev93 → ominfra-0.0.0.dev95}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev93'
+version = '0.0.0.dev95'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev93',
-    'omlish == 0.0.0.dev93',
+    'omdev == 0.0.0.dev95',
+    'omlish == 0.0.0.dev95',
 ]
 
 [project.optional-dependencies]