Check Variable write conflicts against the team being written - #72042
Merged
ferruzzi merged 3 commits intoAug 27, 2026
Conversation
ferruzzi
force-pushed
the
ferruzzi/write-conflict-team-scope
branch
from
August 25, 2026 02:25
fe460cd to
97f697d
Compare
vincbeck
approved these changes
Aug 25, 2026
vincbeck
left a comment
vincbeck
left a comment
Contributor
There was a problem hiding this comment.
Indeed, big miss. Thanks for fixing it!
ramitkataria
approved these changes
Aug 26, 2026
o-nikolas
approved these changes
Aug 26, 2026
Contributor
|
Hi maintainer, this PR was merged without a milestone set.
|
Contributor
Backport successfully created: v3-3-testNote: As of Merging PRs targeted for Airflow 3.X In matter of doubt please ask in #release-management Slack channel.
|
github-actions Bot
pushed a commit
to aws-mwaa/upstream-to-airflow
that referenced
this pull request
Aug 27, 2026
…tten (apache#72042) (cherry picked from commit fc6c8b1) Co-authored-by: D. Ferruzzi <ferruzzi@amazon.com>
aws-airflow-bot
pushed a commit
to aws-mwaa/upstream-to-airflow
that referenced
this pull request
Aug 27, 2026
…tten (apache#72042) (cherry picked from commit fc6c8b1) Co-authored-by: D. Ferruzzi <ferruzzi@amazon.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
4 participants
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.
Variable.check_for_write_conflictdidn't passteam_name, so a team-scoped write had its conflict check resolved against the global scope. A backend shadowing the key in that team went undetected, while a global-only one warned about a conflict that would not actually shadow the read. Both callers already had the value and had validated it against[core] multi_team; it just was not forwarded. The lookup now also goes throughcall_secrets_backend_method, which forwardsteam_nameonly to overrides that accept it, so custom backends on the pre-3.2get_variable(self, key)signature keep working.Generated-by: Kiro (claude-opus-5) following the guidelines