chore: remove CEL XValidation, keep Enum marker for Scope field

Author: AlinsRan

api/v2/apisixroute_types.go

@@ -412,7 +412,6 @@ type ApisixRouteAuthenticationLDAPAuth struct {
 }
 
 // ApisixRouteHTTPMatchExprSubject describes the subject of a route matching expression.
-// +kubebuilder:validation:XValidation:rule="self.scope == 'Path' || self.name != ”",message="name is required when scope is not Path"
 type ApisixRouteHTTPMatchExprSubject struct {
 	// Scope specifies the subject scope.
 	// Supported values: `Header`, `Query`, `Path`, `Cookie`, `Variable`, `Body`.

api/v2/apisixroute_types_test.go

@@ -20,52 +20,10 @@ package v2
 import (
 	"testing"
 
-	"github.com/google/cel-go/cel"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-// celSubjectRule is the CEL expression embedded via +kubebuilder:validation:XValidation
-// on ApisixRouteHTTPMatchExprSubject. This test validates its correctness.
-const celSubjectRule = "self.scope == 'Path' || self.name != ''"
-
-// evalCELSubjectRule evaluates celSubjectRule against a fake subject object.
-func evalCELSubjectRule(t *testing.T, scope, name string) bool {
-	t.Helper()
-	env, err := cel.NewEnv(
-		cel.Variable("self", cel.MapType(cel.StringType, cel.StringType)),
-	)
-	require.NoError(t, err)
-
-	ast, issues := env.Compile(celSubjectRule)
-	require.NoError(t, issues.Err())
-
-	prg, err := env.Program(ast)
-	require.NoError(t, err)
-
-	out, _, err := prg.Eval(map[string]any{
-		"self": map[string]any{"scope": scope, "name": name},
-	})
-	require.NoError(t, err)
-	return out.Value().(bool)
-}
-
-func TestCEL_SubjectRule_ValidScopes(t *testing.T) {
-	// All non-Path scopes with a non-empty name must pass.
-	for _, scope := range []string{ScopeHeader, ScopeQuery, ScopeCookie, ScopeVariable, ScopeBody} {
-		assert.True(t, evalCELSubjectRule(t, scope, "field"), "scope=%s with name should pass", scope)
-	}
-	// Path scope with empty name must pass (name is ignored for Path).
-	assert.True(t, evalCELSubjectRule(t, ScopePath, ""), "Path with empty name should pass")
-}
-
-func TestCEL_SubjectRule_InvalidEmptyName(t *testing.T) {
-	// Non-Path scopes with empty name must fail.
-	for _, scope := range []string{ScopeHeader, ScopeQuery, ScopeCookie, ScopeVariable, ScopeBody} {
-		assert.False(t, evalCELSubjectRule(t, scope, ""), "scope=%s with empty name should fail", scope)
-	}
-}
-
 func strPtr(s string) *string { return &s }
 
 func TestToVars_ScopeBody_SimpleField(t *testing.T) {

config/crd/bases/apisix.apache.org_apisixroutes.yaml

@@ -230,9 +230,6 @@ spec:
                                 - name
                                 - scope
                                 type: object
-                                x-kubernetes-validations:
-                                - message: name is required when scope is not Path
-                                  rule: self.scope == 'Path' || self.name != ”
                               value:
                                 description: |-
                                   Value defines a single value to compare against the subject.