From ae061e80b2adcf4e71c8b85811cc1f1b9d26fb20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3?= <150132506+iddqdex@users.noreply.github.com> Date: Sat, 5 Apr 2025 07:08:36 +0300 Subject: [PATCH 1/4] fix deprecation warning in auth.py --- ydb/iam/auth.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ydb/iam/auth.py b/ydb/iam/auth.py index c4096c09..9804930e 100644 --- a/ydb/iam/auth.py +++ b/ydb/iam/auth.py @@ -43,8 +43,8 @@ def get_jwt(account_id, access_key_id, private_key, jwt_expiration_timeout, algorithm, token_service_url, subject=None): assert jwt is not None, "Install pyjwt library to use jwt tokens" now = time.time() - now_utc = datetime.utcfromtimestamp(now) - exp_utc = datetime.utcfromtimestamp(now + jwt_expiration_timeout) + now_utc = datetime.fromtimestamp(now, datetime.UTC) + exp_utc = datetime.fromtimestamp(now + jwt_expiration_timeout, datetime.UTC) payload = { "iss": account_id, "aud": token_service_url, From dce017f5913694a09dd2ce7f0f610953a69383f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3?= <150132506+iddqdex@users.noreply.github.com> Date: Sat, 5 Apr 2025 07:36:22 +0300 Subject: [PATCH 2/4] fix import --- ydb/iam/auth.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ydb/iam/auth.py b/ydb/iam/auth.py index 9804930e..3197c861 100644 --- a/ydb/iam/auth.py +++ b/ydb/iam/auth.py @@ -3,7 +3,7 @@ import grpc import time import abc -from datetime import datetime +from datetime import datetime, UTC import json import os @@ -43,8 +43,8 @@ def get_jwt(account_id, access_key_id, private_key, jwt_expiration_timeout, algorithm, token_service_url, subject=None): assert jwt is not None, "Install pyjwt library to use jwt tokens" now = time.time() - now_utc = datetime.fromtimestamp(now, datetime.UTC) - exp_utc = datetime.fromtimestamp(now + jwt_expiration_timeout, datetime.UTC) + now_utc = datetime.fromtimestamp(now, UTC) + exp_utc = datetime.fromtimestamp(now + jwt_expiration_timeout, UTC) payload = { "iss": account_id, "aud": token_service_url, From 9d6d9a9c7215c9bec7461bd160b6ce2adf2db63f Mon Sep 17 00:00:00 2001 From: Oleg Geller Date: Sat, 5 Apr 2025 07:44:51 +0300 Subject: [PATCH 3/4] fix --- ydb/iam/auth.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ydb/iam/auth.py b/ydb/iam/auth.py index 3197c861..4e8f6051 100644 --- a/ydb/iam/auth.py +++ b/ydb/iam/auth.py @@ -3,7 +3,7 @@ import grpc import time import abc -from datetime import datetime, UTC +import datetime import json import os @@ -43,8 +43,8 @@ def get_jwt(account_id, access_key_id, private_key, jwt_expiration_timeout, algorithm, token_service_url, subject=None): assert jwt is not None, "Install pyjwt library to use jwt tokens" now = time.time() - now_utc = datetime.fromtimestamp(now, UTC) - exp_utc = datetime.fromtimestamp(now + jwt_expiration_timeout, UTC) + now_utc = datetime.datetime.fromtimestamp(now, datetime.UTC) + exp_utc = datetime.datetime.fromtimestamp(now + jwt_expiration_timeout, datetime.UTC) payload = { "iss": account_id, "aud": token_service_url, From c7c5129409698add84ce35e7fe5e5d30cc87ac67 Mon Sep 17 00:00:00 2001 From: Oleg Geller Date: Sat, 5 Apr 2025 08:00:17 +0300 Subject: [PATCH 4/4] fix for old python --- ydb/iam/auth.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ydb/iam/auth.py b/ydb/iam/auth.py index 4e8f6051..688deded 100644 --- a/ydb/iam/auth.py +++ b/ydb/iam/auth.py @@ -3,7 +3,7 @@ import grpc import time import abc -import datetime +from datetime import datetime, timezone import json import os @@ -43,8 +43,8 @@ def get_jwt(account_id, access_key_id, private_key, jwt_expiration_timeout, algorithm, token_service_url, subject=None): assert jwt is not None, "Install pyjwt library to use jwt tokens" now = time.time() - now_utc = datetime.datetime.fromtimestamp(now, datetime.UTC) - exp_utc = datetime.datetime.fromtimestamp(now + jwt_expiration_timeout, datetime.UTC) + now_utc = datetime.fromtimestamp(now, timezone.utc) + exp_utc = datetime.fromtimestamp(now + jwt_expiration_timeout, timezone.utc) payload = { "iss": account_id, "aud": token_service_url,