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

fixes #12739

Author: shivaspeaks

xds/src/main/java/io/grpc/xds/XdsClusterResource.java

@@ -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();
 
@@ -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

xds/src/test/java/io/grpc/xds/GrpcXdsClientImplDataTest.java

@@ -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;
@@ -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();