xds: fix the transport-socket-name to match what control plane sends (#…

…7508)
grpc · Oct 12, 2020 · b08ce41 · b08ce41
1 parent 46290ef
commit b08ce41
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/xds/src/main/java/io/grpc/xds/EnvoyProtoData.java b/xds/src/main/java/io/grpc/xds/EnvoyProtoData.java
@@ -61,6 +61,7 @@
  */
 // TODO(chengyuanzhang): put data types into smaller categories.
 final class EnvoyProtoData {
+  static final String TRANSPORT_SOCKET_NAME_TLS = "envoy.transport_sockets.tls";
 
   // Prevent instantiation.
   private EnvoyProtoData() {

diff --git a/xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java b/xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java
@@ -16,6 +16,8 @@
 
 package io.grpc.xds;
 
+import static io.grpc.xds.EnvoyProtoData.TRANSPORT_SOCKET_NAME_TLS;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.protobuf.Any;
 import com.google.protobuf.InvalidProtocolBufferException;
@@ -295,7 +297,7 @@ private static DownstreamTlsContext getTlsContextFromFilterChain(
         io.envoyproxy.envoy.config.listener.v3.FilterChain filterChain)
         throws InvalidProtocolBufferException {
       if (filterChain.hasTransportSocket()
-          && "tls".equals(filterChain.getTransportSocket().getName())) {
+          && TRANSPORT_SOCKET_NAME_TLS.equals(filterChain.getTransportSocket().getName())) {
         Any any = filterChain.getTransportSocket().getTypedConfig();
         return DownstreamTlsContext.fromEnvoyProtoDownstreamTlsContext(
             io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext.parseFrom(

diff --git a/xds/src/main/java/io/grpc/xds/XdsClientImpl2.java b/xds/src/main/java/io/grpc/xds/XdsClientImpl2.java
@@ -19,6 +19,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
+import static io.grpc.xds.EnvoyProtoData.TRANSPORT_SOCKET_NAME_TLS;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
@@ -783,7 +784,8 @@ private void handleCdsResponse(DiscoveryResponseData cdsResponse) {
   @Nullable
   private static EnvoyServerProtoData.UpstreamTlsContext getTlsContextFromCluster(Cluster cluster)
       throws InvalidProtocolBufferException {
-    if (cluster.hasTransportSocket() && "tls".equals(cluster.getTransportSocket().getName())) {
+    if (cluster.hasTransportSocket()
+        && TRANSPORT_SOCKET_NAME_TLS.equals(cluster.getTransportSocket().getName())) {
       Any any = cluster.getTransportSocket().getTypedConfig();
       return EnvoyServerProtoData.UpstreamTlsContext.fromEnvoyProtoUpstreamTlsContext(
           any.unpack(UpstreamTlsContext.class));

diff --git a/xds/src/test/java/io/grpc/xds/EnvoyServerProtoDataTest.java b/xds/src/test/java/io/grpc/xds/EnvoyServerProtoDataTest.java
@@ -118,7 +118,7 @@ private static FilterChain createInFilter() {
                         .build())
                     .addApplicationProtocols("managed-mtls")
                     .build())
-            .setTransportSocket(TransportSocket.newBuilder().setName("tls")
+            .setTransportSocket(TransportSocket.newBuilder().setName("envoy.transport_sockets.tls")
                 .setTypedConfig(
                     Any.pack(CommonTlsContextTestsUtil.buildTestDownstreamTlsContext(
                         "google-sds-config-default", "ROOTCA")))

diff --git a/xds/src/test/java/io/grpc/xds/XdsClientImplTestForListener.java b/xds/src/test/java/io/grpc/xds/XdsClientImplTestForListener.java
@@ -786,15 +786,17 @@ static Listener buildListenerWithFilterChain(String name, int portValue, String
   @SuppressWarnings("deprecation")
   static FilterChain buildFilterChain(FilterChainMatch filterChainMatch,
                                       DownstreamTlsContext tlsContext, Filter...filters) {
-    return
-        FilterChain.newBuilder()
-            .setFilterChainMatch(filterChainMatch)
-            .setTransportSocket(tlsContext == null
+    return FilterChain.newBuilder()
+        .setFilterChainMatch(filterChainMatch)
+        .setTransportSocket(
+            tlsContext == null
                 ? TransportSocket.getDefaultInstance()
-                : TransportSocket.newBuilder().setName("tls").setTypedConfig(Any.pack(tlsContext))
+                : TransportSocket.newBuilder()
+                    .setName("envoy.transport_sockets.tls")
+                    .setTypedConfig(Any.pack(tlsContext))
                     .build())
-            .addAllFilters(Arrays.asList(filters))
-            .build();
+        .addAllFilters(Arrays.asList(filters))
+        .build();
   }
 
   static FilterChainMatch buildFilterChainMatch(int destPort, CidrRange...prefixRanges) {

diff --git a/xds/src/test/java/io/grpc/xds/XdsClientTestHelper.java b/xds/src/test/java/io/grpc/xds/XdsClientTestHelper.java
@@ -235,7 +235,9 @@ static Cluster buildSecureCluster(
     }
     if (upstreamTlsContext != null) {
       clusterBuilder.setTransportSocket(
-          TransportSocket.newBuilder().setName("tls").setTypedConfig(Any.pack(upstreamTlsContext)));
+          TransportSocket.newBuilder()
+              .setName("envoy.transport_sockets.tls")
+              .setTypedConfig(Any.pack(upstreamTlsContext)));
     }
     return clusterBuilder.build();
   }