feat: add path of providers base url to pass through requests #159
+183
−107
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
pawbana
force-pushed
the
pb/base_url_with_path
branch
3 times, most recently
from
a4b4177 to
cd873b1
Compare
pawbana
force-pushed
the
pb/base_url_with_path
branch
from
cd873b1 to
41548c5
Compare
pawbana
changed the title
pawbana
changed the title
pawbana
changed the title
| req.URL.Path, err = url.JoinPath(upURL.Path, r.URL.Path) | ||
| if err != nil { | ||
| logger.Warn(ctx, "failed to join upstream path", slog.Error(err), slog.F("upstreamPath", upURL.Path), slog.F("requestPath", req.URL.Path)) | ||
| req.URL.Path = r.URL.Path // Fallback to just the request path. |
Collaborator
There was a problem hiding this comment.
Fail loud and proud.
If we can't join then we should just fail the request rather then it routing unpredictably.
Collaborator
There was a problem hiding this comment.
This branch is also lacking test coverage.
| } | ||
|
|
||
| func newMockServer(ctx context.Context, t *testing.T, files archiveFileMap, responseMutatorFn func(reqCount uint32, resp []byte) []byte) *mockServer { | ||
| func newMockServer(ctx context.Context, t *testing.T, files archiveFileMap, requestValidatorFn func(*http.Request), responseMutatorFn func(reqCount uint32, resp []byte) []byte) *mockServer { |
Collaborator
There was a problem hiding this comment.
For later: we should refactor this to take a variadic set of options.
| @@ -44,11 +44,15 @@ func newPassthroughRouter(provider provider.Provider, logger slog.Logger, m *met | |||
| req.URL.Host = upURL.Host | |||
|
|
|||
| // Preserve the stripped path from the incoming request and ensure leading slash. | |||
Collaborator
There was a problem hiding this comment.
This comment doesn't match the implementation anymore.
| func TestSimple(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| getAnthropicResponseID := func(streaming bool, resp *http.Response) (string, error) { |
Collaborator
There was a problem hiding this comment.
Nit: let's move these into helper funcs; they're probably reusable.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
When requst is being passed though the change makes it so paht of the forwarded request incudles path of configured base url.
Example:
providers base url:
http://some.domain/some/pathpass though route:
/routeurl of passed though request before:
http://some.domain/routeafter the change:
http://some.domain/some/path/route