Skip to content

Commit f71a524

Browse files
authored
Merge pull request #270 Use metadata as default credentials in credentials_from_env_variables
2 parents b41e3e2 + d52e808 commit f71a524

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

ydb/driver.py

+9-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from . import tracing
44
import os
55
import grpc
6+
from . import iam
67
from . import _utilities
78

89
from typing import Any # noqa
@@ -45,16 +46,21 @@ def credentials_from_env_variables(tracer=None):
4546
metadata_credentials = os.getenv("YDB_METADATA_CREDENTIALS", "0") == "1"
4647
if metadata_credentials:
4748
ctx.trace({"credentials.metadata": True})
48-
import ydb.iam
4949

50-
return ydb.iam.MetadataUrlCredentials(tracer=tracer)
50+
return iam.MetadataUrlCredentials(tracer=tracer)
5151

5252
access_token = os.getenv("YDB_ACCESS_TOKEN_CREDENTIALS")
5353
if access_token is not None:
5454
ctx.trace({"credentials.access_token": True})
5555
return credentials_impl.AuthTokenCredentials(access_token)
5656

57-
return default_credentials(None, tracer)
57+
ctx.trace(
58+
{
59+
"credentials.env_default": True,
60+
"credentials.metadata": True,
61+
}
62+
)
63+
return iam.MetadataUrlCredentials(tracer=tracer)
5864

5965

6066
class DriverConfig(object):

0 commit comments

Comments
 (0)