Merge pull request #210 from devopsfaith/optional_and_mandatory_qs

Support mixing optional and mandatory querystring
luraproject · Mar 6, 2019 · f492762 · f492762
2 parents 56f6f4e + c4ee6c8
commit f492762
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/proxy/balancing.go b/proxy/balancing.go
@@ -53,7 +53,7 @@ func newLoadBalancedMiddleware(lb sd.Balancer) Middleware {
 				return nil, err
 			}
 			if len(r.Query) > 0 {
-				r.URL.RawQuery = r.Query.Encode()
+				r.URL.RawQuery += "&" + r.Query.Encode()
 			}
 
 			return next[0](ctx, &r)

diff --git a/proxy/balancing_test.go b/proxy/balancing_test.go
@@ -84,7 +84,7 @@ func testLoadBalancedMw(t *testing.T, lb Middleware) {
 		t.Errorf("The middleware propagated an unexpected error: %s\n", err.Error())
 	}
 
-	want = "http://127.0.0.1:8080/tupu?some=none"
+	want = "http://127.0.0.1:8080/tupu?extra=true&some=none"
 	assertion = func(ctx context.Context, request *Request) (*Response, error) {
 		if request.URL.String() != want {
 			t.Errorf("The middleware did not update the request URL! want [%s], have [%s]\n", want, request.URL)