Fix plumbings.

Author: kannanjgithub

api/src/main/java/io/grpc/EquivalentAddressGroup.java

@@ -55,10 +55,7 @@ public final class EquivalentAddressGroup {
    */
   public static final Attributes.Key<String> ATTR_LOCALITY_NAME =
       Attributes.Key.create("io.grpc.EquivalentAddressGroup.LOCALITY");
-  /** Name associated with individual address, if available (e.g., DNS name). */
-  @Attr
-  public static final Attributes.Key<String> ATTR_ADDRESS_NAME =
-      Attributes.Key.create("io.grpc.xds.XdsAttributes.addressName");
+
   private final List<SocketAddress> addrs;
   private final Attributes attrs;
 

netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java

@@ -760,7 +760,7 @@ public static ProtocolNegotiator tls(SslContext sslContext,
    */
   public static ProtocolNegotiator tls(SslContext sslContext,
       X509TrustManager x509ExtendedTrustManager) {
-    return tls(sslContext, null, Optional.absent(), x509ExtendedTrustManager, null, false);
+    return tls(sslContext, null, Optional.absent(), x509ExtendedTrustManager, null);
   }
 
   public static ProtocolNegotiator.ClientFactory tlsClientFactory(SslContext sslContext,

s2a/src/main/java/io/grpc/s2a/internal/handshaker/S2AProtocolNegotiatorFactory.java

@@ -259,7 +259,7 @@ public void run() {
                               s2aStub.close();
                             }
                           }),
-                          null, null, false)
+                          null, null)
                       .newHandler(grpcHandler);
 
               // Delegate the rest of the handshake to the TLS handler. and remove the 

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

@@ -53,6 +53,7 @@
 import io.grpc.xds.client.XdsClient;
 import io.grpc.xds.client.XdsLogger;
 import io.grpc.xds.client.XdsLogger.XdsLogLevel;
+import io.grpc.xds.internal.XdsInternalAttributes;
 import io.grpc.xds.internal.security.SecurityProtocolNegotiators;
 import io.grpc.xds.internal.security.SslContextProviderSupplier;
 import io.grpc.xds.orca.OrcaPerRequestUtil;
@@ -241,9 +242,9 @@ public Subchannel createSubchannel(CreateSubchannelArgs args) {
           .set(ATTR_CLUSTER_LOCALITY, localityAtomicReference);
       if (GrpcUtil.getFlag("GRPC_EXPERIMENTAL_XDS_AUTHORITY_REWRITE", false)) {
         String hostname = args.getAddresses().get(0).getAttributes()
-            .get(EquivalentAddressGroup.ATTR_ADDRESS_NAME);
+            .get(XdsInternalAttributes.ATTR_ADDRESS_NAME);
         if (hostname != null) {
-          attrsBuilder.set(EquivalentAddressGroup.ATTR_ADDRESS_NAME, hostname);
+          attrsBuilder.set(XdsInternalAttributes.ATTR_ADDRESS_NAME, hostname);
         }
       }
       args = args.toBuilder().setAddresses(addresses).setAttributes(attrsBuilder.build()).build();
@@ -439,7 +440,7 @@ public PickResult pickSubchannel(PickSubchannelArgs args) {
             result = PickResult.withSubchannel(result.getSubchannel(),
                 result.getStreamTracerFactory(),
                 result.getSubchannel().getAttributes().get(
-                    EquivalentAddressGroup.ATTR_ADDRESS_NAME));
+                    XdsInternalAttributes.ATTR_ADDRESS_NAME));
           }
         }
         return result;

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

@@ -47,6 +47,7 @@
 import io.grpc.xds.client.Locality;
 import io.grpc.xds.client.XdsLogger;
 import io.grpc.xds.client.XdsLogger.XdsLogLevel;
+import io.grpc.xds.internal.XdsInternalAttributes;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.ArrayList;
@@ -194,7 +195,7 @@ StatusOr<ClusterResolutionResult> edsUpdateToResult(
                     .set(XdsAttributes.ATTR_LOCALITY_WEIGHT,
                         localityLbInfo.localityWeight())
                     .set(XdsAttributes.ATTR_SERVER_WEIGHT, weight)
-                    .set(EquivalentAddressGroup.ATTR_ADDRESS_NAME, endpoint.hostname())
+                    .set(XdsInternalAttributes.ATTR_ADDRESS_NAME, endpoint.hostname())
                     .build();
             EquivalentAddressGroup eag;
             if (config.isHttp11ProxyAvailable()) {

xds/src/main/java/io/grpc/xds/internal/XdsInternalAttributes.java

@@ -0,0 +1,27 @@
+package io.grpc.xds.internal;
+
+/*
+ * Copyright 2019 The gRPC Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import io.grpc.Attributes;
+import io.grpc.EquivalentAddressGroup;
+
+public final class XdsInternalAttributes {
+  /** Name associated with individual address, if available (e.g., DNS name). */
+  @EquivalentAddressGroup.Attr
+  public static final Attributes.Key<String> ATTR_ADDRESS_NAME =
+      Attributes.Key.create("io.grpc.xds.XdsAttributes.addressName");
+}

xds/src/main/java/io/grpc/xds/internal/security/ClientSslContextProviderFactory.java

@@ -24,8 +24,7 @@
 
 /** Factory to create client-side SslContextProvider from UpstreamTlsContext. */
 final class ClientSslContextProviderFactory
-    implements ValueFactory<AbstractMap.SimpleImmutableEntry<UpstreamTlsContext, String>,
-        SslContextProvider> {
+    implements ValueFactory<UpstreamTlsContext, SslContextProvider> {
 
   private BootstrapInfo bootstrapInfo;
   private final CertProviderClientSslContextProviderFactory
@@ -43,10 +42,9 @@ final class ClientSslContextProviderFactory
 
   /** Creates an SslContextProvider from the given UpstreamTlsContext. */
   @Override
-  public SslContextProvider create(
-      AbstractMap.SimpleImmutableEntry<UpstreamTlsContext, String> key) {
+  public SslContextProvider create(UpstreamTlsContext key) {
     return certProviderClientSslContextProviderFactory.getProvider(
-        key.getKey(), key.getValue(),
+        key,
         bootstrapInfo.node().toEnvoyProtoNode(),
         bootstrapInfo.certProviders());
   }

xds/src/main/java/io/grpc/xds/internal/security/SecurityProtocolNegotiators.java

@@ -33,6 +33,7 @@
 import io.grpc.netty.ProtocolNegotiationEvent;
 import io.grpc.xds.EnvoyServerProtoData;
 import io.grpc.xds.EnvoyServerProtoData.UpstreamTlsContext;
+import io.grpc.xds.internal.XdsInternalAttributes;
 import io.grpc.xds.internal.security.trust.CertificateUtils;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerAdapter;
@@ -150,7 +151,7 @@ public ChannelHandler newHandler(GrpcHttp2ConnectionHandler grpcHandler) {
         return fallbackProtocolNegotiator.newHandler(grpcHandler);
       }
       return new ClientSecurityHandler(grpcHandler, localSslContextProviderSupplier,
-          grpcHandler.getEagAttributes().get(EquivalentAddressGroup.ATTR_ADDRESS_NAME));
+          grpcHandler.getEagAttributes().get(XdsInternalAttributes.ATTR_ADDRESS_NAME));
     }
 
     @Override
@@ -398,7 +399,7 @@ public void updateSslContextAndExtendedX509TrustManager(
             public void onException(Throwable throwable) {
               ctx.fireExceptionCaught(throwable);
             }
-          }, null);
+          });
     }
   }
 }

xds/src/main/java/io/grpc/xds/internal/security/TlsContextManagerImpl.java

@@ -35,8 +35,7 @@
  */
 public final class TlsContextManagerImpl implements TlsContextManager {
 
-  private final ReferenceCountingMap<AbstractMap.SimpleImmutableEntry<UpstreamTlsContext, String>,
-      SslContextProvider> mapForClients;
+  private final ReferenceCountingMap<UpstreamTlsContext, SslContextProvider> mapForClients;
   private final ReferenceCountingMap<DownstreamTlsContext, SslContextProvider> mapForServers;
 
   /**
@@ -50,8 +49,7 @@ public final class TlsContextManagerImpl implements TlsContextManager {
 
   @VisibleForTesting
   TlsContextManagerImpl(
-      ValueFactory<AbstractMap.SimpleImmutableEntry<UpstreamTlsContext, String>,
-          SslContextProvider> clientFactory,
+      ValueFactory<UpstreamTlsContext, SslContextProvider> clientFactory,
       ValueFactory<DownstreamTlsContext, SslContextProvider> serverFactory) {
     checkNotNull(clientFactory, "clientFactory");
     checkNotNull(serverFactory, "serverFactory");
@@ -74,16 +72,14 @@ public SslContextProvider findOrCreateServerSslContextProvider(
   public SslContextProvider findOrCreateClientSslContextProvider(
       UpstreamTlsContext upstreamTlsContext) {
     checkNotNull(upstreamTlsContext, "upstreamTlsContext");
-    return mapForClients.get(new AbstractMap.SimpleImmutableEntry<>(upstreamTlsContext, sni));
+    return mapForClients.get(upstreamTlsContext);
   }
 
   @Override
   public SslContextProvider releaseClientSslContextProvider(
-      SslContextProvider clientSslContextProvider, String sni) {
+      SslContextProvider clientSslContextProvider) {
     checkNotNull(clientSslContextProvider, "clientSslContextProvider");
-    return mapForClients.release(
-        new AbstractMap.SimpleImmutableEntry<>(
-            clientSslContextProvider.getUpstreamTlsContext(), sni),
+    return mapForClients.release(clientSslContextProvider.getUpstreamTlsContext(),
         clientSslContextProvider);
   }
 

xds/src/main/java/io/grpc/xds/internal/security/certprovider/CertProviderClientSslContextProvider.java

@@ -42,7 +42,6 @@ final class CertProviderClientSslContextProvider extends CertProviderSslContextP
       CommonTlsContext.CertificateProviderInstance rootCertInstance,
       CertificateValidationContext staticCertValidationContext,
       UpstreamTlsContext upstreamTlsContext,
-      String sniForSanMatching,
       CertificateProviderStore certificateProviderStore) {
     super(
         node,
@@ -51,8 +50,7 @@ final class CertProviderClientSslContextProvider extends CertProviderSslContextP
         rootCertInstance,
         staticCertValidationContext,
         upstreamTlsContext,
-        certificateProviderStore,
-        upstreamTlsContext.getAutoSniSanValidation() ? sniForSanMatching : null);
+        certificateProviderStore);
   }
 
   @Override