consul: handle nil multierror pointer correctly #24513
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
pkazmierczak
approved these changes
Nov 20, 2024
|
I'll let you be the judge if this warrants a changelog entry or not. Also: backport labels? |
When the service client syncs to Consul, we accumulate service sync errors in a multierror before reading all the local checks. If the API call to the local checks fails, we either return that error or append it to the multierror and return the set of errors. But `multierror.Error.Len()` doesn't nil-check, so we need to do this ourselves. I've also made a quick pass through the rest of the code base looking for multierror `Len` method calls to see if we have this pattern elsewhere. Fixes: #24512
tgross
force-pushed
the
consul-multierr-panic
branch
from
a24e0cb
to
d32fc92
Compare
tgross
added
backport/ent/1.7.x+ent
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.
When the service client syncs to Consul, we accumulate service sync errors in a multierror before reading all the local checks. If the API call to the local checks fails, we either return that error or append it to the multierror and return the set of errors. But
multierror.Error.Len()doesn't nil-check, so we need to do this ourselves.I've also made a quick pass through the rest of the code base looking for multierror
Lenmethod calls to see if we have this pattern elsewhere.Fixes: #24512