Fix adapter.Unwrap() not working after huma.WithContext() #829
Conversation
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
There was a problem hiding this comment.
Pull Request Overview
This PR fixes the issue with adapter.Unwrap() after using huma.WithContext() by exposing the original context through a new API. Key changes include the addition of HumaContext and OriginalContext functions in api.go, and updating each adapter’s Unwrap method to use OriginalContext. The tests have also been updated to ensure that using huma.WithContext() does not cause any panics when unwrapping.
Reviewed Changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| api.go | Added HumaContext and OriginalContext methods to extract the original context. |
| adapters/humamux/humamux.go | Updated Unwrap to call OriginalContext for correct type assertion. |
| adapters/humahttprouter/humahttprouter.go | Updated Unwrap using OriginalContext for httprouter adapter. |
| adapters/humago/humago.go | Updated Unwrap using OriginalContext for humago adapter. |
| adapters/humagin/humagin.go | Updated Unwrap using OriginalContext for gin adapter. |
| adapters/humaflow/humaflow.go | Updated Unwrap using OriginalContext for humaflow adapter. |
| adapters/humafiber/humafiber.go | Updated Unwrap using OriginalContext for humafiber adapter. |
| adapters/humaecho/humaecho.go | Updated Unwrap using OriginalContext for humaecho adapter. |
| adapters/humachi/humachi.go | Updated Unwrap using OriginalContext for chi adapter. |
| adapters/humabunrouter/humabunrouter.go | Updated Unwrap using OriginalContext (with separate handling in compat mode). |
| adapters/adapters_test.go | Modified test setup to include an unwrapper function and added a new humago test case. |
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.
Closes #790
Closes #784
Since I was also affected by this issue I decided to open a PR
I used the (very naive) strategy of exposing a func to extract the original
huma.Contextfrom asubContext, and made use of it in everyadapter.Unwrap(ctx)func.I updated the adapters test to make sure all adapters don't panic while adding a simple context value (and added the missing
humagotest case)While updating the test I also discovered that
humabunrouter.Unwrap(ctx)simply doesn't work with Bun in compat mode. I didn't fix it since it's not really related to this change, and I wasn't sure on the preferred way (duplicated func? new package? return *http.Request for both context implementations?)