Merge pull request kubernetes#88140 from wongma7/websocket-header

k8s-ci-robot · web-flow · commit 12eeb34a6d73 · 2020-02-13T19:48:17.000-08:00
Construct http Request using http.NewRequest
diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
@@ -1536,7 +1536,11 @@ func headersForConfig(c *restclient.Config, url *url.URL) (http.Header, error) {
 	if err != nil {
 		return nil, err
 	}
-	if _, err := rt.RoundTrip(&http.Request{Header: make(http.Header), URL: url}); err != nil {
+	request, err := http.NewRequest("GET", url.String(), nil)
+	if err != nil {
+		return nil, err
+	}
+	if _, err := rt.RoundTrip(request); err != nil {
 		return nil, err
 	}
 	return extract.Header, nil

Original file line number	Diff line number	Diff line change
`@@ -1536,7 +1536,11 @@ func headersForConfig(c restclient.Config, url url.URL) (http.Header, error) {`
`1536`	`1536`	`if err != nil {`
`1537`	`1537`	`return nil, err`
`1538`	`1538`	`}`
`1539`		`- if _, err := rt.RoundTrip(&http.Request{Header: make(http.Header), URL: url}); err != nil {`
	`1539`	`+ request, err := http.NewRequest("GET", url.String(), nil)`
	`1540`	`+ if err != nil {`
	`1541`	`+ return nil, err`
	`1542`	`+ }`
	`1543`	`+ if _, err := rt.RoundTrip(request); err != nil {`
`1540`	`1544`	`return nil, err`
`1541`	`1545`	`}`
`1542`	`1546`	`return extract.Header, nil`