Revert "xds: require router filter when filters are empty" (#4556)

This reverts commit 00ae0c5.
grpc · Jun 17, 2021 · 74fe073 · 74fe073
1 parent 1c1e3f8
commit 74fe073
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/xds/internal/resolver/serviceconfig.go b/xds/internal/resolver/serviceconfig.go
@@ -255,6 +255,9 @@ func (cs *configSelector) generateHash(rpcInfo iresolver.RPCInfo, hashPolicies [
 }
 
 func (cs *configSelector) newInterceptor(rt *route, cluster *routeCluster) (iresolver.ClientInterceptor, error) {
+	if len(cs.httpFilterConfig) == 0 {
+		return nil, nil
+	}
 	interceptors := make([]iresolver.ClientInterceptor, 0, len(cs.httpFilterConfig))
 	for _, filter := range cs.httpFilterConfig {
 		if router.IsRouterFilter(filter.Filter) {

diff --git a/xds/internal/resolver/xds_resolver_test.go b/xds/internal/resolver/xds_resolver_test.go
@@ -1197,11 +1197,6 @@ func (s) TestXDSResolverHTTPFilters(t *testing.T) {
 		selectErr    string
 		newStreamErr string
 	}{
-		{
-			name:       "empty filters",
-			ldsFilters: []xdsclient.HTTPFilter{},
-			selectErr:  "no router filter present",
-		},
 		{
 			name: "no router filter",
 			ldsFilters: []xdsclient.HTTPFilter{