diff --git a/.bazelversion b/.bazelversion index 0b2eb36f508..ee74734aa22 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.7.2 +4.1.0 diff --git a/WORKSPACE b/WORKSPACE index 303add0b927..b249db97577 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -38,10 +38,10 @@ bind( # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed. # # Note: this is needed by release builder to resolve envoy dep sha to tag. -# Commit date: 2021-05-18 -ENVOY_SHA = "ea32578cc8fd79e0d55ed2ee3a873d2ffb45bb8a" +# Commit date: 2021-06-04 +ENVOY_SHA = "436946bb9df0acda0e4e709592205f0d199dfb79" -ENVOY_SHA256 = "d46981a5ad08db489fd59df3fa14e29f13766ccfc8889cfb9508541e8cb80a54" +ENVOY_SHA256 = "bc6218475a7333b4ca5af106761ee034d47a94350d5507114a692860362f101a" ENVOY_ORG = "envoyproxy" diff --git a/envoy.bazelrc b/envoy.bazelrc index 95330f8ddbb..21d0db6bb1a 100644 --- a/envoy.bazelrc +++ b/envoy.bazelrc @@ -105,9 +105,12 @@ build:clang-msan --config=sanitizer build:clang-msan --define ENVOY_CONFIG_MSAN=1 build:clang-msan --copt -fsanitize=memory build:clang-msan --linkopt -fsanitize=memory +build:clang-msan --linkopt -fuse-ld=lld build:clang-msan --copt -fsanitize-memory-track-origins=2 +build:clang-msan --test_env=MSAN_SYMBOLIZER_PATH # MSAN needs -O1 to get reasonable performance. build:clang-msan --copt -O1 +build:clang-msan --copt -fno-optimize-sibling-calls # Clang with libc++ build:libc++ --config=clang diff --git a/extensions/access_log_policy/config.cc b/extensions/access_log_policy/config.cc index e8bf13cd004..6210febb6c7 100644 --- a/extensions/access_log_policy/config.cc +++ b/extensions/access_log_policy/config.cc @@ -13,8 +13,8 @@ * limitations under the License. */ -#include "common/common/base64.h" #include "extensions/access_log_policy/plugin.h" +#include "source/common/common/base64.h" namespace proxy_wasm { namespace null_plugin { diff --git a/extensions/access_log_policy/plugin.cc b/extensions/access_log_policy/plugin.cc index 6b84d2c3146..667fd3be7f9 100644 --- a/extensions/access_log_policy/plugin.cc +++ b/extensions/access_log_policy/plugin.cc @@ -29,7 +29,7 @@ #else -#include "common/common/base64.h" +#include "source/common/common/base64.h" namespace proxy_wasm { namespace null_plugin { namespace AccessLogPolicy { diff --git a/extensions/attributegen/plugin_test.cc b/extensions/attributegen/plugin_test.cc index d936ff63c82..9f7a2feed0b 100644 --- a/extensions/attributegen/plugin_test.cc +++ b/extensions/attributegen/plugin_test.cc @@ -16,15 +16,15 @@ #include #include -#include "common/buffer/buffer_impl.h" -#include "common/http/message_impl.h" -#include "common/stats/isolated_store_impl.h" -#include "common/stream_info/stream_info_impl.h" #include "envoy/server/lifecycle_notifier.h" -#include "extensions/filters/common/expr/cel_state.h" -#include "extensions/filters/http/wasm/wasm_filter.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/message_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/extensions/filters/common/expr/cel_state.h" +#include "source/extensions/filters/http/wasm/wasm_filter.h" #include "test/mocks/grpc/mocks.h" #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/extensions/common/proto_util_speed_test.cc b/extensions/common/proto_util_speed_test.cc index 8a388f041a4..cfd0cdd81e6 100644 --- a/extensions/common/proto_util_speed_test.cc +++ b/extensions/common/proto_util_speed_test.cc @@ -14,11 +14,11 @@ */ #include "benchmark/benchmark.h" -#include "common/stream_info/filter_state_impl.h" #include "extensions/common/node_info_generated.h" #include "extensions/common/proto_util.h" -#include "extensions/filters/common/expr/cel_state.h" #include "google/protobuf/util/json_util.h" +#include "source/common/stream_info/filter_state_impl.h" +#include "source/extensions/filters/common/expr/cel_state.h" // WASM_PROLOG #ifdef NULL_PLUGIN diff --git a/extensions/metadata_exchange/config.cc b/extensions/metadata_exchange/config.cc index 204d88996f5..0cc3a0d31b6 100644 --- a/extensions/metadata_exchange/config.cc +++ b/extensions/metadata_exchange/config.cc @@ -13,8 +13,8 @@ * limitations under the License. */ -#include "common/common/base64.h" #include "include/proxy-wasm/null_plugin.h" +#include "source/common/common/base64.h" namespace proxy_wasm { namespace null_plugin { diff --git a/extensions/metadata_exchange/plugin.cc b/extensions/metadata_exchange/plugin.cc index efb70cd065b..cc7c1b9f6a1 100644 --- a/extensions/metadata_exchange/plugin.cc +++ b/extensions/metadata_exchange/plugin.cc @@ -28,7 +28,7 @@ #else -#include "common/common/base64.h" +#include "source/common/common/base64.h" #include "source/extensions/common/wasm/ext/declare_property.pb.h" namespace proxy_wasm { diff --git a/src/envoy/extensions/wasm/wasm.cc b/src/envoy/extensions/wasm/wasm.cc index e2c93b80ed0..23b46af8d97 100644 --- a/src/envoy/extensions/wasm/wasm.cc +++ b/src/envoy/extensions/wasm/wasm.cc @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "extensions/common/wasm/wasm.h" +#include "source/extensions/common/wasm/wasm.h" -#include "common/stats/utility.h" -#include "common/version/version.h" -#include "server/admin/prometheus_stats.h" +#include "source/common/stats/utility.h" +#include "source/common/version/version.h" +#include "source/server/admin/prometheus_stats.h" #include "src/envoy/extensions/wasm/context.h" namespace Envoy { diff --git a/src/envoy/http/alpn/BUILD b/src/envoy/http/alpn/BUILD index 4eb0adb0de6..0d43065fa34 100644 --- a/src/envoy/http/alpn/BUILD +++ b/src/envoy/http/alpn/BUILD @@ -31,7 +31,7 @@ envoy_cc_library( repository = "@envoy", deps = [ "//external:alpn_filter_config_cc_proto", - "@envoy//include/envoy/http:filter_interface", + "@envoy//envoy/http:filter_interface", "@envoy//source/common/network:application_protocol_lib", "@envoy//source/extensions/filters/http/common:pass_through_filter_lib", ], @@ -46,7 +46,7 @@ envoy_cc_library( deps = [ ":alpn_filter", "//src/envoy/utils:filter_names_lib", - "@envoy//include/envoy/registry", + "@envoy//envoy/registry", "@envoy//source/exe:envoy_common_lib", "@envoy//source/extensions/filters/http/common:factory_base_lib", ], diff --git a/src/envoy/http/alpn/alpn_filter.cc b/src/envoy/http/alpn/alpn_filter.cc index 35c01489a26..4cc82538000 100644 --- a/src/envoy/http/alpn/alpn_filter.cc +++ b/src/envoy/http/alpn/alpn_filter.cc @@ -15,8 +15,8 @@ #include "src/envoy/http/alpn/alpn_filter.h" -#include "common/network/application_protocol.h" #include "envoy/upstream/cluster_manager.h" +#include "source/common/network/application_protocol.h" namespace Envoy { namespace Http { diff --git a/src/envoy/http/alpn/alpn_filter.h b/src/envoy/http/alpn/alpn_filter.h index 302c4a7e35d..2df65d3e34f 100644 --- a/src/envoy/http/alpn/alpn_filter.h +++ b/src/envoy/http/alpn/alpn_filter.h @@ -16,7 +16,7 @@ #pragma once #include "envoy/config/filter/http/alpn/v2alpha1/config.pb.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Http { diff --git a/src/envoy/http/alpn/alpn_test.cc b/src/envoy/http/alpn/alpn_test.cc index 21f3fb4e114..899bf8aef5d 100644 --- a/src/envoy/http/alpn/alpn_test.cc +++ b/src/envoy/http/alpn/alpn_test.cc @@ -13,9 +13,9 @@ * limitations under the License. */ -#include "common/network/application_protocol.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "source/common/network/application_protocol.h" #include "src/envoy/http/alpn/alpn_filter.h" #include "test/mocks/http/mocks.h" #include "test/mocks/upstream/mocks.h" diff --git a/src/envoy/http/alpn/config.cc b/src/envoy/http/alpn/config.cc index 1c83e8ccdd5..93eb4c5d611 100644 --- a/src/envoy/http/alpn/config.cc +++ b/src/envoy/http/alpn/config.cc @@ -15,7 +15,7 @@ #include "src/envoy/http/alpn/config.h" -#include "common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/message_validator_impl.h" #include "src/envoy/http/alpn/alpn_filter.h" #include "src/envoy/utils/filter_names.h" diff --git a/src/envoy/http/alpn/config.h b/src/envoy/http/alpn/config.h index e36db7f12ce..49d6dd15e35 100644 --- a/src/envoy/http/alpn/config.h +++ b/src/envoy/http/alpn/config.h @@ -16,7 +16,7 @@ #pragma once #include "envoy/config/filter/http/alpn/v2alpha1/config.pb.h" -#include "extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/common/factory_base.h" namespace Envoy { namespace Http { diff --git a/src/envoy/http/authn/authenticator_base.cc b/src/envoy/http/authn/authenticator_base.cc index a7ce0181eca..2b706bb6490 100644 --- a/src/envoy/http/authn/authenticator_base.cc +++ b/src/envoy/http/authn/authenticator_base.cc @@ -15,8 +15,8 @@ #include "src/envoy/http/authn/authenticator_base.h" -#include "common/common/assert.h" -#include "common/config/metadata.h" +#include "source/common/common/assert.h" +#include "source/common/config/metadata.h" #include "src/envoy/http/authn/authn_utils.h" #include "src/envoy/utils/filter_names.h" #include "src/envoy/utils/utils.h" diff --git a/src/envoy/http/authn/authenticator_base.h b/src/envoy/http/authn/authenticator_base.h index 696f31d8ee1..18d7aa26898 100644 --- a/src/envoy/http/authn/authenticator_base.h +++ b/src/envoy/http/authn/authenticator_base.h @@ -16,7 +16,7 @@ #pragma once #include "authentication/v1alpha1/policy.pb.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "src/envoy/http/authn/filter_context.h" #include "src/istio/authn/context.pb.h" diff --git a/src/envoy/http/authn/authenticator_base_test.cc b/src/envoy/http/authn/authenticator_base_test.cc index fafb1adb19d..a44f02d258b 100644 --- a/src/envoy/http/authn/authenticator_base_test.cc +++ b/src/envoy/http/authn/authenticator_base_test.cc @@ -15,11 +15,11 @@ #include "src/envoy/http/authn/authenticator_base.h" -#include "common/common/base64.h" -#include "common/protobuf/protobuf.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/config/filter/http/authn/v2alpha1/config.pb.h" #include "gmock/gmock.h" +#include "source/common/common/base64.h" +#include "source/common/protobuf/protobuf.h" #include "src/envoy/http/authn/test_utils.h" #include "src/envoy/utils/filter_names.h" #include "test/mocks/network/mocks.h" diff --git a/src/envoy/http/authn/authn_utils.h b/src/envoy/http/authn/authn_utils.h index b5df2e3a04b..568e5285af7 100644 --- a/src/envoy/http/authn/authn_utils.h +++ b/src/envoy/http/authn/authn_utils.h @@ -16,9 +16,9 @@ #pragma once #include "authentication/v1alpha1/policy.pb.h" -#include "common/common/logger.h" -#include "common/common/utility.h" #include "envoy/http/header_map.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" #include "src/istio/authn/context.pb.h" namespace iaapi = istio::authentication::v1alpha1; diff --git a/src/envoy/http/authn/authn_utils_test.cc b/src/envoy/http/authn/authn_utils_test.cc index c3bcb03fe4b..06413705bb0 100644 --- a/src/envoy/http/authn/authn_utils_test.cc +++ b/src/envoy/http/authn/authn_utils_test.cc @@ -14,8 +14,8 @@ */ #include "src/envoy/http/authn/authn_utils.h" -#include "common/common/base64.h" -#include "common/common/utility.h" +#include "source/common/common/base64.h" +#include "source/common/common/utility.h" #include "src/envoy/http/authn/test_utils.h" #include "test/test_common/utility.h" diff --git a/src/envoy/http/authn/filter_context.h b/src/envoy/http/authn/filter_context.h index 0163d649425..c761c60de84 100644 --- a/src/envoy/http/authn/filter_context.h +++ b/src/envoy/http/authn/filter_context.h @@ -16,12 +16,12 @@ #pragma once #include "authentication/v1alpha1/policy.pb.h" -#include "common/common/logger.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/config/filter/http/authn/v2alpha1/config.pb.h" #include "envoy/http/filter.h" #include "envoy/network/connection.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/http/well_known_names.h" #include "src/istio/authn/context.pb.h" namespace Envoy { diff --git a/src/envoy/http/authn/http_filter.cc b/src/envoy/http/authn/http_filter.cc index 59333bea507..84109d861e6 100644 --- a/src/envoy/http/authn/http_filter.cc +++ b/src/envoy/http/authn/http_filter.cc @@ -16,8 +16,8 @@ #include "src/envoy/http/authn/http_filter.h" #include "authentication/v1alpha1/policy.pb.h" -#include "common/http/utility.h" #include "envoy/config/filter/http/authn/v2alpha1/config.pb.h" +#include "source/common/http/utility.h" #include "src/envoy/http/authn/origin_authenticator.h" #include "src/envoy/http/authn/peer_authenticator.h" #include "src/envoy/utils/authn.h" diff --git a/src/envoy/http/authn/http_filter.h b/src/envoy/http/authn/http_filter.h index bb5ab94ba6f..f544ab5e359 100644 --- a/src/envoy/http/authn/http_filter.h +++ b/src/envoy/http/authn/http_filter.h @@ -15,9 +15,9 @@ #pragma once -#include "common/common/logger.h" #include "envoy/config/filter/http/authn/v2alpha1/config.pb.h" #include "envoy/http/filter.h" +#include "source/common/common/logger.h" #include "src/envoy/http/authn/authenticator_base.h" #include "src/envoy/http/authn/filter_context.h" diff --git a/src/envoy/http/authn/http_filter_integration_test.cc b/src/envoy/http/authn/http_filter_integration_test.cc index 8313a091412..a2b0fbc3103 100644 --- a/src/envoy/http/authn/http_filter_integration_test.cc +++ b/src/envoy/http/authn/http_filter_integration_test.cc @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "common/common/base64.h" -#include "common/common/utility.h" -#include "extensions/filters/http/well_known_names.h" #include "fmt/printf.h" +#include "source/common/common/base64.h" +#include "source/common/common/utility.h" +#include "source/extensions/filters/http/well_known_names.h" #include "src/envoy/utils/filter_names.h" #include "src/istio/authn/context.pb.h" #include "test/integration/http_protocol_integration.h" diff --git a/src/envoy/http/authn/http_filter_test.cc b/src/envoy/http/authn/http_filter_test.cc index c9e2a84299d..6c7f5b4735d 100644 --- a/src/envoy/http/authn/http_filter_test.cc +++ b/src/envoy/http/authn/http_filter_test.cc @@ -15,12 +15,12 @@ #include "src/envoy/http/authn/http_filter.h" -#include "common/common/base64.h" -#include "common/http/header_map_impl.h" -#include "common/stream_info/stream_info_impl.h" #include "envoy/config/filter/http/authn/v2alpha1/config.pb.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "source/common/common/base64.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/stream_info/stream_info_impl.h" #include "src/envoy/http/authn/authenticator_base.h" #include "src/envoy/http/authn/test_utils.h" #include "src/envoy/utils/authn.h" diff --git a/src/envoy/http/authn/origin_authenticator.cc b/src/envoy/http/authn/origin_authenticator.cc index 07eda94bdff..404b3b0b326 100644 --- a/src/envoy/http/authn/origin_authenticator.cc +++ b/src/envoy/http/authn/origin_authenticator.cc @@ -17,8 +17,8 @@ #include "absl/strings/match.h" #include "authentication/v1alpha1/policy.pb.h" -#include "common/http/headers.h" -#include "common/http/utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" #include "src/envoy/http/authn/authn_utils.h" using istio::authn::Payload; diff --git a/src/envoy/http/authn/origin_authenticator_test.cc b/src/envoy/http/authn/origin_authenticator_test.cc index 47390651fe7..aeef6d7a435 100644 --- a/src/envoy/http/authn/origin_authenticator_test.cc +++ b/src/envoy/http/authn/origin_authenticator_test.cc @@ -16,10 +16,10 @@ #include "src/envoy/http/authn/origin_authenticator.h" #include "authentication/v1alpha1/policy.pb.h" -#include "common/protobuf/protobuf.h" #include "envoy/config/core/v3/base.pb.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "source/common/protobuf/protobuf.h" #include "src/envoy/http/authn/test_utils.h" #include "test/mocks/http/mocks.h" #include "test/test_common/utility.h" diff --git a/src/envoy/http/authn/peer_authenticator.cc b/src/envoy/http/authn/peer_authenticator.cc index 44d7679ed79..45abce12521 100644 --- a/src/envoy/http/authn/peer_authenticator.cc +++ b/src/envoy/http/authn/peer_authenticator.cc @@ -15,7 +15,7 @@ #include "src/envoy/http/authn/peer_authenticator.h" -#include "common/http/utility.h" +#include "source/common/http/utility.h" #include "src/envoy/utils/utils.h" using istio::authn::Payload; diff --git a/src/envoy/http/authn/peer_authenticator_test.cc b/src/envoy/http/authn/peer_authenticator_test.cc index 56f95f9f980..e11e80b2efc 100644 --- a/src/envoy/http/authn/peer_authenticator_test.cc +++ b/src/envoy/http/authn/peer_authenticator_test.cc @@ -16,10 +16,10 @@ #include "src/envoy/http/authn/peer_authenticator.h" #include "authentication/v1alpha1/policy.pb.h" -#include "common/protobuf/protobuf.h" #include "envoy/config/core/v3/base.pb.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "source/common/protobuf/protobuf.h" #include "src/envoy/http/authn/test_utils.h" #include "test/mocks/http/mocks.h" #include "test/test_common/utility.h" diff --git a/src/envoy/http/authn/test_utils.h b/src/envoy/http/authn/test_utils.h index 40ffaacc6c5..86890a6de77 100644 --- a/src/envoy/http/authn/test_utils.h +++ b/src/envoy/http/authn/test_utils.h @@ -15,8 +15,8 @@ #pragma once -#include "common/protobuf/protobuf.h" #include "gmock/gmock.h" +#include "source/common/protobuf/protobuf.h" #include "src/istio/authn/context.pb.h" namespace Envoy { diff --git a/src/envoy/tcp/forward_downstream_sni/forward_downstream_sni.cc b/src/envoy/tcp/forward_downstream_sni/forward_downstream_sni.cc index dfd63ad4aaf..093efd9b4af 100644 --- a/src/envoy/tcp/forward_downstream_sni/forward_downstream_sni.cc +++ b/src/envoy/tcp/forward_downstream_sni/forward_downstream_sni.cc @@ -15,8 +15,8 @@ #include "src/envoy/tcp/forward_downstream_sni/forward_downstream_sni.h" -#include "common/network/upstream_server_name.h" #include "envoy/network/connection.h" +#include "source/common/network/upstream_server_name.h" namespace Envoy { namespace Tcp { diff --git a/src/envoy/tcp/forward_downstream_sni/forward_downstream_sni_test.cc b/src/envoy/tcp/forward_downstream_sni/forward_downstream_sni_test.cc index e1437693821..a7ac7335df3 100644 --- a/src/envoy/tcp/forward_downstream_sni/forward_downstream_sni_test.cc +++ b/src/envoy/tcp/forward_downstream_sni/forward_downstream_sni_test.cc @@ -15,9 +15,9 @@ #include "src/envoy/tcp/forward_downstream_sni/forward_downstream_sni.h" -#include "common/network/upstream_server_name.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "source/common/network/upstream_server_name.h" #include "src/envoy/tcp/forward_downstream_sni/config.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/mocks.h" diff --git a/src/envoy/tcp/metadata_exchange/BUILD b/src/envoy/tcp/metadata_exchange/BUILD index 2a32b9c2914..d88833b872e 100644 --- a/src/envoy/tcp/metadata_exchange/BUILD +++ b/src/envoy/tcp/metadata_exchange/BUILD @@ -44,12 +44,12 @@ envoy_cc_library( "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/base:endian", "@com_google_absl//absl/strings", - "@envoy//include/envoy/local_info:local_info_interface", - "@envoy//include/envoy/network:connection_interface", - "@envoy//include/envoy/network:filter_interface", - "@envoy//include/envoy/runtime:runtime_interface", - "@envoy//include/envoy/stats:stats_macros", - "@envoy//include/envoy/stream_info:filter_state_interface", + "@envoy//envoy/local_info:local_info_interface", + "@envoy//envoy/network:connection_interface", + "@envoy//envoy/network:filter_interface", + "@envoy//envoy/runtime:runtime_interface", + "@envoy//envoy/stats:stats_macros", + "@envoy//envoy/stream_info:filter_state_interface", "@envoy//source/common/http:utility_lib", "@envoy//source/common/network:utility_lib", "@envoy//source/common/protobuf", @@ -69,7 +69,7 @@ envoy_cc_library( ":metadata_exchange", "//src/envoy/tcp/metadata_exchange/config:metadata_exchange_cc_proto", "//src/envoy/utils:utils_lib", - "@envoy//include/envoy/registry", + "@envoy//envoy/registry", "@envoy//source/extensions/filters/network/common:factory_base_lib", ], ) diff --git a/src/envoy/tcp/metadata_exchange/config.h b/src/envoy/tcp/metadata_exchange/config.h index 74156d9005d..36b5f865bce 100644 --- a/src/envoy/tcp/metadata_exchange/config.h +++ b/src/envoy/tcp/metadata_exchange/config.h @@ -15,7 +15,7 @@ #pragma once -#include "extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/common/factory_base.h" #include "src/envoy/tcp/metadata_exchange/config/metadata_exchange.pb.h" namespace Envoy { diff --git a/src/envoy/tcp/metadata_exchange/metadata_exchange.cc b/src/envoy/tcp/metadata_exchange/metadata_exchange.cc index 842809a5cbc..4ee5b46761a 100644 --- a/src/envoy/tcp/metadata_exchange/metadata_exchange.cc +++ b/src/envoy/tcp/metadata_exchange/metadata_exchange.cc @@ -21,10 +21,10 @@ #include "absl/base/internal/endian.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" -#include "common/buffer/buffer_impl.h" -#include "common/protobuf/utility.h" #include "envoy/network/connection.h" #include "envoy/stats/scope.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/protobuf/utility.h" #include "src/envoy/tcp/metadata_exchange/metadata_exchange_initial_header.h" namespace Envoy { diff --git a/src/envoy/tcp/metadata_exchange/metadata_exchange.h b/src/envoy/tcp/metadata_exchange/metadata_exchange.h index bfb0ca57393..9a2c365878c 100644 --- a/src/envoy/tcp/metadata_exchange/metadata_exchange.h +++ b/src/envoy/tcp/metadata_exchange/metadata_exchange.h @@ -17,7 +17,6 @@ #include -#include "common/protobuf/protobuf.h" #include "envoy/local_info/local_info.h" #include "envoy/network/filter.h" #include "envoy/runtime/runtime.h" @@ -27,7 +26,8 @@ #include "extensions/common/context.h" #include "extensions/common/node_info_bfbs_generated.h" #include "extensions/common/proto_util.h" -#include "extensions/filters/common/expr/cel_state.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/common/expr/cel_state.h" #include "src/envoy/tcp/metadata_exchange/config/metadata_exchange.pb.h" namespace Envoy { diff --git a/src/envoy/tcp/metadata_exchange/metadata_exchange_test.cc b/src/envoy/tcp/metadata_exchange/metadata_exchange_test.cc index 424529186c4..6d9a0891cd8 100644 --- a/src/envoy/tcp/metadata_exchange/metadata_exchange_test.cc +++ b/src/envoy/tcp/metadata_exchange/metadata_exchange_test.cc @@ -15,11 +15,11 @@ #include "src/envoy/tcp/metadata_exchange/metadata_exchange.h" -#include "common/buffer/buffer_impl.h" -#include "common/protobuf/protobuf.h" #include "gmock/gmock.h" #include "google/protobuf/util/message_differencer.h" #include "gtest/gtest.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/protobuf/protobuf.h" #include "src/envoy/tcp/metadata_exchange/metadata_exchange_initial_header.h" #include "test/mocks/local_info/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/src/envoy/tcp/sni_verifier/sni_verifier.cc b/src/envoy/tcp/sni_verifier/sni_verifier.cc index 52abbe7fc37..d29f0fb2248 100644 --- a/src/envoy/tcp/sni_verifier/sni_verifier.cc +++ b/src/envoy/tcp/sni_verifier/sni_verifier.cc @@ -18,13 +18,13 @@ #include "src/envoy/tcp/sni_verifier/sni_verifier.h" -#include "common/common/assert.h" #include "envoy/buffer/buffer.h" #include "envoy/common/exception.h" #include "envoy/network/connection.h" #include "envoy/stats/scope.h" #include "openssl/err.h" #include "openssl/ssl.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Tcp { diff --git a/src/envoy/tcp/sni_verifier/sni_verifier.h b/src/envoy/tcp/sni_verifier/sni_verifier.h index 633a8d73d5b..4f63b5c9b0e 100644 --- a/src/envoy/tcp/sni_verifier/sni_verifier.h +++ b/src/envoy/tcp/sni_verifier/sni_verifier.h @@ -15,10 +15,10 @@ #pragma once -#include "common/common/logger.h" #include "envoy/network/filter.h" #include "envoy/stats/scope.h" #include "openssl/ssl.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Tcp { diff --git a/src/envoy/tcp/sni_verifier/sni_verifier_test.cc b/src/envoy/tcp/sni_verifier/sni_verifier_test.cc index 1717b13a382..1abaed64233 100644 --- a/src/envoy/tcp/sni_verifier/sni_verifier_test.cc +++ b/src/envoy/tcp/sni_verifier/sni_verifier_test.cc @@ -18,9 +18,9 @@ #include #include -#include "common/buffer/buffer_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "source/common/buffer/buffer_impl.h" #include "src/envoy/tcp/sni_verifier/config.h" #include "test/extensions/filters/listener/tls_inspector/tls_utility.h" #include "test/mocks/network/mocks.h" diff --git a/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite.cc b/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite.cc index 5050c07a09c..b30f37ae796 100644 --- a/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite.cc +++ b/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite.cc @@ -15,9 +15,9 @@ #include "src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite.h" -#include "common/common/assert.h" -#include "common/tcp_proxy/tcp_proxy.h" #include "envoy/network/connection.h" +#include "source/common/common/assert.h" +#include "source/common/tcp_proxy/tcp_proxy.h" using namespace ::istio::envoy::config::filter::network::tcp_cluster_rewrite; diff --git a/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite.h b/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite.h index 4f1e87ebb2d..218232629e6 100644 --- a/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite.h +++ b/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite.h @@ -17,9 +17,9 @@ #include -#include "common/common/logger.h" #include "envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/config.pb.h" #include "envoy/network/filter.h" +#include "source/common/common/logger.h" using namespace ::istio::envoy::config::filter::network::tcp_cluster_rewrite; diff --git a/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite_test.cc b/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite_test.cc index 8fad73b19ae..b83ad8e4039 100644 --- a/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite_test.cc +++ b/src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite_test.cc @@ -15,9 +15,9 @@ #include "src/envoy/tcp/tcp_cluster_rewrite/tcp_cluster_rewrite.h" -#include "common/tcp_proxy/tcp_proxy.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "source/common/tcp_proxy/tcp_proxy.h" #include "src/envoy/tcp/tcp_cluster_rewrite/config.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/mocks.h" diff --git a/src/envoy/upstreams/http/metadata/BUILD b/src/envoy/upstreams/http/metadata/BUILD index a67112bfd92..a60a09f7df0 100644 --- a/src/envoy/upstreams/http/metadata/BUILD +++ b/src/envoy/upstreams/http/metadata/BUILD @@ -33,10 +33,10 @@ envoy_cc_library( deps = [ ":upstream_request_lib", "@com_google_absl//absl/types:optional", - "@envoy//include/envoy/registry", - "@envoy//include/envoy/router:router_interface", - "@envoy//include/envoy/upstream:load_balancer_interface", - "@envoy//include/envoy/upstream:thread_local_cluster_interface", + "@envoy//envoy/registry", + "@envoy//envoy/router:router_interface", + "@envoy//envoy/upstream:load_balancer_interface", + "@envoy//envoy/upstream:thread_local_cluster_interface", "@envoy//source/common/protobuf", ], ) @@ -48,12 +48,12 @@ envoy_cc_library( repository = "@envoy", deps = [ "@com_google_absl//absl/types:optional", - "@envoy//include/envoy/http:codec_interface", - "@envoy//include/envoy/router:router_interface", - "@envoy//include/envoy/stream_info:stream_info_interface", - "@envoy//include/envoy/upstream:host_description_interface", - "@envoy//include/envoy/upstream:load_balancer_interface", - "@envoy//include/envoy/upstream:thread_local_cluster_interface", + "@envoy//envoy/http:codec_interface", + "@envoy//envoy/router:router_interface", + "@envoy//envoy/stream_info:stream_info_interface", + "@envoy//envoy/upstream:host_description_interface", + "@envoy//envoy/upstream:load_balancer_interface", + "@envoy//envoy/upstream:thread_local_cluster_interface", "@envoy//source/extensions/upstreams/http/http:upstream_request_lib", ], ) @@ -64,7 +64,7 @@ envoy_cc_test( repository = "@envoy", deps = [ ":config", - "@envoy//include/envoy/network:address_interface", + "@envoy//envoy/network:address_interface", "@envoy//source/common/http:codec_client_lib", "@envoy//test/integration:http_integration_lib", "@envoy//test/test_common:environment_lib", diff --git a/src/envoy/upstreams/http/metadata/config.h b/src/envoy/upstreams/http/metadata/config.h index 7a04d4a9245..e98090b236e 100644 --- a/src/envoy/upstreams/http/metadata/config.h +++ b/src/envoy/upstreams/http/metadata/config.h @@ -18,12 +18,12 @@ #include #include "absl/types/optional.h" -#include "common/protobuf/protobuf.h" #include "envoy/http/protocol.h" #include "envoy/registry/registry.h" #include "envoy/router/router.h" #include "envoy/upstream/load_balancer.h" #include "envoy/upstream/thread_local_cluster.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Upstreams { diff --git a/src/envoy/upstreams/http/metadata/integration_test.cc b/src/envoy/upstreams/http/metadata/integration_test.cc index d5e915cfa6f..c0acf70bd12 100644 --- a/src/envoy/upstreams/http/metadata/integration_test.cc +++ b/src/envoy/upstreams/http/metadata/integration_test.cc @@ -13,11 +13,11 @@ * limitations under the License. */ -#include "common/http/codec_client.h" #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/network/address.h" #include "envoy/router/router.h" #include "gtest/gtest.h" +#include "source/common/http/codec_client.h" #include "src/envoy/upstreams/http/metadata/config.h" #include "test/integration/http_integration.h" #include "test/test_common/environment.h" diff --git a/src/envoy/upstreams/http/metadata/upstream_request.h b/src/envoy/upstreams/http/metadata/upstream_request.h index ba49e240ce9..d3e64bcc85d 100644 --- a/src/envoy/upstreams/http/metadata/upstream_request.h +++ b/src/envoy/upstreams/http/metadata/upstream_request.h @@ -23,7 +23,7 @@ #include "envoy/upstream/host_description.h" #include "envoy/upstream/load_balancer.h" #include "envoy/upstream/thread_local_cluster.h" -#include "extensions/upstreams/http/http/upstream_request.h" +#include "source/extensions/upstreams/http/http/upstream_request.h" namespace Envoy { namespace Upstreams { diff --git a/src/envoy/utils/authn.cc b/src/envoy/utils/authn.cc index 8f00c54f3b0..4db00a82f59 100644 --- a/src/envoy/utils/authn.cc +++ b/src/envoy/utils/authn.cc @@ -15,7 +15,7 @@ #include "src/envoy/utils/authn.h" -#include "common/common/base64.h" +#include "source/common/common/base64.h" #include "src/envoy/utils/filter_names.h" #include "src/istio/authn/context.pb.h" #include "src/istio/utils/attribute_names.h" diff --git a/src/envoy/utils/authn.h b/src/envoy/utils/authn.h index 70234a5d001..6a027ea5578 100644 --- a/src/envoy/utils/authn.h +++ b/src/envoy/utils/authn.h @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "common/common/logger.h" -#include "common/protobuf/protobuf.h" #include "envoy/config/core/v3/base.pb.h" #include "google/protobuf/struct.pb.h" +#include "source/common/common/logger.h" +#include "source/common/protobuf/protobuf.h" #include "src/istio/authn/context.pb.h" namespace Envoy { diff --git a/src/envoy/utils/authn_test.cc b/src/envoy/utils/authn_test.cc index eb2e3601702..61cf5568e9d 100644 --- a/src/envoy/utils/authn_test.cc +++ b/src/envoy/utils/authn_test.cc @@ -15,7 +15,7 @@ #include "src/envoy/utils/authn.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "src/istio/authn/context.pb.h" #include "src/istio/utils/attribute_names.h" #include "test/test_common/utility.h" diff --git a/test/integration/exchanged_token_integration_test.cc b/test/integration/exchanged_token_integration_test.cc index 3c93959c67e..c17cbfafb02 100644 --- a/test/integration/exchanged_token_integration_test.cc +++ b/test/integration/exchanged_token_integration_test.cc @@ -18,9 +18,9 @@ // (jwt-authn + istio-authn). Filters pass on processing // results next filters using the request info through dynamic metadata. -#include "extensions/filters/http/well_known_names.h" #include "fmt/printf.h" #include "gmock/gmock.h" +#include "source/extensions/filters/http/well_known_names.h" #include "src/envoy/utils/filter_names.h" #include "src/istio/utils/attribute_names.h" #include "test/integration/http_protocol_integration.h" diff --git a/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc b/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc index f3a69dc0741..7caaa391286 100644 --- a/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc +++ b/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc @@ -19,9 +19,9 @@ // metadata) and that information can only be observed at the end. #include "envoy/config/trace/v3/zipkin.pb.h" -#include "extensions/filters/http/well_known_names.h" #include "fmt/printf.h" #include "gmock/gmock.h" +#include "source/extensions/filters/http/well_known_names.h" #include "src/envoy/utils/filter_names.h" #include "src/envoy/utils/trace_headers.h" #include "src/istio/utils/attribute_names.h"