Include base error for json decode error responses#5069
Merged
michel-laterman merged 6 commits intoelastic:mainfrom Jul 3, 2025
Merged
Include base error for json decode error responses#5069michel-laterman merged 6 commits intoelastic:mainfrom
michel-laterman merged 6 commits intoelastic:mainfrom
Conversation
michel-laterman
added
Team:Elastic-Agent-Control-Plane
🎉 Snyk checks have passed. No issues have been found so far.✅ security/snyk check is complete. No issues have been found. (View Details) ✅ license/snyk check is complete. No issues have been found. (View Details) |
cmacknz
previously approved these changes
Jun 26, 2025
Member
cmacknz
left a comment
cmacknz
left a comment
There was a problem hiding this comment.
Thanks, doing a quick paranoia check I don't see any places where nextErr could contain anything we wouldn't want to give back to a client: https://github.com/search?q=repo%3Aelastic%2Ffleet-server%20nextErr&type=code
Contributor
pkoutsovasilis
left a comment
pkoutsovasilis
left a comment
There was a problem hiding this comment.
The code changes look good to me, but could you please update the unit-tests to have a green CI @michel-laterman ? 🙂
Contributor
Author
|
Current e2e failure is dues to the version bump, the test needs |
cmacknz
approved these changes
Jun 30, 2025
Contributor
Author
|
buildkite test this |
|
Contributor
|
@Mergifyio backport 8.17 8.18 8.19 9.0 9.1 |
Contributor
✅ Backports have been createdDetails
|
mergify bot
pushed a commit
that referenced
this pull request
Jul 3, 2025
* Include base error for json decode error responses (cherry picked from commit 966c4f8) # Conflicts: # internal/pkg/api/handleEnroll_test.go
1 task
mergify bot
pushed a commit
that referenced
this pull request
Jul 3, 2025
* Include base error for json decode error responses (cherry picked from commit 966c4f8)
mergify bot
pushed a commit
that referenced
this pull request
Jul 3, 2025
* Include base error for json decode error responses (cherry picked from commit 966c4f8) # Conflicts: # internal/pkg/api/handleEnroll_test.go
This was referenced Jul 3, 2025
mergify bot
pushed a commit
that referenced
this pull request
Jul 3, 2025
* Include base error for json decode error responses (cherry picked from commit 966c4f8)
1 task
mergify bot
pushed a commit
that referenced
this pull request
Jul 3, 2025
* Include base error for json decode error responses (cherry picked from commit 966c4f8)
1 task
michel-laterman
added a commit
that referenced
this pull request
Jul 4, 2025
michel-laterman
added a commit
that referenced
this pull request
Jul 4, 2025
michel-laterman
added a commit
that referenced
this pull request
Jul 4, 2025
michel-laterman
added a commit
that referenced
this pull request
Jul 4, 2025
…nses (#5085) * Include base error for json decode error responses (#5069) * Include base error for json decode error responses (cherry picked from commit 966c4f8) # Conflicts: # internal/pkg/api/handleEnroll_test.go * Fix backport --------- Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> Co-authored-by: michel-laterman <michel.laterman@elastic.co>
michel-laterman
added a commit
that referenced
this pull request
Jul 4, 2025
…nses (#5083) * Include base error for json decode error responses (#5069) * Include base error for json decode error responses (cherry picked from commit 966c4f8) # Conflicts: # internal/pkg/api/handleEnroll_test.go * Fix backport * remove FIPS unit test --------- Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> Co-authored-by: michel-laterman <michel.laterman@elastic.co>
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.
What is the problem this PR solves?
There is no information on why request bodies fail to decode as JSON
How does this PR solve the problem?
Include the base json decode error as part of the response.
Design Checklist
I have ensured my design is stateless and will work when multiple fleet-server instances are behind a load balancer.I have or intend to scale test my changes, ensuring it will work reliably with 100K+ agents connected.I have included fail safe mechanisms to limit the load on fleet-server: rate limiting, circuit breakers, caching, load shedding, etc.Checklist
I have commented my code, particularly in hard-to-understand areasI have made corresponding changes to the documentationI have made corresponding change to the default configuration filesI have added tests that prove my fix is effective or that my feature works./changelog/fragmentsusing the changelog tool