update filter logic (#156) (#191)

Daniel-Fan · horis233 · web-flow · commit e325e3035cc6 · 2022-10-12T01:59:06.000+08:00
Co-authored-by: Jiaming Hu &lt;horis233@gmail.com&gt;
diff --git a/controllers/namespacescope_controller.go b/controllers/namespacescope_controller.go
@@ -959,15 +959,18 @@ func rulesFilter(orgRule []rbacv1.PolicyRule) []rbacv1.PolicyRule {
 	}
 
 	for i := 0; i < len(orgRule); i++ {
-		for j := 0; j < len(orgRule[i].Verbs); j++ {
+		j := 0
+		for j < len(orgRule[i].Verbs) {
 			if orgRule[i].Verbs[j] == "*" {
 				orgRule[i].Verbs = append(orgRule[i].Verbs[:j], orgRule[i].Verbs[j+1:]...)
 				orgRule[i].Verbs = append(orgRule[i].Verbs, verbs...)
 				continue
 			}
 			if _, ok := verbMap[orgRule[i].Verbs[j]]; !ok {
 				orgRule[i].Verbs = append(orgRule[i].Verbs[:j], orgRule[i].Verbs[j+1:]...)
+				continue
 			}
+			j++
 		}
 		if len(orgRule[i].Verbs) == 0 {
 			orgRule = append(orgRule[:i], orgRule[i+1:]...)

Original file line number	Diff line number	Diff line change
`@@ -959,15 +959,18 @@ func rulesFilter(orgRule []rbacv1.PolicyRule) []rbacv1.PolicyRule {`
`959`	`959`	`}`
`960`	`960`
`961`	`961`	`for i := 0; i < len(orgRule); i++ {`
`962`		`- for j := 0; j < len(orgRule[i].Verbs); j++ {`
	`962`	`+ j := 0`
	`963`	`+ for j < len(orgRule[i].Verbs) {`
`963`	`964`	`if orgRule[i].Verbs[j] == "*" {`
`964`	`965`	`orgRule[i].Verbs = append(orgRule[i].Verbs[:j], orgRule[i].Verbs[j+1:]...)`
`965`	`966`	`orgRule[i].Verbs = append(orgRule[i].Verbs, verbs...)`
`966`	`967`	`continue`
`967`	`968`	`}`
`968`	`969`	`if _, ok := verbMap[orgRule[i].Verbs[j]]; !ok {`
`969`	`970`	`orgRule[i].Verbs = append(orgRule[i].Verbs[:j], orgRule[i].Verbs[j+1:]...)`
	`971`	`+ continue`
`970`	`972`	`}`
	`973`	`+ j++`
`971`	`974`	`}`
`972`	`975`	`if len(orgRule[i].Verbs) == 0 {`
`973`	`976`	`orgRule = append(orgRule[:i], orgRule[i+1:]...)`