Updates tcproute translator unit tests

Signed-off-by: Daneyon Hansen <[email protected]>
solo-io · Nov 21, 2024 · 06d09b8 · 06d09b8
1 parent 54b52e2
commit 06d09b8
Show file tree

Hide file tree

Showing 6 changed files with 137 additions and 44 deletions.
diff --git a/changelog/v1.18.0-rc2/issue_10365.yaml b/changelog/v1.18.0-rc2/issue_10365.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10365
+    resolvesIssue: true
+    description: >-
+      Adds support for setting TCPRoute status and managing status conditions.
diff --git a/...ator/plugins/mirror/mocks/mock_queries.go → ...ects/gateway2/query/mocks/mock_queries.go b/...ator/plugins/mirror/mocks/mock_queries.go → ...ects/gateway2/query/mocks/mock_queries.go
diff --git a/projects/gateway2/query/query_test.go b/projects/gateway2/query/query_test.go
@@ -23,6 +23,8 @@ import (
 	"github.com/solo-io/gloo/projects/gateway2/wellknown"
 )
 
+//go:generate go run github.com/golang/mock/mockgen -destination mocks/mock_queries.go -package mocks github.com/solo-io/gloo/projects/gateway2/query GatewayQueries
+
 var _ = Describe("Query", func() {
 	var (
 		scheme  *runtime.Scheme

diff --git a/projects/gateway2/translator/listener/gateway_listener_translator.go b/projects/gateway2/translator/listener/gateway_listener_translator.go
@@ -55,8 +55,8 @@ func mergeGWListeners(
 ) *MergedListeners {
 	ml := &MergedListeners{
 		parentGw:         parentGw,
-		gatewayNamespace: gatewayNamespace,
-		queries:          queries,
+		GatewayNamespace: gatewayNamespace,
+		Queries:          queries,
 	}
 	for _, listener := range listeners {
 		result, ok := routesForGw.ListenerResults[string(listener.Name)]
@@ -76,10 +76,10 @@ func mergeGWListeners(
 }
 
 type MergedListeners struct {
-	gatewayNamespace string
+	GatewayNamespace string
 	parentGw         gwv1.Gateway
 	Listeners        []*MergedListener
-	queries          query.GatewayQueries
+	Queries          query.GatewayQueries
 }
 
 func (ml *MergedListeners) AppendListener(
@@ -135,7 +135,7 @@ func (ml *MergedListeners) appendHttpListener(
 	// create a new filter chain for the listener
 	ml.Listeners = append(ml.Listeners, &MergedListener{
 		name:             listenerName,
-		gatewayNamespace: ml.gatewayNamespace,
+		gatewayNamespace: ml.GatewayNamespace,
 		port:             finalPort,
 		httpFilterChain:  fc,
 		listenerReporter: reporter,
@@ -155,7 +155,7 @@ func (ml *MergedListeners) appendHttpsListener(
 		sniDomain:           listener.Hostname,
 		tls:                 listener.TLS,
 		routesWithHosts:     routesWithHosts,
-		queries:             ml.queries,
+		queries:             ml.Queries,
 	}
 
 	// Perform the port transformation away from privileged ports only once to use
@@ -174,7 +174,7 @@ func (ml *MergedListeners) appendHttpsListener(
 	}
 	ml.Listeners = append(ml.Listeners, &MergedListener{
 		name:              listenerName,
-		gatewayNamespace:  ml.gatewayNamespace,
+		gatewayNamespace:  ml.GatewayNamespace,
 		port:              finalPort,
 		httpsFilterChains: []httpsFilterChain{mfc},
 		listenerReporter:  reporter,
@@ -236,7 +236,7 @@ func (ml *MergedListeners) AppendTcpListener(
 	// create a new filter chain for the listener
 	ml.Listeners = append(ml.Listeners, &MergedListener{
 		name:             listenerName,
-		gatewayNamespace: ml.gatewayNamespace,
+		gatewayNamespace: ml.GatewayNamespace,
 		port:             finalPort,
 		TcpFilterChains:  []tcpFilterChain{fc},
 		listenerReporter: reporter,
@@ -331,7 +331,7 @@ func buildTcpHost(
 	} else if len(weightedDestinations) == 1 {
 		tcpHost.Destination = &v1.TcpHost_TcpAction{
 			Destination: &v1.TcpHost_TcpAction_Single{
-				Single: weightedDestinations[0].Destination,
+				Single: weightedDestinations[0].GetDestination(),
 			},
 		}
 	} else {