rpyc-pve-cloud 0.2.0rc0__py3-none-any.whl → 0.2.0rc1__py3-none-any.whl

pve_cloud_rpc/_version.py

@@ -1 +1 @@
-__version__ = "0.2.0-rc0"
+__version__ = "0.2.0-rc1"

pve_cloud_rpc/server.py

@@ -1,22 +1,22 @@
 import asyncio
+import json
 import socket
 import sys
-import json
 
 import asyncssh
 import grpc
 import yaml
 from pve_cloud.cli.pvclu import get_cluster_vars, get_ssh_master_kubeconfig
 from pve_cloud.lib.inventory import *
+from pve_cloud.orm.alchemy import ProxmoxCloudSecrets, VirtualMachineVars
+from sqlalchemy import create_engine, delete, select
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import Session
 
 import pve_cloud_rpc.protos.cloud_pb2 as cloud_pb2
 import pve_cloud_rpc.protos.cloud_pb2_grpc as cloud_pb2_grpc
 import pve_cloud_rpc.protos.health_pb2 as health_pb2
 import pve_cloud_rpc.protos.health_pb2_grpc as health_pb2_grpc
-from pve_cloud.orm.alchemy import ProxmoxCloudSecrets, VirtualMachineVars
-from sqlalchemy import create_engine, select, delete
-from sqlalchemy.orm import Session
-from sqlalchemy.exc import IntegrityError
 
 
 class HealthServicer(health_pb2_grpc.HealthServicer):
@@ -43,15 +43,11 @@ async def get_engine(online_pve_host):
     async with asyncssh.connect(
         online_pve_host, username="root", known_hosts=None
     ) as conn:
-        cmd = await conn.run(
-            "cat /etc/pve/cloud/secrets/patroni.pass", check=True
-        )
+        cmd = await conn.run("cat /etc/pve/cloud/secrets/patroni.pass", check=True)
         patroni_pass = cmd.stdout.rstrip()
 
         # fetch cluster vars to get internal proxy ip
-        cmd = await conn.run(
-            "cat /etc/pve/cloud/cluster_vars.yaml", check=True
-        )
+        cmd = await conn.run("cat /etc/pve/cloud/cluster_vars.yaml", check=True)
         cluster_vars = yaml.safe_load(cmd.stdout)
 
     # build the connection string
@@ -106,7 +102,6 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
 
         return cloud_pb2.GetCloudFileSecretResponse(secret=catted_secret)
 
-
     # non file proxmox cloud secrets are stored in the patroni database
     async def CreateCloudSecret(self, request, context):
         target_pve = request.target_pve
@@ -119,21 +114,24 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
 
         with Session(engine) as session:
             try:
-                session.add(ProxmoxCloudSecrets(
-                    target_pve=target_pve,
-                    secret_name=secret_name,
-                    secret_data=secret_data,
-                    secret_type=secret_type
-                ))
+                session.add(
+                    ProxmoxCloudSecrets(
+                        target_pve=target_pve,
+                        secret_name=secret_name,
+                        secret_data=secret_data,
+                        secret_type=secret_type,
+                    )
+                )
                 session.commit()
-                
+
             except IntegrityError as e:
                 session.rollback()
-                return cloud_pb2.CreateCloudSecretResponse(success=False, err_message=str(e))
+                return cloud_pb2.CreateCloudSecretResponse(
+                    success=False, err_message=str(e)
+                )
 
         return cloud_pb2.CreateCloudSecretResponse(success=True)
 
-
     async def DeleteCloudSecret(self, request, context):
         target_pve = request.target_pve
         secret_name = request.secret_name
@@ -144,15 +142,14 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
         with Session(engine) as session:
             stmt = delete(ProxmoxCloudSecrets).where(
                 ProxmoxCloudSecrets.target_pve == target_pve,
-                ProxmoxCloudSecrets.secret_name == secret_name
+                ProxmoxCloudSecrets.secret_name == secret_name,
             )
-            
+
             result = session.execute(stmt)
             session.commit()
 
         return cloud_pb2.DeleteCloudSecretResponse(success=True)
 
-
     async def GetCloudSecret(self, request, context):
         target_pve = request.target_pve
         secret_name = request.secret_name
@@ -161,7 +158,10 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
         engine = await get_engine(online_pve_host)
 
         with Session(engine) as session:
-            stmt = select(ProxmoxCloudSecrets).where(ProxmoxCloudSecrets.target_pve == target_pve and ProxmoxCloudSecrets.secret_name == secret_name)
+            stmt = select(ProxmoxCloudSecrets).where(
+                ProxmoxCloudSecrets.target_pve == target_pve
+                and ProxmoxCloudSecrets.secret_name == secret_name
+            )
             record = session.scalars(stmt).first()
 
         return cloud_pb2.GetCloudSecretResponse(secret=json.dumps(record.secret_data))
@@ -175,11 +175,17 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
         engine = await get_engine(online_pve_host)
 
         with Session(engine) as session:
-            stmt = select(ProxmoxCloudSecrets).where(ProxmoxCloudSecrets.target_pve == target_pve and ProxmoxCloudSecrets.secret_type == secret_type)
+            stmt = select(ProxmoxCloudSecrets).where(
+                ProxmoxCloudSecrets.target_pve == target_pve,
+                ProxmoxCloudSecrets.secret_type == secret_type,
+            )
             records = session.scalars(stmt).all()
 
-        return cloud_pb2.GetCloudSecretsResponse(secrets=json.dumps({record.secret_name: record.secret_data for record in records}))
-    
+        return cloud_pb2.GetCloudSecretsResponse(
+            secrets=json.dumps(
+                {record.secret_name: record.secret_data for record in records}
+            )
+        )
 
     async def GetVmVarsBlake(self, request, context):
         blake_ids = request.blake_ids
@@ -189,11 +195,16 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
         engine = await get_engine(online_pve_host)
 
         with Session(engine) as session:
-            stmt = select(VirtualMachineVars).where(VirtualMachineVars.blake_id.in_(blake_ids))
+            stmt = select(VirtualMachineVars).where(
+                VirtualMachineVars.blake_id.in_(blake_ids)
+            )
             records = session.scalars(stmt).all()
 
-        return cloud_pb2.GetVmVarsBlakeResponse(blake_id_vars={entry.blake_id: json.dumps(entry.vm_vars) for entry in records})
-
+        return cloud_pb2.GetVmVarsBlakeResponse(
+            blake_id_vars={
+                entry.blake_id: json.dumps(entry.vm_vars) for entry in records
+            }
+        )
 
     async def GetCephAccess(self, request, context):
         target_pve = request.target_pve
@@ -242,7 +253,9 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
         ) as conn:
             args_string = None
             if request.get_args:
-                args_string = " ".join(f"{k} '{v}'" for k, v in request.get_args.items())
+                args_string = " ".join(
+                    f"{k} '{v}'" for k, v in request.get_args.items()
+                )
 
             cmd = await conn.run(
                 f"pvesh get {request.api_path} {args_string} --output-format json",
@@ -261,7 +274,9 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
         ) as conn:
             args_string = None
             if request.create_args:
-                args_string = " ".join(f"{k} '{v}'" for k, v in request.create_args.items())
+                args_string = " ".join(
+                    f"{k} '{v}'" for k, v in request.create_args.items()
+                )
             try:
                 print(f"pvesh create {request.api_path} {args_string}")
                 cmd = await conn.run(
@@ -270,7 +285,9 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
                 )
                 print(cmd.stdout)
             except asyncssh.ProcessError as e:
-                return cloud_pb2.CreateProxmoxApiResponse(success=False, err_message=f"Exit code {e.exit_status} - {e.stderr}")
+                return cloud_pb2.CreateProxmoxApiResponse(
+                    success=False, err_message=f"Exit code {e.exit_status} - {e.stderr}"
+                )
 
         return cloud_pb2.CreateProxmoxApiResponse(success=True)
 
@@ -288,7 +305,9 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
                 )
                 print(cmd.stdout)
             except asyncssh.ProcessError as e:
-                return cloud_pb2.DeleteProxmoxApiResponse(success=False, err_message=f"Exit code {e.exit_status} - {e.stderr}")
+                return cloud_pb2.DeleteProxmoxApiResponse(
+                    success=False, err_message=f"Exit code {e.exit_status} - {e.stderr}"
+                )
 
         return cloud_pb2.DeleteProxmoxApiResponse(success=True)
 
@@ -308,6 +327,7 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
             inventory=yaml.safe_dump(pve_inventory), cloud_domain=cloud_domain
         )
 
+
 def is_port_bound(port, host="0.0.0.0"):
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)

{rpyc_pve_cloud-0.2.0rc0.dist-info → rpyc_pve_cloud-0.2.0rc1.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: rpyc-pve-cloud
-Version: 0.2.0rc0
+Version: 0.2.0rc1
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE.md
-Requires-Dist: py-pve-cloud==0.15.0rc0
+Requires-Dist: py-pve-cloud==0.15.0rc1
 Requires-Dist: grpcio==1.76.0
 Requires-Dist: asyncssh==2.22.0
 Requires-Dist: protobuf==6.33.4

rpyc_pve_cloud-0.2.0rc1.dist-info/RECORD

@@ -0,0 +1,12 @@
+pve_cloud_rpc/_version.py,sha256=4B6W4wFobVYBGfy-G_6ZpAcAFt9qJZfdNmpeTpnSLDM,26
+pve_cloud_rpc/server.py,sha256=L7gJouzFHOd22yJeBtFoaN1zUkxKfe9Qe00CmMOrPuk,13577
+pve_cloud_rpc/protos/cloud_pb2.py,sha256=2FFa9SSpkdSD1ie_NiAGFGjz92yx028DhEALJazCIdE,11237
+pve_cloud_rpc/protos/cloud_pb2_grpc.py,sha256=V-q4n-dI0nstsuHZLbNyaxk4-3jU8aTWqbeFR8p5SDk,27826
+pve_cloud_rpc/protos/health_pb2.py,sha256=532OgHM0bPu6uyJNyYETlRJp9BzcCZ53fnrRtEu7bnA,2188
+pve_cloud_rpc/protos/health_pb2_grpc.py,sha256=XXT8lsH8YgKLqn07YfigSQ6TNW6s-P4V6S-X69fLfh0,3368
+rpyc_pve_cloud-0.2.0rc1.dist-info/licenses/LICENSE.md,sha256=ADUqsZhl4juwq34PRTMiBqumpm11s_PMli_dZQjWPqQ,34260
+rpyc_pve_cloud-0.2.0rc1.dist-info/METADATA,sha256=FXjGvqqwx9_xxzl4WFY0ULNVsLnyiz40OdPiHDuRv7I,338
+rpyc_pve_cloud-0.2.0rc1.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+rpyc_pve_cloud-0.2.0rc1.dist-info/entry_points.txt,sha256=h4ytTryc_8IlySP_ICyy6srHzF71qrQ0noUhqI-3aGw,52
+rpyc_pve_cloud-0.2.0rc1.dist-info/top_level.txt,sha256=CTGM4RRp33khtroUiv-RiYXI4h6W6AaQQGIvsbwAetM,14
+rpyc_pve_cloud-0.2.0rc1.dist-info/RECORD,,

rpyc_pve_cloud-0.2.0rc0.dist-info/RECORD

@@ -1,12 +0,0 @@
-pve_cloud_rpc/_version.py,sha256=W0Nz2M74b-kThgrTvkhrB8zIno6lQEZG0KXlqDMEO3k,26
-pve_cloud_rpc/server.py,sha256=5aqTe7nyoBS5TIIFh2HAm1I3s8p7Zjr4VH7xBZrcaSQ,13183
-pve_cloud_rpc/protos/cloud_pb2.py,sha256=2FFa9SSpkdSD1ie_NiAGFGjz92yx028DhEALJazCIdE,11237
-pve_cloud_rpc/protos/cloud_pb2_grpc.py,sha256=V-q4n-dI0nstsuHZLbNyaxk4-3jU8aTWqbeFR8p5SDk,27826
-pve_cloud_rpc/protos/health_pb2.py,sha256=532OgHM0bPu6uyJNyYETlRJp9BzcCZ53fnrRtEu7bnA,2188
-pve_cloud_rpc/protos/health_pb2_grpc.py,sha256=XXT8lsH8YgKLqn07YfigSQ6TNW6s-P4V6S-X69fLfh0,3368
-rpyc_pve_cloud-0.2.0rc0.dist-info/licenses/LICENSE.md,sha256=ADUqsZhl4juwq34PRTMiBqumpm11s_PMli_dZQjWPqQ,34260
-rpyc_pve_cloud-0.2.0rc0.dist-info/METADATA,sha256=GR-y-u1pxB_Gdekwwy9mnW1ZpVU8l5_bExDtbU_is4I,338
-rpyc_pve_cloud-0.2.0rc0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-rpyc_pve_cloud-0.2.0rc0.dist-info/entry_points.txt,sha256=h4ytTryc_8IlySP_ICyy6srHzF71qrQ0noUhqI-3aGw,52
-rpyc_pve_cloud-0.2.0rc0.dist-info/top_level.txt,sha256=CTGM4RRp33khtroUiv-RiYXI4h6W6AaQQGIvsbwAetM,14
-rpyc_pve_cloud-0.2.0rc0.dist-info/RECORD,,