mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

chore: simplify validation with named return (#3493)

Browse source 
Signed-off-by: Charles-Edouard Brétéché <charled.breteche@gmail.com>
This commit is contained in:
Charles-Edouard Brétéché 2022-03-29 11:53:10 +02:00 • committed by GitHub
parent 8e8e7803ee
commit 69dcd9ee4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api/kyverno/v1/clusterpolicy_types.go
View file

@ -94,8 +94,7 @@ func (p *ClusterPolicy) IsReady() bool {
// Validate implements programmatic validation
// namespaced means that the policy is bound to a namespace and therefore
// should not filter/generate cluster wide resources.
func (p *ClusterPolicy) Validate(clusterResources sets.String) field.ErrorList {
var errs field.ErrorList
func (p *ClusterPolicy) Validate(clusterResources sets.String) (errs field.ErrorList) {
errs = append(errs, ValidatePolicyName(field.NewPath("name"), p.Name)...)
errs = append(errs, p.Spec.Validate(field.NewPath("spec"), p.IsNamespaced(), clusterResources)...)
return errs

3
api/kyverno/v1/image_verification_types.go
View file

@ -42,8 +42,7 @@ type ImageVerification struct {
}
// Validate implements programmatic validation
func (i *ImageVerification) Validate(path *field.Path) field.ErrorList {
var errs field.ErrorList
func (i *ImageVerification) Validate(path *field.Path) (errs field.ErrorList) {
hasKey := i.Key != ""
hasRoots := i.Roots != ""
hasSubject := i.Subject != ""

3
api/kyverno/v1/match_resources_types.go
View file

@ -31,8 +31,7 @@ type MatchResources struct {
}
// Validate implements programmatic validation
func (m *MatchResources) Validate(path *field.Path, namespaced bool, clusterResources sets.String) field.ErrorList {
var errs field.ErrorList
func (m *MatchResources) Validate(path *field.Path, namespaced bool, clusterResources sets.String) (errs field.ErrorList) {
if len(m.Any) > 0 && len(m.All) > 0 {
errs = append(errs, field.Invalid(path, m, "Can't specify any and all together"))
}

3
api/kyverno/v1/policy_types.go
View file

@ -95,8 +95,7 @@ func (p *Policy) IsReady() bool {
// Validate implements programmatic validation.
// namespaced means that the policy is bound to a namespace and therefore
// should not filter/generate cluster wide resources.
func (p *Policy) Validate(namespaced bool, clusterResources sets.String) field.ErrorList {
var errs field.ErrorList
func (p *Policy) Validate(namespaced bool, clusterResources sets.String) (errs field.ErrorList) {
errs = append(errs, ValidatePolicyName(field.NewPath("name"), p.Name)...)
errs = append(errs, p.Spec.Validate(field.NewPath("spec"), namespaced, clusterResources)...)
return errs

3
api/kyverno/v1/resource_description_types.go
View file

@ -53,8 +53,7 @@ type ResourceDescription struct {
}
// Validate implements programmatic validation
func (r *ResourceDescription) Validate(path *field.Path, namespaced bool, clusterResources sets.String) field.ErrorList {
var errs field.ErrorList
func (r *ResourceDescription) Validate(path *field.Path, namespaced bool, clusterResources sets.String) (errs field.ErrorList) {
if r.Name != "" && len(r.Names) > 0 {
errs = append(errs, field.Invalid(path, r, "Both name and names can not be specified together"))
}

6
api/kyverno/v1/rule_types.go
View file

@ -115,8 +115,7 @@ func (r *Rule) SetAnyAllConditions(in apiextensions.JSON) {
}
// ValidateRuleType checks only one type of rule is defined per rule
func (r *Rule) ValidateRuleType(path *field.Path) field.ErrorList {
var errs field.ErrorList
func (r *Rule) ValidateRuleType(path *field.Path) (errs field.ErrorList) {
ruleTypes := []bool{r.HasMutate(), r.HasValidate(), r.HasGenerate(), r.HasVerifyImages()}
count := 0
for _, v := range ruleTypes {
@ -298,8 +297,7 @@ func (r *Rule) ValidateMathExcludeConflict(path *field.Path) (errs field.ErrorLi
}
// Validate implements programmatic validation
func (r *Rule) Validate(path *field.Path, namespaced bool, clusterResources sets.String) field.ErrorList {
var errs field.ErrorList
func (r *Rule) Validate(path *field.Path, namespaced bool, clusterResources sets.String) (errs field.ErrorList) {
errs = append(errs, r.ValidateRuleType(path)...)
errs = append(errs, r.ValidateMathExcludeConflict(path)...)
errs = append(errs, r.MatchResources.Validate(path.Child("match"), namespaced, clusterResources)...)

9
api/kyverno/v1/spec_types.go
View file

@ -133,8 +133,7 @@ func (s *Spec) BackgroundProcessingEnabled() bool {
}
// ValidateRuleNames checks if the rule names are unique across a policy
func (s *Spec) ValidateRuleNames(path *field.Path) field.ErrorList {
var errs field.ErrorList
func (s *Spec) ValidateRuleNames(path *field.Path) (errs field.ErrorList) {
names := sets.NewString()
for i, rule := range s.Rules {
rulePath := path.Index(i)
@ -147,8 +146,7 @@ func (s *Spec) ValidateRuleNames(path *field.Path) field.ErrorList {
}
// ValidateRules implements programmatic validation of Rules
func (s *Spec) ValidateRules(path *field.Path, namespaced bool, clusterResources sets.String) field.ErrorList {
var errs field.ErrorList
func (s *Spec) ValidateRules(path *field.Path, namespaced bool, clusterResources sets.String) (errs field.ErrorList) {
errs = append(errs, s.ValidateRuleNames(path)...)
for i, rule := range s.Rules {
errs = append(errs, rule.Validate(path.Index(i), namespaced, clusterResources)...)
@ -157,8 +155,7 @@ func (s *Spec) ValidateRules(path *field.Path, namespaced bool, clusterResources
}
// Validate implements programmatic validation
func (s *Spec) Validate(path *field.Path, namespaced bool, clusterResources sets.String) field.ErrorList {
var errs field.ErrorList
func (s *Spec) Validate(path *field.Path, namespaced bool, clusterResources sets.String) (errs field.ErrorList) {
errs = append(errs, s.ValidateRules(path.Child("rules"), namespaced, clusterResources)...)
if namespaced && len(s.ValidationFailureActionOverrides) > 0 {
errs = append(errs, field.Forbidden(path.Child("validationFailureActionOverrides"), "Use of validationFailureActionOverrides is supported only with ClusterPolicy"))

9
api/kyverno/v1/user_info_types.go
View file

@ -24,8 +24,7 @@ type UserInfo struct {
}
// ValidateSubjects implements programmatic validation of Subjects
func (u *UserInfo) ValidateSubjects(path *field.Path) field.ErrorList {
var errs field.ErrorList
func (u *UserInfo) ValidateSubjects(path *field.Path) (errs field.ErrorList) {
for index, subject := range u.Subjects {
entry := path.Index(index)
if subject.Kind == "" {
@ -42,8 +41,7 @@ func (u *UserInfo) ValidateSubjects(path *field.Path) field.ErrorList {
}
// ValidateRoles implements programmatic validation of Roles
func (u *UserInfo) ValidateRoles(path *field.Path) field.ErrorList {
var errs field.ErrorList
func (u *UserInfo) ValidateRoles(path *field.Path) (errs field.ErrorList) {
for i, r := range u.Roles {
role := strings.Split(r, ":")
if len(role) != 2 {
@ -54,8 +52,7 @@ func (u *UserInfo) ValidateRoles(path *field.Path) field.ErrorList {
}
// Validate implements programmatic validation
func (u *UserInfo) Validate(path *field.Path) field.ErrorList {
var errs field.ErrorList
func (u *UserInfo) Validate(path *field.Path) (errs field.ErrorList) {
errs = append(errs, u.ValidateSubjects(path.Child("subjects"))...)
errs = append(errs, u.ValidateRoles(path.Child("roles"))...)
return errs

3
api/kyverno/v1/utils.go
View file

@ -30,8 +30,7 @@ func ToJSON(in apiextensions.JSON) *apiextv1.JSON {
}
// ValidatePolicyName validates policy name
func ValidatePolicyName(path *field.Path, name string) field.ErrorList {
var errs field.ErrorList
func ValidatePolicyName(path *field.Path, name string) (errs field.ErrorList) {
// policy name is stored in the label of the report change request
if len(name) > 63 {
errs = append(errs, field.TooLong(path, name, 63))