Add option to ignore whitespace in the resposnse header values

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

Author: zhaohuabing

conformance/tests/httproute-cors.go

@@ -84,6 +84,7 @@ var HTTPRouteCORS = suite.ConformanceTest{
 						"access-control-max-age":           "3600",
 						"access-control-allow-credentials": "true",
 					},
+					IgnoreWhitespace: true,
 				},
 			},
 			{
@@ -120,6 +121,7 @@ var HTTPRouteCORS = suite.ConformanceTest{
 						"access-control-max-age":           "3600",
 						"access-control-allow-credentials": "true",
 					},
+					IgnoreWhitespace: true,
 				},
 			},
 			{

conformance/utils/http/http.go

@@ -83,9 +83,13 @@ type ExpectedRequest struct {
 
 // Response defines expected properties of a response from a backend.
 type Response struct {
-	StatusCode    int
-	Headers       map[string]string
-	AbsentHeaders []string
+	StatusCode       int
+	Headers          map[string]string
+	AbsentHeaders    []string
+
+	// IgnoreWhitespace will cause whitespace to be ignored when comparing the respond
+	// header values.
+	IgnoreWhitespace bool
 }
 
 type BackendRef struct {
@@ -314,8 +318,14 @@ func CompareRequest(t *testing.T, req *roundtripper.Request, cReq *roundtripper.
 				actualVal, ok := cRes.Headers[strings.ToLower(name)]
 				if !ok {
 					return fmt.Errorf("expected %s header to be set, actual headers: %v", name, cRes.Headers)
-				} else if strings.Join(actualVal, ",") != expectedVal {
-					return fmt.Errorf("expected %s header to be set to %s, got %s", name, expectedVal, strings.Join(actualVal, ","))
+				}
+				actualValStr := strings.Join(actualVal, ",")
+				if expected.Response.IgnoreWhitespace {
+					actualValStr = strings.ReplaceAll(actualValStr, " ", "")
+					expectedVal = strings.ReplaceAll(expectedVal, " ", "")
+				}
+				if actualValStr != expectedVal {
+					return fmt.Errorf("expected %s header to be set to %s, got %s", name, expectedVal, actualValStr)
 				}
 			}
 		}