fix nits

conformance/tests/httproute-request-redirect.go

@@ -43,8 +43,8 @@ var HTTPRouteRequestRedirect = suite.ConformanceTest{
 
 		testCases := []http.ExpectedResponse{{
 			Request: http.Request{
-				Path:             "/hostname",
-				UnFollowRedirect: true,
+				Path:             "/hostname-redirect",
+				UnfollowRedirect: true,
 			},
 			Response: http.Response{
 				StatusCode: 302,
@@ -57,7 +57,7 @@ var HTTPRouteRequestRedirect = suite.ConformanceTest{
 		}, {
 			Request: http.Request{
 				Path:             "/status-code-301",
-				UnFollowRedirect: true,
+				UnfollowRedirect: true,
 			},
 			Response: http.Response{
 				StatusCode: 301,
@@ -67,7 +67,7 @@ var HTTPRouteRequestRedirect = suite.ConformanceTest{
 		}, {
 			Request: http.Request{
 				Path:             "/host-and-status",
-				UnFollowRedirect: true,
+				UnfollowRedirect: true,
 			},
 			Response: http.Response{
 				StatusCode: 301,

conformance/tests/httproute-request-redirect.yaml

@@ -10,7 +10,7 @@ spec:
   - matches:
     - path:
         type: PathPrefix
-        value: /hostname
+        value: /hostname-redirect
     filters:
     - type: RequestRedirect
       requestRedirect:
@@ -37,4 +37,4 @@ spec:
         hostname: example.org
     backendRefs:
     - name: infra-backend-v1
-      port: 8080
+      port: 8080

conformance/utils/http/http.go

@@ -63,7 +63,7 @@ type Request struct {
 	Method           string
 	Path             string
 	Headers          map[string]string
-	UnFollowRedirect bool
+	UnfollowRedirect bool
 }
 
 // ExpectedRequest defines expected properties of a request that reaches a backend.
@@ -114,7 +114,7 @@ func MakeRequestAndExpectEventuallyConsistentResponse(t *testing.T, r roundtripp
 		URL:              url.URL{Scheme: "http", Host: gwAddr, Path: path, RawQuery: query},
 		Protocol:         "HTTP",
 		Headers:          map[string][]string{},
-		UnFollowRedirect: expected.Request.UnFollowRedirect,
+		UnfollowRedirect: expected.Request.UnfollowRedirect,
 	}
 
 	if expected.Request.Headers != nil {

conformance/utils/roundtripper/roundtripper.go

@@ -42,7 +42,7 @@ type Request struct {
 	Protocol         string
 	Method           string
 	Headers          map[string][]string
-	UnFollowRedirect bool
+	UnfollowRedirect bool
 }
 
 // CapturedRequest contains request metadata captured from an echoserver
@@ -58,6 +58,8 @@ type CapturedRequest struct {
 	Pod       string `json:"pod"`
 }
 
+// RedirectRequest contains a follow up request metadata captured from a redirect
+// response.
 type RedirectRequest struct {
 	Scheme   string
 	Hostname string
@@ -88,7 +90,7 @@ func (d *DefaultRoundTripper) CaptureRoundTrip(request Request) (*CapturedReques
 	cReq := &CapturedRequest{}
 	client := http.DefaultClient
 
-	if request.UnFollowRedirect {
+	if request.UnfollowRedirect {
 		client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
 			return http.ErrUseLastResponse
 		}
@@ -173,13 +175,7 @@ func (d *DefaultRoundTripper) CaptureRoundTrip(request Request) (*CapturedReques
 	return cReq, cRes, nil
 }
 
-var startLineRegex = regexp.MustCompile(`(?m)^`)
-
-func formatDump(data []byte, prefix string) string {
-	data = startLineRegex.ReplaceAllLiteral(data, []byte(prefix))
-	return string(data)
-}
-
+// IsRedirect returns true if a given status code is a redirect code supported by the gateway api.
 func IsRedirect(statusCode int) bool {
 	// Gateway allows only 301, and 302
 	switch statusCode {
@@ -190,3 +186,10 @@ func IsRedirect(statusCode int) bool {
 
 	return false
 }
+
+var startLineRegex = regexp.MustCompile(`(?m)^`)
+
+func formatDump(data []byte, prefix string) string {
+	data = startLineRegex.ReplaceAllLiteral(data, []byte(prefix))
+	return string(data)
+}