httpmock: propagate original HTTP request to HTTP response

pborzenkov · pborzenkov · commit aa8f8e8904d1 · 2020-06-27T18:47:06.000+03:00
So that it's possible to access it in mocked HTTP tests.

Signed-off-by: Pavel Borzenkov &lt;pavel.borzenkov@gmail.com&gt;
diff --git a/pkg/httpmock/legacy.go b/pkg/httpmock/legacy.go
@@ -12,19 +12,19 @@ import (
 // TODO: clean up methods in this file when there are no more callers
 
 func (r *Registry) StubResponse(status int, body io.Reader) {
-	r.Register(MatchAny, func(*http.Request) (*http.Response, error) {
-		return httpResponse(status, body), nil
+	r.Register(MatchAny, func(req *http.Request) (*http.Response, error) {
+		return httpResponse(status, req, body), nil
 	})
 }
 
 func (r *Registry) StubWithFixture(status int, fixtureFileName string) func() {
 	fixturePath := path.Join("../test/fixtures/", fixtureFileName)
 	fixtureFile, err := os.Open(fixturePath)
-	r.Register(MatchAny, func(*http.Request) (*http.Response, error) {
+	r.Register(MatchAny, func(req *http.Request) (*http.Response, error) {
 		if err != nil {
 			return nil, err
 		}
-		return httpResponse(200, fixtureFile), nil
+		return httpResponse(200, req, fixtureFile), nil
 	})
 	return func() {
 		if err == nil {
diff --git a/pkg/httpmock/stub.go b/pkg/httpmock/stub.go
@@ -59,15 +59,15 @@ func decodeJSONBody(req *http.Request, dest interface{}) error {
 }
 
 func StringResponse(body string) Responder {
-	return func(*http.Request) (*http.Response, error) {
-		return httpResponse(200, bytes.NewBufferString(body)), nil
+	return func(req *http.Request) (*http.Response, error) {
+		return httpResponse(200, req, bytes.NewBufferString(body)), nil
 	}
 }
 
 func JSONResponse(body interface{}) Responder {
-	return func(*http.Request) (*http.Response, error) {
+	return func(req *http.Request) (*http.Response, error) {
 		b, _ := json.Marshal(body)
-		return httpResponse(200, bytes.NewBuffer(b)), nil
+		return httpResponse(200, req, bytes.NewBuffer(b)), nil
 	}
 }
 
@@ -84,7 +84,7 @@ func GraphQLMutation(body string, cb func(map[string]interface{})) Responder {
 		}
 		cb(bodyData.Variables.Input)
 
-		return httpResponse(200, bytes.NewBufferString(body)), nil
+		return httpResponse(200, req, bytes.NewBufferString(body)), nil
 	}
 }
 
@@ -100,13 +100,14 @@ func GraphQLQuery(body string, cb func(string, map[string]interface{})) Responde
 		}
 		cb(bodyData.Query, bodyData.Variables)
 
-		return httpResponse(200, bytes.NewBufferString(body)), nil
+		return httpResponse(200, req, bytes.NewBufferString(body)), nil
 	}
 }
 
-func httpResponse(status int, body io.Reader) *http.Response {
+func httpResponse(status int, req *http.Request, body io.Reader) *http.Response {
 	return &http.Response{
 		StatusCode: status,
+		Request:    req,
 		Body:       ioutil.NopCloser(body),
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -59,15 +59,15 @@ func decodeJSONBody(req *http.Request, dest interface{}) error {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`func StringResponse(body string) Responder {`
`62`		`- return func(http.Request) (http.Response, error) {`
`63`		`- return httpResponse(200, bytes.NewBufferString(body)), nil`
	`62`	`+ return func(req http.Request) (http.Response, error) {`
	`63`	`+ return httpResponse(200, req, bytes.NewBufferString(body)), nil`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`func JSONResponse(body interface{}) Responder {`
`68`		`- return func(http.Request) (http.Response, error) {`
	`68`	`+ return func(req http.Request) (http.Response, error) {`
`69`	`69`	`b, _ := json.Marshal(body)`
`70`		`- return httpResponse(200, bytes.NewBuffer(b)), nil`
	`70`	`+ return httpResponse(200, req, bytes.NewBuffer(b)), nil`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`@@ -84,7 +84,7 @@ func GraphQLMutation(body string, cb func(map[string]interface{})) Responder {`
`84`	`84`	`}`
`85`	`85`	`cb(bodyData.Variables.Input)`
`86`	`86`
`87`		`- return httpResponse(200, bytes.NewBufferString(body)), nil`
	`87`	`+ return httpResponse(200, req, bytes.NewBufferString(body)), nil`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`@@ -100,13 +100,14 @@ func GraphQLQuery(body string, cb func(string, map[string]interface{})) Responde`
`100`	`100`	`}`
`101`	`101`	`cb(bodyData.Query, bodyData.Variables)`
`102`	`102`
`103`		`- return httpResponse(200, bytes.NewBufferString(body)), nil`
	`103`	`+ return httpResponse(200, req, bytes.NewBufferString(body)), nil`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`107`		`-func httpResponse(status int, body io.Reader) *http.Response {`
	`107`	`+func httpResponse(status int, req http.Request, body io.Reader) http.Response {`
`108`	`108`	`return &http.Response{`
`109`	`109`	`StatusCode: status,`
	`110`	`+ Request: req,`
`110`	`111`	`Body: ioutil.NopCloser(body),`
`111`	`112`	`}`
`112`	`113`	`}`