Commit 6c133675 by Oleksandr Barabash

hotfixes

parent bf693ab9
......@@ -161,20 +161,25 @@ async def v1_health_check(_request: Request) -> Response:
container = None
try:
container = await COSMOS_CLIENT.get_conversations_container()
key = await KEY_VAULT_CLIENT.get_random_key()
data = await KEY_VAULT_CLIENT.get_secret("adminLogin")
return Response(body=json.dumps(dict(data=data)),
status=HTTPStatus.OK,
content_type="application/json")
except Exception as e:
Log.e(TAG, "v1_health_check::error", e)
if key is None:
return Response(
status=HTTPStatus.INTERNAL_SERVER_ERROR,
body=json.dumps({"error": "Can't connect to KeyVault"})
body=json.dumps({"error": "Can't connect to KeyVault"}),
content_type="application/json"
)
if container is None:
return Response(
status=HTTPStatus.INTERNAL_SERVER_ERROR,
body=json.dumps({"error": "Can't connect to CosmosDB"})
body=json.dumps({"error": "Can't connect to CosmosDB"}),
content_type="application/json"
)
return Response(status=HTTPStatus.OK)
return Response(status=HTTPStatus.OK, content_type="application/json")
@web.middleware
......
......@@ -27,12 +27,21 @@ class AzureKeyVaultClient:
self.credential = ManagedIdentityCredential(client_id=client_id)
self.key_client = KeyClient(vault_url=self.key_vault_uri,
credential=self.credential)
self.secret_client = SecretClient(vault_url=self.key_vault_uri,
credential=self.credential)
async def execute_blocking(self, bl, *args):
""" Execute blocking code """
return await asyncio.get_event_loop().run_in_executor(self.executor,
bl,
*args)
return await self.io_loop.run_in_executor(self.executor, bl, *args)
def set_secret(self, name: str, value: str) -> Awaitable["KeyVaultSecret"]:
""" Async set secret """
return self.execute_blocking(self.secret_client.set_secret, name,
value)
def get_secret(self, name: str) -> Awaitable["KeyVaultSecret"]:
""" Async get secret """
return self.execute_blocking(self.secret_client.get_secret, name)
def get_key(self, name: str) -> Awaitable["KeyVaultKey"]:
""" Async get key """
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment