Skip to content

Commit c327620

Browse files
committed
fix(api_fastapi): rename methods argument to method
1 parent be8924d commit c327620

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

airflow/api_fastapi/core_api/security.py

+5-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
# under the License.
1717
from __future__ import annotations
1818

19-
from collections.abc import Container
2019
from functools import cache
2120
from typing import TYPE_CHECKING, Annotated, Callable
2221

@@ -111,13 +110,11 @@ def to_orm(self, select: Select) -> Select:
111110
return select.where(DagModel.dag_id.in_(self.value))
112111

113112

114-
def permitted_dag_filter_factory(
115-
methods: Container[ResourceMethod],
116-
) -> Callable[[Request, BaseUser], PermittedDagFilter]:
113+
def permitted_dag_filter_factory(method: ResourceMethod) -> Callable[[Request, BaseUser], PermittedDagFilter]:
117114
"""
118115
Create a callable for Depends in FastAPI that returns a filter of the permitted dags for the user.
119116
120-
:param methods: whether filter readable or writable.
117+
:param method: whether filter readable or writable.
121118
:return: The callable that can be used as Depends in FastAPI.
122119
"""
123120

@@ -126,14 +123,14 @@ def depends_permitted_dags_filter(
126123
user: GetUserDep,
127124
) -> PermittedDagFilter:
128125
auth_manager: BaseAuthManager = request.app.state.auth_manager
129-
permitted_dags: set[str] = auth_manager.get_permitted_dag_ids(user=user, methods=methods)
126+
permitted_dags: set[str] = auth_manager.get_permitted_dag_ids(user=user, method=method)
130127
return PermittedDagFilter(permitted_dags)
131128

132129
return depends_permitted_dags_filter
133130

134131

135-
EditableDagsFilterDep = Annotated[PermittedDagFilter, Depends(permitted_dag_filter_factory(["PUT"]))]
136-
ReadableDagsFilterDep = Annotated[PermittedDagFilter, Depends(permitted_dag_filter_factory(["GET"]))]
132+
EditableDagsFilterDep = Annotated[PermittedDagFilter, Depends(permitted_dag_filter_factory("PUT"))]
133+
ReadableDagsFilterDep = Annotated[PermittedDagFilter, Depends(permitted_dag_filter_factory("GET"))]
137134

138135

139136
def requires_access_pool(method: ResourceMethod) -> Callable[[Request, BaseUser], None]:

tests/api_fastapi/core_api/routes/public/test_dags.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def test_get_dags(self, test_client, query_params, expected_total_entries, expec
244244
def test_get_dags_should_call_permitted_dag_ids(self, mock_get_permitted_dag_ids, test_client):
245245
mock_get_permitted_dag_ids.return_value = {DAG1_ID, DAG2_ID}
246246
response = test_client.get("/public/dags")
247-
mock_get_permitted_dag_ids.assert_called_once_with(user=mock.ANY, methods=["GET"])
247+
mock_get_permitted_dag_ids.assert_called_once_with(user=mock.ANY, method="GET")
248248
assert response.status_code == 200
249249
body = response.json()
250250

@@ -355,7 +355,7 @@ def test_patch_dags_should_call_permitted_dag_ids(self, mock_get_permitted_dag_i
355355
response = test_client.patch(
356356
"/public/dags", json={"is_paused": False}, params={"only_active": False, "dag_id_pattern": "~"}
357357
)
358-
mock_get_permitted_dag_ids.assert_called_once_with(user=mock.ANY, methods=["PUT"])
358+
mock_get_permitted_dag_ids.assert_called_once_with(user=mock.ANY, method="PUT")
359359
assert response.status_code == 200
360360
body = response.json()
361361

0 commit comments

Comments
 (0)