fix: nil pointer err during hash load balancing build (#3886)

fix nil pointer err in buildHashPolicy Signed-off-by: shawnh2 <shawnhxh@outlook.com>
envoyproxy · Jul 17, 2024 · f9eac40 · f9eac40
1 parent 953a8d8
commit f9eac40
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 5 deletions.
diff --git a/internal/xds/translator/route.go b/internal/xds/translator/route.go
@@ -505,12 +505,12 @@ func buildHashPolicy(httpRoute *ir.HTTPRoute) []*routev3.RouteAction_HashPolicy
 			hashPolicy.GetCookie().Ttl = durationpb.New(ch.Cookie.TTL.Duration)
 		}
 		if ch.Cookie.Attributes != nil {
-			attributes := make([]*routev3.RouteAction_HashPolicy_CookieAttribute, len(ch.Cookie.Attributes))
-			i := 0
+			attributes := make([]*routev3.RouteAction_HashPolicy_CookieAttribute, 0, len(ch.Cookie.Attributes))
 			for name, value := range ch.Cookie.Attributes {
-				attributes[i].Name = name
-				attributes[i].Value = value
-				i++
+				attributes = append(attributes, &routev3.RouteAction_HashPolicy_CookieAttribute{
+					Name:  name,
+					Value: value,
+				})
 			}
 			hashPolicy.GetCookie().Attributes = attributes
 		}

diff --git a/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml b/internal/xds/translator/testdata/in/xds-ir/load-balancer.yaml
@@ -117,3 +117,18 @@ http:
       - endpoints:
         - host: "1.2.3.4"
           port: 50000
+  - name: "tenth-route"
+    hostname: "*"
+    traffic:
+      loadBalancer:
+        consistentHash:
+          cookie:
+            name: "test"
+            attributes:
+              foo: bar
+    destination:
+      name: "tenth-route-dest"
+      settings:
+      - endpoints:
+        - host: "1.2.3.4"
+          port: 50000
diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml
@@ -157,3 +157,20 @@
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768
   type: EDS
+- circuitBreakers:
+    thresholds:
+    - maxRetries: 1024
+  commonLbConfig:
+    localityWeightedLbConfig: {}
+  connectTimeout: 10s
+  dnsLookupFamily: V4_ONLY
+  edsClusterConfig:
+    edsConfig:
+      ads: {}
+      resourceApiVersion: V3
+    serviceName: tenth-route-dest
+  lbPolicy: MAGLEV
+  name: tenth-route-dest
+  outlierDetection: {}
+  perConnectionBufferLimitBytes: 32768
+  type: EDS
diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.endpoints.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.endpoints.yaml
@@ -106,3 +106,15 @@
     loadBalancingWeight: 1
     locality:
       region: ninth-route-dest/backend/0
+- clusterName: tenth-route-dest
+  endpoints:
+  - lbEndpoints:
+    - endpoint:
+        address:
+          socketAddress:
+            address: 1.2.3.4
+            portValue: 50000
+      loadBalancingWeight: 1
+    loadBalancingWeight: 1
+    locality:
+      region: tenth-route-dest/backend/0
diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.routes.yaml
@@ -77,3 +77,16 @@
             name: test
         upgradeConfigs:
         - upgradeType: websocket
+    - match:
+        prefix: /
+      name: tenth-route
+      route:
+        cluster: tenth-route-dest
+        hashPolicy:
+        - cookie:
+            attributes:
+            - name: foo
+              value: bar
+            name: test
+        upgradeConfigs:
+        - upgradeType: websocket