From c64046dddcf844768b20b7614c680caa44c7a1df Mon Sep 17 00:00:00 2001 From: Jakub Sobon Date: Sun, 10 Mar 2024 15:47:57 -0400 Subject: [PATCH] Update Envoy to da1a7d2 (Mar 08, 2024). (#1092) - synced up `.bazelrc`, `tools/code_format/config.yaml` from Envoy's version. - no changes to `.bazelversion`, `ci/run_envoy_docker.sh`, `tools/gen_compilation_database.py`. - adjusting our usage of TLS after https://github.com/envoyproxy/envoy/pull/32368. Signed-off-by: Jakub Sobon --- .bazelrc | 3 ++- bazel/repositories.bzl | 4 ++-- source/client/BUILD | 2 +- source/client/process_impl.h | 2 +- tools/code_format/config.yaml | 4 +++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.bazelrc b/.bazelrc index 11b54ce79..0f6216cbc 100644 --- a/.bazelrc +++ b/.bazelrc @@ -144,7 +144,7 @@ build:clang-asan --linkopt --rtlib=compiler-rt build:clang-asan --linkopt --unwindlib=libgcc # macOS -build:linux --cxxopt=-std=c++20 --host_cxxopt=-std=c++20 +build:macos --cxxopt=-std=c++20 --host_cxxopt=-std=c++20 build:macos --action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin build:macos --host_action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin build:macos --define tcmalloc=disabled @@ -520,6 +520,7 @@ build:rbe-engflow --grpc_keepalive_time=30s build:rbe-engflow --remote_timeout=3600s build:rbe-engflow --bes_timeout=3600s build:rbe-engflow --bes_upload_mode=fully_async +build:rbe-engflow --nolegacy_important_outputs build:cache-envoy-engflow --google_default_credentials=false build:cache-envoy-engflow --remote_cache=grpcs://morganite.cluster.engflow.com diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index a94fee6de..c5fb7f201 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -1,7 +1,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -ENVOY_COMMIT = "e28e0d67fc9f9f677b644f940320c5c01bf057c9" -ENVOY_SHA = "b37f2e2eee9c7b1dd8f0eac76f0e086675e919d8e298fd3fac5d8d03128900d1" +ENVOY_COMMIT = "da1a7d2ed07c6c60e7e0b05430337465ed91a03e" +ENVOY_SHA = "a1c180a8710ff8df298bc04db6207e6055d2558dc0c26a93a6cbb85c0ab090ff" HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad" diff --git a/source/client/BUILD b/source/client/BUILD index a96ace473..6669328ca 100644 --- a/source/client/BUILD +++ b/source/client/BUILD @@ -128,6 +128,7 @@ envoy_cc_library( "@envoy//source/common/stats:thread_local_store_lib_with_external_headers", "@envoy//source/common/stream_info:stream_info_lib_with_external_headers", "@envoy//source/common/thread_local:thread_local_lib_with_external_headers", + "@envoy//source/common/tls:context_lib_with_external_headers", "@envoy//source/common/tracing:tracer_lib_with_external_headers", "@envoy//source/common/upstream:cluster_manager_lib_with_external_headers", "@envoy//source/exe:all_extensions_lib_with_external_headers", @@ -135,7 +136,6 @@ envoy_cc_library( "@envoy//source/exe:platform_impl_lib", "@envoy//source/exe:process_wide_lib_with_external_headers", "@envoy//source/extensions/request_id/uuid:config_with_external_headers", - "@envoy//source/extensions/transport_sockets/tls:context_lib_with_external_headers", "@envoy//source/server:server_lib_with_external_headers", "@envoy//source/server/config_validation:admin_lib_with_external_headers", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/source/client/process_impl.h b/source/client/process_impl.h index 72a225278..a81855a37 100644 --- a/source/client/process_impl.h +++ b/source/client/process_impl.h @@ -30,10 +30,10 @@ #include "external/envoy/source/common/stats/allocator_impl.h" #include "external/envoy/source/common/stats/thread_local_store.h" #include "external/envoy/source/common/thread_local/thread_local_impl.h" +#include "external/envoy/source/common/tls/context_manager_impl.h" #include "external/envoy/source/common/upstream/cluster_manager_impl.h" #include "external/envoy/source/exe/platform_impl.h" #include "external/envoy/source/exe/process_wide.h" -#include "external/envoy/source/extensions/transport_sockets/tls/context_manager_impl.h" #include "external/envoy/source/server/config_validation/admin.h" #include "external/envoy/source/server/options_impl.h" #include "external/envoy_api/envoy/config/bootstrap/v3/bootstrap.pb.h" diff --git a/tools/code_format/config.yaml b/tools/code_format/config.yaml index 092389da4..9ac325220 100644 --- a/tools/code_format/config.yaml +++ b/tools/code_format/config.yaml @@ -120,7 +120,6 @@ paths: - source/common/stats/tag_extractor_impl.cc - source/common/stats/tag_producer_impl.cc - source/common/http/http2/codec_impl.cc - - source/common/http/utility.cc - source/common/http/hash_policy.cc - source/common/http/conn_manager_utility.cc - source/common/http/match_delegate/config.cc @@ -172,6 +171,8 @@ paths: - source/common/ssl/certificate_validation_context_config_impl.cc - source/common/grpc/google_grpc_creds_impl.cc - source/common/local_reply/local_reply.cc + - source/common/tls/context_impl.cc + - source/common/tls/context_config_impl.cc # Only one C++ file should instantiate grpc_init grpc_init: @@ -406,6 +407,7 @@ visibility_excludes: - source/extensions/filters/network/common/BUILD - source/extensions/http/header_validators/envoy_default/BUILD - source/extensions/transport_sockets/common/BUILD +- source/extensions/transport_sockets/tap/BUILD - source/extensions/udp_packet_writer/default/BUILD - source/extensions/udp_packet_writer/gso/BUILD - source/extensions/path/uri_template_lib/BUILD