envoy: update and modify new include paths (#1509)

* envoy: update and modify new include paths Signed-off-by: Jose Nino <jnino@lyft.com> Signed-off-by: JP Simard <jp@jpsim.com>
envoyproxy · Nov 28, 2022 · e052dee · e052dee
1 parent 15475e8
commit e052dee
Show file tree

Hide file tree

Showing 64 changed files with 130 additions and 161 deletions.
diff --git a/mobile/envoy b/mobile/envoy
diff --git a/mobile/envoy_build_config/extension_registry.cc b/mobile/envoy_build_config/extension_registry.cc
@@ -1,21 +1,20 @@
 #include "extension_registry.h"
 
-#include "common/network/socket_interface_impl.h"
-#include "common/upstream/logical_dns_cluster.h"
-
-#include "extensions/clusters/dynamic_forward_proxy/cluster.h"
-#include "extensions/compression/gzip/decompressor/config.h"
-#include "extensions/filters/http/buffer/config.h"
-#include "extensions/filters/http/decompressor/config.h"
-#include "extensions/filters/http/dynamic_forward_proxy/config.h"
-#include "extensions/filters/http/router/config.h"
-#include "extensions/filters/network/http_connection_manager/config.h"
-#include "extensions/http/original_ip_detection/xff/config.h"
-#include "extensions/stat_sinks/metrics_service/config.h"
-#include "extensions/transport_sockets/raw_buffer/config.h"
-#include "extensions/transport_sockets/tls/cert_validator/default_validator.h"
-#include "extensions/transport_sockets/tls/config.h"
-#include "extensions/upstreams/http/generic/config.h"
+#include "source/common/network/socket_interface_impl.h"
+#include "source/common/upstream/logical_dns_cluster.h"
+#include "source/extensions/clusters/dynamic_forward_proxy/cluster.h"
+#include "source/extensions/compression/gzip/decompressor/config.h"
+#include "source/extensions/filters/http/buffer/config.h"
+#include "source/extensions/filters/http/decompressor/config.h"
+#include "source/extensions/filters/http/dynamic_forward_proxy/config.h"
+#include "source/extensions/filters/http/router/config.h"
+#include "source/extensions/filters/network/http_connection_manager/config.h"
+#include "source/extensions/http/original_ip_detection/xff/config.h"
+#include "source/extensions/stat_sinks/metrics_service/config.h"
+#include "source/extensions/transport_sockets/raw_buffer/config.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h"
+#include "source/extensions/transport_sockets/tls/config.h"
+#include "source/extensions/upstreams/http/generic/config.h"
 
 #include "library/common/extensions/filters/http/assertion/config.h"
 #include "library/common/extensions/filters/http/platform_bridge/config.h"

diff --git a/mobile/envoy_build_config/extension_registry.h b/mobile/envoy_build_config/extension_registry.h
@@ -1,20 +1,19 @@
 #pragma once
 
-#include "common/upstream/logical_dns_cluster.h"
-
-#include "extensions/clusters/dynamic_forward_proxy/cluster.h"
-#include "extensions/compression/gzip/decompressor/config.h"
-#include "extensions/filters/http/buffer/config.h"
-#include "extensions/filters/http/decompressor/config.h"
-#include "extensions/filters/http/dynamic_forward_proxy/config.h"
-#include "extensions/filters/http/router/config.h"
-#include "extensions/filters/network/http_connection_manager/config.h"
-#include "extensions/http/original_ip_detection/xff/config.h"
-#include "extensions/stat_sinks/metrics_service/config.h"
-#include "extensions/transport_sockets/raw_buffer/config.h"
-#include "extensions/transport_sockets/tls/cert_validator/default_validator.h"
-#include "extensions/transport_sockets/tls/config.h"
-#include "extensions/upstreams/http/generic/config.h"
+#include "source/common/upstream/logical_dns_cluster.h"
+#include "source/extensions/clusters/dynamic_forward_proxy/cluster.h"
+#include "source/extensions/compression/gzip/decompressor/config.h"
+#include "source/extensions/filters/http/buffer/config.h"
+#include "source/extensions/filters/http/decompressor/config.h"
+#include "source/extensions/filters/http/dynamic_forward_proxy/config.h"
+#include "source/extensions/filters/http/router/config.h"
+#include "source/extensions/filters/network/http_connection_manager/config.h"
+#include "source/extensions/http/original_ip_detection/xff/config.h"
+#include "source/extensions/stat_sinks/metrics_service/config.h"
+#include "source/extensions/transport_sockets/raw_buffer/config.h"
+#include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h"
+#include "source/extensions/transport_sockets/tls/config.h"
+#include "source/extensions/upstreams/http/generic/config.h"
 
 #include "library/common/extensions/filters/http/assertion/config.h"
 #include "library/common/extensions/filters/http/local_error/config.h"

diff --git a/mobile/library/cc/log_level.h b/mobile/library/cc/log_level.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/common/base_logger.h"
+#include "source/common/common/base_logger.h"
 
 namespace Envoy {
 namespace Platform {

diff --git a/mobile/library/common/BUILD b/mobile/library/common/BUILD
@@ -45,7 +45,7 @@ envoy_cc_library(
         "//library/common/http:header_utility_lib",
         "//library/common/stats:utility_lib",
         "//library/common/types:c_types_lib",
-        "@envoy//include/envoy/server:lifecycle_notifier_interface",
+        "@envoy//envoy/server:lifecycle_notifier_interface",
         "@envoy_build_config//:extension_registry",
     ],
 )

diff --git a/mobile/library/common/api/external.cc b/mobile/library/common/api/external.cc
@@ -1,6 +1,6 @@
 #include "external.h"
 
-#include "common/common/assert.h"
+#include "source/common/common/assert.h"
 
 #include "absl/container/flat_hash_map.h"
 

diff --git a/mobile/library/common/buffer/BUILD b/mobile/library/common/buffer/BUILD
@@ -10,6 +10,6 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         "//library/common/types:c_types_lib",
-        "@envoy//include/envoy/buffer:buffer_interface",
+        "@envoy//envoy/buffer:buffer_interface",
     ],
 )
diff --git a/mobile/library/common/buffer/bridge_fragment.h b/mobile/library/common/buffer/bridge_fragment.h
@@ -2,7 +2,7 @@
 
 #include "envoy/buffer/buffer.h"
 
-#include "common/common/non_copyable.h"
+#include "source/common/common/non_copyable.h"
 
 #include "library/common/types/c_types.h"
 

diff --git a/mobile/library/common/common/lambda_logger_delegate.h b/mobile/library/common/common/lambda_logger_delegate.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "common/common/logger.h"
+#include "source/common/common/logger.h"
 
 #include "absl/strings/string_view.h"
 #include "library/common/types/c_types.h"

diff --git a/mobile/library/common/data/BUILD b/mobile/library/common/data/BUILD
@@ -12,7 +12,7 @@ envoy_cc_library(
     deps = [
         "//library/common/buffer:bridge_fragment_lib",
         "//library/common/types:c_types_lib",
-        "@envoy//include/envoy/buffer:buffer_interface",
+        "@envoy//envoy/buffer:buffer_interface",
         "@envoy//source/common/buffer:buffer_lib",
         "@envoy//source/common/common:empty_string",
     ],

diff --git a/mobile/library/common/data/utility.cc b/mobile/library/common/data/utility.cc
@@ -2,8 +2,8 @@
 
 #include <stdlib.h>
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/empty_string.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/empty_string.h"
 
 #include "library/common/buffer/bridge_fragment.h"
 

diff --git a/mobile/library/common/engine.cc b/mobile/library/common/engine.cc
@@ -2,7 +2,7 @@
 
 #include "envoy/stats/histogram.h"
 
-#include "common/common/lock_guard.h"
+#include "source/common/common/lock_guard.h"
 
 #include "library/common/config_internal.h"
 #include "library/common/data/utility.h"

diff --git a/mobile/library/common/engine.h b/mobile/library/common/engine.h
@@ -2,8 +2,8 @@
 
 #include "envoy/server/lifecycle_notifier.h"
 
-#include "common/common/logger.h"
-#include "common/upstream/logical_dns_cluster.h"
+#include "source/common/common/logger.h"
+#include "source/common/upstream/logical_dns_cluster.h"
 
 #include "absl/base/call_once.h"
 #include "extension_registry.h"

diff --git a/mobile/library/common/engine_common.cc b/mobile/library/common/engine_common.cc
@@ -1,7 +1,7 @@
 #include "library/common/engine_common.h"
 
-#include "common/common/random_generator.h"
-#include "common/runtime/runtime_impl.h"
+#include "source/common/common/random_generator.h"
+#include "source/common/runtime/runtime_impl.h"
 
 namespace Envoy {
 

diff --git a/mobile/library/common/engine_common.h b/mobile/library/common/engine_common.h
@@ -3,13 +3,11 @@
 #include "envoy/event/timer.h"
 #include "envoy/server/instance.h"
 
-#include "common/event/real_time_system.h"
-
-#include "exe/main_common.h"
-#include "exe/platform_impl.h"
-
-#include "server/listener_hooks.h"
-#include "server/options_impl.h"
+#include "source/common/event/real_time_system.h"
+#include "source/exe/main_common.h"
+#include "source/exe/platform_impl.h"
+#include "source/server/listener_hooks.h"
+#include "source/server/options_impl.h"
 
 namespace Envoy {
 

diff --git a/mobile/library/common/event/BUILD b/mobile/library/common/event/BUILD
@@ -13,8 +13,8 @@ envoy_cc_library(
     deps = [
         "//library/common/thread:lock_guard_lib",
         "//library/common/types:c_types_lib",
-        "@envoy//include/envoy/event:deferred_deletable",
-        "@envoy//include/envoy/event:dispatcher_interface",
+        "@envoy//envoy/event:deferred_deletable",
+        "@envoy//envoy/event:dispatcher_interface",
         "@envoy//source/common/common:lock_guard_lib",
         "@envoy//source/common/common:minimal_logger_lib",
         "@envoy//source/common/common:thread_synchronizer_lib",

diff --git a/mobile/library/common/event/provisional_dispatcher.cc b/mobile/library/common/event/provisional_dispatcher.cc
@@ -1,6 +1,6 @@
 #include "library/common/event/provisional_dispatcher.h"
 
-#include "common/common/lock_guard.h"
+#include "source/common/common/lock_guard.h"
 
 #include "library/common/thread/lock_guard.h"
 

diff --git a/mobile/library/common/event/provisional_dispatcher.h b/mobile/library/common/event/provisional_dispatcher.h
@@ -3,8 +3,8 @@
 #include "envoy/event/deferred_deletable.h"
 #include "envoy/event/dispatcher.h"
 
-#include "common/common/logger.h"
-#include "common/common/thread_synchronizer.h"
+#include "source/common/common/logger.h"
+#include "source/common/common/thread_synchronizer.h"
 
 #include "library/common/types/c_types.h"
 

diff --git a/mobile/library/common/extensions/filters/http/assertion/BUILD b/mobile/library/common/extensions/filters/http/assertion/BUILD
@@ -21,13 +21,11 @@ envoy_cc_extension(
     name = "assertion_filter_lib",
     srcs = ["filter.cc"],
     hdrs = ["filter.h"],
-    category = "envoy.filters.http",
     repository = "@envoy",
-    security_posture = "requires_trusted_downstream_and_upstream",
     deps = [
         "filter_cc_proto",
-        "@envoy//include/envoy/http:codes_interface",
-        "@envoy//include/envoy/http:filter_interface",
+        "@envoy//envoy/http:codes_interface",
+        "@envoy//envoy/http:filter_interface",
         "@envoy//source/common/http:header_map_lib",
         "@envoy//source/extensions/common/matcher:matcher_lib",
         "@envoy//source/extensions/filters/http/common:pass_through_filter_lib",
@@ -38,9 +36,7 @@ envoy_cc_extension(
     name = "config",
     srcs = ["config.cc"],
     hdrs = ["config.h"],
-    category = "envoy.filters.http",
     repository = "@envoy",
-    security_posture = "requires_trusted_downstream_and_upstream",
     deps = [
         ":assertion_filter_lib",
         "@envoy//source/extensions/filters/http/common:factory_base_lib",

diff --git a/mobile/library/common/extensions/filters/http/assertion/config.h b/mobile/library/common/extensions/filters/http/assertion/config.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/common/factory_base.h"
 
 #include "library/common/extensions/filters/http/assertion/filter.pb.h"
 #include "library/common/extensions/filters/http/assertion/filter.pb.validate.h"

diff --git a/mobile/library/common/extensions/filters/http/assertion/filter.cc b/mobile/library/common/extensions/filters/http/assertion/filter.cc
@@ -3,7 +3,7 @@
 #include "envoy/http/codes.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/http/header_map_impl.h"
+#include "source/common/http/header_map_impl.h"
 
 namespace Envoy {
 namespace Extensions {

diff --git a/mobile/library/common/extensions/filters/http/assertion/filter.h b/mobile/library/common/extensions/filters/http/assertion/filter.h
@@ -2,8 +2,8 @@
 
 #include "envoy/http/filter.h"
 
-#include "extensions/common/matcher/matcher.h"
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/extensions/common/matcher/matcher.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "library/common/extensions/filters/http/assertion/filter.pb.h"
 

diff --git a/mobile/library/common/extensions/filters/http/local_error/BUILD b/mobile/library/common/extensions/filters/http/local_error/BUILD
@@ -18,15 +18,13 @@ envoy_cc_extension(
     name = "local_error_filter_lib",
     srcs = ["filter.cc"],
     hdrs = ["filter.h"],
-    category = "envoy.filters.http",
     repository = "@envoy",
-    security_posture = "requires_trusted_downstream_and_upstream",
     deps = [
         ":filter_cc_proto",
         "//library/common/http:internal_headers_lib",
         "//library/common/types:c_types_lib",
-        "@envoy//include/envoy/http:codes_interface",
-        "@envoy//include/envoy/http:filter_interface",
+        "@envoy//envoy/http:codes_interface",
+        "@envoy//envoy/http:filter_interface",
         "@envoy//source/common/grpc:common_lib",
         "@envoy//source/common/grpc:status_lib",
         "@envoy//source/common/http:codes_lib",
@@ -41,9 +39,7 @@ envoy_cc_extension(
     name = "config",
     srcs = ["config.cc"],
     hdrs = ["config.h"],
-    category = "envoy.filters.http",
     repository = "@envoy",
-    security_posture = "requires_trusted_downstream_and_upstream",
     deps = [
         ":local_error_filter_lib",
         "@envoy//source/extensions/filters/http/common:factory_base_lib",

diff --git a/mobile/library/common/extensions/filters/http/local_error/config.h b/mobile/library/common/extensions/filters/http/local_error/config.h
@@ -1,6 +1,6 @@
 #include <string>
 
-#include "extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/common/factory_base.h"
 
 #include "library/common/extensions/filters/http/local_error/filter.pb.h"
 #include "library/common/extensions/filters/http/local_error/filter.pb.validate.h"

diff --git a/mobile/library/common/extensions/filters/http/local_error/filter.cc b/mobile/library/common/extensions/filters/http/local_error/filter.cc
@@ -3,11 +3,11 @@
 #include "envoy/http/codes.h"
 #include "envoy/server/filter_config.h"
 
-#include "common/grpc/common.h"
-#include "common/grpc/status.h"
-#include "common/http/codes.h"
-#include "common/http/header_map_impl.h"
-#include "common/http/utility.h"
+#include "source/common/grpc/common.h"
+#include "source/common/grpc/status.h"
+#include "source/common/http/codes.h"
+#include "source/common/http/header_map_impl.h"
+#include "source/common/http/utility.h"
 
 #include "library/common/http/headers.h"
 #include "library/common/types/c_types.h"

diff --git a/mobile/library/common/extensions/filters/http/local_error/filter.h b/mobile/library/common/extensions/filters/http/local_error/filter.h
@@ -2,9 +2,8 @@
 
 #include "envoy/http/filter.h"
 
-#include "common/common/logger.h"
-
-#include "extensions/filters/http/common/pass_through_filter.h"
+#include "source/common/common/logger.h"
+#include "source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "library/common/extensions/filters/http/local_error/filter.pb.h"
 

diff --git a/mobile/library/common/extensions/filters/http/platform_bridge/BUILD b/mobile/library/common/extensions/filters/http/platform_bridge/BUILD
@@ -24,17 +24,15 @@ envoy_cc_extension(
         "c_types.h",
         "filter.h",
     ],
-    category = "envoy.filters.http",
     repository = "@envoy",
-    security_posture = "requires_trusted_downstream_and_upstream",
     deps = [
         ":filter_cc_proto",
         "//library/common/api:external_api_lib",
         "//library/common/data:utility_lib",
         "//library/common/http:header_utility_lib",
         "//library/common/http:internal_headers_lib",
         "//library/common/types:c_types_lib",
-        "@envoy//include/envoy/http:filter_interface",
+        "@envoy//envoy/http:filter_interface",
         "@envoy//source/common/common:minimal_logger_lib",
         "@envoy//source/extensions/filters/http/common:pass_through_filter_lib",
     ],
@@ -44,9 +42,7 @@ envoy_cc_extension(
     name = "config",
     srcs = ["config.cc"],
     hdrs = ["config.h"],
-    category = "envoy.filters.http",
     repository = "@envoy",
-    security_posture = "requires_trusted_downstream_and_upstream",
     deps = [
         ":platform_bridge_filter_lib",
         "@envoy//source/extensions/filters/http/common:factory_base_lib",

diff --git a/mobile/library/common/extensions/filters/http/platform_bridge/config.h b/mobile/library/common/extensions/filters/http/platform_bridge/config.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "extensions/filters/http/common/factory_base.h"
+#include "source/extensions/filters/http/common/factory_base.h"
 
 #include "library/common/extensions/filters/http/platform_bridge/filter.pb.h"
 #include "library/common/extensions/filters/http/platform_bridge/filter.pb.validate.h"

diff --git a/mobile/library/common/extensions/filters/http/platform_bridge/filter.cc b/mobile/library/common/extensions/filters/http/platform_bridge/filter.cc
@@ -2,9 +2,9 @@
 
 #include "envoy/server/filter_config.h"
 
-#include "common/buffer/buffer_impl.h"
-#include "common/common/assert.h"
-#include "common/common/utility.h"
+#include "source/common/buffer/buffer_impl.h"
+#include "source/common/common/assert.h"
+#include "source/common/common/utility.h"
 
 #include "library/common/api/external.h"
 #include "library/common/buffer/bridge_fragment.h"