diff --git a/perxis/extensions/bootstrap.py b/perxis/extensions/bootstrap.py index 413b5597f9241e721021f92fb21a3909e104fdde..f6da807ccac71673561004b3dc1eb10a27249d06 100644 --- a/perxis/extensions/bootstrap.py +++ b/perxis/extensions/bootstrap.py @@ -21,24 +21,23 @@ async def _main( ext_manager_host: str, content_host: str ): + metadata = grpc.aio.Metadata( + ('x-perxis-access', 'system'), + ) + @aiocron.crontab('* * * * *', start=False) async def register_extension(): await ext_manager_stub.RegisterExtensions(manager_pb2.RegisterExtensionsRequest( extensions=[ext_descriptor] - )) + ), metadata=metadata) logger.info(f"Расширение {ext_descriptor.extension} зарегистрировано в perxis") - interceptor = header_adder_interceptor( - 'x-perxis-access', 'system' - ) - async with grpc.aio.insecure_channel(ext_manager_host) as extensions_manager_channel: - intercept_channel_extensions_manager_channel = grpc.intercept_channel(extensions_manager_channel, interceptor) - ext_manager_stub = manager_pb2_grpc.ExtensionManagerStub(intercept_channel_extensions_manager_channel) + ext_manager_stub = manager_pb2_grpc.ExtensionManagerStub(extensions_manager_channel) registered_extensions: manager_pb2.ListExtensionsResponse = await ext_manager_stub.ListExtensions( - manager_pb2.ListExtensionsRequest() + manager_pb2.ListExtensionsRequest(), metadata=metadata ) # todo enable after fix - https://tracker.yandex.ru/PRXS-1507 @@ -58,12 +57,11 @@ async def _main( register_extension.start() async with grpc.aio.insecure_channel(content_host) as content_channel: - intercepted_content_channel = grpc.intercept_channel(content_channel, interceptor) - collections_stub = collections_pb2_grpc.CollectionsStub(intercepted_content_channel) - roles_stub = roles_pb2_grpc.RolesStub(intercepted_content_channel) - clients_stub = clients_pb2_grpc.ClientsStub(intercepted_content_channel) - environments_stub = environments_pb2_grpc.EnvironmentsStub(intercepted_content_channel) + collections_stub = collections_pb2_grpc.CollectionsStub(content_channel) + roles_stub = roles_pb2_grpc.RolesStub(content_channel) + clients_stub = clients_pb2_grpc.ClientsStub(content_channel) + environments_stub = environments_pb2_grpc.EnvironmentsStub(content_channel) server = grpc.aio.server(futures.ThreadPoolExecutor(max_workers=10)) await extension_pb2_grpc.add_ExtensionServicer_to_server( diff --git a/setup.py b/setup.py index 0d17b14076562258a37906459fde1a3012cb1ac2..c418b7936e31c7b7459baee1c62748282e28cac7 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ def load_requirements(): setup( name='perxis', - version='1.0.7', + version='1.0.8', description='Perxis python client', long_description=long_description, long_description_content_type='text/markdown',