add common path validator

Author: salonichf5

internal/mode/static/nginx/config/validation/common_test.go

@@ -75,7 +75,7 @@ func TestValidateValidHeaderName(t *testing.T) {
 	)
 }
 
-func TestValidatePath(t *testing.T) {
+func TestValidatePathForFilters(t *testing.T) {
 	t.Parallel()
 	validator := validatePath
 

internal/mode/static/nginx/config/validation/http_filters.go

@@ -11,6 +11,9 @@ type HTTPURLRewriteValidator struct{}
 // which in NGINX is done with the proxy_set_header directive.
 type HTTPHeaderValidator struct{}
 
+// HTTPCommonValidator validates values for path used in filters.
+type HTTPPathValidator struct{}
+
 var supportedRedirectSchemes = map[string]struct{}{
 	"http":  {},
 	"https": {},
@@ -47,13 +50,8 @@ func (HTTPRedirectValidator) ValidateHostname(hostname string) error {
 	return validateEscapedStringNoVarExpansion(hostname, hostnameExamples)
 }
 
-// ValidateRewritePath validates a path used in a URL Rewrite filter.
-func (HTTPURLRewriteValidator) ValidateRewritePath(path string) error {
-	return validatePath(path)
-}
-
-// ValidateRedirectPath validates a path used in a Request Redirect filter.
-func (HTTPRedirectValidator) ValidateRedirectPath(path string) error {
+// ValidatePath validates a path used in filters.
+func (HTTPPathValidator) ValidatePath(path string) error {
 	return validatePath(path)
 }
 

internal/mode/static/nginx/config/validation/http_filters_test.go

@@ -71,13 +71,13 @@ func TestValidateHostname(t *testing.T) {
 	)
 }
 
-func TestValidateRewritePath(t *testing.T) {
+func TestValidatePath(t *testing.T) {
 	t.Parallel()
-	validator := HTTPURLRewriteValidator{}
+	validator := HTTPPathValidator{}
 
 	testValidValuesForSimpleValidator(
 		t,
-		validator.ValidateRewritePath,
+		validator.ValidatePath,
 		"",
 		"/path",
 		"/longer/path",
@@ -86,29 +86,7 @@ func TestValidateRewritePath(t *testing.T) {
 
 	testInvalidValuesForSimpleValidator(
 		t,
-		validator.ValidateRewritePath,
-		"path",
-		"$path",
-		"/path$",
-	)
-}
-
-func TestValidateRedirectPath(t *testing.T) {
-	t.Parallel()
-	validator := HTTPRedirectValidator{}
-
-	testValidValuesForSimpleValidator(
-		t,
-		validator.ValidateRedirectPath,
-		"",
-		"/path",
-		"/longer/path",
-		"/trailing/",
-	)
-
-	testInvalidValuesForSimpleValidator(
-		t,
-		validator.ValidateRedirectPath,
+		validator.ValidatePath,
 		"path",
 		"$path",
 		"/path$",

internal/mode/static/nginx/config/validation/http_validator.go

@@ -12,6 +12,7 @@ type HTTPValidator struct {
 	HTTPRedirectValidator
 	HTTPURLRewriteValidator
 	HTTPHeaderValidator
+	HTTPPathValidator
 }
 
 var _ validation.HTTPFieldsValidator = HTTPValidator{}

internal/mode/static/state/graph/httproute.go

@@ -340,7 +340,7 @@ func validateFilterRedirect(
 			return append(allErrs, valErr)
 		}
 
-		if err := validator.ValidateRedirectPath(path); err != nil {
+		if err := validator.ValidatePath(path); err != nil {
 			valErr := field.Invalid(redirectPath.Child("path"), *redirect.Path, err.Error())
 			allErrs = append(allErrs, valErr)
 		}
@@ -389,7 +389,7 @@ func validateFilterRewrite(
 			return append(allErrs, valErr)
 		}
 
-		if err := validator.ValidateRewritePath(path); err != nil {
+		if err := validator.ValidatePath(path); err != nil {
 			valErr := field.Invalid(rewritePath.Child("path"), *rewrite.Path, err.Error())
 			allErrs = append(allErrs, valErr)
 		}

internal/mode/static/state/graph/httproute_test.go

@@ -1274,7 +1274,7 @@ func TestValidateFilterRedirect(t *testing.T) {
 		{
 			validator: func() *validationfakes.FakeHTTPFieldsValidator {
 				validator := &validationfakes.FakeHTTPFieldsValidator{}
-				validator.ValidateRedirectPathReturns(errors.New("invalid path value"))
+				validator.ValidatePathReturns(errors.New("invalid path value"))
 				return validator
 			}(),
 			requestRedirect: &gatewayv1.HTTPRequestRedirectFilter{
@@ -1289,7 +1289,7 @@ func TestValidateFilterRedirect(t *testing.T) {
 		{
 			validator: func() *validationfakes.FakeHTTPFieldsValidator {
 				validator := &validationfakes.FakeHTTPFieldsValidator{}
-				validator.ValidateRedirectPathReturns(errors.New("invalid path"))
+				validator.ValidatePathReturns(errors.New("invalid path"))
 				return validator
 			}(),
 			requestRedirect: &gatewayv1.HTTPRequestRedirectFilter{
@@ -1403,7 +1403,7 @@ func TestValidateFilterRewrite(t *testing.T) {
 		{
 			validator: func() *validationfakes.FakeHTTPFieldsValidator {
 				validator := &validationfakes.FakeHTTPFieldsValidator{}
-				validator.ValidateRewritePathReturns(errors.New("invalid path value"))
+				validator.ValidatePathReturns(errors.New("invalid path value"))
 				return validator
 			}(),
 			urlRewrite: &gatewayv1.HTTPURLRewriteFilter{
@@ -1418,7 +1418,7 @@ func TestValidateFilterRewrite(t *testing.T) {
 		{
 			validator: func() *validationfakes.FakeHTTPFieldsValidator {
 				validator := &validationfakes.FakeHTTPFieldsValidator{}
-				validator.ValidateRewritePathReturns(errors.New("invalid path"))
+				validator.ValidatePathReturns(errors.New("invalid path"))
 				return validator
 			}(),
 			urlRewrite: &gatewayv1.HTTPURLRewriteFilter{
@@ -1434,7 +1434,7 @@ func TestValidateFilterRewrite(t *testing.T) {
 			validator: func() *validationfakes.FakeHTTPFieldsValidator {
 				validator := &validationfakes.FakeHTTPFieldsValidator{}
 				validator.ValidateHostnameReturns(errors.New("invalid hostname"))
-				validator.ValidateRewritePathReturns(errors.New("invalid path"))
+				validator.ValidatePathReturns(errors.New("invalid path"))
 				return validator
 			}(),
 			urlRewrite: &gatewayv1.HTTPURLRewriteFilter{