ominfra 0.0.0.dev50__tar.gz → 0.0.0.dev52__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev50
+Version: 0.0.0.dev52
 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.dev50
-Requires-Dist: omlish==0.0.0.dev50
+Requires-Dist: omdev==0.0.0.dev52
+Requires-Dist: omlish==0.0.0.dev52
 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.dev50 → ominfra-0.0.0.dev52}/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-0.0.0.dev50 → ominfra-0.0.0.dev52}/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.dev50 → ominfra-0.0.0.dev52/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev50
+Version: 0.0.0.dev52
 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.dev50
-Requires-Dist: omlish==0.0.0.dev50
+Requires-Dist: omdev==0.0.0.dev52
+Requires-Dist: omlish==0.0.0.dev52
 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.dev50 → ominfra-0.0.0.dev52}/ominfra.egg-info/requires.txt

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

{ominfra-0.0.0.dev50 → ominfra-0.0.0.dev52}/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.dev50'
+version = '0.0.0.dev52'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev50',
-    'omlish == 0.0.0.dev50',
+    'omdev == 0.0.0.dev52',
+    'omlish == 0.0.0.dev52',
 ]
 
 [project.optional-dependencies]
@@ -56,6 +56,7 @@ exclude = [
     '*.c',
     '*.cc',
     '*.cu',
+    '*.g4',
     '*.h',
     '.manifests.json',
     'LICENSE',