ominfra 0.0.0.dev58__tar.gz → 0.0.0.dev60__tar.gz

{ominfra-0.0.0.dev58/ominfra.egg-info → ominfra-0.0.0.dev60}/PKG-INFO

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

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

@@ -15,7 +15,10 @@ ominfra.egg-info/requires.txt
 ominfra.egg-info/top_level.txt
 ominfra/clouds/__init__.py
 ominfra/clouds/aws/__init__.py
+ominfra/clouds/aws/__main__.py
 ominfra/clouds/aws/auth.py
+ominfra/clouds/aws/cli.py
+ominfra/clouds/aws/metadata.py
 ominfra/deploy/__init__.py
 ominfra/deploy/_executor.py
 ominfra/deploy/configs.py

{ominfra-0.0.0.dev58 → ominfra-0.0.0.dev60}/ominfra.egg-info/requires.txt

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

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