Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

{dls} Upgrade azure-datalake-store to 1.0.0a0 #30770

Merged
merged 4 commits into from
Feb 7, 2025
Merged

{dls} Upgrade azure-datalake-store to 1.0.0a0 #30770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
864f492
Upgrade azure-datalake-store from track1 to track2
evelyn-ys Feb 6, 2025
07fb3b8
refine code
evelyn-ys Feb 6, 2025
8236fc7
remove unused argument
evelyn-ys Feb 6, 2025
b715006
fix
evelyn-ys Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/azure-cli/azure/cli/command_modules/dls/_client_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,8 @@ 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is weird subscription_id is set to None and then passed to get_login_credentials().

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I removed this

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()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please double check if cli_ctx.cloud.endpoints.active_directory_data_lake_resource_id needs to be set as credential_scopes when creating AzureDLFileSystem.

return core.AzureDLFileSystem(
token=cred,
token_credential=cred,
store_name=account_name,
url_suffix=cli_ctx.cloud.suffixes.azure_datalake_store_file_system_endpoint)
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down