Remove feature guarding of the env vars for Cloud run CSM:

  GRPC_EXPERIMENTAL_XDS_SNI
  GRPC_EXPERIMENTAL_XDS_AUTHORITY_REWRITE
  GRPC_EXPERIMENTAL_XDS_SYSTEM_ROOT_CERTS
  GRPC_EXPERIMENTAL_XDS_GCP_AUTHENTICATION_FILTER

Author: kannanjgithub

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

@@ -65,14 +65,14 @@
 import io.grpc.xds.XdsEndpointResource.EdsUpdate;
 import io.grpc.xds.XdsListenerResource.LdsUpdate;
 import io.grpc.xds.XdsRouteConfigureResource.RdsUpdate;
+import io.grpc.xds.client.Bootstrapper;
 import io.grpc.xds.client.Locality;
 import io.grpc.xds.client.XdsResourceType;
 import io.grpc.xds.client.XdsResourceType.ResourceInvalidException;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -463,7 +463,7 @@ private static LdsUpdate getLdsUpdate() {
   private static RdsUpdate getRdsUpdate() {
     RouteConfiguration routeConfiguration =
         buildRouteConfiguration("my-server", RDS_NAME, CLUSTER_NAME);
-    XdsResourceType.Args args = new XdsResourceType.Args(null, "0", "0", null, null, null);
+    XdsResourceType.Args args = new XdsResourceType.Args(XdsTestUtils.EMPTY_BOOTSTRAPPER_SERVER_INFO, "0", "0", null, null, null);
     try {
       return XdsRouteConfigureResource.getInstance().doParse(args, routeConfiguration);
     } catch (ResourceInvalidException ex) {

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

@@ -530,7 +530,7 @@ public void parseRouteAction_withCluster() {
   }
 
   @Test
-  public void parseRouteAction_withCluster_autoHostRewriteEnabled() {
+  public void parseRouteAction_withCluster_autoHostRewrite() {
     io.envoyproxy.envoy.config.route.v3.RouteAction proto =
         io.envoyproxy.envoy.config.route.v3.RouteAction.newBuilder()
             .setCluster("cluster-foo")
@@ -545,22 +545,6 @@ public void parseRouteAction_withCluster_autoHostRewriteEnabled() {
     assertThat(struct.getStruct().autoHostRewrite()).isTrue();
   }
 
-  @Test
-  public void parseRouteAction_withCluster_flagDisabled_autoHostRewriteNotEnabled() {
-    io.envoyproxy.envoy.config.route.v3.RouteAction proto =
-        io.envoyproxy.envoy.config.route.v3.RouteAction.newBuilder()
-            .setCluster("cluster-foo")
-            .setAutoHostRewrite(BoolValue.of(true))
-            .build();
-    StructOrError<RouteAction> struct =
-        XdsRouteConfigureResource.parseRouteAction(proto, filterRegistry,
-            ImmutableMap.of(), ImmutableSet.of(), getXdsResourceTypeArgs(true));
-    assertThat(struct.getErrorDetail()).isNull();
-    assertThat(struct.getStruct().cluster()).isEqualTo("cluster-foo");
-    assertThat(struct.getStruct().weightedClusters()).isNull();
-    assertThat(struct.getStruct().autoHostRewrite()).isFalse();
-  }
-
   @Test
   public void parseRouteAction_withWeightedCluster() {
     io.envoyproxy.envoy.config.route.v3.RouteAction proto =
@@ -589,7 +573,7 @@ public void parseRouteAction_withWeightedCluster() {
   }
 
   @Test
-  public void parseRouteAction_withWeightedCluster_autoHostRewriteEnabled() {
+  public void parseRouteAction_withWeightedCluster_autoHostRewrite() {
     io.envoyproxy.envoy.config.route.v3.RouteAction proto =
         io.envoyproxy.envoy.config.route.v3.RouteAction.newBuilder()
             .setWeightedClusters(
@@ -616,34 +600,6 @@ public void parseRouteAction_withWeightedCluster_autoHostRewriteEnabled() {
     assertThat(struct.getStruct().autoHostRewrite()).isTrue();
   }
 
-  @Test
-  public void parseRouteAction_withWeightedCluster_flagDisabled_autoHostRewriteDisabled() {
-    io.envoyproxy.envoy.config.route.v3.RouteAction proto =
-        io.envoyproxy.envoy.config.route.v3.RouteAction.newBuilder()
-            .setWeightedClusters(
-                WeightedCluster.newBuilder()
-                    .addClusters(
-                        WeightedCluster.ClusterWeight
-                            .newBuilder()
-                            .setName("cluster-foo")
-                            .setWeight(UInt32Value.newBuilder().setValue(30)))
-                    .addClusters(WeightedCluster.ClusterWeight
-                        .newBuilder()
-                        .setName("cluster-bar")
-                        .setWeight(UInt32Value.newBuilder().setValue(70))))
-            .setAutoHostRewrite(BoolValue.of(true))
-            .build();
-    StructOrError<RouteAction> struct =
-        XdsRouteConfigureResource.parseRouteAction(proto, filterRegistry,
-            ImmutableMap.of(), ImmutableSet.of(), getXdsResourceTypeArgs(true));
-    assertThat(struct.getErrorDetail()).isNull();
-    assertThat(struct.getStruct().cluster()).isNull();
-    assertThat(struct.getStruct().weightedClusters()).containsExactly(
-        ClusterWeight.create("cluster-foo", 30, ImmutableMap.<String, FilterConfig>of()),
-        ClusterWeight.create("cluster-bar", 70, ImmutableMap.<String, FilterConfig>of()));
-    assertThat(struct.getStruct().autoHostRewrite()).isFalse();
-  }
-
   @Test
   public void parseRouteAction_weightedClusterSum() {
     io.envoyproxy.envoy.config.route.v3.RouteAction proto =

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

@@ -77,7 +77,6 @@
 import io.grpc.xds.internal.security.SslContextProviderSupplier;
 import io.grpc.xds.internal.security.TlsContextManagerImpl;
 import io.grpc.xds.internal.security.certprovider.FileWatcherCertificateProviderProvider;
-import io.grpc.xds.internal.security.trust.CertificateUtils;
 import io.netty.handler.ssl.NotSslRecordException;
 import java.io.File;
 import java.io.FileOutputStream;

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

@@ -86,6 +86,33 @@ public class XdsTestUtils {
           + ".HttpConnectionManager";
   public static final String ENDPOINT_HOSTNAME = "data-host";
   public static final int ENDPOINT_PORT = 1234;
+  static final Bootstrapper.ServerInfo EMPTY_BOOTSTRAPPER_SERVER_INFO =
+      new Bootstrapper.ServerInfo() {
+    @Override
+    public String target() {
+      return null;
+    }
+
+    @Override
+    public Object implSpecificConfig() {
+      return null;
+    }
+
+    @Override
+    public boolean ignoreResourceDeletion() {
+      return false;
+    }
+
+    @Override
+    public boolean isTrustedXdsServer() {
+      return false;
+    }
+
+    @Override
+    public boolean resourceTimerIsTransientError() {
+      return false;
+    }
+  };
 
   static BindableService createLrsService(AtomicBoolean lrsEnded,
                                           Queue<LrsRpcCall> loadReportCalls) {
@@ -247,8 +274,8 @@ static XdsConfig getDefaultXdsConfig(String serverHostName)
 
     RouteConfiguration routeConfiguration =
         buildRouteConfiguration(serverHostName, RDS_NAME, CLUSTER_NAME);
-    Bootstrapper.ServerInfo serverInfo = null;
-    XdsResourceType.Args args = new XdsResourceType.Args(serverInfo, "0", "0", null, null, null);
+    XdsResourceType.Args args = new XdsResourceType.Args(
+        EMPTY_BOOTSTRAPPER_SERVER_INFO, "0", "0", null, null, null);
     XdsRouteConfigureResource.RdsUpdate rdsUpdate =
         XdsRouteConfigureResource.getInstance().doParse(args, routeConfiguration);
 
@@ -268,7 +295,7 @@ static XdsConfig getDefaultXdsConfig(String serverHostName)
     XdsEndpointResource.EdsUpdate edsUpdate = new XdsEndpointResource.EdsUpdate(
         EDS_NAME, lbEndpointsMap, Collections.emptyList());
     XdsClusterResource.CdsUpdate cdsUpdate = XdsClusterResource.CdsUpdate.forEds(
-        CLUSTER_NAME, EDS_NAME, serverInfo, null, null, null, false, null)
+        CLUSTER_NAME, EDS_NAME, EMPTY_BOOTSTRAPPER_SERVER_INFO, null, null, null, false, null)
         .lbPolicyConfig(getWrrLbConfigAsMap()).build();
     XdsConfig.XdsClusterConfig clusterConfig = new XdsConfig.XdsClusterConfig(
         CLUSTER_NAME, cdsUpdate, new EndpointConfig(StatusOr.fromValue(edsUpdate)));

xds/src/test/java/io/grpc/xds/internal/security/SecurityProtocolNegotiatorsTest.java

@@ -54,7 +54,6 @@
 import io.grpc.xds.internal.security.SecurityProtocolNegotiators.ClientSecurityHandler;
 import io.grpc.xds.internal.security.SecurityProtocolNegotiators.ClientSecurityProtocolNegotiator;
 import io.grpc.xds.internal.security.certprovider.CommonCertProviderTestUtils;
-import io.grpc.xds.internal.security.trust.CertificateUtils;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPipeline;