Skip to content

Validate update_mask fields in PATCH endpoints against Pydantic models #62657

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

Open
Vamsi-klu wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −8
Open

Validate update_mask fields in PATCH endpoints against Pydantic models #62657

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
6 changes: 5 additions & 1 deletion airflow-core/src/airflow/api_fastapi/core_api/routes/public/connections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,12 @@ def patch_connection(
status.HTTP_404_NOT_FOUND, f"The Connection with connection_id: `{connection_id}` was not found"
)

fields_to_update = patch_body.model_fields_set
if update_mask:
fields_to_update = fields_to_update.intersection(update_mask)

try:
ConnectionBody(**patch_body.model_dump())
ConnectionBody(**patch_body.model_dump(include=fields_to_update))
Copy link
Contributor

@SameerMesiah97 SameerMesiah97 Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As evidenced bythe CI failures, it looks like you are validating only the subset of fields being updated against the full ConnectionBody model. Since ConnectionBody has required fields (e.g. conn_type), partial patch payloads now fail validation.

I think we may need to retrieve the existing model, merge the patch data, and then validate the merged result instead.

except ValidationError as e:
raise RequestValidationError(errors=e.errors())

Expand Down
10 changes: 5 additions & 5 deletions airflow-core/src/airflow/api_fastapi/core_api/routes/public/dags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,11 @@ def patch_dag(
status.HTTP_400_BAD_REQUEST, "Only `is_paused` field can be updated through the REST API"
)
fields_to_update = fields_to_update.intersection(update_mask)
else:
try:
DAGPatchBody(**patch_body.model_dump())
except ValidationError as e:
raise RequestValidationError(errors=e.errors())

try:
DAGPatchBody(**patch_body.model_dump(include=fields_to_update))
except ValidationError as e:
raise RequestValidationError(errors=e.errors())

data = patch_body.model_dump(include=fields_to_update, by_alias=True)

Expand Down
8 changes: 6 additions & 2 deletions airflow-core/src/airflow/api_fastapi/core_api/services/public/variables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,15 @@ def update_orm_from_pydantic(
status.HTTP_404_NOT_FOUND, f"The Variable with key: `{variable_key}` was not found"
)

non_update_fields = {"key"}
fields_to_update = patch_body.model_fields_set
if update_mask:
fields_to_update = fields_to_update.intersection(update_mask)

try:
VariableBody(**patch_body.model_dump())
VariableBody(**patch_body.model_dump(include=fields_to_update))
except ValidationError as e:
raise RequestValidationError(errors=e.errors())
Copy link
Contributor

@SameerMesiah97 SameerMesiah97 Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Above comment applies here as well.

non_update_fields = {"key"}

if patch_body.key != old_variable.key:
raise HTTPException(
Expand Down
Loading