Update data-plane-api (second attempt)

bazel/repositories.bzl

@@ -130,70 +130,6 @@ def _go_deps(skip_targets):
 def _envoy_api_deps():
     _repository_impl("envoy_api")
 
-    api_bind_targets = [
-        "address",
-        "base",
-        "bootstrap",
-        "discovery",
-        "cds",
-        "discovery",
-        "eds",
-        "grpc_service",
-        "health_check",
-        "lds",
-        "metrics",
-        "protocol",
-        "rds",
-        "sds",
-        "stats",
-        "trace",
-    ]
-    for t in api_bind_targets:
-        native.bind(
-            name = "envoy_" + t,
-            actual = "@envoy_api//api:" + t + "_cc",
-        )
-    filter_bind_targets = [
-        "fault",
-    ]
-    for t in filter_bind_targets:
-        native.bind(
-            name = "envoy_filter_" + t,
-            actual = "@envoy_api//api/filter:" + t + "_cc",
-        )
-    http_filter_bind_targets = [
-        "buffer",
-        "fault",
-        "health_check",
-        "ip_tagging",
-        "lua",
-        "rate_limit",
-        "router",
-        "squash",
-        "transcoder",
-    ]
-    for t in http_filter_bind_targets:
-        native.bind(
-            name = "envoy_filter_http_" + t,
-            actual = "@envoy_api//api/filter/http:" + t + "_cc",
-        )
-    network_filter_bind_targets = [
-        "http_connection_manager",
-        "tcp_proxy",
-        "mongo_proxy",
-        "redis_proxy",
-        "rate_limit",
-        "client_ssl_auth",
-    ]
-    for t in network_filter_bind_targets:
-        native.bind(
-            name = "envoy_filter_network_" + t,
-            actual = "@envoy_api//api/filter/network:" + t + "_cc",
-        )
-    native.bind(
-        name = "envoy_filter_accesslog",
-        actual = "@envoy_api//api/filter/accesslog:accesslog_cc",
-    )
     native.bind(
         name = "http_api_protos",
         actual = "@googleapis//:http_api_protos",

bazel/repository_locations.bzl

@@ -71,7 +71,7 @@ REPOSITORY_LOCATIONS = dict(
         urls = ["https://github.com/google/protobuf/archive/v3.5.0.tar.gz"],
     ),
     envoy_api = dict(
-        commit = "5aa0208c3bf0ba35833dc4ac16c73839b032e70a",
+        commit = "8345af596d78d5da6becb0538fced3d65efbaadf",
         remote = "https://github.com/envoyproxy/data-plane-api",
     ),
     grpc_httpjson_transcoding = dict(

include/envoy/grpc/BUILD

@@ -23,10 +23,10 @@ envoy_cc_library(
 envoy_cc_library(
     name = "async_client_manager_interface",
     hdrs = ["async_client_manager.h"],
-    external_deps = ["envoy_grpc_service"],
     deps = [
         ":async_client_interface",
         "//include/envoy/stats:stats_interface",
+        "@envoy_api//envoy/api/v2:grpc_service_cc",
     ],
 )
 

include/envoy/grpc/async_client_manager.h

@@ -1,10 +1,9 @@
 #pragma once
 
+#include "envoy/api/v2/grpc_service.pb.h"
 #include "envoy/grpc/async_client.h"
 #include "envoy/stats/stats.h"
 
-#include "api/grpc_service.pb.h"
-
 namespace Envoy {
 namespace Grpc {
 

include/envoy/local_info/BUILD

@@ -11,6 +11,8 @@ envoy_package()
 envoy_cc_library(
     name = "local_info_interface",
     hdrs = ["local_info.h"],
-    external_deps = ["envoy_base"],
-    deps = ["//include/envoy/network:address_interface"],
+    deps = [
+        "//include/envoy/network:address_interface",
+        "@envoy_api//envoy/api/v2:base_cc",
+    ],
 )

include/envoy/local_info/local_info.h

@@ -2,11 +2,10 @@
 
 #include <string>
 
+#include "envoy/api/v2/base.pb.h"
 #include "envoy/common/pure.h"
 #include "envoy/network/address.h"
 
-#include "api/base.pb.h"
-
 namespace Envoy {
 namespace LocalInfo {
 

include/envoy/network/resolver.h

@@ -5,11 +5,10 @@
 #include <cstdint>
 #include <string>
 
+#include "envoy/api/v2/address.pb.h"
 #include "envoy/common/pure.h"
 #include "envoy/network/address.h"
 
-#include "api/address.pb.h"
-
 namespace Envoy {
 namespace Network {
 namespace Address {

include/envoy/router/BUILD

@@ -17,7 +17,6 @@ envoy_cc_library(
 envoy_cc_library(
     name = "route_config_provider_manager_interface",
     hdrs = ["route_config_provider_manager.h"],
-    external_deps = ["envoy_filter_network_http_connection_manager"],
     deps = [
         ":rds_interface",
         "//include/envoy/event:dispatcher_interface",
@@ -28,6 +27,7 @@ envoy_cc_library(
         "//include/envoy/stats:stats_interface",
         "//include/envoy/thread_local:thread_local_interface",
         "//include/envoy/upstream:cluster_manager_interface",
+        "@envoy_api//envoy/api/v2/filter/network:http_connection_manager_cc",
     ],
 )
 

include/envoy/router/route_config_provider_manager.h

@@ -2,6 +2,7 @@
 
 #include <string>
 
+#include "envoy/api/v2/filter/network/http_connection_manager.pb.h"
 #include "envoy/event/dispatcher.h"
 #include "envoy/init/init.h"
 #include "envoy/json/json_object.h"
@@ -12,8 +13,6 @@
 #include "envoy/thread_local/thread_local.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "api/filter/network/http_connection_manager.pb.h"
-
 namespace Envoy {
 namespace Router {
 

include/envoy/router/router.h

@@ -9,6 +9,7 @@
 #include <string>
 
 #include "envoy/access_log/access_log.h"
+#include "envoy/api/v2/base.pb.h"
 #include "envoy/common/optional.h"
 #include "envoy/http/codec.h"
 #include "envoy/http/codes.h"
@@ -19,8 +20,6 @@
 #include "common/protobuf/protobuf.h"
 #include "common/protobuf/utility.h"
 
-#include "api/base.pb.h"
-
 namespace Envoy {
 namespace Router {
 

include/envoy/server/BUILD

@@ -110,7 +110,6 @@ envoy_cc_library(
 envoy_cc_library(
     name = "filter_config_interface",
     hdrs = ["filter_config.h"],
-    external_deps = ["envoy_base"],
     deps = [
         ":admin_interface",
         "//include/envoy/access_log:access_log_interface",
@@ -128,13 +127,13 @@ envoy_cc_library(
         "//source/common/common:assert_lib",
         "//source/common/common:macros",
         "//source/common/protobuf",
+        "@envoy_api//envoy/api/v2:base_cc",
     ],
 )
 
 envoy_cc_library(
     name = "listener_manager_interface",
     hdrs = ["listener_manager.h"],
-    external_deps = ["envoy_lds"],
     deps = [
         ":drain_manager_interface",
         ":filter_config_interface",
@@ -143,6 +142,7 @@ envoy_cc_library(
         "//include/envoy/network:listen_socket_interface",
         "//include/envoy/ssl:context_interface",
         "//source/common/protobuf",
+        "@envoy_api//envoy/api/v2/listener:listener_cc",
     ],
 )
 

include/envoy/server/filter_config.h

@@ -3,6 +3,7 @@
 #include <functional>
 
 #include "envoy/access_log/access_log.h"
+#include "envoy/api/v2/base.pb.h"
 #include "envoy/http/filter.h"
 #include "envoy/init/init.h"
 #include "envoy/json/json_object.h"
@@ -20,8 +21,6 @@
 #include "common/common/macros.h"
 #include "common/protobuf/protobuf.h"
 
-#include "api/base.pb.h"
-
 namespace Envoy {
 namespace Server {
 namespace Configuration {

include/envoy/server/listener_manager.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "envoy/api/v2/listener/listener.pb.h"
 #include "envoy/network/filter.h"
 #include "envoy/network/listen_socket.h"
 #include "envoy/network/listener.h"
@@ -9,8 +10,6 @@
 
 #include "common/protobuf/protobuf.h"
 
-#include "api/lds.pb.h"
-
 namespace Envoy {
 namespace Server {
 
@@ -36,9 +35,9 @@ class ListenerComponentFactory {
    * @param context supplies the factory creation context.
    * @return std::vector<Configuration::NetworkFilterFactoryCb> the list of filter factories.
    */
-  virtual std::vector<Configuration::NetworkFilterFactoryCb>
-  createNetworkFilterFactoryList(const Protobuf::RepeatedPtrField<envoy::api::v2::Filter>& filters,
-                                 Configuration::FactoryContext& context) PURE;
+  virtual std::vector<Configuration::NetworkFilterFactoryCb> createNetworkFilterFactoryList(
+      const Protobuf::RepeatedPtrField<envoy::api::v2::listener::Filter>& filters,
+      Configuration::FactoryContext& context) PURE;
 
   /**
    * Creates a list of listener filter factories.
@@ -47,7 +46,7 @@ class ListenerComponentFactory {
    * @return std::vector<Configuration::ListenerFilterFactoryCb> the list of filter factories.
    */
   virtual std::vector<Configuration::ListenerFilterFactoryCb> createListenerFilterFactoryList(
-      const Protobuf::RepeatedPtrField<envoy::api::v2::ListenerFilter>& filters,
+      const Protobuf::RepeatedPtrField<envoy::api::v2::listener::ListenerFilter>& filters,
       Configuration::FactoryContext& context) PURE;
 
   /**

include/envoy/upstream/BUILD

@@ -11,10 +11,6 @@ envoy_package()
 envoy_cc_library(
     name = "cluster_manager_interface",
     hdrs = ["cluster_manager.h"],
-    external_deps = [
-        "envoy_bootstrap",
-        "envoy_cds",
-    ],
     deps = [
         ":load_balancer_interface",
         ":thread_local_cluster_interface",
@@ -26,6 +22,8 @@ envoy_cc_library(
         "//include/envoy/http:conn_pool_interface",
         "//include/envoy/local_info:local_info_interface",
         "//include/envoy/runtime:runtime_interface",
+        "@envoy_api//envoy/api/v2:cds_cc",
+        "@envoy_api//envoy/config/bootstrap/v2:bootstrap_cc",
     ],
 )
 
@@ -43,12 +41,12 @@ envoy_cc_library(
 envoy_cc_library(
     name = "host_description_interface",
     hdrs = ["host_description.h"],
-    external_deps = ["envoy_base"],
     deps = [
         ":health_check_host_monitor_interface",
         ":outlier_detection_interface",
         "//include/envoy/network:address_interface",
         "//include/envoy/stats:stats_macros",
+        "@envoy_api//envoy/api/v2:base_cc",
     ],
 )
 
@@ -64,9 +62,9 @@ envoy_cc_library(
 envoy_cc_library(
     name = "load_balancer_type_interface",
     hdrs = ["load_balancer_type.h"],
-    external_deps = ["envoy_cds"],
     deps = [
         "//source/common/protobuf",
+        "@envoy_api//envoy/api/v2:cds_cc",
     ],
 )
 

include/envoy/upstream/cluster_manager.h

@@ -7,6 +7,8 @@
 #include <unordered_map>
 
 #include "envoy/access_log/access_log.h"
+#include "envoy/api/v2/cds.pb.h"
+#include "envoy/config/bootstrap/v2/bootstrap.pb.h"
 #include "envoy/config/grpc_mux.h"
 #include "envoy/grpc/async_client_manager.h"
 #include "envoy/http/async_client.h"
@@ -17,9 +19,6 @@
 #include "envoy/upstream/thread_local_cluster.h"
 #include "envoy/upstream/upstream.h"
 
-#include "api/bootstrap.pb.h"
-#include "api/cds.pb.h"
-
 namespace Envoy {
 namespace Upstream {
 
@@ -193,12 +192,11 @@ class ClusterManagerFactory {
   /**
    * Allocate a cluster manager from configuration proto.
    */
-  virtual ClusterManagerPtr clusterManagerFromProto(const envoy::api::v2::Bootstrap& bootstrap,
-                                                    Stats::Store& stats, ThreadLocal::Instance& tls,
-                                                    Runtime::Loader& runtime,
-                                                    Runtime::RandomGenerator& random,
-                                                    const LocalInfo::LocalInfo& local_info,
-                                                    AccessLog::AccessLogManager& log_manager) PURE;
+  virtual ClusterManagerPtr
+  clusterManagerFromProto(const envoy::config::bootstrap::v2::Bootstrap& bootstrap,
+                          Stats::Store& stats, ThreadLocal::Instance& tls, Runtime::Loader& runtime,
+                          Runtime::RandomGenerator& random, const LocalInfo::LocalInfo& local_info,
+                          AccessLog::AccessLogManager& log_manager) PURE;
 
   /**
    * Allocate an HTTP connection pool.

include/envoy/upstream/host_description.h

@@ -3,22 +3,21 @@
 #include <memory>
 #include <string>
 
+#include "envoy/api/v2/base.pb.h"
 #include "envoy/network/address.h"
 #include "envoy/stats/stats_macros.h"
 #include "envoy/upstream/health_check_host_monitor.h"
 #include "envoy/upstream/outlier_detection.h"
 
-#include "api/base.pb.h"
-
 namespace Envoy {
 namespace Upstream {
 
 /**
  * All per host stats. @see stats_macros.h
  *
  * {rq_success, rq_error} have specific semantics driven by the needs of EDS load reporting. See
- * envoy.api.v2.UpstreamLocalityStats for the definitions of success/error. These are latched by
- * LoadStatsReporter, independent of the normal stats sink flushing.
+ * envoy.api.v2.endpoint.UpstreamLocalityStats for the definitions of success/error. These are
+ * latched by LoadStatsReporter, independent of the normal stats sink flushing.
  */
 // clang-format off
 #define ALL_HOST_STATS(COUNTER, GAUGE)                                                             \

include/envoy/upstream/load_balancer_type.h

@@ -4,9 +4,9 @@
 #include <string>
 #include <vector>
 
-#include "common/protobuf/protobuf.h"
+#include "envoy/api/v2/cds.pb.h"
 
-#include "api/cds.pb.h"
+#include "common/protobuf/protobuf.h"
 
 namespace Envoy {
 namespace Upstream {