From 8f458cefab0a0e6514f9d0e1f5e8353da9114570 Mon Sep 17 00:00:00 2001 From: Timofey Koolin Date: Mon, 3 Apr 2023 08:45:26 +0300 Subject: [PATCH 1/2] add metadata as default cred --- ydb/driver.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ydb/driver.py b/ydb/driver.py index a245563f..380ba59e 100644 --- a/ydb/driver.py +++ b/ydb/driver.py @@ -3,6 +3,7 @@ from . import tracing import os import grpc +from . import iam from . import _utilities from typing import Any # noqa @@ -45,16 +46,19 @@ def credentials_from_env_variables(tracer=None): metadata_credentials = os.getenv("YDB_METADATA_CREDENTIALS", "0") == "1" if metadata_credentials: ctx.trace({"credentials.metadata": True}) - import ydb.iam - return ydb.iam.MetadataUrlCredentials(tracer=tracer) + return iam.MetadataUrlCredentials(tracer=tracer) access_token = os.getenv("YDB_ACCESS_TOKEN_CREDENTIALS") if access_token is not None: ctx.trace({"credentials.access_token": True}) return credentials_impl.AuthTokenCredentials(access_token) - return default_credentials(None, tracer) + ctx.trace({ + "credentials.env_default": True, + "credentials.metadata": True, + }) + return iam.MetadataUrlCredentials(tracer=tracer) class DriverConfig(object): From d52e808a9cdf9738a4709b2bd210da5885e7d9a6 Mon Sep 17 00:00:00 2001 From: Timofey Koolin Date: Mon, 3 Apr 2023 09:27:52 +0300 Subject: [PATCH 2/2] fix format --- ydb/driver.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ydb/driver.py b/ydb/driver.py index 380ba59e..89109b9b 100644 --- a/ydb/driver.py +++ b/ydb/driver.py @@ -54,10 +54,12 @@ def credentials_from_env_variables(tracer=None): ctx.trace({"credentials.access_token": True}) return credentials_impl.AuthTokenCredentials(access_token) - ctx.trace({ - "credentials.env_default": True, - "credentials.metadata": True, - }) + ctx.trace( + { + "credentials.env_default": True, + "credentials.metadata": True, + } + ) return iam.MetadataUrlCredentials(tracer=tracer)