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

require EDS service name in CDS resources with xdstp name (#10329) 

* require EDS service name in CDS resources with xdstp name
This commit is contained in:
Larry Safran 2023-06-30 20:51:46 +00:00 committed by GitHub
parent 1a9c2a0dac
commit ed4cc896fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xds/src/main/java/io/grpc/xds/XdsClusterResource.java
View File

@ -241,6 +241,11 @@ class XdsClusterResource extends XdsResourceType<CdsUpdate> {
if (!edsClusterConfig.getServiceName().isEmpty()) {
edsServiceName = edsClusterConfig.getServiceName();
}
// edsServiceName is required if the CDS resource has an xdstp name.
if ((edsServiceName == null) && clusterName.toLowerCase().startsWith("xdstp:")) {
return StructOrError.fromError(
"EDS service_name must be set when Cluster resource has an xdstp name");
}
return StructOrError.fromStruct(CdsUpdate.forEds(
clusterName, edsServiceName, lrsServerInfo, maxConcurrentRequests, upstreamTlsContext,
outlierDetection));

28
xds/src/test/java/io/grpc/xds/XdsClientImplTestBase.java
View File

@ -2444,6 +2444,34 @@ public abstract class XdsClientImplTestBase {
verifyStatusWithNodeId(errorCaptor.getValue(), Code.UNAVAILABLE, errorMsg);
}
@Test
public void cdsResponseErrorHandling_xdstpWithoutEdsConfig() {
String cdsResourceName = "xdstp://authority.xds.com/envoy.config.cluster.v3.Cluster/cluster1";
final Any testClusterRoundRobin =
Any.pack(mf.buildEdsCluster(cdsResourceName, null, "round_robin", null,
null, false, null, "envoy.transport_sockets.tls", null, null
));
final Any okClusterRoundRobin =
Any.pack(mf.buildEdsCluster(cdsResourceName, "eds-service-bar.googleapis.com",
"round_robin", null,null, false, null, "envoy.transport_sockets.tls", null, null));
DiscoveryRpcCall call = startResourceWatcher(XdsClusterResource.getInstance(),
cdsResourceName, cdsResourceWatcher);
call.sendResponse(CDS, testClusterRoundRobin, VERSION_1, "0000");
List<String> errors = ImmutableList.of("CDS response Cluster "
+ "\'xdstp://authority.xds.com/envoy.config.cluster.v3.Cluster/cluster1\' "
+ "validation error: EDS service_name must be set when Cluster resource has an xdstp name");
call.verifyRequest(CDS, cdsResourceName, "", "", NODE); // get this out of the way
call.verifyRequestNack(CDS, cdsResourceName, "", "0000", NODE, errors);
verifySubscribedResourcesMetadataSizes(0, 1, 0, 0);
call.sendResponse(CDS, okClusterRoundRobin, VERSION_1, "0001");
call.verifyRequest(CDS, cdsResourceName, VERSION_1, "0001", NODE);
}
@Test
@SuppressWarnings("unchecked")
public void cachedCdsResource_data() {