From fd30fdc09199545fb4b9124b89d5e726ffb06568 Mon Sep 17 00:00:00 2001
From: Alex Oskotsky <aoskotsky@amplify.com>
Date: Mon, 26 Feb 2024 13:47:21 -0500
Subject: [PATCH] set timeouts for http terminating gateway requests

---
 agent/xds/listeners.go | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go
index 3ff79a6370f0..a3cab3990076 100644
--- a/agent/xds/listeners.go
+++ b/agent/xds/listeners.go
@@ -1803,16 +1803,19 @@ func (s *ResourceGenerator) makeFilterChainTerminatingGateway(cfgSnap *proxycfg.
 	// Lastly we setup the actual proxying component. For L4 this is a straight
 	// tcp proxy. For L7 this is a very hands-off HTTP proxy just to inject an
 	// HTTP filter to do intention checks here instead.
+	no_timeout := 0
 	opts := listenerFilterOpts{
-		protocol:   tgtwyOpts.protocol,
-		filterName: fmt.Sprintf("%s.%s.%s.%s", tgtwyOpts.service.Name, tgtwyOpts.service.NamespaceOrDefault(), tgtwyOpts.service.PartitionOrDefault(), cfgSnap.Datacenter),
-		routeName:  tgtwyOpts.cluster, // Set cluster name for route config since each will have its own
-		cluster:    tgtwyOpts.cluster,
-		statPrefix: "upstream.",
-		routePath:  "",
-		tracing:    tracing,
-		accessLogs: &cfgSnap.Proxy.AccessLogs,
-		logger:     s.Logger,
+		protocol:         tgtwyOpts.protocol,
+		filterName:       fmt.Sprintf("%s.%s.%s.%s", tgtwyOpts.service.Name, tgtwyOpts.service.NamespaceOrDefault(), tgtwyOpts.service.PartitionOrDefault(), cfgSnap.Datacenter),
+		routeName:        tgtwyOpts.cluster, // Set cluster name for route config since each will have its own
+		cluster:          tgtwyOpts.cluster,
+		statPrefix:       "upstream.",
+		routePath:        "",
+		tracing:          tracing,
+		accessLogs:       &cfgSnap.Proxy.AccessLogs,
+		logger:           s.Logger,
+		idleTimeoutMs:    &no_timeout,
+		requestTimeoutMs: &no_timeout,
 	}
 
 	if useHTTPFilter {