Refactor status code validations

pkg/apis/configuration/validation/validation.go

@@ -171,24 +171,23 @@ func validateStatusMatch(s string, fieldPath *field.Path) field.ErrorList {
 				allErrs = append(allErrs, field.Invalid(fieldPath, s, "`!` can only appear once at the beginning"))
 			}
 		} else if strings.Contains(value, "-") {
-			statusRange := strings.Split(value, "-")
-
-			if len(statusRange) != 2 {
-				allErrs = append(allErrs, field.Invalid(fieldPath, s, "ranges must only have 2 numbers"))
-			} else {
-				if msg := validateStatusCodeRange(statusRange); msg != "" {
-					allErrs = append(allErrs, field.Invalid(fieldPath, s, msg))
-				}
+			if msg := validateStatusCodeRange(value); msg != "" {
+				allErrs = append(allErrs, field.Invalid(fieldPath, s, msg))
 			}
-		} else if msg := validateStatusCodeInRange(value); msg != "" {
+		} else if msg := validateStatusCode(value); msg != "" {
 			allErrs = append(allErrs, field.Invalid(fieldPath, s, msg))
 		}
 	}
 
 	return allErrs
 }
 
-func validateStatusCodeRange(statusRange []string) string {
+func validateStatusCodeRange(statusRangeStr string) string {
+	statusRange := strings.Split(statusRangeStr, "-")
+	if len(statusRange) != 2 {
+		return "ranges must only have 2 numbers"
+	}
+
 	min, msg := validateIntFromString(statusRange[0])
 	if msg != "" {
 		return msg
@@ -200,7 +199,7 @@ func validateStatusCodeRange(statusRange []string) string {
 	}
 
 	for _, code := range statusRange {
-		if msg := validateStatusCodeInRange(code); msg != "" {
+		if msg := validateStatusCode(code); msg != "" {
 			return msg
 		}
 	}
@@ -221,7 +220,7 @@ func validateIntFromString(number string) (int, string) {
 	return int(numberInt), ""
 }
 
-func validateStatusCodeInRange(status string) string {
+func validateStatusCode(status string) string {
 	code, errMsg := validateIntFromString(status)
 	if errMsg != "" {
 		return errMsg
@@ -252,7 +251,7 @@ func validateHeader(h v1alpha1.Header, fieldPath *field.Path) field.ErrorList {
 	return allErrs
 }
 
-const headerValueFmt = `([^"\\]|\\.)*`
+const headerValueFmt = `([^"$\\]|\\.)*`
 const headerValueFmtErrMsg string = `a valid header must have all '"' escaped and must not end with an unescaped '\'`
 
 var headerValueFmtRegexp = regexp.MustCompile("^" + headerValueFmt + "$")

pkg/apis/configuration/validation/validation_test.go

@@ -1841,6 +1841,13 @@ func TestValidateHeaderFails(t *testing.T) {
 			},
 			msg: "Invalid value with ending '\\'",
 		},
+		{
+			header: v1alpha1.Header{
+				Name:  "Host",
+				Value: "$my.service",
+			},
+			msg: "Invalid value with '$' character",
+		},
 	}
 	for _, test := range tests {
 		allErrs := validateHeader(test.header, field.NewPath("headers"))