Fix after cherry-picking changes to latest main.

Not sure why rebase didn't work previously. Signed-off-by: Konstantin Kalin <konstantin.kalin@socotra.com>
envoyproxy · Oct 21, 2021 · 40bae72 · 40bae72
1 parent b6899fb
commit 40bae72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/cache/v3/simple_test.go b/pkg/cache/v3/simple_test.go
@@ -437,7 +437,7 @@ func TestSnapshotCreateWatchWithResourcePreviouslyNotRequested(t *testing.T) {
 		rsrc.EndpointType:        {testEndpoint, resource.MakeEndpoint(clusterName2, 8080)},
 		rsrc.ClusterType:         {testCluster, resource.MakeCluster(resource.Ads, clusterName2)},
 		rsrc.RouteType:           {testRoute, resource.MakeRoute(routeName2, clusterName2)},
-		rsrc.ListenerType:        {testListener, resource.MakeHTTPListener(resource.Ads, listenerName2, 80, routeName2)},
+		rsrc.ListenerType:        {testListener, resource.MakeRouteHTTPListener(resource.Ads, listenerName2, 80, routeName2)},
 		rsrc.RuntimeType:         {},
 		rsrc.SecretType:          {},
 		rsrc.ExtensionConfigType: {},

diff --git a/pkg/server/sotw/v3/server.go b/pkg/server/sotw/v3/server.go
@@ -391,7 +391,7 @@ func (s *server) process(stream Stream, reqCh <-chan *discovery.DiscoveryRequest
 						values.scopedRouteCancel()
 					}
 					values.scopedRoutes = make(chan cache.Response, 1)
-					values.scopedRouteCancel = s.cache.CreateWatch(req, values.scopedRoutes)
+					values.scopedRouteCancel = s.cache.CreateWatch(req, streamState, values.scopedRoutes)
 				}
 			case req.TypeUrl == resource.ListenerType:
 				if values.listenerNonce == "" || values.listenerNonce == nonce {