update variable name and improve fieldalignment in struct

Author: salonichf5

internal/controller/nginx/config/http/config.go

@@ -120,10 +120,10 @@ const (
 // Upstream holds all configuration for an HTTP upstream.
 type Upstream struct {
 	Name                string
-	ZoneSize            string // format: 512k, 1m
+	ZoneSize            string
 	StateFile           string
-	KeepAlive           UpstreamKeepAlive
 	LoadBalancingMethod string
+	KeepAlive           UpstreamKeepAlive
 	Servers             []UpstreamServer
 }
 

internal/controller/nginx/config/upstreams.go

@@ -33,7 +33,7 @@ const (
 	// stateDir is the directory for storing state files.
 	stateDir = "/var/lib/nginx/state"
 	// default load balancing method.
-	randomTwoLeastConnLB = "random two least_conn"
+	defaultLBMethod = "random two least_conn"
 )
 
 // keepAliveChecker takes an upstream name and returns if it has keep alive settings enabled.
@@ -187,7 +187,7 @@ func (g GeneratorImpl) createUpstream(
 		}
 	}
 
-	chosenLBMethod := randomTwoLeastConnLB
+	chosenLBMethod := defaultLBMethod
 	if upstreamPolicySettings.LoadBalancingMethod != "" {
 		chosenLBMethod = upstreamPolicySettings.LoadBalancingMethod
 	}

internal/controller/nginx/config/upstreams_test.go

@@ -213,7 +213,7 @@ func TestCreateUpstreams(t *testing.T) {
 					Address: "10.0.0.2:80",
 				},
 			},
-			LoadBalancingMethod: randomTwoLeastConnLB,
+			LoadBalancingMethod: defaultLBMethod,
 		},
 		{
 			Name:     "up2",
@@ -223,7 +223,7 @@ func TestCreateUpstreams(t *testing.T) {
 					Address: "11.0.0.0:80",
 				},
 			},
-			LoadBalancingMethod: randomTwoLeastConnLB,
+			LoadBalancingMethod: defaultLBMethod,
 		},
 		{
 			Name:     "up3",
@@ -242,7 +242,7 @@ func TestCreateUpstreams(t *testing.T) {
 					Address: "[fd00:10:244:1::7]:80",
 				},
 			},
-			LoadBalancingMethod: randomTwoLeastConnLB,
+			LoadBalancingMethod: defaultLBMethod,
 		},
 		{
 			Name:     "up5-usp",
@@ -347,7 +347,7 @@ func TestCreateUpstream(t *testing.T) {
 						Address: "10.0.0.3:80",
 					},
 				},
-				LoadBalancingMethod: randomTwoLeastConnLB,
+				LoadBalancingMethod: defaultLBMethod,
 			},
 			msg: "multiple endpoints",
 		},
@@ -370,7 +370,7 @@ func TestCreateUpstream(t *testing.T) {
 						Address: "[fd00:10:244:1::7]:80",
 					},
 				},
-				LoadBalancingMethod: randomTwoLeastConnLB,
+				LoadBalancingMethod: defaultLBMethod,
 			},
 			msg: "endpoint ipv6",
 		},
@@ -502,7 +502,7 @@ func TestCreateUpstream(t *testing.T) {
 						Address: "10.0.0.1:80",
 					},
 				},
-				LoadBalancingMethod: randomTwoLeastConnLB,
+				LoadBalancingMethod: defaultLBMethod,
 			},
 			msg: "empty upstreamSettingsPolicies",
 		},
@@ -546,7 +546,7 @@ func TestCreateUpstream(t *testing.T) {
 					Time:        "5s",
 					Timeout:     "10s",
 				},
-				LoadBalancingMethod: randomTwoLeastConnLB,
+				LoadBalancingMethod: defaultLBMethod,
 			},
 			msg: "upstreamSettingsPolicy with only keep alive settings",
 		},
@@ -603,7 +603,7 @@ func TestCreateUpstream(t *testing.T) {
 						Resolve: true,
 					},
 				},
-				LoadBalancingMethod: randomTwoLeastConnLB,
+				LoadBalancingMethod: defaultLBMethod,
 			},
 			msg: "ExternalName service with DNS name",
 		},
@@ -642,7 +642,7 @@ func TestCreateUpstream(t *testing.T) {
 						Address: "[fd00:10:244:1::7]:80",
 					},
 				},
-				LoadBalancingMethod: randomTwoLeastConnLB,
+				LoadBalancingMethod: defaultLBMethod,
 			},
 			msg: "mixed IP addresses and DNS names",
 		},
@@ -663,9 +663,9 @@ func TestCreateUpstreamPlus(t *testing.T) {
 	gen := GeneratorImpl{plus: true}
 
 	tests := []struct {
+		expectedUpstream http.Upstream
 		msg              string
 		stateUpstream    dataplane.Upstream
-		expectedUpstream http.Upstream
 	}{
 		{
 			msg: "with endpoints",
@@ -687,7 +687,7 @@ func TestCreateUpstreamPlus(t *testing.T) {
 						Address: "10.0.0.1:80",
 					},
 				},
-				LoadBalancingMethod: randomTwoLeastConnLB,
+				LoadBalancingMethod: defaultLBMethod,
 			},
 		},
 		{