Make ns prepend more explicit. Fix unit test name

Dean-Coakley · Dean-Coakley · commit 5d5efce9a976 · 2021-02-15T12:56:11.000Z
diff --git a/internal/configs/virtualserver.go b/internal/configs/virtualserver.go
@@ -953,7 +953,8 @@ func (p *policiesCfg) addWAFConfig(
 
 	if waf.ApPolicy != "" {
 		apPolKey := waf.ApPolicy
-		if !strings.Contains(apPolKey, "/") {
+		hasNamepace := strings.Contains(apPolKey, "/")
+		if !hasNamepace {
 			apPolKey = fmt.Sprintf("%v/%v", polNamespace, apPolKey)
 		}
 
@@ -970,7 +971,8 @@ func (p *policiesCfg) addWAFConfig(
 		p.WAF.ApSecurityLogEnable = true
 
 		logConfKey := waf.SecurityLog.ApLogConf
-		if !strings.Contains(logConfKey, "/") {
+		hasNamepace := strings.Contains(logConfKey, "/")
+		if !hasNamepace {
 			logConfKey = fmt.Sprintf("%v/%v", polNamespace, logConfKey)
 		}
 
diff --git a/internal/k8s/controller_test.go b/internal/k8s/controller_test.go
@@ -2106,7 +2106,7 @@ func TestGetWAFPoliciesForAppProtectLogConf(t *testing.T) {
 			pols: policies,
 			key:  "ns2/logConf",
 			want: []*conf_v1.Policy{logConfNs2},
-			msg:  "WAF pols that ref apPol which is in another ns",
+			msg:  "WAF pols that ref logConf which is in another ns",
 		},
 		{
 			pols: policies,

Original file line number	Diff line number	Diff line change
`@@ -2106,7 +2106,7 @@ func TestGetWAFPoliciesForAppProtectLogConf(t *testing.T) {`
`2106`	`2106`	`pols: policies,`
`2107`	`2107`	`key: "ns2/logConf",`
`2108`	`2108`	`want: []*conf_v1.Policy{logConfNs2},`
`2109`		`- msg: "WAF pols that ref apPol which is in another ns",`
	`2109`	`+ msg: "WAF pols that ref logConf which is in another ns",`
`2110`	`2110`	`},`
`2111`	`2111`	`{`
`2112`	`2112`	`pols: policies,`