Rename ValidateRequestHeader to ValidateFilterHeader

Author: kevin85421

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

@@ -72,13 +72,13 @@ func (HTTPURLRewriteValidator) ValidateRewritePath(path string) error {
 	return nil
 }
 
-func (HTTPRequestHeaderValidator) ValidateRequestHeaderName(name string) error {
+func (HTTPRequestHeaderValidator) ValidateFilterHeaderName(name string) error {
 	return validateHeaderName(name)
 }
 
 var requestHeaderValueExamples = []string{"my-header-value", "example/12345=="}
 
-func (HTTPRequestHeaderValidator) ValidateRequestHeaderValue(value string) error {
+func (HTTPRequestHeaderValidator) ValidateFilterHeaderValue(value string) error {
 	// Variables in header values are supported by NGINX but not required by the Gateway API.
 	return validateEscapedStringNoVarExpansion(value, requestHeaderValueExamples)
 }

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

@@ -88,25 +88,25 @@ func TestValidateRewritePath(t *testing.T) {
 	)
 }
 
-func TestValidateRequestHeaderName(t *testing.T) {
+func TestValidateFilterHeaderName(t *testing.T) {
 	validator := HTTPRequestHeaderValidator{}
 
 	testValidValuesForSimpleValidator(
 		t,
-		validator.ValidateRequestHeaderName,
+		validator.ValidateFilterHeaderName,
 		"Content-Encoding",
 		"MyBespokeHeader",
 	)
 
-	testInvalidValuesForSimpleValidator(t, validator.ValidateRequestHeaderName, "$Content-Encoding")
+	testInvalidValuesForSimpleValidator(t, validator.ValidateFilterHeaderName, "$Content-Encoding")
 }
 
-func TestValidateRequestHeaderValue(t *testing.T) {
+func TestValidateFilterHeaderValue(t *testing.T) {
 	validator := HTTPRequestHeaderValidator{}
 
 	testValidValuesForSimpleValidator(
 		t,
-		validator.ValidateRequestHeaderValue,
+		validator.ValidateFilterHeaderValue,
 		"my-cookie-name",
 		"ssl_(server_name}",
 		"example/1234==",
@@ -115,7 +115,7 @@ func TestValidateRequestHeaderValue(t *testing.T) {
 
 	testInvalidValuesForSimpleValidator(
 		t,
-		validator.ValidateRequestHeaderValue,
+		validator.ValidateFilterHeaderValue,
 		"$Content-Encoding",
 		`"example"`,
 	)

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

@@ -832,27 +832,27 @@ func validateFilterHeaderModifierFields(
 	var allErrs field.ErrorList
 
 	for _, h := range headerModifier.Add {
-		if err := validator.ValidateRequestHeaderName(string(h.Name)); err != nil {
+		if err := validator.ValidateFilterHeaderName(string(h.Name)); err != nil {
 			valErr := field.Invalid(headerModifierPath.Child("add"), h, err.Error())
 			allErrs = append(allErrs, valErr)
 		}
-		if err := validator.ValidateRequestHeaderValue(h.Value); err != nil {
+		if err := validator.ValidateFilterHeaderValue(h.Value); err != nil {
 			valErr := field.Invalid(headerModifierPath.Child("add"), h, err.Error())
 			allErrs = append(allErrs, valErr)
 		}
 	}
 	for _, h := range headerModifier.Set {
-		if err := validator.ValidateRequestHeaderName(string(h.Name)); err != nil {
+		if err := validator.ValidateFilterHeaderName(string(h.Name)); err != nil {
 			valErr := field.Invalid(headerModifierPath.Child("set"), h, err.Error())
 			allErrs = append(allErrs, valErr)
 		}
-		if err := validator.ValidateRequestHeaderValue(h.Value); err != nil {
+		if err := validator.ValidateFilterHeaderValue(h.Value); err != nil {
 			valErr := field.Invalid(headerModifierPath.Child("set"), h, err.Error())
 			allErrs = append(allErrs, valErr)
 		}
 	}
 	for _, h := range headerModifier.Remove {
-		if err := validator.ValidateRequestHeaderName(h); err != nil {
+		if err := validator.ValidateFilterHeaderName(h); err != nil {
 			valErr := field.Invalid(headerModifierPath.Child("remove"), h, err.Error())
 			allErrs = append(allErrs, valErr)
 		}

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

@@ -2236,7 +2236,7 @@ func TestValidateFilterRequestHeaderModifier(t *testing.T) {
 		{
 			validator: func() *validationfakes.FakeHTTPFieldsValidator {
 				v := createAllValidValidator()
-				v.ValidateRequestHeaderNameReturns(errors.New("Invalid header"))
+				v.ValidateFilterHeaderNameReturns(errors.New("Invalid header"))
 				return v
 			}(),
 			filter: gatewayv1.HTTPRouteFilter{
@@ -2253,7 +2253,7 @@ func TestValidateFilterRequestHeaderModifier(t *testing.T) {
 		{
 			validator: func() *validationfakes.FakeHTTPFieldsValidator {
 				v := createAllValidValidator()
-				v.ValidateRequestHeaderNameReturns(errors.New("Invalid header"))
+				v.ValidateFilterHeaderNameReturns(errors.New("Invalid header"))
 				return v
 			}(),
 			filter: gatewayv1.HTTPRouteFilter{
@@ -2268,7 +2268,7 @@ func TestValidateFilterRequestHeaderModifier(t *testing.T) {
 		{
 			validator: func() *validationfakes.FakeHTTPFieldsValidator {
 				v := createAllValidValidator()
-				v.ValidateRequestHeaderValueReturns(errors.New("Invalid header value"))
+				v.ValidateFilterHeaderValueReturns(errors.New("Invalid header value"))
 				return v
 			}(),
 			filter: gatewayv1.HTTPRouteFilter{
@@ -2285,8 +2285,8 @@ func TestValidateFilterRequestHeaderModifier(t *testing.T) {
 		{
 			validator: func() *validationfakes.FakeHTTPFieldsValidator {
 				v := createAllValidValidator()
-				v.ValidateRequestHeaderValueReturns(errors.New("Invalid header value"))
-				v.ValidateRequestHeaderNameReturns(errors.New("Invalid header"))
+				v.ValidateFilterHeaderValueReturns(errors.New("Invalid header value"))
+				v.ValidateFilterHeaderNameReturns(errors.New("Invalid header"))
 				return v
 			}(),
 			filter: gatewayv1.HTTPRouteFilter{