From 04d24e1ff722dc96c8b13d778807d44d1e0e3713 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Wed, 13 Jun 2018 21:10:33 +0200 Subject: [PATCH] Switch forwarded-headers e2e to use gorequest. --- test/e2e/settings/forwarded_headers.go | 50 ++++++++++++-------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/test/e2e/settings/forwarded_headers.go b/test/e2e/settings/forwarded_headers.go index c8eee1b5e..35f9a5fff 100644 --- a/test/e2e/settings/forwarded_headers.go +++ b/test/e2e/settings/forwarded_headers.go @@ -18,12 +18,12 @@ package settings import ( "fmt" - "io/ioutil" - "net" + "net/http" "strings" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/parnurzeal/gorequest" "k8s.io/ingress-nginx/test/e2e/framework" ) @@ -60,20 +60,17 @@ var _ = framework.IngressNginxDescribe("X-Forwarded headers", func() { }) Expect(err).NotTo(HaveOccurred()) - ip, err := f.GetNginxIP() - Expect(err).NotTo(HaveOccurred()) - port, err := f.GetNginxPort("http") - Expect(err).NotTo(HaveOccurred()) + resp, body, errs := gorequest.New(). + Get(f.IngressController.HTTPURL). + Set("Host", host). + Set("X-Forwarded-Port", "1234"). + Set("X-Forwarded-Proto", "myproto"). + Set("X-Forwarded-For", "1.2.3.4"). + Set("X-Forwarded-Host", "myhost"). + End() - conn, err := net.Dial("tcp", fmt.Sprintf("%v:%v", ip, port)) - Expect(err).NotTo(HaveOccurred()) - defer conn.Close() - - conn.Write([]byte("GET / HTTP/1.1\r\nHost: forwarded-headers\r\nX-Forwarded-Port: 1234\r\nX-Forwarded-Proto: myproto\r\nX-Forwarded-For: 1.2.3.4\r\nX-Forwarded-Host: myhost\r\n\r\n")) - - data, err := ioutil.ReadAll(conn) - Expect(err).NotTo(HaveOccurred()) - body := string(data) + Expect(len(errs)).Should(BeNumerically("==", 0)) + Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(body).Should(ContainSubstring(fmt.Sprintf("host=myhost"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-host=myhost"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-proto=myproto"))) @@ -96,20 +93,17 @@ var _ = framework.IngressNginxDescribe("X-Forwarded headers", func() { }) Expect(err).NotTo(HaveOccurred()) - ip, err := f.GetNginxIP() - Expect(err).NotTo(HaveOccurred()) - port, err := f.GetNginxPort("http") - Expect(err).NotTo(HaveOccurred()) + resp, body, errs := gorequest.New(). + Get(f.IngressController.HTTPURL). + Set("Host", host). + Set("X-Forwarded-Port", "1234"). + Set("X-Forwarded-Proto", "myproto"). + Set("X-Forwarded-For", "1.2.3.4"). + Set("X-Forwarded-Host", "myhost"). + End() - conn, err := net.Dial("tcp", fmt.Sprintf("%v:%v", ip, port)) - Expect(err).NotTo(HaveOccurred()) - defer conn.Close() - - conn.Write([]byte("GET / HTTP/1.1\r\nHost: forwarded-headers\r\nX-Forwarded-Port: 1234\r\nX-Forwarded-Proto: myproto\r\nX-Forwarded-For: 1.2.3.4\r\nX-Forwarded-Host: myhost\r\n\r\n")) - - data, err := ioutil.ReadAll(conn) - Expect(err).NotTo(HaveOccurred()) - body := string(data) + Expect(len(errs)).Should(BeNumerically("==", 0)) + Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(body).Should(ContainSubstring(fmt.Sprintf("host=forwarded-headers"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-port=80"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-proto=http")))