ominfra 0.0.0.dev58__py3-none-any.whl → 0.0.0.dev60__py3-none-any.whl

ominfra/.manifests.json

@@ -1,4 +1,16 @@
 [
+  {
+    "module": ".clouds.aws.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "ominfra/clouds/aws/__main__.py",
+    "line": 4,
+    "value": {
+      "$omdev.cli.types.CliModule": {
+        "cmd_name": "aws",
+        "mod_name": "ominfra.clouds.aws.__main__"
+      }
+    }
+  },
   {
     "module": ".tailscale.cli",
     "attr": "_CLI_MODULE",

ominfra/clouds/aws/__main__.py

@@ -0,0 +1,11 @@
+from omdev.cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('aws', __name__)
+
+
+if __name__ == '__main__':
+    from .cli import _main
+
+    _main()

ominfra/clouds/aws/cli.py

@@ -0,0 +1,25 @@
+from omlish import argparse as ap
+from omlish.formats import json
+
+from . import metadata
+
+
+class Cli(ap.Cli):
+    @ap.command(
+        ap.arg('key', action='append'),
+        ap.arg('--url'),
+    )
+    def metadata(self) -> None:
+        md = metadata.read_metadata(
+            self.args.keys or metadata.DEFAULT_METADATA_KEYS,
+            url=self.args.url or metadata.DEFAULT_METADATA_URL,
+        )
+        print(json.dumps_pretty(md))
+
+
+def _main() -> None:
+    Cli()()
+
+
+if __name__ == '__main__':
+    _main()

ominfra/clouds/aws/metadata.py

@@ -0,0 +1,99 @@
+"""
+TOKEN=`curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600"` && \
+    curl -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/
+"""
+import logging
+import socket
+import typing as ta
+import urllib.error
+import urllib.parse
+import urllib.request
+
+from omlish import check
+from omlish import lang
+
+
+DEFAULT_METADATA_URL = 'http://169.254.169.254/'
+
+METADATA_TOKEN_HEADER = 'X-aws-ec2-metadata-token'  # noqa
+METADATA_TOKEN_TTL_HEADER = 'X-aws-ec2-metadata-token-ttl-seconds'  # noqa
+
+
+def read_metadata(
+        keys: ta.Iterable[str],
+        *,
+        url: str = DEFAULT_METADATA_URL,
+        version: str = 'latest',
+        ping_timeout_s: float = 10.,
+        token_ttl: int = 60,
+        encoding: str = 'utf-8',
+) -> dict[str, str | None] | None:
+    check.not_isinstance(keys, str)
+
+    if not url.endswith('/'):
+        url += '/'
+
+    parsed: urllib.parse.ParseResult = urllib.parse.urlparse(url)
+    if not parsed.scheme:
+        url = 'http://' + url
+        parsed = urllib.parse.urlparse(url)
+    check.arg(bool(parsed.netloc))
+
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as ping_sock:
+        ping_sock.settimeout(ping_timeout_s)
+        try:
+            ping_sock.connect((parsed.netloc, 80))
+        except OSError:
+            return None
+
+    with urllib.request.urlopen(urllib.request.Request(  # noqa
+            urllib.parse.urljoin(url, f'{version}/api/token'),
+            method='PUT',
+            headers={
+                METADATA_TOKEN_TTL_HEADER: str(token_ttl),
+            },
+    )) as resp:
+        if resp.status != 200:
+            raise Exception(f'Failed to get token')
+        token = resp.read().decode(encoding).strip()
+
+    dct = {}
+    for key in keys:
+        try:
+            with urllib.request.urlopen(urllib.request.Request(  # noqa
+                    urllib.parse.urljoin(url, f'{version}/meta-data/{key}/'),
+                    headers={
+                        METADATA_TOKEN_HEADER: token,
+                    },
+            )) as resp:
+                dct[key] = resp.read().decode(encoding)
+        except urllib.error.URLError:
+            dct[key] = None
+    return dct
+
+
+DEFAULT_METADATA_KEYS: ta.AbstractSet[str] = {
+    'hostname',
+    'instance-id',
+}
+
+
+@lang.cached_function
+def metadata() -> ta.Mapping[str, str | None] | None:
+    return read_metadata(DEFAULT_METADATA_KEYS)
+
+
+##
+
+
+class MetadataLogFilter(logging.Filter):
+
+    def filter(self, record):
+        md = metadata() or {}
+        record.aws_hostname = md.get('hostname', '?')
+        record.aws_instance_id = md.get('instance-id', '?')
+        return True
+
+
+def configure_metadata_logging(handler: logging.Handler) -> None:
+    handler.addFilter(MetadataLogFilter())

{ominfra-0.0.0.dev58.dist-info → ominfra-0.0.0.dev60.dist-info}/METADATA

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

@@ -1,11 +1,14 @@
-ominfra/.manifests.json,sha256=f_sjpvGcLg_qmHDgUvtQ1gPdNfomJNPm75nEKJZziOY,310
+ominfra/.manifests.json,sha256=KjKpu0HX2bG8bASAjq9pt9FLAiDYqS1lZ8x-buseoik,589
 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=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/__main__.py,sha256=HXMoxEl9KHhv6zOOPQxiJAftfR2SjBqeVTYw-og9aFw,163
 ominfra/clouds/aws/auth.py,sha256=EW3lK1U0hnjXkTn1KWJeuv9GG0ibbKdvgLD0P6HJtwo,5502
+ominfra/clouds/aws/cli.py,sha256=jCvZIZGLWIkMlb1WYMQ-Gvs4YKPDCiWKjkFTaH9ARMc,517
+ominfra/clouds/aws/metadata.py,sha256=XR1BuMdQheyeFjjA3MN8GCNWVAp5ahoPdbWXEmViutQ,2767
 ominfra/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/deploy/_executor.py,sha256=3mUpHetUu9POcV3nLu8NlVnK4-jzRYHVnnT8uyZPfSA,32506
 ominfra/deploy/configs.py,sha256=qi0kwT7G2NH7dXLOQic-u6R3yeadup_QtvrjwWIggbM,435
@@ -43,9 +46,9 @@ ominfra/tailscale/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ominfra/tailscale/cli.py,sha256=Ltg6RVFsMLLPjLzoGwM6sxjmwjEVEYHAdrqmCc4N1HM,3174
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=L4t5rszm9ulcdWyr7n48_R9d5Etg4S2a4WQhlbHDtnQ,6106
-ominfra-0.0.0.dev58.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev58.dist-info/METADATA,sha256=nQ34Ifyi87uHjVm71dlIWRX6uwlDYOz8Mgc8g1lOOww,799
-ominfra-0.0.0.dev58.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-ominfra-0.0.0.dev58.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev58.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev58.dist-info/RECORD,,
+ominfra-0.0.0.dev60.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev60.dist-info/METADATA,sha256=Az4lEVQxqpAvug6FZRo4kJy57V6qA3MAHotHEYPUp0g,799
+ominfra-0.0.0.dev60.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+ominfra-0.0.0.dev60.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev60.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev60.dist-info/RECORD,,