tools: api_booster tool for upgrading Envoy APIs.

.gitignore

@@ -19,7 +19,7 @@ cscope.*
 *.pyc
 **/pyformat
 SOURCE_VERSION
-source/common/config/api_type_db.generated.pb_text
+api_type_db.generated.pb_text
 .settings/
 *.sw*
 tags

include/envoy/grpc/status.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdint>
+
 namespace Envoy {
 namespace Grpc {
 

include/envoy/network/BUILD

@@ -118,6 +118,7 @@ envoy_cc_library(
         ":connection_interface",
         ":listen_socket_interface",
         "//include/envoy/stats:stats_interface",
+        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
     ],
 )
 

include/envoy/network/hash_policy.h

@@ -24,4 +24,4 @@ class HashPolicy {
                const Network::Address::Instance* upstream_address) const PURE;
 };
 } // namespace Network
-} // namespace Envoy
+} // namespace Envoy

include/envoy/network/listener.h

@@ -5,6 +5,7 @@
 #include <string>
 
 #include "envoy/api/io_error.h"
+#include "envoy/api/v2/core/base.pb.h"
 #include "envoy/common/exception.h"
 #include "envoy/network/connection.h"
 #include "envoy/network/connection_balancer.h"

include/envoy/router/BUILD

@@ -30,6 +30,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:pkg_cc_proto",
         "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto",
     ],
 )
@@ -42,6 +43,7 @@ envoy_cc_library(
         ":rds_interface",
         "//include/envoy/common:time_interface",
         "//source/common/protobuf",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
     ],
 )
 
@@ -63,6 +65,7 @@ envoy_cc_library(
         "//source/common/protobuf",
         "//source/common/protobuf:utility_lib",
         "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
+        "@envoy_api//envoy/type:pkg_cc_proto",
     ],
 )
 

include/envoy/router/route_config_provider_manager.h

@@ -2,6 +2,7 @@
 
 #include <string>
 
+#include "envoy/api/v2/rds.pb.h"
 #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.h"
 #include "envoy/event/dispatcher.h"
 #include "envoy/json/json_object.h"

include/envoy/router/route_config_update_receiver.h

@@ -2,6 +2,8 @@
 
 #include <memory>
 
+#include "envoy/api/v2/discovery.pb.h"
+#include "envoy/api/v2/rds.pb.h"
 #include "envoy/common/pure.h"
 #include "envoy/common/time.h"
 #include "envoy/router/rds.h"

include/envoy/router/router.h

@@ -17,6 +17,7 @@
 #include "envoy/http/hash_policy.h"
 #include "envoy/http/header_map.h"
 #include "envoy/tracing/http_tracer.h"
+#include "envoy/type/percent.pb.h"
 #include "envoy/upstream/resource_manager.h"
 #include "envoy/upstream/retry.h"
 

include/envoy/secret/BUILD

@@ -31,5 +31,6 @@ envoy_cc_library(
     deps = [
         ":secret_provider_interface",
         "@envoy_api//envoy/api/v2/auth:pkg_cc_proto",
+        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
     ],
 )

include/envoy/secret/secret_manager.h

@@ -3,6 +3,7 @@
 #include <string>
 
 #include "envoy/api/v2/auth/cert.pb.h"
+#include "envoy/api/v2/core/config_source.pb.h"
 #include "envoy/secret/secret_provider.h"
 
 namespace Envoy {

include/envoy/server/BUILD

@@ -40,6 +40,7 @@ envoy_cc_library(
         "//include/envoy/ratelimit:ratelimit_interface",
         "//include/envoy/tracing:http_tracer_interface",
         "//include/envoy/upstream:cluster_manager_interface",
+        "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto",
     ],
 )
 
@@ -71,7 +72,10 @@ envoy_cc_library(
 envoy_cc_library(
     name = "health_checker_config_interface",
     hdrs = ["health_checker_config.h"],
-    deps = ["//include/envoy/upstream:health_checker_interface"],
+    deps = [
+        "//include/envoy/upstream:health_checker_interface",
+        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
+    ],
 )
 
 envoy_cc_library(
@@ -191,6 +195,8 @@ envoy_cc_library(
         "//include/envoy/ssl:context_interface",
         "//source/common/protobuf",
         "@envoy_api//envoy/admin/v2alpha:pkg_cc_proto",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
+        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
         "@envoy_api//envoy/api/v2/listener:pkg_cc_proto",
     ],
 )

include/envoy/server/configuration.h

@@ -7,6 +7,7 @@
 #include <string>
 #include <vector>
 
+#include "envoy/config/bootstrap/v2/bootstrap.pb.h"
 #include "envoy/stats/sink.h"
 #include "envoy/tracing/http_tracer.h"
 #include "envoy/upstream/cluster_manager.h"

include/envoy/server/health_checker_config.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "envoy/api/v2/core/health_check.pb.h"
 #include "envoy/runtime/runtime.h"
 #include "envoy/upstream/health_checker.h"
 

include/envoy/server/listener_manager.h

@@ -3,6 +3,8 @@
 #include <vector>
 
 #include "envoy/admin/v2alpha/config_dump.pb.h"
+#include "envoy/api/v2/core/config_source.pb.h"
+#include "envoy/api/v2/lds.pb.h"
 #include "envoy/api/v2/listener/listener.pb.h"
 #include "envoy/network/filter.h"
 #include "envoy/network/listen_socket.h"

include/envoy/upstream/BUILD

@@ -30,6 +30,7 @@ envoy_cc_library(
         "//include/envoy/tcp:conn_pool_interface",
         "//include/envoy/thread_local:thread_local_interface",
         "@envoy_api//envoy/api/v2:pkg_cc_proto",
+        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
         "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto",
     ],
 )
@@ -149,6 +150,7 @@ envoy_cc_library(
         "//include/envoy/ssl:context_interface",
         "//include/envoy/ssl:context_manager_interface",
         "//include/envoy/upstream:types_interface",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
     ],
 )
@@ -171,6 +173,6 @@ envoy_cc_library(
         "//include/envoy/runtime:runtime_interface",
         "//include/envoy/ssl:context_interface",
         "//include/envoy/ssl:context_manager_interface",
-        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
     ],
 )

include/envoy/upstream/cluster_factory.h

@@ -10,7 +10,7 @@
 
 #include "envoy/access_log/access_log.h"
 #include "envoy/api/api.h"
-#include "envoy/api/v2/core/base.pb.h"
+#include "envoy/api/v2/cds.pb.h"
 #include "envoy/event/dispatcher.h"
 #include "envoy/local_info/local_info.h"
 #include "envoy/network/dns.h"

include/envoy/upstream/cluster_manager.h

@@ -9,6 +9,8 @@
 #include "envoy/access_log/access_log.h"
 #include "envoy/api/api.h"
 #include "envoy/api/v2/cds.pb.h"
+#include "envoy/api/v2/core/address.pb.h"
+#include "envoy/api/v2/core/config_source.pb.h"
 #include "envoy/config/bootstrap/v2/bootstrap.pb.h"
 #include "envoy/config/grpc_mux.h"
 #include "envoy/config/subscription_factory.h"

include/envoy/upstream/upstream.h

@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "envoy/api/v2/cds.pb.h"
 #include "envoy/api/v2/core/base.pb.h"
 #include "envoy/common/callback.h"
 #include "envoy/config/typed_metadata.h"

source/common/access_log/BUILD

@@ -32,6 +32,7 @@ envoy_cc_library(
         "//source/common/stream_info:stream_info_lib",
         "//source/common/tracing:http_tracer_lib",
         "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto",
+        "@envoy_api//envoy/type:pkg_cc_proto",
     ],
 )
 
@@ -49,6 +50,7 @@ envoy_cc_library(
         "//source/common/http:utility_lib",
         "//source/common/protobuf:message_validator_lib",
         "//source/common/stream_info:utility_lib",
+        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
     ],
 )
 

source/common/access_log/access_log_formatter.cc

@@ -5,6 +5,8 @@
 #include <string>
 #include <vector>
 
+#include "envoy/api/v2/core/base.pb.h"
+
 #include "common/common/assert.h"
 #include "common/common/fmt.h"
 #include "common/common/utility.h"

source/common/access_log/access_log_formatter.h

@@ -6,6 +6,7 @@
 #include <vector>
 
 #include "envoy/access_log/access_log.h"
+#include "envoy/api/v2/core/base.pb.h"
 #include "envoy/common/time.h"
 #include "envoy/stream_info/stream_info.h"
 

source/common/access_log/access_log_impl.cc

@@ -4,6 +4,7 @@
 #include <string>
 
 #include "envoy/common/time.h"
+#include "envoy/config/filter/accesslog/v2/accesslog.pb.h"
 #include "envoy/config/filter/accesslog/v2/accesslog.pb.validate.h"
 #include "envoy/filesystem/filesystem.h"
 #include "envoy/http/header_map.h"

source/common/access_log/access_log_impl.h

@@ -9,6 +9,7 @@
 #include "envoy/config/filter/accesslog/v2/accesslog.pb.h"
 #include "envoy/runtime/runtime.h"
 #include "envoy/server/access_log_config.h"
+#include "envoy/type/percent.pb.h"
 
 #include "common/grpc/status.h"
 #include "common/http/header_utility.h"

source/common/api/os_sys_calls_impl_hot_restart.h

@@ -17,4 +17,4 @@ class HotRestartOsSysCallsImpl : public HotRestartOsSysCalls {
 using HotRestartOsSysCallsSingleton = ThreadSafeSingleton<HotRestartOsSysCallsImpl>;
 
 } // namespace Api
-} // namespace Envoy
+} // namespace Envoy

source/common/common/BUILD

@@ -91,6 +91,7 @@ envoy_basic_cc_library(
         "fmtlib",
     ],
     include_prefix = envoy_include_prefix(package_name()),
+    deps = ["//include/envoy/common:base_includes"],
 )
 
 envoy_cc_library(

source/common/common/matchers.cc

@@ -1,6 +1,10 @@
 #include "common/common/matchers.h"
 
 #include "envoy/api/v2/core/base.pb.h"
+#include "envoy/type/matcher/metadata.pb.h"
+#include "envoy/type/matcher/number.pb.h"
+#include "envoy/type/matcher/string.pb.h"
+#include "envoy/type/matcher/value.pb.h"
 
 #include "common/common/regex.h"
 #include "common/config/metadata.h"

source/common/common/regex.cc

@@ -1,6 +1,7 @@
 #include "common/common/regex.h"
 
 #include "envoy/common/exception.h"
+#include "envoy/type/matcher/regex.pb.h"
 
 #include "common/common/assert.h"
 #include "common/common/fmt.h"

source/common/config/BUILD

@@ -70,6 +70,7 @@ envoy_cc_library(
         "//source/common/common:minimal_logger_lib",
         "//source/common/common:token_bucket_impl_lib",
         "//source/common/protobuf",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
     ],
 )
 
@@ -104,7 +105,7 @@ envoy_cc_library(
         "//source/common/protobuf",
         "//source/common/protobuf:message_validator_lib",
         "//source/common/protobuf:utility_lib",
-        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
     ],
 )
 
@@ -137,6 +138,7 @@ envoy_cc_library(
         "//include/envoy/upstream:cluster_manager_interface",
         "//source/common/common:minimal_logger_lib",
         "//source/common/protobuf",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
     ],
 )
 
@@ -152,7 +154,6 @@ envoy_cc_library(
         "//source/common/common:minimal_logger_lib",
         "//source/common/grpc:common_lib",
         "//source/common/protobuf",
-        "@envoy_api//envoy/api/v2:pkg_cc_proto",
     ],
 )
 
@@ -165,7 +166,6 @@ envoy_cc_library(
         "//include/envoy/config:subscription_interface",
         "//include/envoy/event:dispatcher_interface",
         "//include/envoy/grpc:async_client_interface",
-        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
     ],
 )
 
@@ -201,7 +201,7 @@ envoy_cc_library(
         "//source/common/http:rest_api_fetcher_lib",
         "//source/common/protobuf",
         "//source/common/protobuf:utility_lib",
-        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
     ],
 )
 
@@ -226,7 +226,7 @@ envoy_cc_library(
     hdrs = ["pausable_ack_queue.h"],
     deps = [
         "//source/common/common:assert_lib",
-        "@envoy_api//envoy/api/v2:pkg_cc_proto",
+        "@com_google_googleapis//google/rpc:status_cc_proto",
     ],
 )
 
@@ -293,6 +293,8 @@ envoy_cc_library(
         "//source/common/grpc:common_lib",
         "//source/common/protobuf",
         "@envoy_api//envoy/api/v2:pkg_cc_proto",
+        "@envoy_api//envoy/api/v2/auth:pkg_cc_proto",
+        "@envoy_api//envoy/api/v2/route:pkg_cc_proto",
         "@envoy_api//envoy/service/discovery/v2:pkg_cc_proto",
     ],
 )
@@ -323,10 +325,10 @@ envoy_cc_library(
         "//source/common/stats:stats_matcher_lib",
         "//source/common/stats:tag_producer_lib",
         "@com_github_cncf_udpa//udpa/type/v1:pkg_cc_proto",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
+        "@envoy_api//envoy/api/v2/endpoint:pkg_cc_proto",
         "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto",
-        "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto",
-        "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto",
     ],
 )
 
@@ -349,6 +351,7 @@ envoy_cc_library(
         "//source/common/common:assert_lib",
         "//source/common/common:minimal_logger_lib",
         "//source/common/protobuf",
+        "@envoy_api//envoy/api/v2:pkg_cc_proto",
     ],
 )
 

source/common/config/datasource.cc

@@ -1,5 +1,7 @@
 #include "common/config/datasource.h"
 
+#include "envoy/api/v2/core/base.pb.h"
+
 #include "fmt/format.h"
 
 namespace Envoy {

source/common/config/delta_subscription_impl.cc

@@ -1,5 +1,7 @@
 #include "common/config/delta_subscription_impl.h"
 
+#include "envoy/api/v2/discovery.pb.h"
+
 namespace Envoy {
 namespace Config {