Prevent panic in proxy diffing #48216
Merged
Conversation
This file contains 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
#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
added
no-changelog
|
This pull request is automatically being deployed by Amplify Hosting (learn more). |
espadolini
approved these changes
Oct 31, 2024
kimlisa
approved these changes
Oct 31, 2024
public-teleport-github-review-bot
bot
removed request for
fspmarshall and
kiosion
|
@rosstimothy See the table below for backport results.
|
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.
#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.