Add retries support for vs/vsr

internal/configs/virtualserver_test.go

@@ -931,17 +931,13 @@ func TestGenerateString(t *testing.T) {
 		expected string
 	}{
 		{
-			inputS:   "error timeout",
-			expected: "error timeout",
+			inputS:   "http_404",
+			expected: "http_404",
 		},
 		{
 			inputS:   "",
 			expected: "error timeout",
 		},
-		{
-			inputS:   "http_404",
-			expected: "http_404",
-		},
 	}
 
 	for _, test := range tests {

pkg/apis/configuration/validation/validation.go

@@ -159,7 +159,7 @@ func validateUpstreams(upstreams []v1alpha1.Upstream, fieldPath *field.Path, isP
 	return allErrs, upstreamNames
 }
 
-var validVariableParams = map[string]bool{
+var validNextUpstreamParams = map[string]bool{
 	"error":          true,
 	"timeout":        true,
 	"invalid_header": true,
@@ -172,23 +172,22 @@ var validVariableParams = map[string]bool{
 	"http_429":       true,
 	"non_idempotent": true,
 	"off":            true,
+	"":               true,
 }
 
 // validateNextUpstream checks the values given for passing queries to a upstream
 func validateNextUpstream(nextUpstream string, fieldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
-	var occur int
+	allParams := sets.String{}
 	params := strings.Fields(nextUpstream)
 	for _, para := range params {
-		if !validVariableParams[para] {
+		if !validNextUpstreamParams[para] {
 			allErrs = append(allErrs, field.Invalid(fieldPath, para, "not a valid parameter"))
 		}
-		for _, p := range params {
-			if p == para {
-				occur++
-			} else if occur > 1 {
-				allErrs = append(allErrs, field.Invalid(fieldPath, para, "can not have recurring parameters"))
-			}
+		if allParams.Has(para) {
+			allErrs = append(allErrs, field.Invalid(fieldPath, para, "can not have duplicate parameters"))
+		} else {
+			allParams.Insert(para)
 		}
 	}
 	return allErrs

pkg/apis/configuration/validation/validation_test.go

@@ -314,14 +314,13 @@ func TestValidateNextUpstream(t *testing.T) {
 			inputS: "error timeout",
 		},
 		{
-
 			inputS: "http_404 timeout",
 		},
 	}
 	for _, test := range tests {
 		allErrs := validateNextUpstream(test.inputS, field.NewPath("next-upstreams"))
 		if len(allErrs) > 0 {
-			t.Errorf("validateNextUpstream() returned errors %v for valid input for the case of %s", allErrs, test.inputS)
+			t.Errorf("validateNextUpstream(%q) returned errors %v for valid input for the case of %s", test.inputS, allErrs, test.inputS)
 		}
 	}
 }
@@ -333,17 +332,14 @@ func TestValidateNextUpstreamFails(t *testing.T) {
 		{
 			inputS: "error error",
 		},
-		{
-			inputS: "",
-		},
 		{
 			inputS: "https_404",
 		},
 	}
 	for _, test := range tests {
 		allErrs := validateNextUpstream(test.inputS, field.NewPath("next-upstreams"))
 		if len(allErrs) < 0 {
-			t.Errorf("validateNextUpstream() didn't return errors %v for invalid input for the case of %s", allErrs, test.inputS)
+			t.Errorf("validateNextUpstream(%q) didn't return errors %v for invalid input for the case of %s", test.inputS, allErrs, test.inputS)
 		}
 	}
 }