mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-08-15 19:56:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge rule 8 and 9 validations into main loop

Browse Source 
Merge validateNoDuplicateNamespacePatterns and validateGlobPatterns
into validateNamespacedFilterPolicies to avoid iterate the policies
multiple times.

Signed-off-by: Adam Zhang <adam.zhang@broadcom.com>
This commit is contained in:
Adam Zhang
2026-06-02 13:53:53 +08:00
parent b278d38f7e
commit 3d085de99c
1 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/resourcepolicies/resource_policies.go
+11 -36
View File
@@ -343,6 +343,8 @@ func getResourcePoliciesFromConfig(cm *corev1api.ConfigMap) (*Policies, error) {
}
func (p *Policies) validateNamespacedFilterPolicies() error {
seenPatterns := make(map[string][]int) // pattern -> list of policy indices
// Rule 1-7: Basic validation rules
for i, nfp := range p.namespacedFilterPolicies {
if len(nfp.Namespaces) == 0 {
@@ -352,6 +354,14 @@ func (p *Policies) validateNamespacedFilterPolicies() error {
return fmt.Errorf("namespacedFilterPolicies[%d]: at least one resourceFilter must be specified", i)
}
// Rule 8 & 9: Validate glob patterns and collect namespace patterns for duplicate check
for j, pattern := range nfp.Namespaces {
if err := wildcard.ValidateNamespaceName(pattern); err != nil {
return fmt.Errorf("namespacedFilterPolicies[%d].namespaces[%d]: %w", i, j, err)
}
seenPatterns[pattern] = append(seenPatterns[pattern], i)
}
seenKinds := make(map[string]int)
hasCatchAll := false
for j, rf := range nfp.ResourceFilters {
@@ -393,29 +403,7 @@ func (p *Policies) validateNamespacedFilterPolicies() error {
}
}
// Rule 8: Validate no duplicate namespace patterns across filter policies
if err := p.validateNoDuplicateNamespacePatterns(); err != nil {
return err
}
// Rule 9: Validate glob patterns for namespace names
if err := p.validateGlobPatterns(); err != nil {
return err
}
return nil
}
func (p *Policies) validateNoDuplicateNamespacePatterns() error {
seenPatterns := make(map[string][]int) // pattern -> list of policy indices
for i, policy := range p.namespacedFilterPolicies {
for _, pattern := range policy.Namespaces {
seenPatterns[pattern] = append(seenPatterns[pattern], i)
}
}
// Report exact duplicates only
// Rule 8: Report exact duplicates only
for pattern, policyIndices := range seenPatterns {
if len(policyIndices) > 1 {
return fmt.Errorf(
@@ -423,19 +411,6 @@ func (p *Policies) validateNoDuplicateNamespacePatterns() error {
pattern, policyIndices)
}
}
return nil
}
func (p *Policies) validateGlobPatterns() error {
for i, policy := range p.namespacedFilterPolicies {
for j, pattern := range policy.Namespaces {
// Use existing Velero wildcard validation for namespace patterns
if err := wildcard.ValidateNamespaceName(pattern); err != nil {
return fmt.Errorf(
"namespacedFilterPolicies[%d].namespaces[%d]: %w",
i, j, err)
}
}
}
return nil
}