This is an automated email from the ASF dual-hosted git repository.
weilee pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 629545bea2 Adds job_id as path param in update permission (#38962)
629545bea2 is described below
commit 629545bea2afa55dbda9b839734b4851d9da566e
Author: SubhamSinghal <[email protected]>
AuthorDate: Sun Apr 14 14:11:48 2024 +0530
Adds job_id as path param in update permission (#38962)
---
airflow/providers/databricks/hooks/databricks.py | 6 +++---
airflow/providers/databricks/operators/databricks.py | 2 +-
tests/providers/databricks/operators/test_databricks.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/airflow/providers/databricks/hooks/databricks.py
b/airflow/providers/databricks/hooks/databricks.py
index c86391f4cd..1a0ab8e8c6 100644
--- a/airflow/providers/databricks/hooks/databricks.py
+++ b/airflow/providers/databricks/hooks/databricks.py
@@ -51,7 +51,6 @@ DELETE_RUN_ENDPOINT = ("POST", "api/2.1/jobs/runs/delete")
REPAIR_RUN_ENDPOINT = ("POST", "api/2.1/jobs/runs/repair")
OUTPUT_RUNS_JOB_ENDPOINT = ("GET", "api/2.1/jobs/runs/get-output")
CANCEL_ALL_RUNS_ENDPOINT = ("POST", "api/2.1/jobs/runs/cancel-all")
-UPDATE_PERMISSION_ENDPOINT = ("PATCH", "api/2.0/permissions/jobs")
INSTALL_LIBS_ENDPOINT = ("POST", "api/2.0/libraries/install")
UNINSTALL_LIBS_ENDPOINT = ("POST", "api/2.0/libraries/uninstall")
@@ -656,14 +655,15 @@ class DatabricksHook(BaseDatabricksHook):
return None
- def update_job_permission(self, json: dict[str, Any]) -> dict:
+ def update_job_permission(self, job_id: int, json: dict[str, Any]) -> dict:
"""
Update databricks job permission.
+ :param job_id: job id
:param json: payload
:return: json containing permission specification
"""
- return self._do_api_call(UPDATE_PERMISSION_ENDPOINT, json)
+ return self._do_api_call(("PATCH",
f"api/2.0/permissions/jobs/{job_id}"), json)
def test_connection(self) -> tuple[bool, str]:
"""Test the Databricks connectivity from UI."""
diff --git a/airflow/providers/databricks/operators/databricks.py
b/airflow/providers/databricks/operators/databricks.py
index 3d95c61f6a..1d0d920ecc 100644
--- a/airflow/providers/databricks/operators/databricks.py
+++ b/airflow/providers/databricks/operators/databricks.py
@@ -318,7 +318,7 @@ class DatabricksCreateJobsOperator(BaseOperator):
self._hook.reset_job(str(job_id), self.json)
if (access_control_list := self.json.get("access_control_list")) is
not None:
acl_json = {"access_control_list": access_control_list}
- self._hook.update_job_permission(normalise_json_content(acl_json))
+ self._hook.update_job_permission(job_id,
normalise_json_content(acl_json))
return job_id
diff --git a/tests/providers/databricks/operators/test_databricks.py
b/tests/providers/databricks/operators/test_databricks.py
index 278f95bf01..46e14a917a 100644
--- a/tests/providers/databricks/operators/test_databricks.py
+++ b/tests/providers/databricks/operators/test_databricks.py
@@ -538,7 +538,7 @@ class TestDatabricksCreateJobsOperator:
caller="DatabricksCreateJobsOperator",
)
- db_mock.update_job_permission.assert_called_once_with(expected)
+ db_mock.update_job_permission.assert_called_once_with(JOB_ID, expected)
@mock.patch("airflow.providers.databricks.operators.databricks.DatabricksHook")
def test_exec_update_job_permission_with_empty_acl(self, db_mock_class):
