From 985c0328c76f7bf27e71cf4241fda9ca77aadba7 Mon Sep 17 00:00:00 2001 From: meierale Date: Fri, 23 Jul 2021 15:02:16 +0200 Subject: [PATCH] remote: add excludes for AzureDefaultCredentials (#6359) add additional excludes to DefaultAzureCredential which are needed in a Windows Environment to use az cli provided credentials, etc. Co-authored-by: Alexander Meier --- dvc/config_schema.py | 6 +++++- dvc/fs/azure.py | 14 +++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dvc/config_schema.py b/dvc/config_schema.py index dfa2a0ac2..0ce6d0916 100644 --- a/dvc/config_schema.py +++ b/dvc/config_schema.py @@ -189,7 +189,11 @@ SCHEMA = { "tenant_id": str, "client_id": str, "client_secret": str, - "allow_anonymous_login": bool, + "allow_anonymous_login": Bool, + "exclude_environment_credential": Bool, + "exclude_visual_studio_code_credential": Bool, + "exclude_shared_token_cache_credential": Bool, + "exclude_managed_identity_credential": Bool, **REMOTE_COMMON, }, "oss": { diff --git a/dvc/fs/azure.py b/dvc/fs/azure.py index 7950c0703..6ae3e2bc0 100644 --- a/dvc/fs/azure.py +++ b/dvc/fs/azure.py @@ -108,7 +108,19 @@ class AzureFileSystem(ObjectFSWrapper): ): with fsspec_loop(): login_info["credential"] = DefaultAzureCredential( - exclude_interactive_browser_credential=False + exclude_interactive_browser_credential=False, + exclude_environment_credential=config.get( + "exclude_environment_credential", False + ), + exclude_visual_studio_code_credential=config.get( + "exclude_visual_studio_code_credential", False + ), + exclude_shared_token_cache_credential=config.get( + "exclude_shared_token_cache_credential", False + ), + exclude_managed_identity_credential=config.get( + "exclude_managed_identity_credential", False + ), ) for login_method, required_keys in [ # noqa