Skip to content

Bump azure-mgmt-datafactory to 10.0 and fix compat #69901

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

Closed
amoghrajesh wants to merge 1 commit into from
Closed

Bump azure-mgmt-datafactory to 10.0 and fix compat #69901

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
2 changes: 1 addition & 1 deletion providers/microsoft/azure/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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``
Expand Down
2 changes: 1 addition & 1 deletion providers/microsoft/azure/docs/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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``
Expand Down
2 changes: 1 addition & 1 deletion providers/microsoft/azure/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_data_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand Down Expand Up @@ -335,21 +335,21 @@ 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):
with patch.object(hook, "_dataflow_exists") as mock_dataflow_exists:
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):
Expand Down Expand Up @@ -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):
Expand Down
Loading