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

xds/internal/xdsclient: NACK empty clusters in aggregate clusters (#6023)

This commit is contained in:
Zach Reyes 2023-02-14 22:57:10 -05:00 committed by GitHub
parent 081499f2e8
commit 30d8c0a043
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xds/internal/xdsclient/xdsresource/unmarshal_cds.go
View File

@ -177,6 +177,9 @@ func validateClusterAndConstructClusterUpdate(cluster *v3clusterpb.Cluster) (Clu
if err := proto.Unmarshal(cluster.GetClusterType().GetTypedConfig().GetValue(), clusters); err != nil { if err := proto.Unmarshal(cluster.GetClusterType().GetTypedConfig().GetValue(), clusters); err != nil {
return ClusterUpdate{}, fmt.Errorf("failed to unmarshal resource: %v", err) return ClusterUpdate{}, fmt.Errorf("failed to unmarshal resource: %v", err)
} }
if len(clusters.Clusters) == 0 {
return ClusterUpdate{}, fmt.Errorf("xds: aggregate cluster has empty clusters field in response: %+v", cluster)
}
ret.ClusterType = ClusterTypeAggregate ret.ClusterType = ClusterTypeAggregate
ret.PrioritizedClusterNames = clusters.Clusters ret.PrioritizedClusterNames = clusters.Clusters
return ret, nil return ret, nil

32
xds/internal/xdsclient/xdsresource/unmarshal_cds_test.go
View File

@ -194,6 +194,38 @@ func (s) TestValidateCluster_Failure(t *testing.T) {
wantUpdate: emptyUpdate, wantUpdate: emptyUpdate,
wantErr: true, wantErr: true,
}, },
{
name: "aggregate-nil-clusters",
cluster: &v3clusterpb.Cluster{
Name: clusterName,
ClusterDiscoveryType: &v3clusterpb.Cluster_ClusterType{
ClusterType: &v3clusterpb.Cluster_CustomClusterType{
Name: "envoy.clusters.aggregate",
TypedConfig: testutils.MarshalAny(&v3aggregateclusterpb.ClusterConfig{}),
},
},
LbPolicy: v3clusterpb.Cluster_ROUND_ROBIN,
},
wantUpdate: emptyUpdate,
wantErr: true,
},
{
name: "aggregate-empty-clusters",
cluster: &v3clusterpb.Cluster{
Name: clusterName,
ClusterDiscoveryType: &v3clusterpb.Cluster_ClusterType{
ClusterType: &v3clusterpb.Cluster_CustomClusterType{
Name: "envoy.clusters.aggregate",
TypedConfig: testutils.MarshalAny(&v3aggregateclusterpb.ClusterConfig{
Clusters: []string{},
}),
},
},
LbPolicy: v3clusterpb.Cluster_ROUND_ROBIN,
},
wantUpdate: emptyUpdate,
wantErr: true,
},
} }
oldAggregateAndDNSSupportEnv := envconfig.XDSAggregateAndDNS oldAggregateAndDNSSupportEnv := envconfig.XDSAggregateAndDNS