Merge ee50c09 into b9e5048

uber · Mar 28, 2020 · 9be9d2e · 9be9d2e
2 parents b9e5048 + ee50c09
commit 9be9d2e
Show file tree

Hide file tree

Showing 12 changed files with 223 additions and 52 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/http_client.tmpl b/codegen/templates/http_client.tmpl
@@ -306,7 +306,11 @@ func (c *{{$clientName}}) {{$methodName}}(
 		return responseBody, respHeaders, nil
 		{{ else }}
 		var responseBody {{unref .ResponseType}}
-		err = res.ReadAndUnmarshalBody(&responseBody)
+		rawBody, err := res.ReadAll()
+		if err != nil {
+			return defaultRes, respHeaders, err
+		}
+		err = res.UnmarshalBody(&responseBody, rawBody)
 		if err != nil {
 			return defaultRes, respHeaders, err
 		}
@@ -378,7 +382,11 @@ func (c *{{$clientName}}) {{$methodName}}(
 		return responseBody, respHeaders, nil
 		{{ else }}
 		var responseBody {{unref .ResponseType}}
-		err = res.ReadAndUnmarshalBody(&responseBody)
+		rawBody, err := res.ReadAll()
+		if err != nil {
+			return defaultRes, respHeaders, err
+		}
+		err = res.UnmarshalBody(&responseBody, rawBody)
 		if err != nil {
 			return defaultRes, respHeaders, err
 		}