Fix unexpected ";" using zone-sync in the Configmap while disabling IPV6 (#9213)

Author: AlexFenlon

internal/configs/version1/__snapshots__/template_test.snap

@@ -6281,9 +6281,9 @@ http {
         set $resource_namespace "";
         set $service "";
 
-        listen 0 default_server;listen [::]:0 default_server;
+        listen 0 default_server;
         listen 0 ssl default_server;
-        listen [::]:0 ssl default_server;
+        
         ssl_certificate /etc/nginx/secrets/default;
         ssl_certificate_key /etc/nginx/secrets/default;
 
@@ -6337,7 +6337,6 @@ stream {
     
     server {
         listen 1223;
-        listen [::]:1223;
         resolver example.com valid=20s ipv6=off;
         zone_sync;
         zone_sync_server nginx-ingress-headless.nginx-ingress.svc.cluster.local:1223 resolve;

internal/configs/version1/nginx-plus.tmpl

@@ -353,7 +353,9 @@ stream {
     {{- if .ZoneSyncConfig.Enable }}
     server {
         listen {{ .ZoneSyncConfig.Port }};
-        {{ if not .DisableIPV6}}listen [::]:{{ .ZoneSyncConfig.Port }}{{end}};
+        {{- if not .DisableIPV6 }}
+        listen [::]:{{ .ZoneSyncConfig.Port }};
+        {{- end }}
         {{ makeResolver .ZoneSyncConfig.ResolverAddresses .ZoneSyncConfig.ResolverValid .ZoneSyncConfig.ResolverIPV6 }}
         zone_sync;
         zone_sync_server {{ .ZoneSyncConfig.Domain }}:{{ .ZoneSyncConfig.Port }} resolve;

internal/configs/version1/template_test.go

@@ -1251,12 +1251,23 @@ func TestExecuteTemplate_ForMainForNGINXWithZoneSyncEnabledCustomResolverAddress
 		"zone_sync_server nginx-ingress-headless.nginx-ingress.svc.cluster.local:1223 resolve;",
 	}
 
+	unwantedDirectives := []string{
+		"listen [::]:1223;",
+	}
+
 	mainConf := buf.String()
 	for _, want := range wantDirectives {
 		if !strings.Contains(mainConf, want) {
 			t.Errorf("want %q in generated config", want)
 		}
 	}
+
+	for _, unwanted := range unwantedDirectives {
+		if strings.Contains(mainConf, unwanted) {
+			t.Errorf("do not want %q in generated config", unwanted)
+		}
+	}
+
 	snaps.MatchSnapshot(t, buf.String())
 }
 
@@ -2987,6 +2998,7 @@ var (
 	}
 
 	mainCfgWithZoneSyncEnabledCustomResolverAddressAndValidAndIPV6Off = MainConfig{
+		DisableIPV6: true,
 		ZoneSyncConfig: ZoneSyncConfig{
 			Enable:            true,
 			Port:              1223,