rpyc-pve-cloud 0.0.31__py3-none-any.whl → 0.0.33__py3-none-any.whl

pve_cloud_rpc/_version.py

@@ -1 +1 @@
-__version__ = "0.0.31"
+__version__ = "0.0.33"

pve_cloud_rpc/protos/cloud_pb2.py

@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE

pve_cloud_rpc/protos/cloud_pb2_grpc.py

@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc

pve_cloud_rpc/protos/health_pb2.py

@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
@@ -27,7 +24,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0chealth.proto\x12\x06protos\"%\n\x12HealthCheckRequest\x12\x0f\n\x07service\x18\x01 \x01(\t\"\xa1\x01\n\x13HealthCheckResponse\x12\x39\n\x06status\x18\x01 \x01(\x0e\x32).protos.HealthCheckResponse.ServingStatus\"O\n\rServingStatus\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07SERVING\x10\x01\x12\x0f\n\x0bNOT_SERVING\x10\x02\x12\x13\n\x0fSERVICE_UNKNOWN\x10\x03\x32J\n\x06Health\x12@\n\x05\x43heck\x12\x1a.protos.HealthCheckRequest\x1a\x1b.protos.HealthCheckResponseBQZOgithub.com/Proxmox-Cloud/terraform-provider-pxc/internal/provider/protos;protosb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0chealth.proto\x12\x06protos\"(\n\x12HealthCheckRequest\x12\x12\n\ntarget_pve\x18\x01 \x01(\t\"\x94\x01\n\x13HealthCheckResponse\x12\x39\n\x06status\x18\x01 \x01(\x0e\x32).protos.HealthCheckResponse.ServingStatus\x12\x15\n\rerror_message\x18\x02 \x01(\t\"+\n\rServingStatus\x12\x0b\n\x07SERVING\x10\x00\x12\r\n\tMISSMATCH\x10\x01\x32J\n\x06Health\x12@\n\x05\x43heck\x12\x1a.protos.HealthCheckRequest\x1a\x1b.protos.HealthCheckResponseBQZOgithub.com/Proxmox-Cloud/terraform-provider-pxc/internal/provider/protos;protosb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -36,11 +33,11 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
   _globals['DESCRIPTOR']._serialized_options = b'ZOgithub.com/Proxmox-Cloud/terraform-provider-pxc/internal/provider/protos;protos'
   _globals['_HEALTHCHECKREQUEST']._serialized_start=24
-  _globals['_HEALTHCHECKREQUEST']._serialized_end=61
-  _globals['_HEALTHCHECKRESPONSE']._serialized_start=64
-  _globals['_HEALTHCHECKRESPONSE']._serialized_end=225
-  _globals['_HEALTHCHECKRESPONSE_SERVINGSTATUS']._serialized_start=146
-  _globals['_HEALTHCHECKRESPONSE_SERVINGSTATUS']._serialized_end=225
-  _globals['_HEALTH']._serialized_start=227
-  _globals['_HEALTH']._serialized_end=301
+  _globals['_HEALTHCHECKREQUEST']._serialized_end=64
+  _globals['_HEALTHCHECKRESPONSE']._serialized_start=67
+  _globals['_HEALTHCHECKRESPONSE']._serialized_end=215
+  _globals['_HEALTHCHECKRESPONSE_SERVINGSTATUS']._serialized_start=172
+  _globals['_HEALTHCHECKRESPONSE_SERVINGSTATUS']._serialized_end=215
+  _globals['_HEALTH']._serialized_start=217
+  _globals['_HEALTH']._serialized_end=291
 # @@protoc_insertion_point(module_scope)

pve_cloud_rpc/protos/health_pb2_grpc.py

@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc

pve_cloud_rpc/server.py

@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 import asyncio, asyncssh
 import grpc
 import pve_cloud_rpc.protos.cloud_pb2 as cloud_pb2
@@ -15,17 +12,16 @@ import sys
 
 
 class HealthServicer(health_pb2_grpc.HealthServicer):
-    def __init__(self):
-        self._statuses = {}
 
+    # this also performs the py-pve-cloud version check to not run against incompatible
+    # installed proxmox cloud versions
     async def Check(self, request, context):
-        service_name = request.service or ""
-        status = self._statuses.get(service_name, health_pb2.HealthCheckResponse.UNKNOWN)
-        print(f"Health Check request for service '{service_name}', returning {status}")
-        return health_pb2.HealthCheckResponse(status=status)
-
-    def set_status(self, service_name: str, status: health_pb2.HealthCheckResponse.ServingStatus):
-        self._statuses[service_name] = status
+        target_pve = request.target_pve
+        try:
+            get_online_pve_host(target_pve, skip_py_cloud_check=False) # actually perform the check
+            return health_pb2.HealthCheckResponse(status=health_pb2.HealthCheckResponse.SERVING)
+        except RuntimeError as e:
+            return health_pb2.HealthCheckResponse(status=health_pb2.HealthCheckResponse.MISSMATCH, error_message=f"py-pve-cloud version check failed with: {e}") # go provider process will kill
 
 
 class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
@@ -139,21 +135,12 @@ async def serve():
 
     health_servicer = HealthServicer()
     health_pb2_grpc.add_HealthServicer_to_server(health_servicer, server)
-
-    # if is_port_bound(50052): # google quirks nice
-    #     raise RuntimeError("PCRPC Already running / unclean shutdown!")
     
     socket_file = f"/tmp/pc-rpc-{sys.argv[1]}.sock"
 
-    # listen_addr = "[::]:50052"
     server.add_insecure_port(f"unix://{socket_file}") 
     await server.start()
 
-    health_servicer.set_status(
-        "",  # empty = overall server health
-        health_pb2.HealthCheckResponse.SERVING
-    )
-    # print(f"gRPC AsyncIO server running on {listen_addr}")
     print(f"gRPC AsyncIO server running on {socket_file}")
     try:
         await server.wait_for_termination()
@@ -167,6 +154,5 @@ async def serve():
             os.remove(socket_file)
 
 
-
 def main():
     asyncio.run(serve())

{rpyc_pve_cloud-0.0.31.dist-info → rpyc_pve_cloud-0.0.33.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: rpyc-pve-cloud
-Version: 0.0.31
+Version: 0.0.33
 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.14.0,>=0.13.12
+Requires-Dist: py-pve-cloud<0.14.0,>=0.13.14
 Requires-Dist: grpcio==1.76.0
 Requires-Dist: asyncssh==2.21.0
 Requires-Dist: protobuf==6.33.2

rpyc_pve_cloud-0.0.33.dist-info/RECORD

@@ -0,0 +1,12 @@
+pve_cloud_rpc/_version.py,sha256=AGWXI5DVsNfiiV5VgHNNK08ZPMOHqnJB3xLlEoyC3hg,23
+pve_cloud_rpc/server.py,sha256=0UMKGkT-HNEnx5rULEl5vRA0HtKMeLv3k7Apb7iUExQ,6209
+pve_cloud_rpc/protos/cloud_pb2.py,sha256=8w_hu6psK9ooFbqPCGeTY398XbntH61I3b3k4jvQTcg,6133
+pve_cloud_rpc/protos/cloud_pb2_grpc.py,sha256=FOC_MXEZkXe32dzxQua9zHBLWLjso1X-xqj0xTexfFg,15535
+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.0.33.dist-info/licenses/LICENSE.md,sha256=ADUqsZhl4juwq34PRTMiBqumpm11s_PMli_dZQjWPqQ,34260
+rpyc_pve_cloud-0.0.33.dist-info/METADATA,sha256=EhVUHkGBXCaMYbQ_mOjcQSWclQOnjFUDZ5JCbZJqyN0,342
+rpyc_pve_cloud-0.0.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rpyc_pve_cloud-0.0.33.dist-info/entry_points.txt,sha256=h4ytTryc_8IlySP_ICyy6srHzF71qrQ0noUhqI-3aGw,52
+rpyc_pve_cloud-0.0.33.dist-info/top_level.txt,sha256=CTGM4RRp33khtroUiv-RiYXI4h6W6AaQQGIvsbwAetM,14
+rpyc_pve_cloud-0.0.33.dist-info/RECORD,,

rpyc_pve_cloud-0.0.31.dist-info/RECORD

@@ -1,12 +0,0 @@
-pve_cloud_rpc/_version.py,sha256=YRrMDApG1V6fNZdI4BA631DmsqtamSXgI1yu0tnt4h0,23
-pve_cloud_rpc/server.py,sha256=oZWZYAwQl8eCd4qHH0u7k11lVkPPdtcZrtjdArgh3vg,6507
-pve_cloud_rpc/protos/cloud_pb2.py,sha256=O1DXdbm0KSG7Nose6XWfCz9VU2ujW0uK2CTwgFuuQA0,6201
-pve_cloud_rpc/protos/cloud_pb2_grpc.py,sha256=mDHCc8Sc-dGhISEUchfmJI74rISbdysNUzkDhOyTQ8I,15603
-pve_cloud_rpc/protos/health_pb2.py,sha256=t_Xinf3sAzzY-NL9g1LKFfnw2v7XhsEJ8mrKRhQLcEw,2286
-pve_cloud_rpc/protos/health_pb2_grpc.py,sha256=h4NndEaW_Em92bktRkL1VqT_WIVqfifQg_SVbAOYjfc,3436
-rpyc_pve_cloud-0.0.31.dist-info/licenses/LICENSE.md,sha256=ADUqsZhl4juwq34PRTMiBqumpm11s_PMli_dZQjWPqQ,34260
-rpyc_pve_cloud-0.0.31.dist-info/METADATA,sha256=bimPX54aYJQG_EvRLIaYDKZ2GIhPz5qvGPrF0y1TzaA,342
-rpyc_pve_cloud-0.0.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rpyc_pve_cloud-0.0.31.dist-info/entry_points.txt,sha256=h4ytTryc_8IlySP_ICyy6srHzF71qrQ0noUhqI-3aGw,52
-rpyc_pve_cloud-0.0.31.dist-info/top_level.txt,sha256=CTGM4RRp33khtroUiv-RiYXI4h6W6AaQQGIvsbwAetM,14
-rpyc_pve_cloud-0.0.31.dist-info/RECORD,,