ominfra 0.0.0.dev51__py3-none-any.whl → 0.0.0.dev53__py3-none-any.whl

ominfra/.manifests.json

@@ -1 +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/ssh.py

@@ -172,9 +172,9 @@ async def _a_main() -> None:
     cfg = load_secrets()
 
     sc = SshConfig(
-        host=cfg['ec2_ssh_host'],
-        username=cfg['ec2_ssh_user'],
-        key_file_path=cfg['ec2_ssh_key_file'],
+        host=cfg.get('ec2_ssh_host').reveal(),
+        username=cfg.get('ec2_ssh_user').reveal(),
+        key_file_path=cfg.get('ec2_ssh_key_file').reveal(),
     )
 
     for scr in [

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/tools/listresources.py

@@ -12,7 +12,6 @@ unique server ids:
 """
 import json
 import pprint
-import typing as ta
 
 import urllib3
 
@@ -20,13 +19,14 @@ from omdev.secrets import load_secrets
 from omlish import check
 from omlish import dataclasses as dc
 from omlish import lang
+from omlish import secrets as sec
 
 
 ##
 
 
 @lang.cached_function
-def _get_secrets() -> dict[str, ta.Any]:
+def _get_secrets() -> sec.Secrets:
     return load_secrets()
 
 
@@ -72,9 +72,9 @@ def get_ec2_servers() -> list[Ec2Server]:
     cfg = _get_secrets()
     import boto3
     session = boto3.Session(
-        aws_access_key_id=cfg['aws_access_key_id'],
-        aws_secret_access_key=cfg['aws_secret_access_key'],
-        region_name=cfg['aws_region'],
+        aws_access_key_id=cfg.get('aws_access_key_id').reveal(),
+        aws_secret_access_key=cfg.get('aws_secret_access_key').reveal(),
+        region_name=cfg.get('aws_region').reveal(),
     )
     ec2 = session.client('ec2')
     resp = ec2.describe_instances()
@@ -103,9 +103,9 @@ def get_rds_instances() -> list[RdsInstance]:
     cfg = _get_secrets()
     import boto3
     session = boto3.Session(
-        aws_access_key_id=cfg['aws_access_key_id'],
-        aws_secret_access_key=cfg['aws_secret_access_key'],
-        region_name=cfg['aws_region'],
+        aws_access_key_id=cfg.get('aws_access_key_id').reveal(),
+        aws_secret_access_key=cfg.get('aws_secret_access_key').reveal(),
+        region_name=cfg.get('aws_region').reveal(),
     )
     rds = session.client('rds')
     resp = rds.describe_db_instances()
@@ -132,13 +132,17 @@ class GcpServer(Server):
 
 def get_gcp_servers() -> list[GcpServer]:
     cfg = _get_secrets()
+    creds = cfg.try_get('gcp_oauth2').reveal()
+
     from google.oauth2 import service_account
-    credentials = service_account.Credentials.from_service_account_info(cfg['gcp_oauth2'])
+    credentials = service_account.Credentials.from_service_account_info(json.loads(creds))
+
     from google.cloud import compute_v1
     instance_client = compute_v1.InstancesClient(credentials=credentials)
     request = compute_v1.AggregatedListInstancesRequest()
-    request.project = cfg['gcp_project_id']
+    request.project = cfg.get('gcp_project_id').reveal()
     request.max_results = 50
+
     out: list[GcpServer] = []
     for zone, response in instance_client.aggregated_list(request=request):
         for instance in (response.instances or []):
@@ -148,6 +152,7 @@ def get_gcp_servers() -> list[GcpServer]:
                 id=instance.name,
                 zone=zone,
             ))
+
     return out
 
 
@@ -160,7 +165,7 @@ class RunpodServer(Server):
 
 
 def get_runpod_servers() -> list[RunpodServer]:
-    api_key = _get_secrets()['runpod_api_key']
+    api_key = _get_secrets().get('runpod_api_key').reveal()
     query = 'query Pods { myself { pods { id runtime { ports { ip isIpPublic privatePort publicPort type } } } } }'
     resp = urllib3.request(
         'POST',
@@ -190,7 +195,7 @@ class LambdaLabsServer(Server):
 
 
 def get_lambda_labs_servers() -> list[LambdaLabsServer]:
-    api_key = _get_secrets()['lambda_labs_api_key']
+    api_key = _get_secrets().get('lambda_labs_api_key').reveal()
     resp = urllib3.request(
         'GET',
         'https://cloud.lambdalabs.com/api/v1/instances',
@@ -217,7 +222,7 @@ class DigitalOceanServer(Server):
 
 
 def get_digital_ocean_servers() -> list[DigitalOceanServer]:
-    api_key = _get_secrets()['digital_ocean_api_key']
+    api_key = _get_secrets().get('digital_ocean_api_key').reveal()
     resp = urllib3.request(
         'GET',
         'https://api.digitalocean.com/v2/droplets',

{ominfra-0.0.0.dev51.dist-info → ominfra-0.0.0.dev53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev51
+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.dev51
-Requires-Dist: omlish ==0.0.0.dev51
+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.dev51.dist-info → ominfra-0.0.0.dev53.dist-info}/RECORD

@@ -1,8 +1,8 @@
-ominfra/.manifests.json,sha256=N1F-Xz3GaBn2H1p7uKzhkhKCQV8QVR0t76XD6wmFtXA,3
+ominfra/.manifests.json,sha256=f_sjpvGcLg_qmHDgUvtQ1gPdNfomJNPm75nEKJZziOY,310
 ominfra/__about__.py,sha256=iYpUXgOtMUoc5leWMmABMGn81LS_nLzDLZU198aCwWk,730
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/cmds.py,sha256=E0AfnvEmnKntXWvmLW5L05_NeDpBET1VBXn7vV6EwBQ,2083
-ominfra/ssh.py,sha256=0GH_dpjCG0vWCT2Lh2v6pB-Y4IRsVNXfA5wDsZDvyKk,5392
+ominfra/ssh.py,sha256=jQpc4WvkMckIfk4vILda8zFaeharRqc_6wxW50b0OjQ,5431
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/auth.py,sha256=EW3lK1U0hnjXkTn1KWJeuv9GG0ibbKdvgLD0P6HJtwo,5502
@@ -39,11 +39,13 @@ ominfra/pyremote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 ominfra/pyremote/_runcommands.py,sha256=gxmbQYUwi51ekiVtwciY18_8Vx7pzgeIycAgaZeTxlQ,26342
 ominfra/pyremote/bootstrap.py,sha256=RvMO3YGaN1E4sgUi1JEtiPak8cjvqtc_vRCq1yqbeZg,3370
 ominfra/pyremote/runcommands.py,sha256=bviS0_TDIoZVAe4h-_iavbvJtVSFu8lnk7fQ5iasCWE,1571
+ominfra/tailscale/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ominfra/tailscale/cli.py,sha256=Ltg6RVFsMLLPjLzoGwM6sxjmwjEVEYHAdrqmCc4N1HM,3174
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/tools/listresources.py,sha256=4LhqZcBHVIAME0ulYKjPJV1tVKKBevPSGKaJXbxTBbI,5917
-ominfra-0.0.0.dev51.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev51.dist-info/METADATA,sha256=A6r4CSN9px9sae8PEU0eFUq7hq7dRdiezumk1qfU0KM,799
-ominfra-0.0.0.dev51.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-ominfra-0.0.0.dev51.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev51.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev51.dist-info/RECORD,,
+ominfra/tools/listresources.py,sha256=L4t5rszm9ulcdWyr7n48_R9d5Etg4S2a4WQhlbHDtnQ,6106
+ominfra-0.0.0.dev53.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev53.dist-info/METADATA,sha256=NJm_tslqMbWChDqviFPBsJJjxr8uFmGRn2ugq38yT4A,799
+ominfra-0.0.0.dev53.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+ominfra-0.0.0.dev53.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev53.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev53.dist-info/RECORD,,