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

xds: require router filter when filters are empty (#4553)

This commit is contained in:
Aliaksandr Mianzhynski 2021-06-17 20:23:18 +03:00 committed by GitHub
parent 633fbe4dfe
commit 00ae0c57cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,9 +255,6 @@ func (cs *configSelector) generateHash(rpcInfo iresolver.RPCInfo, hashPolicies [
} }
func (cs *configSelector) newInterceptor(rt *route, cluster *routeCluster) (iresolver.ClientInterceptor, error) { 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)) interceptors := make([]iresolver.ClientInterceptor, 0, len(cs.httpFilterConfig))
for _, filter := range cs.httpFilterConfig { for _, filter := range cs.httpFilterConfig {
if router.IsRouterFilter(filter.Filter) { if router.IsRouterFilter(filter.Filter) {

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

@ -1197,6 +1197,11 @@ func (s) TestXDSResolverHTTPFilters(t *testing.T) {
selectErr string selectErr string
newStreamErr string newStreamErr string
}{ }{
{
name: "empty filters",
ldsFilters: []xdsclient.HTTPFilter{},
selectErr: "no router filter present",
},
{ {
name: "no router filter", name: "no router filter",
ldsFilters: []xdsclient.HTTPFilter{ ldsFilters: []xdsclient.HTTPFilter{