Skip to content

Use DefaultAzureCredential instead of ManagedIdentityCredential in azure wasb hook #23394

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

Merged
potiuk merged 1 commit into from
May 8, 2022
Merged

Use DefaultAzureCredential instead of ManagedIdentityCredential in azure wasb hook #23394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions airflow/providers/microsoft/azure/hooks/wasb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from typing import Any, Dict, List, Optional

from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError
from azure.identity import ClientSecretCredential, ManagedIdentityCredential
from azure.identity import ClientSecretCredential, DefaultAzureCredential
from azure.storage.blob import BlobClient, BlobServiceClient, ContainerClient, StorageStreamDownloader

from airflow.exceptions import AirflowException
Expand All @@ -46,7 +46,7 @@ class WasbHook(BaseHook):
passed to the `BlockBlockService()` constructor. For example, authenticate
using a SAS token by adding {"sas_token": "YOUR_TOKEN"}.

If no authentication configuration is provided, managed identity will be used (applicable
If no authentication configuration is provided, DefaultAzureCredential will be used (applicable
when using Azure compute infrastructure).

:param wasb_conn_id: Reference to the :ref:`wasb connection <howto/connection:wasb>`.
Expand Down Expand Up @@ -151,8 +151,8 @@ def get_conn(self) -> BlobServiceClient:
# Fall back to old auth (password) or use managed identity if not provided.
credential = conn.password
if not credential:
credential = ManagedIdentityCredential()
self.log.info("Using managed identity as credential")
credential = DefaultAzureCredential()
self.log.info("Using DefaultAzureCredential as credential")
return BlobServiceClient(
account_url=f"https://{conn.login}.blob.core.windows.net/",
credential=credential,
Expand Down
4 changes: 2 additions & 2 deletions tests/providers/microsoft/azure/hooks/test_wasb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from unittest import mock

import pytest
from azure.identity import ManagedIdentityCredential
from azure.identity import DefaultAzureCredential
from azure.storage.blob import BlobServiceClient

from airflow.exceptions import AirflowException
Expand Down Expand Up @@ -140,7 +140,7 @@ def test_shared_key_connection(self):
def test_managed_identity(self):
hook = WasbHook(wasb_conn_id=self.managed_identity_conn_id)
assert isinstance(hook.get_conn(), BlobServiceClient)
assert isinstance(hook.get_conn().credential, ManagedIdentityCredential)
assert isinstance(hook.get_conn().credential, DefaultAzureCredential)

@pytest.mark.parametrize(
argnames="conn_id_str, extra_key",
Expand Down