github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 20:00:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #132061 from miltosdoul/fix_typeprovider_datarace

Browse Source 
fix: datarace in ResolverTypeProvider
This commit is contained in:
Kubernetes Prow Robot
2025-06-03 14:34:44 -07:00
committed by GitHub
parent 68a0142976 de1d6fbf24
commit bd87e4d2a6
3 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
staging/src/k8s.io/apiserver/pkg/cel/common/typeprovider.go
View File

@@ -105,23 +105,13 @@ func (p *ResolverTypeProvider) FindIdent(identName string) (ref.Val, bool) {
return p.underlyingTypeProvider.FindIdent(identName)
}
// ResolverEnvOption creates the ResolverTypeProvider with a given DynamicTypeResolver,
// and also returns the CEL ResolverEnvOption to apply it to the env.
// ResolverEnvOption creates the ResolverTypeProvider with a given DynamicTypeResolver
// and returns the CEL ResolverEnvOption to apply it to the env.
func ResolverEnvOption(resolver TypeResolver) cel.EnvOption {
_, envOpt := NewResolverTypeProviderAndEnvOption(resolver)
return envOpt
}
// NewResolverTypeProviderAndEnvOption creates the ResolverTypeProvider with a given DynamicTypeResolver,
// and also returns the CEL ResolverEnvOption to apply it to the env.
func NewResolverTypeProviderAndEnvOption(resolver TypeResolver) (*ResolverTypeProvider, cel.EnvOption) {
tp := &ResolverTypeProvider{typeResolver: resolver}
var envOption cel.EnvOption = func(e *cel.Env) (*cel.Env, error) {
// wrap the existing type provider (acquired from the env)
// and set new type provider for the env.
tp.underlyingTypeProvider = e.CELTypeProvider()
return func(e *cel.Env) (*cel.Env, error) {
tp := &ResolverTypeProvider{typeResolver: resolver, underlyingTypeProvider: e.CELTypeProvider()}
// set new type provider for the env.
typeProviderOption := cel.CustomTypeProvider(tp)
return typeProviderOption(e)
}
return tp, envOption
}

2
staging/src/k8s.io/apiserver/pkg/cel/common/typeprovider_test.go
View File

@@ -58,7 +58,7 @@ func TestTypeProvider(t *testing.T) {
},
} {
t.Run(tc.name, func(t *testing.T) {
_, option := NewResolverTypeProviderAndEnvOption(&mockTypeResolver{})
option := ResolverEnvOption(&mockTypeResolver{})
env := mustCreateEnv(t, option)
ast, issues := env.Compile(tc.expression)
if len(tc.expectCompileError) > 0 {

4
staging/src/k8s.io/apiserver/pkg/cel/mutation/typeresolver_test.go
View File

@@ -212,7 +212,7 @@ func TestTypeResolver(t *testing.T) {
},
} {
t.Run(tc.name, func(t *testing.T) {
_, option := common.NewResolverTypeProviderAndEnvOption(&DynamicTypeResolver{})
option := common.ResolverEnvOption(&DynamicTypeResolver{})
env := mustCreateEnv(t, option)
ast, issues := env.Compile(tc.expression)
if len(tc.expectCompileError) > 0 {
@@ -307,7 +307,7 @@ func TestCELOptional(t *testing.T) {
},
} {
t.Run(tc.name, func(t *testing.T) {
_, option := common.NewResolverTypeProviderAndEnvOption(&DynamicTypeResolver{})
option := common.ResolverEnvOption(&DynamicTypeResolver{})
env := mustCreateEnvWithOptional(t, option)
ast, issues := env.Compile(tc.expression)
if len(tc.expectedCompileError) > 0 {