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

fix test error

Browse source
This commit is contained in:
Shuting Zhao 2019-10-18 17:50:26 -07:00
parent 32f94bca27
commit 2e1b731e35
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/engine/policy/validate.go
View file

@ -33,7 +33,7 @@ func Validate(p kyverno.ClusterPolicy) error {
}
for _, rule := range p.Spec.Rules {
if ruleErrs := validate(rule); len(ruleErrs) != 0 {
if ruleErrs := validateRule(rule); len(ruleErrs) != 0 {
errs = append(errs, fmt.Errorf("- invalid rule '%s':", rule.Name))
errs = append(errs, ruleErrs...)
}
@ -56,7 +56,7 @@ func validateUniqueRuleName(p kyverno.ClusterPolicy) error {
}
// Validate checks if rule is not empty and all substructures are valid
func validate(r kyverno.Rule) []error {
func validateRule(r kyverno.Rule) []error {
var errs []error
// only one type of rule is allowed per rule
@ -154,7 +154,7 @@ func validateMutation(m kyverno.Mutation) []error {
}
if m.Overlay != nil {
_, err := validateAnchors([]anchor{conditionalAnchor, plusAnchor}, m.Overlay, "/")
_, err := validateAnchors([]anchor{conditionalAnchor, plusAnchor, negationAnchor}, m.Overlay, "/")
if err != nil {
errs = append(errs, err)
}
@ -253,7 +253,7 @@ func validateGeneration(gen kyverno.Generation) error {
// validateAnchors validates:
// 1. existing acnchor must define on array
// 2. anchors in mutation must be one of: (), +()
// 3. anchors in validate must be one of: (), ^(), =()
// 3. anchors in validate must be one of: (), ^(), =(), X()
// 4. no anchor is allowed in generate
func validateAnchors(anchorPatterns []anchor, pattern interface{}, path string) (string, error) {
switch typedPattern := pattern.(type) {

2
pkg/engine/policy/validate_test.go
View file

@ -1227,7 +1227,7 @@ func Test_Validate_ErrorFormat(t *testing.T) {
duplicate rule name: 'validate-user-privilege'
- invalid rule 'image-pull-policy':
error in exclude block, the requirements are not specified in selector
invalid anchor found at /spec/template/spec/containers/0/=(image), expect: () || +()
invalid anchor found at /spec/template/spec/containers/0/=(image), expect: () || +() || X()
- invalid rule 'validate-user-privilege':
error in match block, field Kind is not specified
- invalid rule 'validate-user-privilege':