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,9 @@ var HTTPRouteCORS = suite.ConformanceTest{
 						"access-control-max-age":           "3600",
 						"access-control-allow-credentials": "true",
 					},
+					// Ignore whitespace when comparing the response headers. This is because some
+					// implementations add a space after each comma, and some don't. Both are valid.
+					IgnoreWhitespace: true,
 				},
 			},
 			{
@@ -120,6 +123,9 @@ var HTTPRouteCORS = suite.ConformanceTest{
 						"access-control-max-age":           "3600",
 						"access-control-allow-credentials": "true",
 					},
+					// Ignore whitespace when comparing the response headers. This is because some
+					// implementations add a space after each comma, and some don't. Both are valid.
+					IgnoreWhitespace: true,
 				},
 			},
 			{

conformance/utils/http/http.go

@@ -98,6 +98,9 @@ type Response struct {
 	Headers       map[string]string
 	AbsentHeaders []string
 	Protocol      string
+	// IgnoreWhitespace will cause whitespace to be ignored when comparing the respond
+	// header values.
+	IgnoreWhitespace bool
 }
 
 type BackendRef struct {
@@ -375,8 +378,14 @@ func CompareRoundTrip(t *testing.T, req *roundtripper.Request, cReq *roundtrippe
 				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)
 				}
 			}
 		}