change v5 check to check if file exists

Author: AlexFenlon

cmd/nginx-ingress/main.go

@@ -145,12 +145,15 @@ func main() {
 	if *appProtect {
 		appProtectVersion = getAppProtectVersionInfo(ctx)
 
-		for _, flag := range parsedFlags {
-			if strings.Contains(flag, "app-protect-enforcer-address") {
-				appProtectV5 = true
-				appProtectBundlePath = appProtectv5BundleFolder
-				break
+		if _, err := os.Stat("/opt/app_protect/VERSION.common"); os.IsNotExist(err) {
+			appProtectV5 = true
+			appProtectBundlePath = appProtectv5BundleFolder
+			nl.Infof(l, "Detected WAF v5")
+		} else {
+			if err != nil {
+				nl.Warnf(l, "Cannot detect WAF version: %v, defaulting to WAF v4", err)
 			}
+			nl.Infof(l, "Detected WAF v4")
 		}
 	}
 

tests/suite/utils/resources_utils.py

@@ -1414,7 +1414,6 @@ def create_ingress_controller_wafv5(
         [
             f"-default-server-tls-secret=$(POD_NAMESPACE)/default-server-secret",
             f"-enable-telemetry-reporting=false",
-            f"-app-protect-enforcer-address",
         ]
     )