Repository navigation
Inline the masked Variable merge and drop unused merge depth args - #76306
Merged
pierrejeambrun merged 2 commits intoNov 3, 2026
Merged
Conversation
pierrejeambrun
marked this pull request as ready for review
November 2, 2026 15:34
pierrejeambrun
requested review from
amoghrajesh,
ashb,
bugraoz93,
choo121600,
ephraimbuddy,
henry3260,
jason810496,
potiuk,
rawwar and
shubhamraj-git
as code owners
November 2, 2026 15:34
pierrejeambrun
force-pushed
the
simplify-masked-variable-merge
branch
from
November 2, 2026 15:34
7c05eaa to
ad5a497
Compare
The restore runs from a single place, so keeping it inline mirrors the Connection update it is modelled on. Merging now walks every depth like redaction does, so the depth arguments threaded through _merge no longer bound anything and only suggested a cutoff that does not exist.
pierrejeambrun
force-pushed
the
simplify-masked-variable-merge
branch
from
November 2, 2026 16:13
ad5a497 to
034577c
Compare
ephraimbuddy
reviewed
Nov 3, 2026
Contributor
Backport successfully created: v3-4-testNote: As of Merging PRs targeted for Airflow 3.X In matter of doubt please ask in #release-management Slack channel.
|
pierrejeambrun
added a commit
that referenced
this pull request
Nov 3, 2026
…pth args (#76306) (#76378) * Simplify the masked Variable merge and drop unused merge depth arguments The restore runs from a single place, so keeping it inline mirrors the Connection update it is modelled on. Merging now walks every depth like redaction does, so the depth arguments threaded through _merge no longer bound anything and only suggested a cutoff that does not exist. * Read the stored Variable value once and clarify the merge max_depth docstring (cherry picked from commit 9a6ef0a) Co-authored-by: Pierre Jeambrun <pierrejbrun@gmail.com>
vatsrahul1001
pushed a commit
that referenced
this pull request
Nov 4, 2026
…pth args (#76306) (#76378) * Simplify the masked Variable merge and drop unused merge depth arguments The restore runs from a single place, so keeping it inline mirrors the Connection update it is modelled on. Merging now walks every depth like redaction does, so the depth arguments threaded through _merge no longer bound anything and only suggested a cutoff that does not exist. * Read the stored Variable value once and clarify the merge max_depth docstring (cherry picked from commit 9a6ef0a) Co-authored-by: Pierre Jeambrun <pierrejbrun@gmail.com>
vatsrahul1001
pushed a commit
that referenced
this pull request
Nov 9, 2026
…pth args (#76306) (#76378) * Simplify the masked Variable merge and drop unused merge depth arguments The restore runs from a single place, so keeping it inline mirrors the Connection update it is modelled on. Merging now walks every depth like redaction does, so the depth arguments threaded through _merge no longer bound anything and only suggested a cutoff that does not exist. * Read the stored Variable value once and clarify the merge max_depth docstring (cherry picked from commit 9a6ef0a) Co-authored-by: Pierre Jeambrun <pierrejbrun@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #76012.
The Variable restore has a single caller, so keeping it inline in
update_orm_from_pydanticmirrors the Connection update it was modelled on.#76012 made
mergewalk nested values at any depth, asredacthas done since #73793. Thedepthandmax_deptharguments threaded through_mergeno longer bound anything and only suggested a cutoff that doesn't exist, so they go. The publicmerge(max_depth=...)keeps its signature for compatibility, and its docstring now says the argument is ignored.No behaviour change.
Was generative AI tooling used to co-author this PR?
Generated-by: Claude Code (Opus 5.5) following the guidelines