address comment

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

Author: zhaohuabing

conformance/tests/httproute-cors.go

@@ -76,13 +76,22 @@ var HTTPRouteCORS = suite.ConformanceTest{
 				Namespace: "",
 				Response: http.Response{
 					StatusCodes: []int{200, 204},
-					Headers: map[string]string{
-						"access-control-allow-origin":      "https://www.foo.com",
-						"access-control-allow-methods":     "GET, OPTIONS",
-						"access-control-allow-headers":     "x-header-1, x-header-2",
-						"access-control-expose-headers":    "x-header-3, x-header-4",
-						"access-control-max-age":           "3600",
-						"access-control-allow-credentials": "true",
+					HeadersWithMultipleValues: map[string][]string{
+						"access-control-allow-origin": {"https://www.foo.com"},
+						"access-control-allow-methods": {
+							"GET, OPTIONS",
+							"OPTIONS, GET",
+						},
+						"access-control-allow-headers": {
+							"x-header-1, x-header-2",
+							"x-header-2, x-header-1",
+						},
+						"access-control-expose-headers": {
+							"x-header-3, x-header-4",
+							"x-header-4, x-header-3",
+						},
+						"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.
@@ -114,14 +123,22 @@ var HTTPRouteCORS = suite.ConformanceTest{
 				},
 				Namespace: "",
 				Response: http.Response{
-					StatusCodes: []int{200, 204},
-					Headers: map[string]string{
-						"access-control-allow-origin":      "https://www.bar.com",
-						"access-control-allow-methods":     "GET, OPTIONS",
-						"access-control-allow-headers":     "x-header-1, x-header-2",
-						"access-control-expose-headers":    "x-header-3, x-header-4",
-						"access-control-max-age":           "3600",
-						"access-control-allow-credentials": "true",
+					StatusCode: 200,
+					HeadersWithMultipleValues: map[string][]string{
+						"access-control-allow-origin": {"https://www.bar.com"},
+						"access-control-allow-methods": {
+							"GET, OPTIONS",
+							"OPTIONS, GET"},
+						"access-control-allow-headers": {
+							"x-header-1, x-header-2",
+							"x-header-2, x-header-1",
+						},
+						"access-control-expose-headers": {
+							"x-header-3, x-header-4",
+							"x-header-4, x-header-3",
+						},
+						"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.

conformance/utils/http/http.go

@@ -84,10 +84,11 @@ type ExpectedRequest struct {
 
 // Response defines expected properties of a response from a backend.
 type Response struct {
-	StatusCode    int
-	StatusCodes   []int // alternative to StatusCode, allows multiple acceptable codes
-	Headers       map[string]string
-	AbsentHeaders []string
+	StatusCode                int
+	StatusCodes               []int // alternative to StatusCode, allows multiple acceptable codes
+	Headers                   map[string]string
+	HeadersWithMultipleValues map[string][]string // allows multiple values for a header
+	AbsentHeaders             []string
 
 	// IgnoreWhitespace will cause whitespace to be ignored when comparing the respond
 	// header values.
@@ -343,26 +344,52 @@ func CompareRequest(t *testing.T, req *roundtripper.Request, cReq *roundtripper.
 			}
 		}
 
-		if expected.Response.Headers != nil {
+		if expected.Response.Headers != nil || expected.Response.HeadersWithMultipleValues != nil {
 			if cRes.Headers == nil {
 				return fmt.Errorf("no headers captured, expected %v", len(expected.Response.Headers))
 			}
 			for name, val := range cRes.Headers {
 				cRes.Headers[strings.ToLower(name)] = val
 			}
 
-			for name, expectedVal := range expected.Response.Headers {
-				actualVal, ok := cRes.Headers[strings.ToLower(name)]
-				if !ok {
-					return fmt.Errorf("expected %s header to be set, actual headers: %v", name, cRes.Headers)
-				}
-				actualValStr := strings.Join(actualVal, ",")
-				if expected.Response.IgnoreWhitespace {
-					actualValStr = strings.ReplaceAll(actualValStr, " ", "")
-					expectedVal = strings.ReplaceAll(expectedVal, " ", "")
+			if expected.Response.HeadersWithMultipleValues != nil {
+				for name, expectedVals := range expected.Response.HeadersWithMultipleValues {
+					actualVal, ok := cRes.Headers[strings.ToLower(name)]
+					if !ok {
+						return fmt.Errorf("expected %s header to be set, actual headers: %v", name, cRes.Headers)
+					}
+					actualValStr := strings.Join(actualVal, ",")
+					if expected.Response.IgnoreWhitespace {
+						actualValStr = strings.ReplaceAll(actualValStr, " ", "")
+						for i := range expectedVals {
+							expectedVals[i] = strings.ReplaceAll(expectedVals[i], " ", "")
+						}
+					}
+					matched := false
+					for _, expectedVal := range expectedVals {
+						if actualValStr == expectedVal {
+							matched = true
+							break
+						}
+					}
+					if !matched {
+						return fmt.Errorf("expected %s header to be set to one of %v, got %s", name, expectedVals, actualValStr)
+					}
 				}
-				if actualValStr != expectedVal {
-					return fmt.Errorf("expected %s header to be set to %s, got %s", name, expectedVal, actualValStr)
+			} else {
+				for name, expectedVal := range expected.Response.Headers {
+					actualVal, ok := cRes.Headers[strings.ToLower(name)]
+					if !ok {
+						return fmt.Errorf("expected %s header to be set, actual headers: %v", name, cRes.Headers)
+					}
+					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)
+					}
 				}
 			}
 		}