fix: warehouse proxy endpoints #3476
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
achettyiitr
changed the title
achettyiitr
force-pushed
the
fix.warehouse-gateway-paths
branch
from
4cb875e
to
59ecefe
Compare
achettyiitr
force-pushed
the
fix.warehouse-gateway-paths
branch
from
59ecefe
to
4431a41
Compare
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## release/1.9.x #3476 +/- ##
=================================================
+ Coverage 53.29% 53.30% +0.01%
=================================================
Files 330 330
Lines 52789 52782 -7
=================================================
+ Hits 28136 28138 +2
+ Misses 23005 22996 -9
Partials 1648 1648
☔ View full report in Codecov by Sentry. |
saurav-malani
approved these changes
Jun 9, 2023
achettyiitr
commented
Jun 9, 2023
Comment on lines
-979
to
-1014
| Context("Warehouse proxy", func() { | ||
| DescribeTable("forwarding requests to warehouse with different response codes", | ||
| func(url string, code int, payload string) { | ||
| gateway := &HandleT{} | ||
| whMock := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| Expect(r.URL.String()).To(Equal(url)) | ||
| Expect(r.Body) | ||
| Expect(r.Body).To(Not(BeNil())) | ||
| defer func() { _ = r.Body.Close() }() | ||
| reqBody, err := io.ReadAll(r.Body) | ||
| Expect(err).To(BeNil()) | ||
| Expect(string(reqBody)).To(Equal(payload)) | ||
| w.WriteHeader(code) | ||
| })) | ||
| GinkgoT().Setenv("WAREHOUSE_URL", whMock.URL) | ||
| GinkgoT().Setenv("RSERVER_WAREHOUSE_MODE", config.OffMode) | ||
| err := gateway.Setup(context.Background(), c.mockApp, c.mockBackendConfig, c.mockJobsDB, nil, c.mockVersionHandler, rsources.NewNoOpService(), sourcedebugger.NewNoOpService()) | ||
| Expect(err).To(BeNil()) | ||
|
|
||
| defer func() { | ||
| err := gateway.Shutdown() | ||
| Expect(err).To(BeNil()) | ||
| whMock.Close() | ||
| }() | ||
|
|
||
| req := httptest.NewRequest("POST", "http://rudder-server"+url, bytes.NewBufferString(payload)) | ||
| w := httptest.NewRecorder() | ||
| gateway.whProxy.ServeHTTP(w, req) | ||
| resp := w.Result() | ||
| Expect(resp.StatusCode).To(Equal(code)) | ||
| }, | ||
| Entry("successful request", "/v1/warehouse/pending-events", http.StatusOK, `{"source_id": "1", "task_run_id":"2"}`), | ||
| Entry("failed request", "/v1/warehouse/pending-events", http.StatusBadRequest, `{"source_id": "3", "task_run_id":"4"}`), | ||
| Entry("request with query parameters", "/v1/warehouse/pending-events?triggerUpload=true", http.StatusOK, `{"source_id": "5", "task_run_id":"6"}`), | ||
| ) | ||
| }) |
There was a problem hiding this comment.
We don't need to have this test verify the reverse proxy behaviour.
lvrach
reviewed
Jun 9, 2023
gateway/gateway_test.go
Outdated
| "testing" | ||
| "time" | ||
|
|
||
| kitHelper "github.com/rudderlabs/rudder-go-kit/testhelper" |
There was a problem hiding this comment.
[minor] for consistency
Suggested change
| kitHelper "github.com/rudderlabs/rudder-go-kit/testhelper" | |
| kithelper "github.com/rudderlabs/rudder-go-kit/testhelper" |
lvrach
approved these changes
Jun 9, 2023
achettyiitr
force-pushed
the
fix.warehouse-gateway-paths
branch
2 times, most recently
from
287034e
to
1fc6934
Compare
fracasula
approved these changes
Jun 9, 2023
gateway/gateway_test.go
Outdated
| parsedURL, err := url.Parse(WHURL) | ||
| Expect(err).To(BeNil()) | ||
| whPort := parsedURL.Port() | ||
| os.Setenv("RSERVER_WAREHOUSE_WEB_PORT", whPort) |
There was a problem hiding this comment.
It should be possible to use GinkgoT().Setenv(). Just check it out, if not nevermind.
achettyiitr
force-pushed
the
fix.warehouse-gateway-paths
branch
2 times, most recently
from
a7d3284
to
7a556f5
Compare
achettyiitr
force-pushed
the
fix.warehouse-gateway-paths
branch
from
7a556f5
to
7447c68
Compare
cisse21
approved these changes
Jun 9, 2023
Merged
1 task
Merged
This was referenced Jun 21, 2023
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.
Description
Using dedicated public endpoints for the warehouse instead of passing everything with the matching
/warehousepattern. Currently, the warehouse supports these endpoints:Notion Ticket
https://www.notion.so/rudderstacks/Gateway-endpoints-are-not-working-for-warehouse-b6e7acafe48f49a587f7f7ef7e401291?pvs=4
Security