Skip to content

Inline the masked Variable merge and drop unused merge depth args - #76306

Merged
pierrejeambrun merged 2 commits into
apache:mainfrom
astronomer:simplify-masked-variable-merge
Nov 3, 2026
Merged

pierrejeambrun merged 2 commits into
apache:mainfrom
astronomer:simplify-masked-variable-merge

Conversation

@pierrejeambrun

@pierrejeambrun pierrejeambrun commented Nov 2, 2026 •

Copy link
Copy Markdown
Member

Follow-up to #76012.

The Variable restore has a single caller, so keeping it inline in update_orm_from_pydantic mirrors the Connection update it was modelled on.

#76012 made merge walk nested values at any depth, as redact has done since #73793. The depth and max_depth arguments threaded through _merge no longer bound anything and only suggested a cutoff that doesn't exist, so they go. The public merge(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?
  • Yes — Claude Code (Opus 5.5)

Generated-by: Claude Code (Opus 5.5) following the guidelines

@boring-cyborg boring-cyborg Bot added the area:API Airflow's REST/HTTP API label Nov 2, 2026
@pierrejeambrun
pierrejeambrun marked this pull request as ready for review November 2, 2026 15:34
@pierrejeambrun
pierrejeambrun force-pushed the simplify-masked-variable-merge branch from 7c05eaa to ad5a497 Compare November 2, 2026 15:34
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
pierrejeambrun force-pushed the simplify-masked-variable-merge branch from ad5a497 to 034577c Compare November 2, 2026 16:13

@ephraimbuddy ephraimbuddy left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@pierrejeambrun
pierrejeambrun enabled auto-merge (squash) November 3, 2026 14:38
@pierrejeambrun pierrejeambrun added the backport-to-v3-4-test Backport to v3-4-test label Nov 3, 2026
@pierrejeambrun pierrejeambrun added this to the Airflow 3.4.1 milestone Nov 3, 2026
@pierrejeambrun
pierrejeambrun merged commit 9a6ef0a into apache:main Nov 3, 2026
77 checks passed
@pierrejeambrun
pierrejeambrun deleted the simplify-masked-variable-merge branch November 3, 2026 15:16
@github-actions

github-actions Bot commented Nov 3, 2026

Copy link
Copy Markdown
Contributor

Backport successfully created: v3-4-test

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status Branch Result
✅ v3-4-test PR Link

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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:API Airflow's REST/HTTP API backport-to-v3-4-test Backport to v3-4-test

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants