diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/validation.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/validation.go index ed03a579c52..a871ecf7d94 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/validation.go +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/validation.go @@ -1211,7 +1211,7 @@ func (g *genValidations) emitValidationVariables(c *generator.Context, t *types. tn := g.discovered.typeNodes[t] variables := tn.typeValidations.Variables - slices.SortFunc(variables, func(a, b *validators.VariableGen) int { + slices.SortFunc(variables, func(a, b validators.VariableGen) int { return cmp.Compare(a.Variable.Name, b.Variable.Name) }) for _, variable := range variables { diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/validators/validators.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/validators/validators.go index 4839d2d673e..730bd0fbdc1 100644 --- a/staging/src/k8s.io/code-generator/cmd/validation-gen/validators/validators.go +++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/validators/validators.go @@ -232,7 +232,7 @@ type Validations struct { // Variables holds any variables which must be generated to perform // validation. Variables are not permitted in every context. - Variables []*VariableGen + Variables []VariableGen // Comments holds comments to emit (without the leanding "//"). Comments []string @@ -259,12 +259,12 @@ func (v *Validations) Len() int { return len(v.Functions) + len(v.Variables) + len(v.Comments) } -func (v *Validations) AddFunction(f FunctionGen) { - v.Functions = append(v.Functions, f) +func (v *Validations) AddFunction(fn FunctionGen) { + v.Functions = append(v.Functions, fn) } -func (v *Validations) AddVariable(variable *VariableGen) { - v.Variables = append(v.Variables, variable) +func (v *Validations) AddVariable(vr VariableGen) { + v.Variables = append(v.Variables, vr) } func (v *Validations) AddComment(comment string) { @@ -391,8 +391,8 @@ func (fg FunctionGen) WithComment(comment string) FunctionGen { } // Variable creates a VariableGen for a given function name and extraArgs. -func Variable(variable PrivateVar, initFunc FunctionGen) *VariableGen { - return &VariableGen{ +func Variable(variable PrivateVar, initFunc FunctionGen) VariableGen { + return VariableGen{ Variable: variable, InitFunc: initFunc, }