fix commented issue

Author: fabian4

internal/controller/nginx/config/servers.go

@@ -997,23 +997,15 @@ func exactPath(path string) string {
 	return fmt.Sprintf("= %s", path)
 }
 
-func prefixPath(path string) string {
-	return fmt.Sprintf("^~ %s", path)
-}
-
-func regularExpressionPath(path string) string {
-	return fmt.Sprintf("~ %s", path)
-}
-
 // createPath builds the location path depending on the path type.
 func createPath(rule dataplane.PathRule) string {
 	switch rule.PathType {
 	case dataplane.PathTypeExact:
 		return exactPath(rule.Path)
 	case dataplane.PathTypePrefix:
-		return prefixPath(rule.Path)
+		return fmt.Sprintf("^~ %s", rule.Path)
 	case dataplane.PathTypeRegularExpression:
-		return regularExpressionPath(rule.Path)
+		return fmt.Sprintf("~ %s", rule.Path)
 	default:
 		return "" // should never happen because path type is validated earlier
 	}

internal/controller/nginx/config/servers_test.go

@@ -2682,7 +2682,7 @@ func TestCreateLocationsPath(t *testing.T) {
 			},
 		},
 		{
-			Path:     "^/path/(.*)$",
+			Path:     "^/regular-expression-path/(.*)$",
 			PathType: dataplane.PathTypeRegularExpression,
 			MatchRules: []dataplane.MatchRule{
 				{
@@ -2728,7 +2728,7 @@ func TestCreateLocationsPath(t *testing.T) {
 					Type:            http.ExternalLocationType,
 				},
 				{
-					Path:            "~ ^/path/(.*)$",
+					Path:            "~ ^/regular-expression-path/(.*)$",
 					ProxyPass:       "http://test_foo_80$request_uri",
 					ProxySetHeaders: httpBaseHeaders,
 					Type:            http.ExternalLocationType,

internal/controller/nginx/config/validation/common_test.go

@@ -149,5 +149,7 @@ func TestValidatePathInRegexMatch(t *testing.T) {
 		`/foo(?<!bar)`,
 		`(\w+)\1$`,
 		`(\w+)\2$`,
+		`/foo/(?P<bad-name>[0-9]+)`,
+		`/foo/(?P<bad name>[0-9]+)`,
 	)
 }

internal/controller/state/dataplane/convert_test.go

@@ -551,6 +551,10 @@ func TestConvertPathType(t *testing.T) {
 			expected: PathTypeRegularExpression,
 			pathType: v1.PathMatchRegularExpression,
 		},
+		{
+			pathType: v1.PathMatchType("InvalidType"),
+			panic:    true,
+		},
 	}
 
 	for _, tc := range tests {

internal/controller/state/graph/httproute_test.go

@@ -1161,12 +1161,27 @@ func TestValidateMatch(t *testing.T) {
 			match: gatewayv1.HTTPRouteMatch{
 				Path: &gatewayv1.HTTPPathMatch{
 					Type:  helpers.GetPointer(gatewayv1.PathMatchRegularExpression),
-					Value: helpers.GetPointer("/"),
+					Value: helpers.GetPointer("/foo/(.*)$"),
 				},
 			},
 			expectErrCount: 0,
 			name:           "valid regex match",
 		},
+		{
+			validator: func() *validationfakes.FakeHTTPFieldsValidator {
+				validator := createAllValidValidator()
+				validator.ValidatePathInRegexMatchReturns(errors.New("invalid path value"))
+				return validator
+			}(),
+			match: gatewayv1.HTTPRouteMatch{
+				Path: &gatewayv1.HTTPPathMatch{
+					Type:  helpers.GetPointer(gatewayv1.PathMatchRegularExpression),
+					Value: helpers.GetPointer("(foo"),
+				},
+			},
+			expectErrCount: 1,
+			name:           "bad path regex",
+		},
 		{
 			validator: createAllValidValidator(),
 			match: gatewayv1.HTTPRouteMatch{
@@ -1338,7 +1353,7 @@ func TestValidateMatch(t *testing.T) {
 			match: gatewayv1.HTTPRouteMatch{
 				Path: &gatewayv1.HTTPPathMatch{
 					Type:  helpers.GetPointer(gatewayv1.PathMatchRegularExpression),
-					Value: helpers.GetPointer("/"),
+					Value: helpers.GetPointer("/foo/(.*)$"),
 				},
 				Headers: []gatewayv1.HTTPHeaderMatch{
 					{