grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This reverts commit 00ae0c57cc.
This commit is contained in:
Doug Fawley 2021-06-17 16:53:52 -07:00 committed by GitHub
parent 1c1e3f88d3
commit 74fe073e9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xds/internal/resolver/serviceconfig.go
View File

@ -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) {

5
xds/internal/resolver/xds_resolver_test.go
View File

@ -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{