Skip to content

Avoid extra_dejson in ADF and Synapse async hooks#72130

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
Aug 29, 2026
Merged

Avoid extra_dejson in ADF and Synapse async hooks #72130

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: 6 additions & 2 deletions providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
from __future__ import annotations

import inspect
import json
import time
from collections.abc import Callable
from functools import wraps
Expand DownExpand Up@@ -1124,7 +1125,8 @@ async def bind_argument(arg: Any, default_key: str) -> None:
if arg not in bound_args.arguments or bound_args.arguments[arg] is None:
self = args[0]
conn = await get_async_connection(self.conn_id)
extras = conn.extra_dejson
# extra_dejson can call mask_secret -> sync send on the triggerer loop.
extras = json.loads(conn.extra) if conn.extra else {}
default_value = extras.get(default_key) or extras.get(
f"extra__azure_data_factory__{default_key}"
)
Expand DownExpand Up@@ -1175,7 +1177,8 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:
return self._async_conn

conn = await get_async_connection(self.conn_id)
extras = conn.extra_dejson
# extra_dejson can call mask_secret -> sync send on the triggerer loop.
extras = json.loads(conn.extra) if conn.extra else {}
tenant = get_field(extras, "tenantId")

try:
Expand DownExpand Up@@ -1208,6 +1211,7 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:

async def refresh_conn(self) -> AsyncDataFactoryManagementClient: # type: ignore[override]
self._conn = None
await self.close()
return await self.get_async_conn()

@provide_targeted_factory_async
Expand Down
7 changes: 5 additions & 2 deletions providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/synapse.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import time
from typing import TYPE_CHECKING, Any

Expand All@@ -29,6 +30,7 @@
from azure.synapse.artifacts.aio import ArtifactsClient as AsyncArtifactsClient
from azure.synapse.spark import SparkClient

from airflow.providers.common.compat.connection import get_async_connection
from airflow.providers.common.compat.sdk import AirflowException, AirflowTaskTimeout, BaseHook
from airflow.providers.microsoft.azure.utils import (
add_managed_identity_connection_widgets,
Expand DownExpand Up@@ -489,8 +491,9 @@ async def get_async_conn(self) -> AsyncArtifactsClient:
if self._async_conn is not None:
return self._async_conn

conn = self.get_connection(self.conn_id)
extras = conn.extra_dejson
conn = await get_async_connection(self.conn_id)
# extra_dejson can call mask_secret -> sync send on the triggerer loop.
extras = json.loads(conn.extra) if conn.extra else {}
tenant = self._get_field(extras, "tenantId")

credential: AsyncCredentials
Expand Down
68 changes: 64 additions & 4 deletions providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import os
from unittest import mock
from unittest.mock import MagicMock, PropertyMock, patch
Expand DownExpand Up@@ -716,20 +717,31 @@ async def test_get_adf_pipeline_run_status_cancelled(self, mock_get_pipeline_run
assert response == mock_status

@pytest.mark.asyncio
@mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_connection")
@mock.patch(f"{MODULE}.get_async_connection", new_callable=mock.AsyncMock)
@mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_connection):
async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_async_connection):
"""
Test get_pipeline_run function without passing the resource name to check the decorator function and
raise exception
"""
mock_connection = Connection(extra={"factory_name": DATAFACTORY_NAME})
mock_get_connection.return_value = mock_connection
mock_get_async_connection.return_value = mock_connection
mock_conn.return_value.pipeline_runs.get.return_value = MagicMock()
hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
with pytest.raises(AirflowException):
await hook.get_pipeline_run(RUN_ID, None, DATAFACTORY_NAME)

@staticmethod
def _conn_with_raising_extra_dejson(extra: dict, login="clientId", password="clientSecret"):
conn = mock.Mock()
conn.login = login
conn.password = password
conn.extra = json.dumps(extra)
type(conn).extra_dejson = PropertyMock(
side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
)
return conn

@pytest.mark.asyncio
@pytest.mark.parametrize(
"mocked_connection",
Expand DownExpand Up@@ -786,6 +798,50 @@ async def test_get_async_conn(self, mocked_connection):
response = await hook.get_async_conn()
assert isinstance(response, DataFactoryManagementClient)

@pytest.mark.asyncio
async def test_get_async_conn_does_not_touch_extra_dejson(self):
conn = self._conn_with_raising_extra_dejson(
{"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
)
hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
with (
mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)),
mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient") as mock_client,
):
response = await hook.get_async_conn()
assert response is mock_client.return_value

@pytest.mark.asyncio
async def test_get_async_conn_uses_get_async_connection(self):
conn = self._conn_with_raising_extra_dejson(
{"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
)
hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
with (
mock.patch(
f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)
) as mock_get_async_connection,
mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient"),
):
await hook.get_async_conn()
mock_get_async_connection.assert_awaited_once_with(AZURE_DATA_FACTORY_CONN_ID)

@pytest.mark.asyncio
@mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
async def test_provide_targeted_factory_async_does_not_touch_extra_dejson(self, mock_get_async_conn):
conn = self._conn_with_raising_extra_dejson(
{"resource_group_name": RESOURCE_GROUP_NAME, "factory_name": DATAFACTORY_NAME}
)
mock_get_async_conn.return_value.pipeline_runs.get = mock.AsyncMock(return_value=MagicMock())
hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
with mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)):
await hook.get_pipeline_run(RUN_ID, None, None)
mock_get_async_conn.return_value.pipeline_runs.get.assert_awaited_once_with(
RESOURCE_GROUP_NAME, DATAFACTORY_NAME, RUN_ID
)

@pytest.mark.asyncio
@pytest.mark.parametrize(
"mocked_connection",
Expand DownExpand Up@@ -904,10 +960,14 @@ def test_get_field_non_prefixed_extras(self):
@pytest.mark.asyncio
@mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
async def test_refresh_conn(self, mock_get_async_conn):
"""Test refresh_conn method _conn is reset and get_async_conn is called"""
"""Test refresh_conn closes the async client before recreating it."""
hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
mock_async_conn = mock.AsyncMock()
hook._async_conn = mock_async_conn
await hook.refresh_conn()
assert not hook._conn
mock_async_conn.close.assert_awaited_once()
assert hook._async_conn is None
assert mock_get_async_conn.called

@pytest.mark.asyncio
Expand Down
43 changes: 42 additions & 1 deletion providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_synapse_pipeline.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,8 @@
# under the License.
from __future__ import annotations

from unittest.mock import AsyncMock, MagicMock, patch
import json
from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch

import pytest
from azure.synapse.artifacts import ArtifactsClient
Expand DownExpand Up@@ -247,6 +248,46 @@ async def test_get_async_conn_client_secret(self, mock_credential, mock_client):
credential=mock_credential.return_value,
)

@pytest.mark.asyncio
@patch(f"{MODULE}.AsyncArtifactsClient")
@patch(f"{MODULE}.AsyncClientSecretCredential")
async def test_get_async_conn_does_not_touch_extra_dejson(self, mock_credential, mock_client):
conn = MagicMock()
conn.login = "clientId"
conn.password = "clientSecret"
conn.extra = json.dumps({"tenantId": "tenantId"})
type(conn).extra_dejson = PropertyMock(
side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
)
hook = AzureSynapsePipelineAsyncHook(
azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
)
with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)):
result = await hook.get_async_conn()
assert result is mock_client.return_value
mock_credential.assert_called_with(
client_id="clientId",
client_secret="clientSecret",
tenant_id="tenantId",
)

@pytest.mark.asyncio
@patch(f"{MODULE}.AsyncArtifactsClient")
@patch(f"{MODULE}.AsyncClientSecretCredential")
async def test_get_async_conn_uses_get_async_connection(self, mock_credential, mock_client):
conn = MagicMock()
conn.login = "clientId"
conn.password = "clientSecret"
conn.extra = json.dumps({"tenantId": "tenantId"})
hook = AzureSynapsePipelineAsyncHook(
azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
)
with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)) as mock_get:
await hook.get_async_conn()
mock_get.assert_awaited_once_with(DEFAULT_CONNECTION_CLIENT_SECRET)

@pytest.mark.asyncio
@patch(f"{MODULE}.AsyncArtifactsClient")
@patch(f"{MODULE}.AsyncDefaultAzureCredential")
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Avoid extra_dejson in ADF and Synapse async hooks by Vamsi-klu · Pull Request #72130 · apache/airflow · GitHub
Skip to content
Avoid extra_dejson in ADF and Synapse async hooks#72130

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

Aug 29, 2026
 Merged


Avoid extra_dejson in ADF and Synapse async hooks
#72130
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: 6 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
from __future__ import annotations

import inspect
import json
import time
from collections.abc import Callable
from functools import wraps
Expand DownExpand Up@@ -1124,7 +1125,8 @@ async def bind_argument(arg: Any, default_key: str) -> None:
 if arg not in bound_args.arguments or bound_args.arguments[arg] is None:
 self = args[0]
 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 default_value = extras.get(default_key) or extras.get(
 f"extra__azure_data_factory__{default_key}"
 )
Expand DownExpand Up@@ -1175,7 +1177,8 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:
 return self._async_conn

 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = get_field(extras, "tenantId")

 try:
Expand DownExpand Up@@ -1208,6 +1211,7 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:

 async def refresh_conn(self) -> AsyncDataFactoryManagementClient: # type: ignore[override]
 self._conn = None
 await self.close()
 return await self.get_async_conn()

 @provide_targeted_factory_async
Expand Down

7 changes: 5 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/synapse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import time
from typing import TYPE_CHECKING, Any

Expand All@@ -29,6 +30,7 @@
from azure.synapse.artifacts.aio import ArtifactsClient as AsyncArtifactsClient
from azure.synapse.spark import SparkClient

from airflow.providers.common.compat.connection import get_async_connection
from airflow.providers.common.compat.sdk import AirflowException, AirflowTaskTimeout, BaseHook
from airflow.providers.microsoft.azure.utils import (
 add_managed_identity_connection_widgets,
Expand DownExpand Up@@ -489,8 +491,9 @@ async def get_async_conn(self) -> AsyncArtifactsClient:
 if self._async_conn is not None:
 return self._async_conn

 conn = self.get_connection(self.conn_id)
 extras = conn.extra_dejson
 conn = await get_async_connection(self.conn_id)
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = self._get_field(extras, "tenantId")

 credential: AsyncCredentials
Expand Down

68 changes: 64 additions & 4 deletions
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import os
from unittest import mock
from unittest.mock import MagicMock, PropertyMock, patch
Expand DownExpand Up@@ -716,20 +717,31 @@ async def test_get_adf_pipeline_run_status_cancelled(self, mock_get_pipeline_run
 assert response == mock_status

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_connection")
 @mock.patch(f"{MODULE}.get_async_connection", new_callable=mock.AsyncMock)
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_connection):
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_async_connection):
 """
 Test get_pipeline_run function without passing the resource name to check the decorator function and
 raise exception
 """
 mock_connection = Connection(extra={"factory_name": DATAFACTORY_NAME})
mock_get_connection.return_value = mock_connection
mock_get_async_connection.return_value = mock_connection
 mock_conn.return_value.pipeline_runs.get.return_value = MagicMock()
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with pytest.raises(AirflowException):
 await hook.get_pipeline_run(RUN_ID, None, DATAFACTORY_NAME)

 @staticmethod
 def _conn_with_raising_extra_dejson(extra: dict, login="clientId", password="clientSecret"):
 conn = mock.Mock()
 conn.login = login
 conn.password = password
 conn.extra = json.dumps(extra)
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 return conn

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -786,6 +798,50 @@ async def test_get_async_conn(self, mocked_connection):
 response = await hook.get_async_conn()
 assert isinstance(response, DataFactoryManagementClient)

 @pytest.mark.asyncio
 async def test_get_async_conn_does_not_touch_extra_dejson(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)),
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient") as mock_client,
 ):
 response = await hook.get_async_conn()
 assert response is mock_client.return_value

 @pytest.mark.asyncio
 async def test_get_async_conn_uses_get_async_connection(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(
 f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)
 ) as mock_get_async_connection,
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient"),
 ):
 await hook.get_async_conn()
 mock_get_async_connection.assert_awaited_once_with(AZURE_DATA_FACTORY_CONN_ID)

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_provide_targeted_factory_async_does_not_touch_extra_dejson(self, mock_get_async_conn):
 conn = self._conn_with_raising_extra_dejson(
 {"resource_group_name": RESOURCE_GROUP_NAME, "factory_name": DATAFACTORY_NAME}
 )
 mock_get_async_conn.return_value.pipeline_runs.get = mock.AsyncMock(return_value=MagicMock())
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)):
 await hook.get_pipeline_run(RUN_ID, None, None)
 mock_get_async_conn.return_value.pipeline_runs.get.assert_awaited_once_with(
 RESOURCE_GROUP_NAME, DATAFACTORY_NAME, RUN_ID
 )

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -904,10 +960,14 @@ def test_get_field_non_prefixed_extras(self):
 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_refresh_conn(self, mock_get_async_conn):
 """Test refresh_conn method _conn is reset and get_async_conn is called"""
 """Test refresh_conn closes the async client before recreating it."""
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 mock_async_conn = mock.AsyncMock()
 hook._async_conn = mock_async_conn
 await hook.refresh_conn()
 assert not hook._conn
 mock_async_conn.close.assert_awaited_once()
 assert hook._async_conn is None
 assert mock_get_async_conn.called

 @pytest.mark.asyncio
Expand Down

43 changes: 42 additions & 1 deletion
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_synapse_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,8 @@
# under the License.
from __future__ import annotations

from unittest.mock import AsyncMock, MagicMock, patch
import json
from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch

import pytest
from azure.synapse.artifacts import ArtifactsClient
Expand DownExpand Up@@ -247,6 +248,46 @@ async def test_get_async_conn_client_secret(self, mock_credential, mock_client):
 credential=mock_credential.return_value,
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_does_not_touch_extra_dejson(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)):
 result = await hook.get_async_conn()
 assert result is mock_client.return_value
 mock_credential.assert_called_with(
 client_id="clientId",
 client_secret="clientSecret",
 tenant_id="tenantId",
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_uses_get_async_connection(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)) as mock_get:
 await hook.get_async_conn()
 mock_get.assert_awaited_once_with(DEFAULT_CONNECTION_CLIENT_SECRET)

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncDefaultAzureCredential")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Avoid extra_dejson in ADF and Synapse async hooks by Vamsi-klu · Pull Request #72130 · apache/airflow · GitHub
Skip to content
Avoid extra_dejson in ADF and Synapse async hooks#72130

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

Aug 29, 2026
 Merged


Avoid extra_dejson in ADF and Synapse async hooks
#72130
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: 6 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
from __future__ import annotations

import inspect
import json
import time
from collections.abc import Callable
from functools import wraps
Expand DownExpand Up@@ -1124,7 +1125,8 @@ async def bind_argument(arg: Any, default_key: str) -> None:
 if arg not in bound_args.arguments or bound_args.arguments[arg] is None:
 self = args[0]
 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 default_value = extras.get(default_key) or extras.get(
 f"extra__azure_data_factory__{default_key}"
 )
Expand DownExpand Up@@ -1175,7 +1177,8 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:
 return self._async_conn

 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = get_field(extras, "tenantId")

 try:
Expand DownExpand Up@@ -1208,6 +1211,7 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:

 async def refresh_conn(self) -> AsyncDataFactoryManagementClient: # type: ignore[override]
 self._conn = None
 await self.close()
 return await self.get_async_conn()

 @provide_targeted_factory_async
Expand Down

7 changes: 5 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/synapse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import time
from typing import TYPE_CHECKING, Any

Expand All@@ -29,6 +30,7 @@
from azure.synapse.artifacts.aio import ArtifactsClient as AsyncArtifactsClient
from azure.synapse.spark import SparkClient

from airflow.providers.common.compat.connection import get_async_connection
from airflow.providers.common.compat.sdk import AirflowException, AirflowTaskTimeout, BaseHook
from airflow.providers.microsoft.azure.utils import (
 add_managed_identity_connection_widgets,
Expand DownExpand Up@@ -489,8 +491,9 @@ async def get_async_conn(self) -> AsyncArtifactsClient:
 if self._async_conn is not None:
 return self._async_conn

 conn = self.get_connection(self.conn_id)
 extras = conn.extra_dejson
 conn = await get_async_connection(self.conn_id)
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = self._get_field(extras, "tenantId")

 credential: AsyncCredentials
Expand Down

68 changes: 64 additions & 4 deletions
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import os
from unittest import mock
from unittest.mock import MagicMock, PropertyMock, patch
Expand DownExpand Up@@ -716,20 +717,31 @@ async def test_get_adf_pipeline_run_status_cancelled(self, mock_get_pipeline_run
 assert response == mock_status

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_connection")
 @mock.patch(f"{MODULE}.get_async_connection", new_callable=mock.AsyncMock)
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_connection):
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_async_connection):
 """
 Test get_pipeline_run function without passing the resource name to check the decorator function and
 raise exception
 """
 mock_connection = Connection(extra={"factory_name": DATAFACTORY_NAME})
mock_get_connection.return_value = mock_connection
mock_get_async_connection.return_value = mock_connection
 mock_conn.return_value.pipeline_runs.get.return_value = MagicMock()
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with pytest.raises(AirflowException):
 await hook.get_pipeline_run(RUN_ID, None, DATAFACTORY_NAME)

 @staticmethod
 def _conn_with_raising_extra_dejson(extra: dict, login="clientId", password="clientSecret"):
 conn = mock.Mock()
 conn.login = login
 conn.password = password
 conn.extra = json.dumps(extra)
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 return conn

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -786,6 +798,50 @@ async def test_get_async_conn(self, mocked_connection):
 response = await hook.get_async_conn()
 assert isinstance(response, DataFactoryManagementClient)

 @pytest.mark.asyncio
 async def test_get_async_conn_does_not_touch_extra_dejson(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)),
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient") as mock_client,
 ):
 response = await hook.get_async_conn()
 assert response is mock_client.return_value

 @pytest.mark.asyncio
 async def test_get_async_conn_uses_get_async_connection(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(
 f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)
 ) as mock_get_async_connection,
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient"),
 ):
 await hook.get_async_conn()
 mock_get_async_connection.assert_awaited_once_with(AZURE_DATA_FACTORY_CONN_ID)

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_provide_targeted_factory_async_does_not_touch_extra_dejson(self, mock_get_async_conn):
 conn = self._conn_with_raising_extra_dejson(
 {"resource_group_name": RESOURCE_GROUP_NAME, "factory_name": DATAFACTORY_NAME}
 )
 mock_get_async_conn.return_value.pipeline_runs.get = mock.AsyncMock(return_value=MagicMock())
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)):
 await hook.get_pipeline_run(RUN_ID, None, None)
 mock_get_async_conn.return_value.pipeline_runs.get.assert_awaited_once_with(
 RESOURCE_GROUP_NAME, DATAFACTORY_NAME, RUN_ID
 )

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -904,10 +960,14 @@ def test_get_field_non_prefixed_extras(self):
 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_refresh_conn(self, mock_get_async_conn):
 """Test refresh_conn method _conn is reset and get_async_conn is called"""
 """Test refresh_conn closes the async client before recreating it."""
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 mock_async_conn = mock.AsyncMock()
 hook._async_conn = mock_async_conn
 await hook.refresh_conn()
 assert not hook._conn
 mock_async_conn.close.assert_awaited_once()
 assert hook._async_conn is None
 assert mock_get_async_conn.called

 @pytest.mark.asyncio
Expand Down

43 changes: 42 additions & 1 deletion
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_synapse_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,8 @@
# under the License.
from __future__ import annotations

from unittest.mock import AsyncMock, MagicMock, patch
import json
from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch

import pytest
from azure.synapse.artifacts import ArtifactsClient
Expand DownExpand Up@@ -247,6 +248,46 @@ async def test_get_async_conn_client_secret(self, mock_credential, mock_client):
 credential=mock_credential.return_value,
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_does_not_touch_extra_dejson(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)):
 result = await hook.get_async_conn()
 assert result is mock_client.return_value
 mock_credential.assert_called_with(
 client_id="clientId",
 client_secret="clientSecret",
 tenant_id="tenantId",
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_uses_get_async_connection(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)) as mock_get:
 await hook.get_async_conn()
 mock_get.assert_awaited_once_with(DEFAULT_CONNECTION_CLIENT_SECRET)

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncDefaultAzureCredential")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Avoid extra_dejson in ADF and Synapse async hooks by Vamsi-klu · Pull Request #72130 · apache/airflow · GitHub
Skip to content
Avoid extra_dejson in ADF and Synapse async hooks#72130

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

Aug 29, 2026
 Merged


Avoid extra_dejson in ADF and Synapse async hooks
#72130
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: 6 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
from __future__ import annotations

import inspect
import json
import time
from collections.abc import Callable
from functools import wraps
Expand DownExpand Up@@ -1124,7 +1125,8 @@ async def bind_argument(arg: Any, default_key: str) -> None:
 if arg not in bound_args.arguments or bound_args.arguments[arg] is None:
 self = args[0]
 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 default_value = extras.get(default_key) or extras.get(
 f"extra__azure_data_factory__{default_key}"
 )
Expand DownExpand Up@@ -1175,7 +1177,8 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:
 return self._async_conn

 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = get_field(extras, "tenantId")

 try:
Expand DownExpand Up@@ -1208,6 +1211,7 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:

 async def refresh_conn(self) -> AsyncDataFactoryManagementClient: # type: ignore[override]
 self._conn = None
 await self.close()
 return await self.get_async_conn()

 @provide_targeted_factory_async
Expand Down

7 changes: 5 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/synapse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import time
from typing import TYPE_CHECKING, Any

Expand All@@ -29,6 +30,7 @@
from azure.synapse.artifacts.aio import ArtifactsClient as AsyncArtifactsClient
from azure.synapse.spark import SparkClient

from airflow.providers.common.compat.connection import get_async_connection
from airflow.providers.common.compat.sdk import AirflowException, AirflowTaskTimeout, BaseHook
from airflow.providers.microsoft.azure.utils import (
 add_managed_identity_connection_widgets,
Expand DownExpand Up@@ -489,8 +491,9 @@ async def get_async_conn(self) -> AsyncArtifactsClient:
 if self._async_conn is not None:
 return self._async_conn

 conn = self.get_connection(self.conn_id)
 extras = conn.extra_dejson
 conn = await get_async_connection(self.conn_id)
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = self._get_field(extras, "tenantId")

 credential: AsyncCredentials
Expand Down

68 changes: 64 additions & 4 deletions
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import os
from unittest import mock
from unittest.mock import MagicMock, PropertyMock, patch
Expand DownExpand Up@@ -716,20 +717,31 @@ async def test_get_adf_pipeline_run_status_cancelled(self, mock_get_pipeline_run
 assert response == mock_status

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_connection")
 @mock.patch(f"{MODULE}.get_async_connection", new_callable=mock.AsyncMock)
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_connection):
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_async_connection):
 """
 Test get_pipeline_run function without passing the resource name to check the decorator function and
 raise exception
 """
 mock_connection = Connection(extra={"factory_name": DATAFACTORY_NAME})
mock_get_connection.return_value = mock_connection
mock_get_async_connection.return_value = mock_connection
 mock_conn.return_value.pipeline_runs.get.return_value = MagicMock()
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with pytest.raises(AirflowException):
 await hook.get_pipeline_run(RUN_ID, None, DATAFACTORY_NAME)

 @staticmethod
 def _conn_with_raising_extra_dejson(extra: dict, login="clientId", password="clientSecret"):
 conn = mock.Mock()
 conn.login = login
 conn.password = password
 conn.extra = json.dumps(extra)
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 return conn

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -786,6 +798,50 @@ async def test_get_async_conn(self, mocked_connection):
 response = await hook.get_async_conn()
 assert isinstance(response, DataFactoryManagementClient)

 @pytest.mark.asyncio
 async def test_get_async_conn_does_not_touch_extra_dejson(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)),
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient") as mock_client,
 ):
 response = await hook.get_async_conn()
 assert response is mock_client.return_value

 @pytest.mark.asyncio
 async def test_get_async_conn_uses_get_async_connection(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(
 f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)
 ) as mock_get_async_connection,
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient"),
 ):
 await hook.get_async_conn()
 mock_get_async_connection.assert_awaited_once_with(AZURE_DATA_FACTORY_CONN_ID)

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_provide_targeted_factory_async_does_not_touch_extra_dejson(self, mock_get_async_conn):
 conn = self._conn_with_raising_extra_dejson(
 {"resource_group_name": RESOURCE_GROUP_NAME, "factory_name": DATAFACTORY_NAME}
 )
 mock_get_async_conn.return_value.pipeline_runs.get = mock.AsyncMock(return_value=MagicMock())
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)):
 await hook.get_pipeline_run(RUN_ID, None, None)
 mock_get_async_conn.return_value.pipeline_runs.get.assert_awaited_once_with(
 RESOURCE_GROUP_NAME, DATAFACTORY_NAME, RUN_ID
 )

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -904,10 +960,14 @@ def test_get_field_non_prefixed_extras(self):
 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_refresh_conn(self, mock_get_async_conn):
 """Test refresh_conn method _conn is reset and get_async_conn is called"""
 """Test refresh_conn closes the async client before recreating it."""
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 mock_async_conn = mock.AsyncMock()
 hook._async_conn = mock_async_conn
 await hook.refresh_conn()
 assert not hook._conn
 mock_async_conn.close.assert_awaited_once()
 assert hook._async_conn is None
 assert mock_get_async_conn.called

 @pytest.mark.asyncio
Expand Down

43 changes: 42 additions & 1 deletion
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_synapse_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,8 @@
# under the License.
from __future__ import annotations

from unittest.mock import AsyncMock, MagicMock, patch
import json
from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch

import pytest
from azure.synapse.artifacts import ArtifactsClient
Expand DownExpand Up@@ -247,6 +248,46 @@ async def test_get_async_conn_client_secret(self, mock_credential, mock_client):
 credential=mock_credential.return_value,
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_does_not_touch_extra_dejson(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)):
 result = await hook.get_async_conn()
 assert result is mock_client.return_value
 mock_credential.assert_called_with(
 client_id="clientId",
 client_secret="clientSecret",
 tenant_id="tenantId",
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_uses_get_async_connection(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)) as mock_get:
 await hook.get_async_conn()
 mock_get.assert_awaited_once_with(DEFAULT_CONNECTION_CLIENT_SECRET)

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncDefaultAzureCredential")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Avoid extra_dejson in ADF and Synapse async hooks by Vamsi-klu · Pull Request #72130 · apache/airflow · GitHub
Skip to content
Avoid extra_dejson in ADF and Synapse async hooks#72130

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

Aug 29, 2026
 Merged


Avoid extra_dejson in ADF and Synapse async hooks
#72130
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: 6 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
from __future__ import annotations

import inspect
import json
import time
from collections.abc import Callable
from functools import wraps
Expand DownExpand Up@@ -1124,7 +1125,8 @@ async def bind_argument(arg: Any, default_key: str) -> None:
 if arg not in bound_args.arguments or bound_args.arguments[arg] is None:
 self = args[0]
 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 default_value = extras.get(default_key) or extras.get(
 f"extra__azure_data_factory__{default_key}"
 )
Expand DownExpand Up@@ -1175,7 +1177,8 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:
 return self._async_conn

 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = get_field(extras, "tenantId")

 try:
Expand DownExpand Up@@ -1208,6 +1211,7 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:

 async def refresh_conn(self) -> AsyncDataFactoryManagementClient: # type: ignore[override]
 self._conn = None
 await self.close()
 return await self.get_async_conn()

 @provide_targeted_factory_async
Expand Down

7 changes: 5 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/synapse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import time
from typing import TYPE_CHECKING, Any

Expand All@@ -29,6 +30,7 @@
from azure.synapse.artifacts.aio import ArtifactsClient as AsyncArtifactsClient
from azure.synapse.spark import SparkClient

from airflow.providers.common.compat.connection import get_async_connection
from airflow.providers.common.compat.sdk import AirflowException, AirflowTaskTimeout, BaseHook
from airflow.providers.microsoft.azure.utils import (
 add_managed_identity_connection_widgets,
Expand DownExpand Up@@ -489,8 +491,9 @@ async def get_async_conn(self) -> AsyncArtifactsClient:
 if self._async_conn is not None:
 return self._async_conn

 conn = self.get_connection(self.conn_id)
 extras = conn.extra_dejson
 conn = await get_async_connection(self.conn_id)
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = self._get_field(extras, "tenantId")

 credential: AsyncCredentials
Expand Down

68 changes: 64 additions & 4 deletions
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import os
from unittest import mock
from unittest.mock import MagicMock, PropertyMock, patch
Expand DownExpand Up@@ -716,20 +717,31 @@ async def test_get_adf_pipeline_run_status_cancelled(self, mock_get_pipeline_run
 assert response == mock_status

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_connection")
 @mock.patch(f"{MODULE}.get_async_connection", new_callable=mock.AsyncMock)
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_connection):
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_async_connection):
 """
 Test get_pipeline_run function without passing the resource name to check the decorator function and
 raise exception
 """
 mock_connection = Connection(extra={"factory_name": DATAFACTORY_NAME})
mock_get_connection.return_value = mock_connection
mock_get_async_connection.return_value = mock_connection
 mock_conn.return_value.pipeline_runs.get.return_value = MagicMock()
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with pytest.raises(AirflowException):
 await hook.get_pipeline_run(RUN_ID, None, DATAFACTORY_NAME)

 @staticmethod
 def _conn_with_raising_extra_dejson(extra: dict, login="clientId", password="clientSecret"):
 conn = mock.Mock()
 conn.login = login
 conn.password = password
 conn.extra = json.dumps(extra)
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 return conn

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -786,6 +798,50 @@ async def test_get_async_conn(self, mocked_connection):
 response = await hook.get_async_conn()
 assert isinstance(response, DataFactoryManagementClient)

 @pytest.mark.asyncio
 async def test_get_async_conn_does_not_touch_extra_dejson(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)),
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient") as mock_client,
 ):
 response = await hook.get_async_conn()
 assert response is mock_client.return_value

 @pytest.mark.asyncio
 async def test_get_async_conn_uses_get_async_connection(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(
 f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)
 ) as mock_get_async_connection,
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient"),
 ):
 await hook.get_async_conn()
 mock_get_async_connection.assert_awaited_once_with(AZURE_DATA_FACTORY_CONN_ID)

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_provide_targeted_factory_async_does_not_touch_extra_dejson(self, mock_get_async_conn):
 conn = self._conn_with_raising_extra_dejson(
 {"resource_group_name": RESOURCE_GROUP_NAME, "factory_name": DATAFACTORY_NAME}
 )
 mock_get_async_conn.return_value.pipeline_runs.get = mock.AsyncMock(return_value=MagicMock())
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)):
 await hook.get_pipeline_run(RUN_ID, None, None)
 mock_get_async_conn.return_value.pipeline_runs.get.assert_awaited_once_with(
 RESOURCE_GROUP_NAME, DATAFACTORY_NAME, RUN_ID
 )

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -904,10 +960,14 @@ def test_get_field_non_prefixed_extras(self):
 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_refresh_conn(self, mock_get_async_conn):
 """Test refresh_conn method _conn is reset and get_async_conn is called"""
 """Test refresh_conn closes the async client before recreating it."""
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 mock_async_conn = mock.AsyncMock()
 hook._async_conn = mock_async_conn
 await hook.refresh_conn()
 assert not hook._conn
 mock_async_conn.close.assert_awaited_once()
 assert hook._async_conn is None
 assert mock_get_async_conn.called

 @pytest.mark.asyncio
Expand Down

43 changes: 42 additions & 1 deletion
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_synapse_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,8 @@
# under the License.
from __future__ import annotations

from unittest.mock import AsyncMock, MagicMock, patch
import json
from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch

import pytest
from azure.synapse.artifacts import ArtifactsClient
Expand DownExpand Up@@ -247,6 +248,46 @@ async def test_get_async_conn_client_secret(self, mock_credential, mock_client):
 credential=mock_credential.return_value,
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_does_not_touch_extra_dejson(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)):
 result = await hook.get_async_conn()
 assert result is mock_client.return_value
 mock_credential.assert_called_with(
 client_id="clientId",
 client_secret="clientSecret",
 tenant_id="tenantId",
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_uses_get_async_connection(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)) as mock_get:
 await hook.get_async_conn()
 mock_get.assert_awaited_once_with(DEFAULT_CONNECTION_CLIENT_SECRET)

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncDefaultAzureCredential")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Avoid extra_dejson in ADF and Synapse async hooks by Vamsi-klu · Pull Request #72130 · apache/airflow · GitHub
Skip to content
Avoid extra_dejson in ADF and Synapse async hooks#72130

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

Aug 29, 2026
 Merged


Avoid extra_dejson in ADF and Synapse async hooks
#72130
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: 6 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
from __future__ import annotations

import inspect
import json
import time
from collections.abc import Callable
from functools import wraps
Expand DownExpand Up@@ -1124,7 +1125,8 @@ async def bind_argument(arg: Any, default_key: str) -> None:
 if arg not in bound_args.arguments or bound_args.arguments[arg] is None:
 self = args[0]
 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 default_value = extras.get(default_key) or extras.get(
 f"extra__azure_data_factory__{default_key}"
 )
Expand DownExpand Up@@ -1175,7 +1177,8 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:
 return self._async_conn

 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = get_field(extras, "tenantId")

 try:
Expand DownExpand Up@@ -1208,6 +1211,7 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:

 async def refresh_conn(self) -> AsyncDataFactoryManagementClient: # type: ignore[override]
 self._conn = None
 await self.close()
 return await self.get_async_conn()

 @provide_targeted_factory_async
Expand Down

7 changes: 5 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/synapse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import time
from typing import TYPE_CHECKING, Any

Expand All@@ -29,6 +30,7 @@
from azure.synapse.artifacts.aio import ArtifactsClient as AsyncArtifactsClient
from azure.synapse.spark import SparkClient

from airflow.providers.common.compat.connection import get_async_connection
from airflow.providers.common.compat.sdk import AirflowException, AirflowTaskTimeout, BaseHook
from airflow.providers.microsoft.azure.utils import (
 add_managed_identity_connection_widgets,
Expand DownExpand Up@@ -489,8 +491,9 @@ async def get_async_conn(self) -> AsyncArtifactsClient:
 if self._async_conn is not None:
 return self._async_conn

 conn = self.get_connection(self.conn_id)
 extras = conn.extra_dejson
 conn = await get_async_connection(self.conn_id)
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = self._get_field(extras, "tenantId")

 credential: AsyncCredentials
Expand Down

68 changes: 64 additions & 4 deletions
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import os
from unittest import mock
from unittest.mock import MagicMock, PropertyMock, patch
Expand DownExpand Up@@ -716,20 +717,31 @@ async def test_get_adf_pipeline_run_status_cancelled(self, mock_get_pipeline_run
 assert response == mock_status

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_connection")
 @mock.patch(f"{MODULE}.get_async_connection", new_callable=mock.AsyncMock)
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_connection):
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_async_connection):
 """
 Test get_pipeline_run function without passing the resource name to check the decorator function and
 raise exception
 """
 mock_connection = Connection(extra={"factory_name": DATAFACTORY_NAME})
mock_get_connection.return_value = mock_connection
mock_get_async_connection.return_value = mock_connection
 mock_conn.return_value.pipeline_runs.get.return_value = MagicMock()
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with pytest.raises(AirflowException):
 await hook.get_pipeline_run(RUN_ID, None, DATAFACTORY_NAME)

 @staticmethod
 def _conn_with_raising_extra_dejson(extra: dict, login="clientId", password="clientSecret"):
 conn = mock.Mock()
 conn.login = login
 conn.password = password
 conn.extra = json.dumps(extra)
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 return conn

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -786,6 +798,50 @@ async def test_get_async_conn(self, mocked_connection):
 response = await hook.get_async_conn()
 assert isinstance(response, DataFactoryManagementClient)

 @pytest.mark.asyncio
 async def test_get_async_conn_does_not_touch_extra_dejson(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)),
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient") as mock_client,
 ):
 response = await hook.get_async_conn()
 assert response is mock_client.return_value

 @pytest.mark.asyncio
 async def test_get_async_conn_uses_get_async_connection(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(
 f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)
 ) as mock_get_async_connection,
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient"),
 ):
 await hook.get_async_conn()
 mock_get_async_connection.assert_awaited_once_with(AZURE_DATA_FACTORY_CONN_ID)

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_provide_targeted_factory_async_does_not_touch_extra_dejson(self, mock_get_async_conn):
 conn = self._conn_with_raising_extra_dejson(
 {"resource_group_name": RESOURCE_GROUP_NAME, "factory_name": DATAFACTORY_NAME}
 )
 mock_get_async_conn.return_value.pipeline_runs.get = mock.AsyncMock(return_value=MagicMock())
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)):
 await hook.get_pipeline_run(RUN_ID, None, None)
 mock_get_async_conn.return_value.pipeline_runs.get.assert_awaited_once_with(
 RESOURCE_GROUP_NAME, DATAFACTORY_NAME, RUN_ID
 )

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -904,10 +960,14 @@ def test_get_field_non_prefixed_extras(self):
 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_refresh_conn(self, mock_get_async_conn):
 """Test refresh_conn method _conn is reset and get_async_conn is called"""
 """Test refresh_conn closes the async client before recreating it."""
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 mock_async_conn = mock.AsyncMock()
 hook._async_conn = mock_async_conn
 await hook.refresh_conn()
 assert not hook._conn
 mock_async_conn.close.assert_awaited_once()
 assert hook._async_conn is None
 assert mock_get_async_conn.called

 @pytest.mark.asyncio
Expand Down

43 changes: 42 additions & 1 deletion
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_synapse_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,8 @@
# under the License.
from __future__ import annotations

from unittest.mock import AsyncMock, MagicMock, patch
import json
from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch

import pytest
from azure.synapse.artifacts import ArtifactsClient
Expand DownExpand Up@@ -247,6 +248,46 @@ async def test_get_async_conn_client_secret(self, mock_credential, mock_client):
 credential=mock_credential.return_value,
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_does_not_touch_extra_dejson(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)):
 result = await hook.get_async_conn()
 assert result is mock_client.return_value
 mock_credential.assert_called_with(
 client_id="clientId",
 client_secret="clientSecret",
 tenant_id="tenantId",
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_uses_get_async_connection(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)) as mock_get:
 await hook.get_async_conn()
 mock_get.assert_awaited_once_with(DEFAULT_CONNECTION_CLIENT_SECRET)

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncDefaultAzureCredential")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Avoid extra_dejson in ADF and Synapse async hooks by Vamsi-klu · Pull Request #72130 · apache/airflow · GitHub
Skip to content
Avoid extra_dejson in ADF and Synapse async hooks#72130

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

Aug 29, 2026
 Merged


Avoid extra_dejson in ADF and Synapse async hooks
#72130
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: 6 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
from __future__ import annotations

import inspect
import json
import time
from collections.abc import Callable
from functools import wraps
Expand DownExpand Up@@ -1124,7 +1125,8 @@ async def bind_argument(arg: Any, default_key: str) -> None:
 if arg not in bound_args.arguments or bound_args.arguments[arg] is None:
 self = args[0]
 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 default_value = extras.get(default_key) or extras.get(
 f"extra__azure_data_factory__{default_key}"
 )
Expand DownExpand Up@@ -1175,7 +1177,8 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:
 return self._async_conn

 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = get_field(extras, "tenantId")

 try:
Expand DownExpand Up@@ -1208,6 +1211,7 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:

 async def refresh_conn(self) -> AsyncDataFactoryManagementClient: # type: ignore[override]
 self._conn = None
 await self.close()
 return await self.get_async_conn()

 @provide_targeted_factory_async
Expand Down

7 changes: 5 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/synapse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import time
from typing import TYPE_CHECKING, Any

Expand All@@ -29,6 +30,7 @@
from azure.synapse.artifacts.aio import ArtifactsClient as AsyncArtifactsClient
from azure.synapse.spark import SparkClient

from airflow.providers.common.compat.connection import get_async_connection
from airflow.providers.common.compat.sdk import AirflowException, AirflowTaskTimeout, BaseHook
from airflow.providers.microsoft.azure.utils import (
 add_managed_identity_connection_widgets,
Expand DownExpand Up@@ -489,8 +491,9 @@ async def get_async_conn(self) -> AsyncArtifactsClient:
 if self._async_conn is not None:
 return self._async_conn

 conn = self.get_connection(self.conn_id)
 extras = conn.extra_dejson
 conn = await get_async_connection(self.conn_id)
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = self._get_field(extras, "tenantId")

 credential: AsyncCredentials
Expand Down

68 changes: 64 additions & 4 deletions
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import os
from unittest import mock
from unittest.mock import MagicMock, PropertyMock, patch
Expand DownExpand Up@@ -716,20 +717,31 @@ async def test_get_adf_pipeline_run_status_cancelled(self, mock_get_pipeline_run
 assert response == mock_status

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_connection")
 @mock.patch(f"{MODULE}.get_async_connection", new_callable=mock.AsyncMock)
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_connection):
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_async_connection):
 """
 Test get_pipeline_run function without passing the resource name to check the decorator function and
 raise exception
 """
 mock_connection = Connection(extra={"factory_name": DATAFACTORY_NAME})
mock_get_connection.return_value = mock_connection
mock_get_async_connection.return_value = mock_connection
 mock_conn.return_value.pipeline_runs.get.return_value = MagicMock()
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with pytest.raises(AirflowException):
 await hook.get_pipeline_run(RUN_ID, None, DATAFACTORY_NAME)

 @staticmethod
 def _conn_with_raising_extra_dejson(extra: dict, login="clientId", password="clientSecret"):
 conn = mock.Mock()
 conn.login = login
 conn.password = password
 conn.extra = json.dumps(extra)
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 return conn

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -786,6 +798,50 @@ async def test_get_async_conn(self, mocked_connection):
 response = await hook.get_async_conn()
 assert isinstance(response, DataFactoryManagementClient)

 @pytest.mark.asyncio
 async def test_get_async_conn_does_not_touch_extra_dejson(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)),
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient") as mock_client,
 ):
 response = await hook.get_async_conn()
 assert response is mock_client.return_value

 @pytest.mark.asyncio
 async def test_get_async_conn_uses_get_async_connection(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(
 f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)
 ) as mock_get_async_connection,
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient"),
 ):
 await hook.get_async_conn()
 mock_get_async_connection.assert_awaited_once_with(AZURE_DATA_FACTORY_CONN_ID)

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_provide_targeted_factory_async_does_not_touch_extra_dejson(self, mock_get_async_conn):
 conn = self._conn_with_raising_extra_dejson(
 {"resource_group_name": RESOURCE_GROUP_NAME, "factory_name": DATAFACTORY_NAME}
 )
 mock_get_async_conn.return_value.pipeline_runs.get = mock.AsyncMock(return_value=MagicMock())
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)):
 await hook.get_pipeline_run(RUN_ID, None, None)
 mock_get_async_conn.return_value.pipeline_runs.get.assert_awaited_once_with(
 RESOURCE_GROUP_NAME, DATAFACTORY_NAME, RUN_ID
 )

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -904,10 +960,14 @@ def test_get_field_non_prefixed_extras(self):
 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_refresh_conn(self, mock_get_async_conn):
 """Test refresh_conn method _conn is reset and get_async_conn is called"""
 """Test refresh_conn closes the async client before recreating it."""
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 mock_async_conn = mock.AsyncMock()
 hook._async_conn = mock_async_conn
 await hook.refresh_conn()
 assert not hook._conn
 mock_async_conn.close.assert_awaited_once()
 assert hook._async_conn is None
 assert mock_get_async_conn.called

 @pytest.mark.asyncio
Expand Down

43 changes: 42 additions & 1 deletion
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_synapse_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,8 @@
# under the License.
from __future__ import annotations

from unittest.mock import AsyncMock, MagicMock, patch
import json
from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch

import pytest
from azure.synapse.artifacts import ArtifactsClient
Expand DownExpand Up@@ -247,6 +248,46 @@ async def test_get_async_conn_client_secret(self, mock_credential, mock_client):
 credential=mock_credential.return_value,
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_does_not_touch_extra_dejson(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)):
 result = await hook.get_async_conn()
 assert result is mock_client.return_value
 mock_credential.assert_called_with(
 client_id="clientId",
 client_secret="clientSecret",
 tenant_id="tenantId",
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_uses_get_async_connection(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)) as mock_get:
 await hook.get_async_conn()
 mock_get.assert_awaited_once_with(DEFAULT_CONNECTION_CLIENT_SECRET)

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncDefaultAzureCredential")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Avoid extra_dejson in ADF and Synapse async hooks by Vamsi-klu · Pull Request #72130 · apache/airflow · GitHub
Skip to content
Avoid extra_dejson in ADF and Synapse async hooks#72130

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

Aug 29, 2026
 Merged


Avoid extra_dejson in ADF and Synapse async hooks
#72130
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: 6 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
from __future__ import annotations

import inspect
import json
import time
from collections.abc import Callable
from functools import wraps
Expand DownExpand Up@@ -1124,7 +1125,8 @@ async def bind_argument(arg: Any, default_key: str) -> None:
 if arg not in bound_args.arguments or bound_args.arguments[arg] is None:
 self = args[0]
 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 default_value = extras.get(default_key) or extras.get(
 f"extra__azure_data_factory__{default_key}"
 )
Expand DownExpand Up@@ -1175,7 +1177,8 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:
 return self._async_conn

 conn = await get_async_connection(self.conn_id)
 extras = conn.extra_dejson
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = get_field(extras, "tenantId")

 try:
Expand DownExpand Up@@ -1208,6 +1211,7 @@ async def get_async_conn(self) -> AsyncDataFactoryManagementClient:

 async def refresh_conn(self) -> AsyncDataFactoryManagementClient: # type: ignore[override]
 self._conn = None
 await self.close()
 return await self.get_async_conn()

 @provide_targeted_factory_async
Expand Down

7 changes: 5 additions & 2 deletions
providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/synapse.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import time
from typing import TYPE_CHECKING, Any

Expand All@@ -29,6 +30,7 @@
from azure.synapse.artifacts.aio import ArtifactsClient as AsyncArtifactsClient
from azure.synapse.spark import SparkClient

from airflow.providers.common.compat.connection import get_async_connection
from airflow.providers.common.compat.sdk import AirflowException, AirflowTaskTimeout, BaseHook
from airflow.providers.microsoft.azure.utils import (
 add_managed_identity_connection_widgets,
Expand DownExpand Up@@ -489,8 +491,9 @@ async def get_async_conn(self) -> AsyncArtifactsClient:
 if self._async_conn is not None:
 return self._async_conn

 conn = self.get_connection(self.conn_id)
 extras = conn.extra_dejson
 conn = await get_async_connection(self.conn_id)
 # extra_dejson can call mask_secret -> sync send on the triggerer loop.
 extras = json.loads(conn.extra) if conn.extra else {}
 tenant = self._get_field(extras, "tenantId")

 credential: AsyncCredentials
Expand Down

68 changes: 64 additions & 4 deletions
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
import os
from unittest import mock
from unittest.mock import MagicMock, PropertyMock, patch
Expand DownExpand Up@@ -716,20 +717,31 @@ async def test_get_adf_pipeline_run_status_cancelled(self, mock_get_pipeline_run
 assert response == mock_status

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_connection")
 @mock.patch(f"{MODULE}.get_async_connection", new_callable=mock.AsyncMock)
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_connection):
 async def test_get_pipeline_run_exception_without_resource(self, mock_conn, mock_get_async_connection):
 """
 Test get_pipeline_run function without passing the resource name to check the decorator function and
 raise exception
 """
 mock_connection = Connection(extra={"factory_name": DATAFACTORY_NAME})
mock_get_connection.return_value = mock_connection
mock_get_async_connection.return_value = mock_connection
 mock_conn.return_value.pipeline_runs.get.return_value = MagicMock()
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with pytest.raises(AirflowException):
 await hook.get_pipeline_run(RUN_ID, None, DATAFACTORY_NAME)

 @staticmethod
 def _conn_with_raising_extra_dejson(extra: dict, login="clientId", password="clientSecret"):
 conn = mock.Mock()
 conn.login = login
 conn.password = password
 conn.extra = json.dumps(extra)
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 return conn

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -786,6 +798,50 @@ async def test_get_async_conn(self, mocked_connection):
 response = await hook.get_async_conn()
 assert isinstance(response, DataFactoryManagementClient)

 @pytest.mark.asyncio
 async def test_get_async_conn_does_not_touch_extra_dejson(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)),
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient") as mock_client,
 ):
 response = await hook.get_async_conn()
 assert response is mock_client.return_value

 @pytest.mark.asyncio
 async def test_get_async_conn_uses_get_async_connection(self):
 conn = self._conn_with_raising_extra_dejson(
 {"tenantId": "tenantId", "subscriptionId": "subscriptionId"}
 )
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with (
 mock.patch(
 f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)
 ) as mock_get_async_connection,
 mock.patch(f"{MODULE}.AsyncClientSecretCredential"),
 mock.patch(f"{MODULE}.AsyncDataFactoryManagementClient"),
 ):
 await hook.get_async_conn()
 mock_get_async_connection.assert_awaited_once_with(AZURE_DATA_FACTORY_CONN_ID)

 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_provide_targeted_factory_async_does_not_touch_extra_dejson(self, mock_get_async_conn):
 conn = self._conn_with_raising_extra_dejson(
 {"resource_group_name": RESOURCE_GROUP_NAME, "factory_name": DATAFACTORY_NAME}
 )
 mock_get_async_conn.return_value.pipeline_runs.get = mock.AsyncMock(return_value=MagicMock())
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 with mock.patch(f"{MODULE}.get_async_connection", new=mock.AsyncMock(return_value=conn)):
 await hook.get_pipeline_run(RUN_ID, None, None)
 mock_get_async_conn.return_value.pipeline_runs.get.assert_awaited_once_with(
 RESOURCE_GROUP_NAME, DATAFACTORY_NAME, RUN_ID
 )

 @pytest.mark.asyncio
 @pytest.mark.parametrize(
 "mocked_connection",
Expand DownExpand Up@@ -904,10 +960,14 @@ def test_get_field_non_prefixed_extras(self):
 @pytest.mark.asyncio
 @mock.patch(f"{MODULE}.AzureDataFactoryAsyncHook.get_async_conn")
 async def test_refresh_conn(self, mock_get_async_conn):
 """Test refresh_conn method _conn is reset and get_async_conn is called"""
 """Test refresh_conn closes the async client before recreating it."""
 hook = AzureDataFactoryAsyncHook(AZURE_DATA_FACTORY_CONN_ID)
 mock_async_conn = mock.AsyncMock()
 hook._async_conn = mock_async_conn
 await hook.refresh_conn()
 assert not hook._conn
 mock_async_conn.close.assert_awaited_once()
 assert hook._async_conn is None
 assert mock_get_async_conn.called

 @pytest.mark.asyncio
Expand Down

43 changes: 42 additions & 1 deletion
providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_synapse_pipeline.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,8 @@
# under the License.
from __future__ import annotations

from unittest.mock import AsyncMock, MagicMock, patch
import json
from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch

import pytest
from azure.synapse.artifacts import ArtifactsClient
Expand DownExpand Up@@ -247,6 +248,46 @@ async def test_get_async_conn_client_secret(self, mock_credential, mock_client):
 credential=mock_credential.return_value,
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_does_not_touch_extra_dejson(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 type(conn).extra_dejson = PropertyMock(
 side_effect=RuntimeError("You cannot use AsyncToSync in the same thread as an async event loop")
 )
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)):
 result = await hook.get_async_conn()
 assert result is mock_client.return_value
 mock_credential.assert_called_with(
 client_id="clientId",
 client_secret="clientSecret",
 tenant_id="tenantId",
 )

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncClientSecretCredential")
 async def test_get_async_conn_uses_get_async_connection(self, mock_credential, mock_client):
 conn = MagicMock()
 conn.login = "clientId"
 conn.password = "clientSecret"
 conn.extra = json.dumps({"tenantId": "tenantId"})
 hook = AzureSynapsePipelineAsyncHook(
 azure_synapse_conn_id=DEFAULT_CONNECTION_CLIENT_SECRET,
 azure_synapse_workspace_dev_endpoint=AZURE_SYNAPSE_WORKSPACE_DEV_ENDPOINT,
 )
 with patch(f"{MODULE}.get_async_connection", new=AsyncMock(return_value=conn)) as mock_get:
 await hook.get_async_conn()
 mock_get.assert_awaited_once_with(DEFAULT_CONNECTION_CLIENT_SECRET)

 @pytest.mark.asyncio
 @patch(f"{MODULE}.AsyncArtifactsClient")
 @patch(f"{MODULE}.AsyncDefaultAzureCredential")
Expand Down