diff --git a/requirements.txt b/requirements.txt index abbd0460f..e410c7f11 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,8 +48,8 @@ urllib3==1.26.* azure-mgmt-rdbms==10.1.0 azure-mgmt-resource==23.0.1 azure-mgmt-subscription==3.1.1 -azure-identity==1.13.0 +azure-identity==1.15.0 google-api-python-client==2.* -google-auth-oauthlib==1.0.0 +google-auth-oauthlib==1.1.0 Werkzeug==2.2.3 keyring==23.* diff --git a/web/pgacloud/providers/azure.py b/web/pgacloud/providers/azure.py index c38fe2fc9..4ef212b44 100644 --- a/web/pgacloud/providers/azure.py +++ b/web/pgacloud/providers/azure.py @@ -24,7 +24,7 @@ import sys CURRENT_PATH = os.path.dirname(os.path.realpath(__file__)) root = os.path.dirname(os.path.dirname(CURRENT_PATH)) sys.path.insert(0, root) -from pgadmin.misc.cloud.azure.azure_cache import load_persistent_cache, \ +from utils.azure_cache import load_persistent_cache, \ TokenCachePersistenceOptions diff --git a/web/pgadmin/misc/cloud/azure/azure_cache.py b/web/pgacloud/utils/azure_cache.py similarity index 100% rename from web/pgadmin/misc/cloud/azure/azure_cache.py rename to web/pgacloud/utils/azure_cache.py diff --git a/web/pgadmin/misc/cloud/azure/__init__.py b/web/pgadmin/misc/cloud/azure/__init__.py index 4f7f8a183..fb64b7fca 100644 --- a/web/pgadmin/misc/cloud/azure/__init__.py +++ b/web/pgadmin/misc/cloud/azure/__init__.py @@ -19,7 +19,8 @@ import json from flask import session, current_app, request from flask_login import current_user from config import root -from .azure_cache import load_persistent_cache, TokenCachePersistenceOptions +from pgacloud.utils.azure_cache import load_persistent_cache, \ + TokenCachePersistenceOptions import os