From f0be66b582a676877fc0d5ab878365813c27413d Mon Sep 17 00:00:00 2001 From: Wei Lee Date: Thu, 17 Aug 2023 18:25:46 +0800 Subject: [PATCH 1/3] feat(providers/microsoft): add DefaultAzureCredential support to AzureBatchHook --- airflow/providers/microsoft/azure/hooks/batch.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/airflow/providers/microsoft/azure/hooks/batch.py b/airflow/providers/microsoft/azure/hooks/batch.py index a5494b94caf8c..45dbecae45b07 100644 --- a/airflow/providers/microsoft/azure/hooks/batch.py +++ b/airflow/providers/microsoft/azure/hooks/batch.py @@ -23,6 +23,7 @@ from azure.batch import BatchServiceClient, batch_auth, models as batch_models from azure.batch.models import JobAddParameter, PoolAddParameter, TaskAddParameter +from azure.identity import DefaultAzureCredential from airflow.exceptions import AirflowException from airflow.hooks.base import BaseHook @@ -96,7 +97,12 @@ def get_conn(self): if not batch_account_url: raise AirflowException("Batch Account URL parameter is missing.") - credentials = batch_auth.SharedKeyCredentials(conn.login, conn.password) + credentials: batch_auth.SharedKeyCredentials | DefaultAzureCredential + if all([conn.login, conn.password]): + credentials = batch_auth.SharedKeyCredentials(conn.login, conn.password) + else: + credentials = DefaultAzureCredential() + batch_client = BatchServiceClient(credentials, batch_url=batch_account_url) return batch_client @@ -344,7 +350,6 @@ def add_single_task_to_job(self, job_id: str, task: TaskAddParameter) -> None: :param task: The task to add """ try: - self.connection.task.add(job_id=job_id, task=task) except batch_models.BatchErrorException as err: if not err.error or err.error.code != "TaskExists": From 4bfd925073285b6385e739a721b7b6bf71af1820 Mon Sep 17 00:00:00 2001 From: Wei Lee Date: Thu, 24 Aug 2023 19:01:53 +0800 Subject: [PATCH 2/3] fix(providers/microsfot): replace DefaultAzureCredential with AzureIdentityCredentialAdapter azure-batch does not directly supports DefaultAzureCredential --- airflow/providers/microsoft/azure/hooks/batch.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/airflow/providers/microsoft/azure/hooks/batch.py b/airflow/providers/microsoft/azure/hooks/batch.py index 45dbecae45b07..deca28216dbb9 100644 --- a/airflow/providers/microsoft/azure/hooks/batch.py +++ b/airflow/providers/microsoft/azure/hooks/batch.py @@ -23,12 +23,11 @@ from azure.batch import BatchServiceClient, batch_auth, models as batch_models from azure.batch.models import JobAddParameter, PoolAddParameter, TaskAddParameter -from azure.identity import DefaultAzureCredential from airflow.exceptions import AirflowException from airflow.hooks.base import BaseHook from airflow.models import Connection -from airflow.providers.microsoft.azure.utils import get_field +from airflow.providers.microsoft.azure.utils import AzureIdentityCredentialAdapter, get_field from airflow.utils import timezone @@ -97,11 +96,14 @@ def get_conn(self): if not batch_account_url: raise AirflowException("Batch Account URL parameter is missing.") - credentials: batch_auth.SharedKeyCredentials | DefaultAzureCredential + credentials: batch_auth.SharedKeyCredentials | AzureIdentityCredentialAdapter if all([conn.login, conn.password]): credentials = batch_auth.SharedKeyCredentials(conn.login, conn.password) else: - credentials = DefaultAzureCredential() + credentials = AzureIdentityCredentialAdapter( + None, resource_id="https://batch.core.windows.net/.default" + ) + # credentials = AzureIdentityCredentialAdapter() batch_client = BatchServiceClient(credentials, batch_url=batch_account_url) return batch_client From 6cb046d82a0f5d85707c0f205d24810490a4396c Mon Sep 17 00:00:00 2001 From: Wei Lee Date: Sat, 26 Aug 2023 01:05:46 +0800 Subject: [PATCH 3/3] test(providers/microsoft): add test case test_fallback_to_azure_identity_credential_adppter_when_name_and_key_is_not_provided --- .../microsoft/azure/hooks/test_azure_batch.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/providers/microsoft/azure/hooks/test_azure_batch.py b/tests/providers/microsoft/azure/hooks/test_azure_batch.py index 05a8864f50068..a3a421f5a00d9 100644 --- a/tests/providers/microsoft/azure/hooks/test_azure_batch.py +++ b/tests/providers/microsoft/azure/hooks/test_azure_batch.py @@ -27,6 +27,8 @@ from airflow.providers.microsoft.azure.hooks.batch import AzureBatchHook from airflow.utils import db +MODULE = "airflow.providers.microsoft.azure.hooks.batch" + class TestAzureBatchHook: # set up the test environment @@ -67,6 +69,24 @@ def test_connection_and_client(self): assert isinstance(hook._connection(), Connection) assert isinstance(hook.get_conn(), BatchServiceClient) + @mock.patch(f"{MODULE}.batch_auth.SharedKeyCredentials") + @mock.patch(f"{MODULE}.AzureIdentityCredentialAdapter") + def test_fallback_to_azure_identity_credential_adppter_when_name_and_key_is_not_provided( + self, mock_azure_identity_credential_adapter, mock_shared_key_credentials + ): + self.test_account_name = None + self.test_account_key = None + + hook = AzureBatchHook(azure_batch_conn_id=self.test_vm_conn_id) + assert isinstance(hook.get_conn(), BatchServiceClient) + mock_azure_identity_credential_adapter.assert_called_with( + None, resource_id="https://batch.core.windows.net/.default" + ) + assert not mock_shared_key_credentials.auth.called + + self.test_account_name = "test_account_name" + self.test_account_key = "test_account_key" + def test_configure_pool_with_vm_config(self): hook = AzureBatchHook(azure_batch_conn_id=self.test_vm_conn_id) pool = hook.configure_pool(