Skip to content

xds: fix xDS HTTP CONNECT's transport socket name bug #12740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shivaspeaks wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −9
Open

xds: fix xDS HTTP CONNECT's transport socket name bug #12740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69601b6
xds: fix transport socket name bug
shivaspeaks Apr 1, 2026
9329ca2
use .is to check Any
shivaspeaks Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions xds/src/main/java/io/grpc/xds/XdsClusterResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ class XdsClusterResource extends XdsResourceType<CdsUpdate> {
"type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext";
private static final String TYPE_URL_UPSTREAM_TLS_CONTEXT_V2 =
"type.googleapis.com/envoy.api.v2.auth.UpstreamTlsContext";
static final String TRANSPORT_SOCKET_NAME_HTTP11_PROXY =
"type.googleapis.com/envoy.extensions.transport_sockets.http_11_proxy.v3"
+ ".Http11ProxyUpstreamTransport";
private final LoadBalancerRegistry loadBalancerRegistry
= LoadBalancerRegistry.getDefaultRegistry();

Expand Down Expand Up @@ -261,14 +258,14 @@ private static StructOrError<CdsUpdate.Builder> parseNonAggregateCluster(
TransportSocket transportSocket = cluster.getTransportSocket();

if (hasTransportSocket && !TRANSPORT_SOCKET_NAME_TLS.equals(transportSocket.getName())
&& !(isEnabledXdsHttpConnect
&& TRANSPORT_SOCKET_NAME_HTTP11_PROXY.equals(transportSocket.getName()))) {
&& !(isEnabledXdsHttpConnect && transportSocket.getTypedConfig().is(
Http11ProxyUpstreamTransport.class))) {
return StructOrError.fromError(
"transport-socket with name " + transportSocket.getName() + " not supported.");
}

if (hasTransportSocket && isEnabledXdsHttpConnect
&& TRANSPORT_SOCKET_NAME_HTTP11_PROXY.equals(transportSocket.getName())) {
if (hasTransportSocket && isEnabledXdsHttpConnect && transportSocket.getTypedConfig().is(
Http11ProxyUpstreamTransport.class)) {
isHttp11ProxyAvailable = true;
try {
Http11ProxyUpstreamTransport wrappedTransportSocket = transportSocket
Expand Down
3 changes: 1 addition & 2 deletions xds/src/test/java/io/grpc/xds/GrpcXdsClientImplDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import static com.google.common.truth.Truth.assertThat;
import static io.envoyproxy.envoy.config.route.v3.RouteAction.ClusterSpecifierCase.CLUSTER_SPECIFIER_PLUGIN;
import static io.grpc.xds.XdsClusterResource.TRANSPORT_SOCKET_NAME_HTTP11_PROXY;
import static io.grpc.xds.XdsEndpointResource.GRPC_EXPERIMENTAL_XDS_DUALSTACK_ENDPOINTS;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
Expand Down Expand Up @@ -2615,7 +2614,7 @@ public void parseNonAggregateCluster_withHttp11ProxyTransportSocket() throws Exc
.build();

TransportSocket transportSocket = TransportSocket.newBuilder()
.setName(TRANSPORT_SOCKET_NAME_HTTP11_PROXY)
.setName("envoy.transport_sockets.http_11_proxy")
.setTypedConfig(Any.pack(http11ProxyUpstreamTransport))
.build();

Expand Down
Loading