BUG/MEDIUM: http rules: ineffectual delete operation when refreshing rules

Mo3m3n · Mo3m3n · commit 67b6ac4ce19f · 2021-03-01T19:05:31.000+01:00
diff --git a/controller/haproxy/rules.go b/controller/haproxy/rules.go
@@ -183,7 +183,7 @@ func (r Rules) Refresh(client api.HAProxyClient) (reload bool) {
 				id := getID(ruleSet[i])
 				if ftRules.status[id] == TO_DELETE {
 					delete(ftRules.status, id)
-					ftRules.rules[ruleType] = append(ruleSet[:i], ruleSet[i+1:]...)
+					ruleSet = append(ruleSet[:i], ruleSet[i+1:]...)
 					continue
 				}
 				if ftRules.status[id]&INGRESS != 0 {
@@ -195,6 +195,7 @@ func (r Rules) Refresh(client api.HAProxyClient) (reload bool) {
 					reload = true
 				}
 			}
+			ftRules.rules[ruleType] = ruleSet
 		}
 	}
 	return reload

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func (r Rules) Refresh(client api.HAProxyClient) (reload bool) {`
`183`	`183`	`id := getID(ruleSet[i])`
`184`	`184`	`if ftRules.status[id] == TO_DELETE {`
`185`	`185`	`delete(ftRules.status, id)`
`186`		`- ftRules.rules[ruleType] = append(ruleSet[:i], ruleSet[i+1:]...)`
	`186`	`+ ruleSet = append(ruleSet[:i], ruleSet[i+1:]...)`
`187`	`187`	`continue`
`188`	`188`	`}`
`189`	`189`	`if ftRules.status[id]&INGRESS != 0 {`
`@@ -195,6 +195,7 @@ func (r Rules) Refresh(client api.HAProxyClient) (reload bool) {`
`195`	`195`	`reload = true`
`196`	`196`	`}`
`197`	`197`	`}`
	`198`	`+ ftRules.rules[ruleType] = ruleSet`
`198`	`199`	`}`
`199`	`200`	`}`
`200`	`201`	`return reload`