ominfra 0.0.0.dev52__tar.gz → 0.0.0.dev53__tar.gz

{ominfra-0.0.0.dev52/ominfra.egg-info → ominfra-0.0.0.dev53}/PKG-INFO

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

ominfra-0.0.0.dev53/ominfra/.manifests.json

@@ -0,0 +1,17 @@
+[
+  {
+    "module": ".tailscale.cli",
+    "attr": "_CLI_MODULE",
+    "file": "ominfra/tailscale/cli.py",
+    "line": 104,
+    "value": {
+      "$omdev.cli.types.CliModule": {
+        "cmd_name": [
+          "tailscale",
+          "ts"
+        ],
+        "mod_name": "ominfra.tailscale.cli"
+      }
+    }
+  }
+]

ominfra-0.0.0.dev53/ominfra/tailscale/cli.py

@@ -0,0 +1,113 @@
+import re
+import subprocess
+import sys
+import typing as ta
+
+from omdev.cli import CliModule
+from omlish import argparse as ap
+from omlish import cached
+from omlish import collections as col
+from omlish import dataclasses as dc
+from omlish import lang
+from omlish import marshal as msh
+from omlish.formats import json
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.CAMEL, unknown_field='x')
+class CliNode:
+    id: str = dc.xfield() | msh.update_field_metadata(name='ID')
+    public_key: str = dc.xfield()
+    host_name: str = dc.xfield()
+    dns_name: str | None = dc.xfield(None) | msh.update_field_metadata(name='DNSName')
+    tailscale_ips: ta.Sequence[str] | None = dc.xfield(None) | msh.update_field_metadata(name='TailscaleIPs')
+    allowed_ips: ta.Sequence[str] | None = dc.xfield(None) | msh.update_field_metadata(name='AllowedPs')
+    tags: ta.Sequence[str] | None = None
+
+    x: ta.Mapping[str, ta.Any] | None = None
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.CAMEL, unknown_field='x')
+class CliStatus:
+    version: str | None = None
+    backend_state: str | None = None
+    tailscale_ips: ta.Sequence[str] | None = dc.xfield(None) | msh.update_field_metadata(name='TailscaleIPs')
+    self: CliNode | None = None
+    peers: ta.Mapping[str, CliNode] | None = dc.xfield(None) | msh.update_field_metadata(name='Peer')
+
+    @cached.property
+    def nodes(self) -> ta.Sequence[CliNode]:
+        return [
+            *([self.self] if self.self is not None else []),
+            *(self.peers.values() if self.peers else []),
+        ]
+
+    @cached.property
+    def nodes_by_host_name(self) -> ta.Mapping[str, CliNode]:
+        return col.make_map(((n.host_name, n) for n in self.nodes if n.host_name), strict=True)
+
+    x: ta.Mapping[str, ta.Any] | None = None
+
+
+##
+
+
+_IP_V4_PAT = re.compile(r'\d{1,3}(\.\d{1,3}){3}')
+
+
+class Cli(ap.Cli):
+    @lang.cached_function
+    def bin(self) -> str:
+        if sys.platform == 'darwin':
+            return '/Applications/Tailscale.app/Contents/MacOS/Tailscale'
+        else:
+            return 'tailscale'
+
+    @ap.command(name='bin')
+    def bin_cmd(self) -> None:
+        print(self.bin())
+
+    def status(self) -> CliStatus:
+        stdout = subprocess.check_output([
+            self.bin(),
+            'status',
+            '--json',
+        ])
+        return msh.unmarshal(json.loads(stdout.decode()), CliStatus)
+
+    @ap.command(
+        ap.arg('name', nargs='?'),
+        name='status',
+    )
+    def status_cmd(self) -> None:
+        status = self.status()
+        out: ta.Any
+        if (name := self.args.name):
+            out = status.nodes_by_host_name[name]
+        else:
+            out = status
+        print(json.dumps_pretty(msh.marshal(out)))
+
+    @ap.command(
+        ap.arg('name'),
+    )
+    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])
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule(['tailscale', 'ts'], __name__)
+
+
+def _main() -> None:
+    Cli()()
+
+
+if __name__ == '__main__':
+    _main()

{ominfra-0.0.0.dev52 → ominfra-0.0.0.dev53/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev52 → ominfra-0.0.0.dev53}/ominfra.egg-info/SOURCES.txt

@@ -49,5 +49,7 @@ ominfra/pyremote/__init__.py
 ominfra/pyremote/_runcommands.py
 ominfra/pyremote/bootstrap.py
 ominfra/pyremote/runcommands.py
+ominfra/tailscale/__init__.py
+ominfra/tailscale/cli.py
 ominfra/tools/__init__.py
 ominfra/tools/listresources.py

{ominfra-0.0.0.dev52 → ominfra-0.0.0.dev53}/ominfra.egg-info/requires.txt

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

{ominfra-0.0.0.dev52 → ominfra-0.0.0.dev53}/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.dev52'
+version = '0.0.0.dev53'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev52',
-    'omlish == 0.0.0.dev52',
+    'omdev == 0.0.0.dev53',
+    'omlish == 0.0.0.dev53',
 ]
 
 [project.optional-dependencies]

ominfra-0.0.0.dev52/ominfra/.manifests.json

@@ -1 +0,0 @@
-[]