fix: match the wrong port (#112)

Author: AlinsRan

internal/provider/adc/translator/httproute.go

@@ -266,13 +266,16 @@ func (t *Translator) fillHTTPRoutePolicies(routes []*adctypes.Route, policies []
 	}
 }
 
-func (t *Translator) translateEndpointSlice(weight int, endpointSlices []discoveryv1.EndpointSlice) adctypes.UpstreamNodes {
+func (t *Translator) translateEndpointSlice(portName *string, weight int, endpointSlices []discoveryv1.EndpointSlice) adctypes.UpstreamNodes {
 	var nodes adctypes.UpstreamNodes
 	if len(endpointSlices) == 0 {
 		return nodes
 	}
 	for _, endpointSlice := range endpointSlices {
 		for _, port := range endpointSlice.Ports {
+			if portName != nil && !ptr.Equal(portName, port.Name) {
+				continue
+			}
 			for _, endpoint := range endpointSlice.Endpoints {
 				for _, addr := range endpoint.Addresses {
 					node := adctypes.UpstreamNode{
@@ -283,21 +286,16 @@ func (t *Translator) translateEndpointSlice(weight int, endpointSlices []discove
 					nodes = append(nodes, node)
 				}
 			}
+			if portName != nil {
+				break
+			}
 		}
 	}
 
 	return nodes
 }
 
 func (t *Translator) translateBackendRef(tctx *provider.TranslateContext, ref gatewayv1.BackendRef) adctypes.UpstreamNodes {
-	weight := 1
-	port := 80
-	if ref.Weight != nil {
-		weight = int(*ref.Weight)
-	}
-	if ref.Port != nil {
-		port = int(*ref.Port)
-	}
 	key := types.NamespacedName{
 		Namespace: string(*ref.Namespace),
 		Name:      string(ref.Name),
@@ -307,7 +305,16 @@ func (t *Translator) translateBackendRef(tctx *provider.TranslateContext, ref ga
 		return adctypes.UpstreamNodes{}
 	}
 
+	weight := 1
+	if ref.Weight != nil {
+		weight = int(*ref.Weight)
+	}
+
 	if service.Spec.Type == corev1.ServiceTypeExternalName {
+		port := 80
+		if ref.Port != nil {
+			port = int(*ref.Port)
+		}
 		return adctypes.UpstreamNodes{
 			{
 				Host:   service.Spec.ExternalName,
@@ -316,8 +323,22 @@ func (t *Translator) translateBackendRef(tctx *provider.TranslateContext, ref ga
 			},
 		}
 	}
+
+	var portName *string
+	if ref.Port != nil {
+		for _, p := range service.Spec.Ports {
+			if int(p.Port) == int(*ref.Port) {
+				portName = ptr.To(p.Name)
+				break
+			}
+		}
+		if portName == nil {
+			return adctypes.UpstreamNodes{}
+		}
+	}
+
 	endpointSlices := tctx.EndpointSlices[key]
-	return t.translateEndpointSlice(weight, endpointSlices)
+	return t.translateEndpointSlice(portName, weight, endpointSlices)
 }
 
 func (t *Translator) TranslateHTTPRoute(tctx *provider.TranslateContext, httpRoute *gatewayv1.HTTPRoute) (*TranslateResult, error) {

test/e2e/gatewayapi/httproute.go

@@ -1,6 +1,7 @@
 package gatewayapi
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"strings"
@@ -411,6 +412,47 @@ spec:
     - name: httpbin-service-e2e-test
       port: 80
 `
+		var invalidBackendPort = `
+apiVersion: v1
+kind: Service
+metadata:
+  name: httpbin-multiple-port
+spec:
+  selector:
+    app: httpbin-deployment-e2e-test
+  ports:
+    - name: http
+      port: 80
+      protocol: TCP
+      targetPort: 80
+    - name: invalid
+      port: 10031
+      protocol: TCP
+      targetPort: 10031
+    - name: http2
+      port: 8080
+      protocol: TCP
+      targetPort: 80
+  type: ClusterIP
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: httpbin
+spec:
+  parentRefs:
+  - name: api7ee
+  hostnames:
+  - httpbin.example
+  rules:
+  - matches: 
+    - path:
+        type: Exact
+        value: /get
+    backendRefs:
+    - name: httpbin-multiple-port
+      port: 80
+`
 
 		BeforeEach(beforeEachHTTP)
 
@@ -476,6 +518,20 @@ spec:
 				Expect().
 				Status(200)
 		})
+
+		It("Match Port", func() {
+			By("create HTTPRoute")
+			ResourceApplied("HTTPRoute", "httpbin", invalidBackendPort, 1)
+
+			serviceResources, err := s.DefaultDataplaneResource().Service().List(context.Background())
+			Expect(err).NotTo(HaveOccurred(), "listing services")
+			Expect(serviceResources).To(HaveLen(1), "checking service length")
+
+			serviceResource := serviceResources[0]
+			nodes := serviceResource.Upstream.Nodes
+			Expect(nodes).To(HaveLen(1), "checking nodes length")
+			Expect(nodes[0].Port).To(Equal(80))
+		})
 	})
 
 	Context("HTTPRoute Rule Match", func() {