From d18d040391b69fab487d59c4ee8c092f5bec13db Mon Sep 17 00:00:00 2001 From: Amogh Desai Date: Wed, 15 Jul 2026 10:26:44 +0530 Subject: [PATCH] Bump azure-mgmt-datafactory to 10.0 and fix compat --- providers/microsoft/azure/README.rst | 2 +- providers/microsoft/azure/docs/index.rst | 2 +- providers/microsoft/azure/pyproject.toml | 2 +- .../providers/microsoft/azure/hooks/data_factory.py | 12 ++++++------ .../unit/microsoft/azure/hooks/test_data_factory.py | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/providers/microsoft/azure/README.rst b/providers/microsoft/azure/README.rst index 63f0e97e18160..be404f636ee4a 100644 --- a/providers/microsoft/azure/README.rst +++ b/providers/microsoft/azure/README.rst @@ -74,7 +74,7 @@ PIP package Version required ``azure-synapse-artifacts`` ``>=0.17.0`` ``azure-storage-file-datalake`` ``>=12.9.1`` ``azure-kusto-data`` ``>=4.1.0,!=5.0.0`` -``azure-mgmt-datafactory`` ``>=2.0.0`` +``azure-mgmt-datafactory`` ``>=10.0.0`` ``azure-mgmt-containerregistry`` ``>=8.0.0`` ``azure-mgmt-compute`` ``>=33.0.0`` ``azure-mgmt-containerinstance`` ``>=10.1.0`` diff --git a/providers/microsoft/azure/docs/index.rst b/providers/microsoft/azure/docs/index.rst index 0ad9ca9512f32..b326188e24e90 100644 --- a/providers/microsoft/azure/docs/index.rst +++ b/providers/microsoft/azure/docs/index.rst @@ -128,7 +128,7 @@ PIP package Version required ``azure-synapse-artifacts`` ``>=0.17.0`` ``azure-storage-file-datalake`` ``>=12.9.1`` ``azure-kusto-data`` ``>=4.1.0,!=5.0.0`` -``azure-mgmt-datafactory`` ``>=2.0.0`` +``azure-mgmt-datafactory`` ``>=10.0.0`` ``azure-mgmt-containerregistry`` ``>=8.0.0`` ``azure-mgmt-compute`` ``>=33.0.0`` ``azure-mgmt-containerinstance`` ``>=10.1.0`` diff --git a/providers/microsoft/azure/pyproject.toml b/providers/microsoft/azure/pyproject.toml index 9b2d117593b5a..91327c2c74d20 100644 --- a/providers/microsoft/azure/pyproject.toml +++ b/providers/microsoft/azure/pyproject.toml @@ -84,7 +84,7 @@ dependencies = [ "azure-storage-file-datalake>=12.9.1", # azure-kusto-data 5.0.0 pins requests to a specific version which makes resolving dependencies harder "azure-kusto-data>=4.1.0,!=5.0.0", - "azure-mgmt-datafactory>=2.0.0", + "azure-mgmt-datafactory>=10.0.0", "azure-mgmt-containerregistry>=8.0.0", "azure-mgmt-compute>=33.0.0", "azure-mgmt-containerinstance>=10.1.0", diff --git a/providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py b/providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py index dd408bed51555..4583256fc7448 100644 --- a/providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py +++ b/providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py @@ -278,7 +278,7 @@ def update_factory( raise AirflowException(f"Factory {factory!r} does not exist.") return self.get_conn().factories.create_or_update( - resource_group_name, factory_name, factory, if_match, **config + resource_group_name, factory_name, factory, etag=if_match, **config ) @provide_targeted_factory @@ -339,7 +339,7 @@ def get_linked_service( :return: The linked service. """ return self.get_conn().linked_services.get( - resource_group_name, factory_name, linked_service_name, if_none_match, **config + resource_group_name, factory_name, linked_service_name, etag=if_none_match, **config ) def _linked_service_exists(self, resource_group_name, factory_name, linked_service_name) -> bool: @@ -549,7 +549,7 @@ def get_dataflow( :return: The DataFlowResource. """ return self.get_conn().data_flows.get( - resource_group_name, factory_name, dataflow_name, if_none_match, **config + resource_group_name, factory_name, dataflow_name, etag=if_none_match, **config ) def _dataflow_exists( @@ -597,7 +597,7 @@ def update_dataflow( raise AirflowException(f"Dataflow {dataflow_name!r} does not exist.") return self.get_conn().data_flows.create_or_update( - resource_group_name, factory_name, dataflow_name, dataflow, if_match, **config + resource_group_name, factory_name, dataflow_name, dataflow, etag=if_match, **config ) @provide_targeted_factory @@ -627,7 +627,7 @@ def create_dataflow( raise AirflowException(f"Dataflow {dataflow_name!r} already exists.") return self.get_conn().data_flows.create_or_update( - resource_group_name, factory_name, dataflow_name, dataflow, if_match, **config + resource_group_name, factory_name, dataflow_name, dataflow, etag=if_match, **config ) @provide_targeted_factory @@ -923,7 +923,7 @@ def update_trigger( raise AirflowException(f"Trigger {trigger_name!r} does not exist.") return self.get_conn().triggers.create_or_update( - resource_group_name, factory_name, trigger_name, trigger, if_match, **config + resource_group_name, factory_name, trigger_name, trigger, etag=if_match, **config ) @provide_targeted_factory diff --git a/providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py b/providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py index 92608f6101a94..b1eeec35f9e64 100644 --- a/providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py +++ b/providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py @@ -247,7 +247,7 @@ def test_update_factory(hook: AzureDataFactoryHook): mock_factory_exists.return_value = True hook.update_factory(MODEL, RESOURCE_GROUP, FACTORY) - hook._conn.factories.create_or_update.assert_called_with(RESOURCE_GROUP, FACTORY, MODEL, None) + hook._conn.factories.create_or_update.assert_called_with(RESOURCE_GROUP, FACTORY, MODEL, etag=None) def test_update_factory_non_existent(hook: AzureDataFactoryHook): @@ -267,7 +267,7 @@ def test_delete_factory(hook: AzureDataFactoryHook): def test_get_linked_service(hook: AzureDataFactoryHook): hook.get_linked_service(NAME, RESOURCE_GROUP, FACTORY) - hook._conn.linked_services.get.assert_called_with(RESOURCE_GROUP, FACTORY, NAME, None) + hook._conn.linked_services.get.assert_called_with(RESOURCE_GROUP, FACTORY, NAME, etag=None) def test_create_linked_service(hook: AzureDataFactoryHook): @@ -335,13 +335,13 @@ def test_delete_dataset(hook: AzureDataFactoryHook): def test_get_dataflow(hook: AzureDataFactoryHook): hook.get_dataflow(NAME, RESOURCE_GROUP, FACTORY) - hook._conn.data_flows.get.assert_called_with(RESOURCE_GROUP, FACTORY, NAME, None) + hook._conn.data_flows.get.assert_called_with(RESOURCE_GROUP, FACTORY, NAME, etag=None) def test_create_dataflow(hook: AzureDataFactoryHook): hook.create_dataflow(NAME, MODEL, RESOURCE_GROUP, FACTORY) - hook._conn.data_flows.create_or_update.assert_called_with(RESOURCE_GROUP, FACTORY, NAME, MODEL, None) + hook._conn.data_flows.create_or_update.assert_called_with(RESOURCE_GROUP, FACTORY, NAME, MODEL, etag=None) def test_update_dataflow(hook: AzureDataFactoryHook): @@ -349,7 +349,7 @@ def test_update_dataflow(hook: AzureDataFactoryHook): mock_dataflow_exists.return_value = True hook.update_dataflow(NAME, MODEL, RESOURCE_GROUP, FACTORY) - hook._conn.data_flows.create_or_update.assert_called_with(RESOURCE_GROUP, FACTORY, NAME, MODEL, None) + hook._conn.data_flows.create_or_update.assert_called_with(RESOURCE_GROUP, FACTORY, NAME, MODEL, etag=None) def test_update_dataflow_non_existent(hook: AzureDataFactoryHook): @@ -478,7 +478,7 @@ def test_update_trigger(hook: AzureDataFactoryHook): mock_trigger_exists.return_value = True hook.update_trigger(NAME, MODEL, RESOURCE_GROUP, FACTORY) - hook._conn.triggers.create_or_update.assert_called_with(RESOURCE_GROUP, FACTORY, NAME, MODEL, None) + hook._conn.triggers.create_or_update.assert_called_with(RESOURCE_GROUP, FACTORY, NAME, MODEL, etag=None) def test_update_trigger_non_existent(hook: AzureDataFactoryHook):