Alexander deb vhds support

api/src/main/proto/envoy/config/route/v3/route.proto

@@ -36,12 +36,12 @@ message RouteConfiguration {
   // An array of virtual hosts that make up the route table.
   repeated VirtualHost virtual_hosts = 2;
 
-  // An array of virtual hosts will be dynamically loaded via the VHDS API.
-  // Both *virtual_hosts* and *vhds* fields will be used when present. *virtual_hosts* can be used
-  // for a base routing table or for infrequently changing virtual hosts. *vhds* is used for
-  // on-demand discovery of virtual hosts. The contents of these two fields will be merged to
-  // generate a routing table for a given RouteConfiguration, with *vhds* derived configuration
-  // taking precedence.
+//   An array of virtual hosts will be dynamically loaded via the VHDS API.
+//   Both *virtual_hosts* and *vhds* fields will be used when present. *virtual_hosts* can be used
+//   for a base routing table or for infrequently changing virtual hosts. *vhds* is used for
+//   on-demand discovery of virtual hosts. The contents of these two fields will be merged to
+//   generate a routing table for a given RouteConfiguration, with *vhds* derived configuration
+//   taking precedence.
   Vhds vhds = 9;
 
   // Optionally specifies a list of HTTP headers that the connection manager

cache/src/main/java/io/envoyproxy/controlplane/cache/Resources.java

@@ -2,11 +2,6 @@
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static io.envoyproxy.controlplane.cache.Resources.ApiVersion.V3;
-import static io.envoyproxy.controlplane.cache.Resources.ResourceType.CLUSTER;
-import static io.envoyproxy.controlplane.cache.Resources.ResourceType.ENDPOINT;
-import static io.envoyproxy.controlplane.cache.Resources.ResourceType.LISTENER;
-import static io.envoyproxy.controlplane.cache.Resources.ResourceType.ROUTE;
-import static io.envoyproxy.controlplane.cache.Resources.ResourceType.SECRET;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -21,6 +16,7 @@
 import io.envoyproxy.envoy.config.listener.v3.FilterChain;
 import io.envoyproxy.envoy.config.listener.v3.Listener;
 import io.envoyproxy.envoy.config.route.v3.RouteConfiguration;
+import io.envoyproxy.envoy.config.route.v3.VirtualHost;
 import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager;
 import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.RouteSpecifierCase;
 import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.Secret;
@@ -42,6 +38,7 @@ public enum ResourceType {
     ENDPOINT,
     LISTENER,
     ROUTE,
+    VIRTUAL_HOST,
     SECRET
   }
 
@@ -64,6 +61,8 @@ public static class V3 {
         "type.googleapis.com/envoy.config.listener.v3" + ".Listener";
     public static final String ROUTE_TYPE_URL =
         "type.googleapis.com/envoy.config.route.v3" + ".RouteConfiguration";
+    public static final String VIRTUAL_HOST_TYPE_URL =
+        "type.googleapis.com/envoy.config.route.v3" + ".VirtualHost";
     public static final String SECRET_TYPE_URL =
         "type.googleapis.com/envoy.extensions" + ".transport_sockets.tls.v3.Secret";
 
@@ -73,19 +72,26 @@ public static class V3 {
             ENDPOINT_TYPE_URL,
             LISTENER_TYPE_URL,
             ROUTE_TYPE_URL,
+            VIRTUAL_HOST_TYPE_URL,
             SECRET_TYPE_URL);
   }
 
   public static final List<ResourceType> RESOURCE_TYPES_IN_ORDER =
-      ImmutableList.of(CLUSTER, ENDPOINT, LISTENER, ROUTE, SECRET);
+      ImmutableList.of(ResourceType.CLUSTER,
+          ResourceType.ENDPOINT,
+          ResourceType.LISTENER,
+          ResourceType.ROUTE,
+          ResourceType.VIRTUAL_HOST,
+          ResourceType.SECRET);
 
   public static final Map<String, ResourceType> TYPE_URLS_TO_RESOURCE_TYPE =
       new ImmutableMap.Builder<String, ResourceType>()
-          .put(Resources.V3.CLUSTER_TYPE_URL, CLUSTER)
-          .put(Resources.V3.ENDPOINT_TYPE_URL, ENDPOINT)
-          .put(Resources.V3.LISTENER_TYPE_URL, LISTENER)
-          .put(Resources.V3.ROUTE_TYPE_URL, ROUTE)
-          .put(Resources.V3.SECRET_TYPE_URL, SECRET)
+          .put(Resources.V3.CLUSTER_TYPE_URL, ResourceType.CLUSTER)
+          .put(Resources.V3.ENDPOINT_TYPE_URL, ResourceType.ENDPOINT)
+          .put(Resources.V3.LISTENER_TYPE_URL, ResourceType.LISTENER)
+          .put(Resources.V3.ROUTE_TYPE_URL, ResourceType.ROUTE)
+          .put(Resources.V3.VIRTUAL_HOST_TYPE_URL, ResourceType.VIRTUAL_HOST)
+          .put(Resources.V3.SECRET_TYPE_URL, ResourceType.SECRET)
           .build();
 
   public static final Map<String, Class<? extends Message>> RESOURCE_TYPE_BY_URL =
@@ -94,6 +100,7 @@ public static class V3 {
           .put(Resources.V3.ENDPOINT_TYPE_URL, ClusterLoadAssignment.class)
           .put(Resources.V3.LISTENER_TYPE_URL, Listener.class)
           .put(Resources.V3.ROUTE_TYPE_URL, RouteConfiguration.class)
+          .put(Resources.V3.VIRTUAL_HOST_TYPE_URL, VirtualHost.class)
           .put(Resources.V3.SECRET_TYPE_URL, Secret.class)
           .build();
 
@@ -119,6 +126,10 @@ public static String getResourceName(Message resource) {
       return ((RouteConfiguration) resource).getName();
     }
 
+    if (resource instanceof VirtualHost) {
+      return ((VirtualHost) resource).getName();
+    }
+
     if (resource instanceof Secret) {
       return ((Secret) resource).getName();
     }

cache/src/main/java/io/envoyproxy/controlplane/cache/SnapshotResources.java

@@ -2,6 +2,7 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.protobuf.Message;
+
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collector;
@@ -21,7 +22,7 @@ public static <T extends Message> SnapshotResources<T> create(
       Iterable<?> resources,
       String version) {
     ResourceMapBuilder<T> resourcesMapBuilder = createResourcesMap(resources);
-    return new AutoValue_SnapshotResources<>(
+    return new io.envoyproxy.controlplane.cache.AutoValue_SnapshotResources<>(
         resourcesMapBuilder.getVersionedResources(),
         resourcesMapBuilder.getResources(),
         (r) -> version
@@ -40,7 +41,7 @@ public static <T extends Message> SnapshotResources<T> create(
       Iterable<VersionedResource<T>> resources,
       ResourceVersionResolver versionResolver) {
     ResourceMapBuilder<T> resourcesMapBuilder = createResourcesMap(resources);
-    return new AutoValue_SnapshotResources<>(
+    return new io.envoyproxy.controlplane.cache.AutoValue_SnapshotResources<>(
         resourcesMapBuilder.getVersionedResources(),
         resourcesMapBuilder.getResources(),
         versionResolver);

cache/src/main/java/io/envoyproxy/controlplane/cache/TestResources.java

@@ -24,13 +24,15 @@
 import io.envoyproxy.envoy.config.route.v3.RouteAction;
 import io.envoyproxy.envoy.config.route.v3.RouteConfiguration;
 import io.envoyproxy.envoy.config.route.v3.RouteMatch;
+import io.envoyproxy.envoy.config.route.v3.Vhds;
 import io.envoyproxy.envoy.config.route.v3.VirtualHost;
 import io.envoyproxy.envoy.extensions.filters.http.router.v3.Router;
 import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager;
 import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.CodecType;
 import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.Secret;
 import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.TlsCertificate;
 
+
 /**
  * {@code TestResources} provides helper methods for generating resource messages for testing. It is
  * not intended to be used in production code.
@@ -209,6 +211,34 @@ public static Listener createListener(
         .build();
   }
 
+  /**
+   * Returns a new test v3 route.
+   *
+   * @param routeName name of the new route
+   */
+  public static RouteConfiguration createVhdsRoute(String routeName) {
+
+    ApiVersion adsTransportVersion = ApiVersion.V3;
+
+    ConfigSource edsSource =
+        ConfigSource.newBuilder()
+            .setResourceApiVersion(ApiVersion.V3)
+            .setApiConfigSource(
+                ApiConfigSource.newBuilder()
+                    .setTransportApiVersion(adsTransportVersion)
+                    .setApiType(ApiConfigSource.ApiType.DELTA_GRPC)
+                    .addGrpcServices(
+                        GrpcService.newBuilder()
+                            .setEnvoyGrpc(
+                                GrpcService.EnvoyGrpc.newBuilder()
+                                    .setClusterName(XDS_CLUSTER))))
+            .build();
+
+    return RouteConfiguration.newBuilder()
+        .setVhds(Vhds.newBuilder().setConfigSource(edsSource).build())
+        .setName(routeName).build();
+  }
+
   /**
    * Returns a new test v3 route.
    *
@@ -229,6 +259,22 @@ public static RouteConfiguration createRoute(String routeName, String clusterNam
         .build();
   }
 
+  /**
+   * Returns a new Virtual Host.
+   *
+   * @param name Virtual host name
+   * @param domain domain name
+   */
+  public static VirtualHost createVirtualHost(String name, String domain) {
+    return VirtualHost.newBuilder()
+        .setName(name)
+        .addDomains(domain)
+        .addRoutes(
+            Route.newBuilder()
+                .setMatch(RouteMatch.newBuilder().setPrefix("/")))
+        .build();
+  }
+
   /**
    * Returns a new test v3 secret.
    *

cache/src/main/java/io/envoyproxy/controlplane/cache/v3/Snapshot.java

@@ -15,12 +15,14 @@
 import io.envoyproxy.envoy.config.endpoint.v3.ClusterLoadAssignment;
 import io.envoyproxy.envoy.config.listener.v3.Listener;
 import io.envoyproxy.envoy.config.route.v3.RouteConfiguration;
+import io.envoyproxy.envoy.config.route.v3.VirtualHost;
 import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.Secret;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+
 /**
  * {@code Snapshot} is a data class that contains an internally consistent snapshot of v3 xDS resources. Snapshots
  * should have distinct versions per node group.
@@ -43,10 +45,13 @@ public static Snapshot create(
       Iterable<ClusterLoadAssignment> endpoints,
       Iterable<Listener> listeners,
       Iterable<RouteConfiguration> routes,
+      Iterable<VirtualHost> virtualHosts,
       Iterable<Secret> secrets,
+
+
       String version) {
 
-    return new AutoValue_Snapshot(
+    return new io.envoyproxy.controlplane.cache.v3.AutoValue_Snapshot(
         SnapshotResources
             .create(generateSnapshotResourceIterable(clusters), version),
         SnapshotResources
@@ -56,7 +61,9 @@ public static Snapshot create(
         SnapshotResources
             .create(generateSnapshotResourceIterable(routes), version),
         SnapshotResources
-            .create(generateSnapshotResourceIterable(secrets), version));
+            .create(generateSnapshotResourceIterable(secrets), version),
+        SnapshotResources
+            .create(generateSnapshotResourceIterable(virtualHosts), version));
   }
 
   /**
@@ -81,11 +88,13 @@ public static Snapshot create(
       String listenersVersion,
       Iterable<RouteConfiguration> routes,
       String routesVersion,
+      Iterable<VirtualHost> virtualHosts,
+      String virtualHostsVersion,
       Iterable<Secret> secrets,
       String secretsVersion) {
 
     // TODO(snowp): add a builder alternative
-    return new AutoValue_Snapshot(
+    return new io.envoyproxy.controlplane.cache.v3.AutoValue_Snapshot(
         SnapshotResources.create(generateSnapshotResourceIterable(clusters),
             clustersVersion),
         SnapshotResources.create(generateSnapshotResourceIterable(endpoints),
@@ -94,6 +103,8 @@ public static Snapshot create(
             listenersVersion),
         SnapshotResources
             .create(generateSnapshotResourceIterable(routes), routesVersion),
+        SnapshotResources
+            .create(generateSnapshotResourceIterable(virtualHosts), virtualHostsVersion),
         SnapshotResources.create(generateSnapshotResourceIterable(secrets),
             secretsVersion));
   }
@@ -105,7 +116,7 @@ public static Snapshot create(
    */
   public static Snapshot createEmpty(String version) {
     return create(Collections.emptySet(), Collections.emptySet(),
-            Collections.emptySet(), Collections.emptySet(), Collections.emptySet(), version);
+            Collections.emptySet(), Collections.emptySet(), Collections.emptySet(), Collections.emptySet(), version);
   }
 
   /**
@@ -133,6 +144,8 @@ public static Snapshot createEmpty(String version) {
    */
   public abstract SnapshotResources<Secret> secrets();
 
+  public abstract SnapshotResources<VirtualHost> virtualHosts();
+
   /**
    * Asserts that all dependent resources are included in the snapshot. All EDS resources are listed by name in CDS
    * resources, and all RDS resources are listed by name in LDS resources.
@@ -189,6 +202,8 @@ public Map<String, VersionedResource<?>> resources(String typeUrl) {
         return (Map) listeners().resources();
       case ROUTE:
         return (Map) routes().resources();
+      case VIRTUAL_HOST:
+        return (Map) virtualHosts().resources();
       case SECRET:
         return (Map) secrets().resources();
       default:
@@ -211,6 +226,8 @@ public Map<String, VersionedResource<?>> versionedResources(ResourceType resourc
         return (Map) listeners().versionedResources();
       case ROUTE:
         return (Map) routes().versionedResources();
+      case VIRTUAL_HOST:
+        return (Map) virtualHosts().versionedResources();
       case SECRET:
         return (Map) secrets().versionedResources();
       default:
@@ -266,6 +283,8 @@ public String version(ResourceType resourceType, List<String> resourceNames) {
         return listeners().version(resourceNames);
       case ROUTE:
         return routes().version(resourceNames);
+      case VIRTUAL_HOST:
+        return virtualHosts().version(resourceNames);
       case SECRET:
         return secrets().version(resourceNames);
       default:

cache/src/test/java/io/envoyproxy/controlplane/cache/v3/SimpleCacheTest.java

@@ -11,6 +11,7 @@
 import io.envoyproxy.controlplane.cache.Resources;
 import io.envoyproxy.controlplane.cache.Response;
 import io.envoyproxy.controlplane.cache.StatusInfo;
+import io.envoyproxy.controlplane.cache.TestResources;
 import io.envoyproxy.controlplane.cache.VersionedResource;
 import io.envoyproxy.controlplane.cache.Watch;
 import io.envoyproxy.controlplane.cache.XdsRequest;
@@ -49,14 +50,18 @@ public class SimpleCacheTest {
       ImmutableList.of(ClusterLoadAssignment.getDefaultInstance()),
       ImmutableList.of(Listener.newBuilder().setName(LISTENER_NAME).build()),
       ImmutableList.of(RouteConfiguration.newBuilder().setName(ROUTE_NAME).build()),
+      ImmutableList.of(TestResources.createVirtualHost("v1",  "a")),
       ImmutableList.of(Secret.newBuilder().setName(SECRET_NAME).build()),
+
       VERSION1);
 
   private static final Snapshot SNAPSHOT2 = Snapshot.create(
       ImmutableList.of(Cluster.newBuilder().setName(CLUSTER_NAME).build()),
       ImmutableList.of(ClusterLoadAssignment.getDefaultInstance()),
       ImmutableList.of(Listener.newBuilder().setName(LISTENER_NAME).build()),
       ImmutableList.of(RouteConfiguration.newBuilder().setName(ROUTE_NAME).build()),
+      ImmutableList.of(TestResources.createVirtualHost("v1", "a")),
+
       ImmutableList.of(Secret.newBuilder().setName(SECRET_NAME).build()),
       VERSION2);
 
@@ -67,6 +72,8 @@ public class SimpleCacheTest {
           ClusterLoadAssignment.newBuilder().setClusterName(SECONDARY_CLUSTER_NAME).build()),
       ImmutableList.of(Listener.newBuilder().setName(LISTENER_NAME).build()),
       ImmutableList.of(RouteConfiguration.newBuilder().setName(ROUTE_NAME).build()),
+      ImmutableList.of(TestResources.createVirtualHost("v1","a")),
+
       ImmutableList.of(Secret.newBuilder().setName(SECRET_NAME).build()),
       VERSION2);
 
@@ -429,7 +436,13 @@ public void watchesAreReleasedAfterCancel() {
   public void watchIsLeftOpenIfNotRespondedImmediately() {
     SimpleCache<String> cache = new SimpleCache<>(new SingleNodeGroup());
     cache.setSnapshot(SingleNodeGroup.GROUP, Snapshot.create(
-        ImmutableList.of(), ImmutableList.of(), ImmutableList.of(), ImmutableList.of(), ImmutableList.of(), VERSION1));
+        ImmutableList.of(),
+        ImmutableList.of(),
+        ImmutableList.of(),
+        ImmutableList.of(),
+        ImmutableList.of(),
+        ImmutableList.of(),
+        VERSION1));
 
     ResponseTracker responseTracker = new ResponseTracker();
     Watch watch = cache.createWatch(