From 864f4926eaf5e2804f7396edc7424dd5808fe5a6 Mon Sep 17 00:00:00 2001 From: Yishi Wang Date: Thu, 6 Feb 2025 13:21:18 +0800 Subject: [PATCH 1/4] Upgrade azure-datalake-store from track1 to track2 --- src/azure-cli/requirements.py3.Darwin.txt | 2 +- src/azure-cli/requirements.py3.Linux.txt | 2 +- src/azure-cli/requirements.py3.windows.txt | 2 +- src/azure-cli/setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index fadbba89033..ba04fd8e02a 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -11,7 +11,7 @@ azure-common==1.1.22 azure-core==1.31.0 azure-cosmos==3.2.0 azure-data-tables==12.4.0 -azure-datalake-store==0.0.53 +azure-datalake-store==1.0.0a0 azure-keyvault-administration==4.4.0b2 azure-keyvault-certificates==4.7.0 azure-keyvault-keys==4.9.0b3 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index e0dacb5b676..7e0a8e26c2c 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -11,7 +11,7 @@ azure-common==1.1.22 azure-core==1.31.0 azure-cosmos==3.2.0 azure-data-tables==12.4.0 -azure-datalake-store==0.0.53 +azure-datalake-store==1.0.0a0 azure-keyvault-administration==4.4.0b2 azure-keyvault-certificates==4.7.0 azure-keyvault-keys==4.9.0b3 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 1e3b441648e..9f5f286167b 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -11,7 +11,7 @@ azure-common==1.1.22 azure-core==1.31.0 azure-cosmos==3.2.0 azure-data-tables==12.4.0 -azure-datalake-store==0.0.53 +azure-datalake-store==1.0.0a0 azure-keyvault-administration==4.4.0b2 azure-keyvault-certificates==4.7.0 azure-keyvault-keys==4.9.0b3 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index a6ab8fa9471..5d06af6ae05 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -56,7 +56,7 @@ 'azure-cli-core=={}'.format(VERSION), 'azure-cosmos~=3.0,>=3.0.2', 'azure-data-tables==12.4.0', - 'azure-datalake-store~=0.0.53', + 'azure-datalake-store~=1.0.0a0', 'azure-keyvault-administration==4.4.0b2', 'azure-keyvault-certificates==4.7.0', 'azure-keyvault-keys==4.9.0b3', From 07fb3b80477f0d756b3d993cb2de1920ae891584 Mon Sep 17 00:00:00 2001 From: Yishi Wang Date: Thu, 6 Feb 2025 13:32:22 +0800 Subject: [PATCH 2/4] refine code --- src/azure-cli/azure/cli/command_modules/dls/_client_factory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py b/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py index 5c739ee76ab..962dcf41557 100644 --- a/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py +++ b/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py @@ -32,6 +32,6 @@ def cf_dls_filesystem(cli_ctx, account_name): subscription_id=subscription_id, resource=cli_ctx.cloud.endpoints.active_directory_data_lake_resource_id) return core.AzureDLFileSystem( - token=cred, + token_credential=cred, store_name=account_name, url_suffix=cli_ctx.cloud.suffixes.azure_datalake_store_file_system_endpoint) From 8236fc76918eda49d89251f88d4d894f56b63b99 Mon Sep 17 00:00:00 2001 From: Yishi Wang Date: Thu, 6 Feb 2025 13:35:50 +0800 Subject: [PATCH 3/4] remove unused argument --- .../azure/cli/command_modules/dls/_client_factory.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py b/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py index 962dcf41557..dbcf384dccd 100644 --- a/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py +++ b/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py @@ -26,11 +26,7 @@ def cf_dls_filesystem(cli_ctx, account_name): from azure.datalake.store import core from azure.cli.core._profile import Profile - profile = Profile(cli_ctx=cli_ctx) - subscription_id = None - cred, subscription_id, _ = profile.get_login_credentials( - subscription_id=subscription_id, - resource=cli_ctx.cloud.endpoints.active_directory_data_lake_resource_id) + cred = Profile(cli_ctx=cli_ctx).get_login_credentials() return core.AzureDLFileSystem( token_credential=cred, store_name=account_name, From b715006de9e445a76f9e4d81c18200fdaade5aa7 Mon Sep 17 00:00:00 2001 From: Yishi Wang Date: Thu, 6 Feb 2025 13:38:41 +0800 Subject: [PATCH 4/4] fix --- src/azure-cli/azure/cli/command_modules/dls/_client_factory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py b/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py index dbcf384dccd..53348d34adf 100644 --- a/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py +++ b/src/azure-cli/azure/cli/command_modules/dls/_client_factory.py @@ -26,7 +26,7 @@ def cf_dls_filesystem(cli_ctx, account_name): from azure.datalake.store import core from azure.cli.core._profile import Profile - cred = Profile(cli_ctx=cli_ctx).get_login_credentials() + cred, _, _ = Profile(cli_ctx=cli_ctx).get_login_credentials() return core.AzureDLFileSystem( token_credential=cred, store_name=account_name,