diff --git a/BUILD b/BUILD index 9897adcd0f0..0be13c0df87 100644 --- a/BUILD +++ b/BUILD @@ -2174,7 +2174,6 @@ grpc_cc_library( "//src/core:channel_args", "//src/core:channel_fwd", "//src/core:closure", - "//src/core:connection_context", "//src/core:context", "//src/core:error", "//src/core:event_engine_memory_allocator", diff --git a/CMakeLists.txt b/CMakeLists.txt index 493ee1d939d..f56216d4f82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2895,7 +2895,6 @@ add_library(grpc src/core/lib/surface/client_call.cc src/core/lib/surface/completion_queue.cc src/core/lib/surface/completion_queue_factory.cc - src/core/lib/surface/connection_context.cc src/core/lib/surface/event_string.cc src/core/lib/surface/filter_stack_call.cc src/core/lib/surface/init.cc @@ -3669,7 +3668,6 @@ add_library(grpc_unsecure src/core/lib/surface/client_call.cc src/core/lib/surface/completion_queue.cc src/core/lib/surface/completion_queue_factory.cc - src/core/lib/surface/connection_context.cc src/core/lib/surface/event_string.cc src/core/lib/surface/filter_stack_call.cc src/core/lib/surface/init.cc @@ -5874,7 +5872,6 @@ add_library(grpc_authorization_provider src/core/lib/surface/client_call.cc src/core/lib/surface/completion_queue.cc src/core/lib/surface/completion_queue_factory.cc - src/core/lib/surface/connection_context.cc src/core/lib/surface/event_string.cc src/core/lib/surface/filter_stack_call.cc src/core/lib/surface/init_internally.cc @@ -12375,6 +12372,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(connection_context_test + src/core/lib/surface/connection_context.cc test/core/surface/connection_context_test.cc test/core/test_util/cmdline.cc test/core/test_util/fuzzer_util.cc diff --git a/Makefile b/Makefile index ba9bd8ba040..45e2e7e72c0 100644 --- a/Makefile +++ b/Makefile @@ -1302,7 +1302,6 @@ LIBGRPC_SRC = \ src/core/lib/surface/client_call.cc \ src/core/lib/surface/completion_queue.cc \ src/core/lib/surface/completion_queue_factory.cc \ - src/core/lib/surface/connection_context.cc \ src/core/lib/surface/event_string.cc \ src/core/lib/surface/filter_stack_call.cc \ src/core/lib/surface/init.cc \ diff --git a/Package.swift b/Package.swift index 780fe8ff063..1ba620eab9a 100644 --- a/Package.swift +++ b/Package.swift @@ -1596,8 +1596,6 @@ let package = Package( "src/core/lib/surface/completion_queue.h", "src/core/lib/surface/completion_queue_factory.cc", "src/core/lib/surface/completion_queue_factory.h", - "src/core/lib/surface/connection_context.cc", - "src/core/lib/surface/connection_context.h", "src/core/lib/surface/event_string.cc", "src/core/lib/surface/event_string.h", "src/core/lib/surface/filter_stack_call.cc", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 356e8794416..b5f26926fea 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -1055,7 +1055,6 @@ libs: - src/core/lib/surface/client_call.h - src/core/lib/surface/completion_queue.h - src/core/lib/surface/completion_queue_factory.h - - src/core/lib/surface/connection_context.h - src/core/lib/surface/event_string.h - src/core/lib/surface/filter_stack_call.h - src/core/lib/surface/init.h @@ -1912,7 +1911,6 @@ libs: - src/core/lib/surface/client_call.cc - src/core/lib/surface/completion_queue.cc - src/core/lib/surface/completion_queue_factory.cc - - src/core/lib/surface/connection_context.cc - src/core/lib/surface/event_string.cc - src/core/lib/surface/filter_stack_call.cc - src/core/lib/surface/init.cc @@ -2611,7 +2609,6 @@ libs: - src/core/lib/surface/client_call.h - src/core/lib/surface/completion_queue.h - src/core/lib/surface/completion_queue_factory.h - - src/core/lib/surface/connection_context.h - src/core/lib/surface/event_string.h - src/core/lib/surface/filter_stack_call.h - src/core/lib/surface/init.h @@ -3041,7 +3038,6 @@ libs: - src/core/lib/surface/client_call.cc - src/core/lib/surface/completion_queue.cc - src/core/lib/surface/completion_queue_factory.cc - - src/core/lib/surface/connection_context.cc - src/core/lib/surface/event_string.cc - src/core/lib/surface/filter_stack_call.cc - src/core/lib/surface/init.cc @@ -4680,7 +4676,6 @@ libs: - src/core/lib/surface/client_call.h - src/core/lib/surface/completion_queue.h - src/core/lib/surface/completion_queue_factory.h - - src/core/lib/surface/connection_context.h - src/core/lib/surface/event_string.h - src/core/lib/surface/filter_stack_call.h - src/core/lib/surface/init.h @@ -4985,7 +4980,6 @@ libs: - src/core/lib/surface/client_call.cc - src/core/lib/surface/completion_queue.cc - src/core/lib/surface/completion_queue_factory.cc - - src/core/lib/surface/connection_context.cc - src/core/lib/surface/event_string.cc - src/core/lib/surface/filter_stack_call.cc - src/core/lib/surface/init_internally.cc @@ -9144,6 +9138,7 @@ targets: build: test language: c++ headers: + - src/core/lib/surface/connection_context.h - test/core/test_util/cmdline.h - test/core/test_util/evaluate_args_test_util.h - test/core/test_util/fuzzer_util.h @@ -9155,6 +9150,7 @@ targets: - test/core/test_util/slice_splitter.h - test/core/test_util/tracer_util.h src: + - src/core/lib/surface/connection_context.cc - test/core/surface/connection_context_test.cc - test/core/test_util/cmdline.cc - test/core/test_util/fuzzer_util.cc diff --git a/config.m4 b/config.m4 index 98278457102..f8b38adf606 100644 --- a/config.m4 +++ b/config.m4 @@ -677,7 +677,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/surface/client_call.cc \ src/core/lib/surface/completion_queue.cc \ src/core/lib/surface/completion_queue_factory.cc \ - src/core/lib/surface/connection_context.cc \ src/core/lib/surface/event_string.cc \ src/core/lib/surface/filter_stack_call.cc \ src/core/lib/surface/init.cc \ diff --git a/config.w32 b/config.w32 index 6dac489066e..7a03656de1d 100644 --- a/config.w32 +++ b/config.w32 @@ -642,7 +642,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\surface\\client_call.cc " + "src\\core\\lib\\surface\\completion_queue.cc " + "src\\core\\lib\\surface\\completion_queue_factory.cc " + - "src\\core\\lib\\surface\\connection_context.cc " + "src\\core\\lib\\surface\\event_string.cc " + "src\\core\\lib\\surface\\filter_stack_call.cc " + "src\\core\\lib\\surface\\init.cc " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 671a9cf30ba..72a7240a5e4 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1106,7 +1106,6 @@ Pod::Spec.new do |s| 'src/core/lib/surface/client_call.h', 'src/core/lib/surface/completion_queue.h', 'src/core/lib/surface/completion_queue_factory.h', - 'src/core/lib/surface/connection_context.h', 'src/core/lib/surface/event_string.h', 'src/core/lib/surface/filter_stack_call.h', 'src/core/lib/surface/init.h', @@ -2398,7 +2397,6 @@ Pod::Spec.new do |s| 'src/core/lib/surface/client_call.h', 'src/core/lib/surface/completion_queue.h', 'src/core/lib/surface/completion_queue_factory.h', - 'src/core/lib/surface/connection_context.h', 'src/core/lib/surface/event_string.h', 'src/core/lib/surface/filter_stack_call.h', 'src/core/lib/surface/init.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 733e089783e..d8a7b33b9bd 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1712,8 +1712,6 @@ Pod::Spec.new do |s| 'src/core/lib/surface/completion_queue.h', 'src/core/lib/surface/completion_queue_factory.cc', 'src/core/lib/surface/completion_queue_factory.h', - 'src/core/lib/surface/connection_context.cc', - 'src/core/lib/surface/connection_context.h', 'src/core/lib/surface/event_string.cc', 'src/core/lib/surface/event_string.h', 'src/core/lib/surface/filter_stack_call.cc', @@ -3252,7 +3250,6 @@ Pod::Spec.new do |s| 'src/core/lib/surface/client_call.h', 'src/core/lib/surface/completion_queue.h', 'src/core/lib/surface/completion_queue_factory.h', - 'src/core/lib/surface/connection_context.h', 'src/core/lib/surface/event_string.h', 'src/core/lib/surface/filter_stack_call.h', 'src/core/lib/surface/init.h', diff --git a/grpc.gemspec b/grpc.gemspec index b53df0df1f5..268da42963b 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1598,8 +1598,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/surface/completion_queue.h ) s.files += %w( src/core/lib/surface/completion_queue_factory.cc ) s.files += %w( src/core/lib/surface/completion_queue_factory.h ) - s.files += %w( src/core/lib/surface/connection_context.cc ) - s.files += %w( src/core/lib/surface/connection_context.h ) s.files += %w( src/core/lib/surface/event_string.cc ) s.files += %w( src/core/lib/surface/event_string.h ) s.files += %w( src/core/lib/surface/filter_stack_call.cc ) diff --git a/package.xml b/package.xml index 2f235cfa185..b19e583a1b9 100644 --- a/package.xml +++ b/package.xml @@ -1580,8 +1580,6 @@ - - diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h index 105222eefdb..1a5b7afa320 100644 --- a/src/core/lib/security/context/security_context.h +++ b/src/core/lib/security/context/security_context.h @@ -33,9 +33,7 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep -#include "src/core/lib/surface/connection_context.h" #include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" @@ -79,7 +77,6 @@ struct grpc_auth_context if (chained_ != nullptr) { peer_identity_property_name_ = chained_->peer_identity_property_name_; } - connection_context_ = grpc_core::ConnectionContext::Create(); } ~grpc_auth_context() { @@ -101,10 +98,6 @@ struct grpc_auth_context const grpc_auth_context* chained() const { return chained_.get(); } const grpc_auth_property_array& properties() const { return properties_; } - grpc_core::ConnectionContext* connection_context() const { - return connection_context_.get(); - } - bool is_authenticated() const { return peer_identity_property_name_ != nullptr; } @@ -127,7 +120,6 @@ struct grpc_auth_context grpc_auth_property_array properties_; const char* peer_identity_property_name_ = nullptr; std::unique_ptr extension_; - grpc_core::OrphanablePtr connection_context_; }; // --- grpc_security_context_extension --- diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index d2c46a476a1..b73b62761e7 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -651,7 +651,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/surface/client_call.cc', 'src/core/lib/surface/completion_queue.cc', 'src/core/lib/surface/completion_queue_factory.cc', - 'src/core/lib/surface/connection_context.cc', 'src/core/lib/surface/event_string.cc', 'src/core/lib/surface/filter_stack_call.cc', 'src/core/lib/surface/init.cc', diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index b611cc7877a..5cce618c9f1 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2562,8 +2562,6 @@ src/core/lib/surface/completion_queue.cc \ src/core/lib/surface/completion_queue.h \ src/core/lib/surface/completion_queue_factory.cc \ src/core/lib/surface/completion_queue_factory.h \ -src/core/lib/surface/connection_context.cc \ -src/core/lib/surface/connection_context.h \ src/core/lib/surface/event_string.cc \ src/core/lib/surface/event_string.h \ src/core/lib/surface/filter_stack_call.cc \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index f72d7a221d3..8f03a2b34df 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -2373,8 +2373,6 @@ src/core/lib/surface/completion_queue.cc \ src/core/lib/surface/completion_queue.h \ src/core/lib/surface/completion_queue_factory.cc \ src/core/lib/surface/completion_queue_factory.h \ -src/core/lib/surface/connection_context.cc \ -src/core/lib/surface/connection_context.h \ src/core/lib/surface/event_string.cc \ src/core/lib/surface/event_string.h \ src/core/lib/surface/filter_stack_call.cc \