Send a print out original path of request (istio#32152)

howardjohn · web-flow · commit 78136cdcd667 · 2021-04-13T14:00:05.000-07:00
Avoid golang processing the URL which limits our ability to tests
non-standard clients.
diff --git a/pkg/test/echo/server/endpoint/http.go b/pkg/test/echo/server/endpoint/http.go
@@ -302,7 +302,8 @@ func (h *httpHandler) addResponsePayload(r *http.Request, body *bytes.Buffer) {
 	writeField(body, response.ServiceVersionField, h.Version)
 	writeField(body, response.ServicePortField, port)
 	writeField(body, response.HostField, r.Host)
-	writeField(body, response.URLField, r.URL.String())
+	// Use raw path, we don't want golang normalizing anything since we use this for testing purposes
+	writeField(body, response.URLField, r.RequestURI)
 	writeField(body, response.ClusterField, h.Cluster)
 	writeField(body, response.IstioVersionField, h.IstioVersion)
 
diff --git a/pkg/test/echo/server/forwarder/http.go b/pkg/test/echo/server/forwarder/http.go
@@ -72,6 +72,8 @@ func (c *httpProtocol) makeRequest(ctx context.Context, req *request) (string, e
 	if err != nil {
 		return "", err
 	}
+	// Use raw path, we don't want golang normalizing anything since we use this for testing purposes
+	httpReq.URL.Opaque = httpReq.URL.RawPath
 
 	// Set the per-request timeout.
 	ctx, cancel := context.WithTimeout(ctx, req.Timeout)

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ func (c httpProtocol) makeRequest(ctx context.Context, req request) (string, e`
`72`	`72`	`if err != nil {`
`73`	`73`	`return "", err`
`74`	`74`	`}`
	`75`	`+ // Use raw path, we don't want golang normalizing anything since we use this for testing purposes`
	`76`	`+ httpReq.URL.Opaque = httpReq.URL.RawPath`
`75`	`77`
`76`	`78`	`// Set the per-request timeout.`
`77`	`79`	`ctx, cancel := context.WithTimeout(ctx, req.Timeout)`