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

refactor item.go with buildMatchConditions, make itemTagValidator a LateTagValidator

Browse Source
This commit is contained in:
Aaron Prindle
2025-07-16 21:49:14 +00:00
parent 5d1c5ebd8c
commit bfb42fc31c
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
staging/src/k8s.io/code-generator/cmd/validation-gen/validators/item.go
View File

@@ -64,6 +64,10 @@ func (itemTagValidator) ValidScopes() sets.Set[Scope] {
return itemTagValidScopes
}
// LateTagValidator indicates that this validator has to run AFTER the listType
// and listMapKey tags.
func (itemTagValidator) LateTagValidator() {}
func (itv *itemTagValidator) GetValidations(context Context, tag codetags.Tag) (Validations, error) {
// TODO: Support regular maps with syntax like:
// +k8s:item("map-key")=+k8s:immutable
@@ -321,26 +325,35 @@ func validateTypeMatch(fieldType *types.Type, value any) error {
return nil
}
func createMatchFn(elemT *types.Type, criteria []keyValuePair) (FunctionLiteral, error) {
func buildMatchConditions(elemT *types.Type, criteria []keyValuePair, itemRef string) (string, error) {
var conditions []string
for _, fld := range criteria {
member := util.GetMemberByJSON(elemT, fld.key)
if member == nil {
return FunctionLiteral{}, fmt.Errorf("no field with JSON name %q", fld.key)
return "", fmt.Errorf("no field with JSON name %q", fld.key)
}
// Generate the comparison based on the field's actual type
rhs, err := generateComparisonRHS(member, fld.value)
if err != nil {
return FunctionLiteral{}, err
return "", err
}
conditions = append(conditions, fmt.Sprintf("item.%s == %s", member.Name, rhs))
conditions = append(conditions, fmt.Sprintf("%s.%s == %s", itemRef, member.Name, rhs))
}
return strings.Join(conditions, " && "), nil
}
func createMatchFn(elemT *types.Type, criteria []keyValuePair) (FunctionLiteral, error) {
condition, err := buildMatchConditions(elemT, criteria, "item")
if err != nil {
return FunctionLiteral{}, err
}
return FunctionLiteral{
Parameters: []ParamResult{{"item", types.PointerTo(elemT)}},
Results: []ParamResult{{"", types.Bool}},
Body: fmt.Sprintf("return %s", strings.Join(conditions, " && ")),
Body: fmt.Sprintf("return %s", condition),
}, nil
}