Skip to content
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.

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

[v17] Prevent panic in proxy diffing #48223

Merged
merged 1 commit into from
Oct 31, 2024

Conversation

rosstimothy
Copy link
Contributor

Backport #48216 to branch/v17

#47561 incorrectly translated the logic on when to call the diff
function for resources. The previous logic only called the differ
_if_ the resource had already been seen before, which guaranteed
that both the old and new resource provided to the diff function
were not nil. However, after the conversion to the generic watcher
the diff function was called for new resources, resulting in a nil
value being provided for the old resource and caused a panic.
The previous behavior has been restored, and the ProxyWatcher test
has been updated to set a diff function to prevent regressions.
@rosstimothy rosstimothy added the no-changelog Indicates that a PR does not require a changelog entry label Oct 31, 2024
@rosstimothy rosstimothy enabled auto-merge October 31, 2024 16:12
@public-teleport-github-review-bot public-teleport-github-review-bot bot removed the request for review from kimlisa October 31, 2024 16:33
@rosstimothy rosstimothy added this pull request to the merge queue Oct 31, 2024
Merged via the queue into branch/v17 with commit 413abcc Oct 31, 2024
41 of 42 checks passed
@rosstimothy rosstimothy deleted the bot/backport-48216-branch/v17 branch October 31, 2024 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport no-changelog Indicates that a PR does not require a changelog entry size/sm
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants