Merge branch 'master' into master

responsibility-act · Jun 9, 2020 · 0f22bb2 · 0f22bb2
2 parents 98a1de6 + c08fff8
commit 0f22bb2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/core/request.go b/core/request.go
@@ -203,7 +203,9 @@ func (r *RequestAccessor) EventToRequest(req events.APIGatewayProxyRequest) (*ht
 		}
 	}
 
-	return httpRequest, nil
+  httpRequest.RequestURI = httpRequest.URL.RequestURI()
+
+  return httpRequest, nil
 }
 
 func addToHeader(req *http.Request, apiGwRequest events.APIGatewayProxyRequest) (*http.Request, error) {

diff --git a/core/request_test.go b/core/request_test.go
@@ -24,6 +24,7 @@ var _ = Describe("RequestAccessor tests", func() {
 			httpReq, err := accessor.EventToRequestWithContext(context.Background(), basicRequest)
 			Expect(err).To(BeNil())
 			Expect("/hello").To(Equal(httpReq.URL.Path))
+			Expect("/hello").To(Equal(httpReq.RequestURI))
 			Expect("GET").To(Equal(httpReq.Method))
 		})
 
@@ -33,6 +34,7 @@ var _ = Describe("RequestAccessor tests", func() {
 			httpReq, err := accessor.ProxyEventToHTTPRequest(basicRequest)
 			Expect(err).To(BeNil())
 			Expect("/hello").To(Equal(httpReq.URL.Path))
+			Expect("/hello").To(Equal(httpReq.RequestURI))
 			Expect("GET").To(Equal(httpReq.Method))
 		})
 
@@ -52,6 +54,7 @@ var _ = Describe("RequestAccessor tests", func() {
 			httpReq, err := accessor.EventToRequestWithContext(context.Background(), binaryRequest)
 			Expect(err).To(BeNil())
 			Expect("/hello").To(Equal(httpReq.URL.Path))
+			Expect("/hello").To(Equal(httpReq.RequestURI))
 			Expect("POST").To(Equal(httpReq.Method))
 
 			bodyBytes, err := ioutil.ReadAll(httpReq.Body)
@@ -74,6 +77,9 @@ var _ = Describe("RequestAccessor tests", func() {
 			httpReq, err := accessor.EventToRequestWithContext(context.Background(), mqsRequest)
 			Expect(err).To(BeNil())
 			Expect("/hello").To(Equal(httpReq.URL.Path))
+			Expect(httpReq.RequestURI).To(ContainSubstring("hello=1"))
+			Expect(httpReq.RequestURI).To(ContainSubstring("world=2"))
+			Expect(httpReq.RequestURI).To(ContainSubstring("world=3"))
 			Expect("GET").To(Equal(httpReq.Method))
 
 			query := httpReq.URL.Query()
@@ -98,6 +104,8 @@ var _ = Describe("RequestAccessor tests", func() {
 			httpReq, err := accessor.EventToRequestWithContext(context.Background(), qsRequest)
 			Expect(err).To(BeNil())
 			Expect("/hello").To(Equal(httpReq.URL.Path))
+			Expect(httpReq.RequestURI).To(ContainSubstring("hello=1"))
+			Expect(httpReq.RequestURI).To(ContainSubstring("world=2"))
 			Expect("GET").To(Equal(httpReq.Method))
 
 			query := httpReq.URL.Query()
@@ -156,6 +164,7 @@ var _ = Describe("RequestAccessor tests", func() {
 
 			Expect(err).To(BeNil())
 			Expect("/orders").To(Equal(httpReq.URL.Path))
+			Expect("/orders").To(Equal(httpReq.RequestURI))
 		})
 
 		contextRequest := getProxyRequest("orders", "GET")