update comment, remove redundant tests, export and use dataplane constant, update object tests for nil and empty nginxporxy

Author: Sarthak Agrawal

internal/controller/nginx/config/main_config_test.go

@@ -156,34 +156,13 @@ func TestExecuteMainConfig_WorkerConnections(t *testing.T) {
 		expWorkerConnections string
 		conf                 dataplane.Configuration
 	}{
-		{
-			name: "default worker connections",
-			conf: dataplane.Configuration{
-				WorkerConnections: 1024,
-			},
-			expWorkerConnections: "worker_connections 1024;",
-		},
 		{
 			name: "custom worker connections",
 			conf: dataplane.Configuration{
 				WorkerConnections: 2048,
 			},
 			expWorkerConnections: "worker_connections 2048;",
 		},
-		{
-			name: "minimum worker connections",
-			conf: dataplane.Configuration{
-				WorkerConnections: 1,
-			},
-			expWorkerConnections: "worker_connections 1;",
-		},
-		{
-			name: "maximum worker connections",
-			conf: dataplane.Configuration{
-				WorkerConnections: 65535,
-			},
-			expWorkerConnections: "worker_connections 65535;",
-		},
 	}
 
 	for _, test := range tests {

internal/controller/provisioner/objects.go

@@ -20,6 +20,7 @@ import (
 
 	ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2"
 	"github.com/nginx/nginx-gateway-fabric/internal/controller/config"
+	"github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane"
 	"github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph"
 	"github.com/nginx/nginx-gateway-fabric/internal/framework/controller"
 	"github.com/nginx/nginx-gateway-fabric/internal/framework/helpers"
@@ -317,7 +318,7 @@ func (p *NginxProvisioner) buildNginxConfigMaps(
 		logLevel = string(*nProxyCfg.Logging.ErrorLevel)
 	}
 
-	workerConnections := int32(1024)
+	workerConnections := dataplane.DefaultWorkerConnections
 	if nProxyCfg != nil && nProxyCfg.WorkerConnections != nil {
 		workerConnections = *nProxyCfg.WorkerConnections
 	}

internal/controller/provisioner/objects_test.go

@@ -1029,15 +1029,32 @@ func TestBuildNginxConfigMaps_WorkerConnections(t *testing.T) {
 	}
 	objectMeta := metav1.ObjectMeta{Name: "test", Namespace: "default"}
 
+	// Test with default worker connections (nil NginxProxy config)
+	configMaps := provisioner.buildNginxConfigMaps(objectMeta, nil, "test-bootstrap", "test-agent", false, false)
+	g.Expect(configMaps).To(HaveLen(2))
+
+	bootstrapCM, ok := configMaps[0].(*corev1.ConfigMap)
+	g.Expect(ok).To(BeTrue())
+	g.Expect(bootstrapCM.Data["main.conf"]).To(ContainSubstring("worker_connections 1024;"))
+
+	// Test with default worker connections (empty NginxProxy config)
+	nProxyCfgEmpty := &graph.EffectiveNginxProxy{}
+	configMaps = provisioner.buildNginxConfigMaps(objectMeta, nProxyCfgEmpty, "test-bootstrap", "test-agent", false, false)
+	g.Expect(configMaps).To(HaveLen(2))
+
+	bootstrapCM, ok = configMaps[0].(*corev1.ConfigMap)
+	g.Expect(ok).To(BeTrue())
+	g.Expect(bootstrapCM.Data["main.conf"]).To(ContainSubstring("worker_connections 1024;"))
+
 	// Test with custom worker connections
 	nProxyCfg := &graph.EffectiveNginxProxy{
 		WorkerConnections: helpers.GetPointer(int32(2048)),
 	}
 
-	configMaps := provisioner.buildNginxConfigMaps(objectMeta, nProxyCfg, "test-bootstrap", "test-agent", false, false)
+	configMaps = provisioner.buildNginxConfigMaps(objectMeta, nProxyCfg, "test-bootstrap", "test-agent", false, false)
 	g.Expect(configMaps).To(HaveLen(2))
 
-	bootstrapCM, ok := configMaps[0].(*corev1.ConfigMap)
+	bootstrapCM, ok = configMaps[0].(*corev1.ConfigMap)
 	g.Expect(ok).To(BeTrue())
 	g.Expect(bootstrapCM.Data["main.conf"]).To(ContainSubstring("worker_connections 2048;"))
 }

internal/controller/state/dataplane/configuration.go

@@ -25,7 +25,7 @@ const (
 	wildcardHostname         = "~^"
 	alpineSSLRootCAPath      = "/etc/ssl/cert.pem"
 	defaultErrorLogLevel     = "info"
-	defaultWorkerConnections = int32(1024)
+	DefaultWorkerConnections = int32(1024)
 )
 
 // BuildConfiguration builds the Configuration from the Graph.
@@ -1109,15 +1109,15 @@ func buildLogging(gateway *graph.Gateway) Logging {
 
 func buildWorkerConnections(gateway *graph.Gateway) int32 {
 	if gateway == nil || gateway.EffectiveNginxProxy == nil {
-		return defaultWorkerConnections
+		return DefaultWorkerConnections
 	}
 
 	ngfProxy := gateway.EffectiveNginxProxy
 	if ngfProxy.WorkerConnections != nil {
 		return *ngfProxy.WorkerConnections
 	}
 
-	return defaultWorkerConnections
+	return DefaultWorkerConnections
 }
 
 func buildAuxiliarySecrets(

internal/controller/state/dataplane/configuration_test.go

@@ -4907,14 +4907,14 @@ func TestBuildWorkerConnections(t *testing.T) {
 		{
 			msg:                  "NginxProxy is nil",
 			gw:                   &graph.Gateway{},
-			expWorkerConnections: defaultWorkerConnections,
+			expWorkerConnections: DefaultWorkerConnections,
 		},
 		{
 			msg: "NginxProxy doesn't specify worker connections",
 			gw: &graph.Gateway{
 				EffectiveNginxProxy: &graph.EffectiveNginxProxy{},
 			},
-			expWorkerConnections: defaultWorkerConnections,
+			expWorkerConnections: DefaultWorkerConnections,
 		},
 		{
 			msg: "NginxProxy specifies worker connections",

internal/controller/state/dataplane/types.go

@@ -54,7 +54,7 @@ type Configuration struct {
 	NginxPlus NginxPlus
 	// BaseHTTPConfig holds the configuration options at the http context.
 	BaseHTTPConfig BaseHTTPConfig
-	// WorkerConnections specifies the max number of simultaneous connections that can be opened by a worker process.
+	// WorkerConnections specifies the maximum number of simultaneous connections that can be opened by a worker process.
 	WorkerConnections int32
 }