From 0d3fcb41ea7a1fc054d881336d14c60294f85e05 Mon Sep 17 00:00:00 2001 From: Cheng-Yu Chung Date: Wed, 7 Dec 2022 03:39:43 +0800 Subject: [PATCH] Revert "Move google_default channel_credentials out of `include/grpc/grpc_security.h` (#31786)" (#31822) This reverts commit 3d59abc94ec09d97543958d10414f2871b6f2e19. --- BUILD | 1 - CMakeLists.txt | 3 -- Makefile | 2 - build_autogenerated.yaml | 3 -- gRPC-Core.podspec | 1 - grpc.def | 2 +- grpc.gemspec | 1 - .../grpc/channel_credentials/google_default.h | 52 ------------------- include/grpc/grpc_security.h | 21 ++++++++ include/grpc/module.modulemap | 1 - package.xml | 1 - .../channel_creds_registry_init.cc | 1 - .../google_default_credentials.cc | 1 - src/cpp/client/secure_credentials.cc | 1 - src/php/ext/grpc/channel_credentials.c | 1 - .../grpcio/grpc/_cython/_cygrpc/grpc.pxi | 6 +-- src/ruby/ext/grpc/rb_grpc_imports.generated.c | 4 +- src/ruby/ext/grpc/rb_grpc_imports.generated.h | 7 ++- test/core/security/credentials_test.cc | 1 - .../print_google_default_creds_token.cc | 1 - .../core/surface/public_headers_must_be_c89.c | 3 +- tools/doxygen/Doxyfile.c++ | 1 - tools/doxygen/Doxyfile.c++.internal | 1 - tools/doxygen/Doxyfile.core | 1 - tools/doxygen/Doxyfile.core.internal | 1 - 25 files changed, 30 insertions(+), 88 deletions(-) delete mode 100644 include/grpc/channel_credentials/google_default.h diff --git a/BUILD b/BUILD index c6137df4eb0..33ab16ef712 100644 --- a/BUILD +++ b/BUILD @@ -194,7 +194,6 @@ GPR_PUBLIC_HDRS = [ GRPC_PUBLIC_HDRS = [ "include/grpc/byte_buffer.h", "include/grpc/byte_buffer_reader.h", - "include/grpc/channel_credentials/google_default.h", "include/grpc/compression.h", "include/grpc/fork.h", "include/grpc/grpc.h", diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c82b671450..904ff82e7de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2435,7 +2435,6 @@ foreach(_hdr include/grpc/byte_buffer.h include/grpc/byte_buffer_reader.h include/grpc/census.h - include/grpc/channel_credentials/google_default.h include/grpc/compression.h include/grpc/event_engine/endpoint_config.h include/grpc/event_engine/event_engine.h @@ -3041,7 +3040,6 @@ foreach(_hdr include/grpc/byte_buffer.h include/grpc/byte_buffer_reader.h include/grpc/census.h - include/grpc/channel_credentials/google_default.h include/grpc/compression.h include/grpc/event_engine/endpoint_config.h include/grpc/event_engine/event_engine.h @@ -4519,7 +4517,6 @@ target_link_libraries(grpc_authorization_provider foreach(_hdr include/grpc/byte_buffer.h include/grpc/byte_buffer_reader.h - include/grpc/channel_credentials/google_default.h include/grpc/compression.h include/grpc/event_engine/endpoint_config.h include/grpc/event_engine/event_engine.h diff --git a/Makefile b/Makefile index 25deb30b39c..5890f05aeb9 100644 --- a/Makefile +++ b/Makefile @@ -1669,7 +1669,6 @@ PUBLIC_HEADERS_C += \ include/grpc/byte_buffer.h \ include/grpc/byte_buffer_reader.h \ include/grpc/census.h \ - include/grpc/channel_credentials/google_default.h \ include/grpc/compression.h \ include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/event_engine.h \ @@ -2135,7 +2134,6 @@ PUBLIC_HEADERS_C += \ include/grpc/byte_buffer.h \ include/grpc/byte_buffer_reader.h \ include/grpc/census.h \ - include/grpc/channel_credentials/google_default.h \ include/grpc/compression.h \ include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/event_engine.h \ diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 4062e449ecf..806e09a59fc 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -256,7 +256,6 @@ libs: - include/grpc/byte_buffer.h - include/grpc/byte_buffer_reader.h - include/grpc/census.h - - include/grpc/channel_credentials/google_default.h - include/grpc/compression.h - include/grpc/event_engine/endpoint_config.h - include/grpc/event_engine/event_engine.h @@ -1838,7 +1837,6 @@ libs: - include/grpc/byte_buffer.h - include/grpc/byte_buffer_reader.h - include/grpc/census.h - - include/grpc/channel_credentials/google_default.h - include/grpc/compression.h - include/grpc/event_engine/endpoint_config.h - include/grpc/event_engine/event_engine.h @@ -3373,7 +3371,6 @@ libs: public_headers: - include/grpc/byte_buffer.h - include/grpc/byte_buffer_reader.h - - include/grpc/channel_credentials/google_default.h - include/grpc/compression.h - include/grpc/event_engine/endpoint_config.h - include/grpc/event_engine/event_engine.h diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index fe346f0874d..878203b17ea 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -107,7 +107,6 @@ Pod::Spec.new do |s| ss.source_files = 'include/grpc/byte_buffer.h', 'include/grpc/byte_buffer_reader.h', 'include/grpc/census.h', - 'include/grpc/channel_credentials/google_default.h', 'include/grpc/compression.h', 'include/grpc/event_engine/endpoint_config.h', 'include/grpc/event_engine/event_engine.h', diff --git a/grpc.def b/grpc.def index 155339c1eba..c0171e080e4 100644 --- a/grpc.def +++ b/grpc.def @@ -10,7 +10,6 @@ EXPORTS grpc_byte_buffer_reader_peek grpc_byte_buffer_reader_readall grpc_raw_byte_buffer_from_reader - grpc_google_default_credentials_create grpc_compression_algorithm_is_message grpc_compression_algorithm_is_stream grpc_compression_algorithm_parse @@ -116,6 +115,7 @@ EXPORTS grpc_ssl_session_cache_destroy grpc_ssl_session_cache_create_channel_arg grpc_call_credentials_release + grpc_google_default_credentials_create grpc_set_ssl_roots_override_callback grpc_ssl_credentials_create grpc_ssl_credentials_create_ex diff --git a/grpc.gemspec b/grpc.gemspec index cc9b64b2d28..e7a851c56d2 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -50,7 +50,6 @@ Gem::Specification.new do |s| s.files += %w( include/grpc/byte_buffer.h ) s.files += %w( include/grpc/byte_buffer_reader.h ) s.files += %w( include/grpc/census.h ) - s.files += %w( include/grpc/channel_credentials/google_default.h ) s.files += %w( include/grpc/compression.h ) s.files += %w( include/grpc/event_engine/endpoint_config.h ) s.files += %w( include/grpc/event_engine/event_engine.h ) diff --git a/include/grpc/channel_credentials/google_default.h b/include/grpc/channel_credentials/google_default.h deleted file mode 100644 index 736aa4e0937..00000000000 --- a/include/grpc/channel_credentials/google_default.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2022 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GRPC_CHANNEL_CREDENTIALS_GOOGLE_DEFAULT_H -#define GRPC_CHANNEL_CREDENTIALS_GOOGLE_DEFAULT_H - -#include - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** Creates default credentials to connect to a google gRPC service. - WARNING: Do NOT use this credentials to connect to a non-google service as - this could result in an oauth2 token leak. The security level of the - resulting connection is GRPC_PRIVACY_AND_INTEGRITY. - - If specified, the supplied call credentials object will be attached to the - returned channel credentials object. The call_credentials object must remain - valid throughout the lifetime of the returned grpc_channel_credentials - object. It is expected that the call credentials object was generated - according to the Application Default Credentials mechanism and asserts the - identity of the default service account of the machine. Supplying any other - sort of call credential will result in undefined behavior, up to and - including the sudden and unexpected failure of RPCs. - - If nullptr is supplied, the returned channel credentials object will use a - call credentials object based on the Application Default Credentials - mechanism. -*/ -GRPCAPI grpc_channel_credentials* grpc_google_default_credentials_create( - grpc_call_credentials* call_credentials); - -#ifdef __cplusplus -} -#endif - -#endif /* GRPC_CHANNEL_CREDENTIALS_GOOGLE_DEFAULT_H */ diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h index 362c2441f9d..63810f6fa91 100644 --- a/include/grpc/grpc_security.h +++ b/include/grpc/grpc_security.h @@ -131,6 +131,27 @@ typedef struct grpc_call_credentials grpc_call_credentials; The creator of the credentials object is responsible for its release. */ GRPCAPI void grpc_call_credentials_release(grpc_call_credentials* creds); +/** Creates default credentials to connect to a google gRPC service. + WARNING: Do NOT use this credentials to connect to a non-google service as + this could result in an oauth2 token leak. The security level of the + resulting connection is GRPC_PRIVACY_AND_INTEGRITY. + + If specified, the supplied call credentials object will be attached to the + returned channel credentials object. The call_credentials object must remain + valid throughout the lifetime of the returned grpc_channel_credentials + object. It is expected that the call credentials object was generated + according to the Application Default Credentials mechanism and asserts the + identity of the default service account of the machine. Supplying any other + sort of call credential will result in undefined behavior, up to and + including the sudden and unexpected failure of RPCs. + + If nullptr is supplied, the returned channel credentials object will use a + call credentials object based on the Application Default Credentials + mechanism. +*/ +GRPCAPI grpc_channel_credentials* grpc_google_default_credentials_create( + grpc_call_credentials* call_credentials); + /** Callback for getting the SSL roots override from the application. In case of success, *pem_roots_certs must be set to a NULL terminated string containing the list of PEM encoded root certificates. The ownership is passed diff --git a/include/grpc/module.modulemap b/include/grpc/module.modulemap index fe793e9abe8..4d0881f712e 100644 --- a/include/grpc/module.modulemap +++ b/include/grpc/module.modulemap @@ -5,7 +5,6 @@ framework module grpc { header "byte_buffer.h" header "byte_buffer_reader.h" header "census.h" - header "channel_credentials/google_default.h" header "compression.h" header "fork.h" header "grpc.h" diff --git a/package.xml b/package.xml index 103c7702837..bd0ddc17dc2 100644 --- a/package.xml +++ b/package.xml @@ -32,7 +32,6 @@ - diff --git a/src/core/lib/security/credentials/channel_creds_registry_init.cc b/src/core/lib/security/credentials/channel_creds_registry_init.cc index b2663da3a98..57c576a1022 100644 --- a/src/core/lib/security/credentials/channel_creds_registry_init.cc +++ b/src/core/lib/security/credentials/channel_creds_registry_init.cc @@ -22,7 +22,6 @@ #include "absl/strings/string_view.h" -#include #include #include diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 9196e1235ed..5f7cffb89a6 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -32,7 +32,6 @@ #include "absl/strings/strip.h" #include "absl/types/optional.h" -#include #include // IWYU pragma: keep #include #include diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index 494e99b2298..69c33ae78da 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -29,7 +29,6 @@ #include "absl/strings/str_join.h" #include "absl/types/optional.h" -#include #include #include #include diff --git a/src/php/ext/grpc/channel_credentials.c b/src/php/ext/grpc/channel_credentials.c index 73e21896675..7d9de6a11e6 100644 --- a/src/php/ext/grpc/channel_credentials.c +++ b/src/php/ext/grpc/channel_credentials.c @@ -27,7 +27,6 @@ #include #include -#include #include #include diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi index 1c190daaae4..fd3abefc788 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi @@ -552,6 +552,7 @@ cdef extern from "grpc/grpc_security.h": void grpc_set_ssl_roots_override_callback( grpc_ssl_roots_override_callback cb) nogil + grpc_channel_credentials *grpc_google_default_credentials_create(grpc_call_credentials* call_credentials) nogil grpc_channel_credentials *grpc_ssl_credentials_create( const char *pem_root_certs, grpc_ssl_pem_key_cert_pair *pem_key_cert_pair, verify_peer_options *verify_options, void *reserved) nogil @@ -666,7 +667,7 @@ cdef extern from "grpc/grpc_security.h": ctypedef struct grpc_alts_credentials_options: # We don't care about the internals (and in fact don't know them) pass - + grpc_channel_credentials *grpc_alts_credentials_create( const grpc_alts_credentials_options *options) grpc_server_credentials *grpc_alts_server_credentials_create( @@ -678,9 +679,6 @@ cdef extern from "grpc/grpc_security.h": void grpc_alts_credentials_client_options_add_target_service_account(grpc_alts_credentials_options *options, const char *service_account) -cdef extern from "grpc/channel_credentials/google_default.h": - grpc_channel_credentials *grpc_google_default_credentials_create(grpc_call_credentials* call_credentials) nogil - cdef extern from "grpc/compression.h": diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.c b/src/ruby/ext/grpc/rb_grpc_imports.generated.c index 11ee2ef064f..58d7a6b2d41 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.c +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.c @@ -33,7 +33,6 @@ grpc_byte_buffer_reader_next_type grpc_byte_buffer_reader_next_import; grpc_byte_buffer_reader_peek_type grpc_byte_buffer_reader_peek_import; grpc_byte_buffer_reader_readall_type grpc_byte_buffer_reader_readall_import; grpc_raw_byte_buffer_from_reader_type grpc_raw_byte_buffer_from_reader_import; -grpc_google_default_credentials_create_type grpc_google_default_credentials_create_import; grpc_compression_algorithm_is_message_type grpc_compression_algorithm_is_message_import; grpc_compression_algorithm_is_stream_type grpc_compression_algorithm_is_stream_import; grpc_compression_algorithm_parse_type grpc_compression_algorithm_parse_import; @@ -139,6 +138,7 @@ grpc_ssl_session_cache_create_lru_type grpc_ssl_session_cache_create_lru_import; grpc_ssl_session_cache_destroy_type grpc_ssl_session_cache_destroy_import; grpc_ssl_session_cache_create_channel_arg_type grpc_ssl_session_cache_create_channel_arg_import; grpc_call_credentials_release_type grpc_call_credentials_release_import; +grpc_google_default_credentials_create_type grpc_google_default_credentials_create_import; grpc_set_ssl_roots_override_callback_type grpc_set_ssl_roots_override_callback_import; grpc_ssl_credentials_create_type grpc_ssl_credentials_create_import; grpc_ssl_credentials_create_ex_type grpc_ssl_credentials_create_ex_import; @@ -318,7 +318,6 @@ void grpc_rb_load_imports(HMODULE library) { grpc_byte_buffer_reader_peek_import = (grpc_byte_buffer_reader_peek_type) GetProcAddress(library, "grpc_byte_buffer_reader_peek"); grpc_byte_buffer_reader_readall_import = (grpc_byte_buffer_reader_readall_type) GetProcAddress(library, "grpc_byte_buffer_reader_readall"); grpc_raw_byte_buffer_from_reader_import = (grpc_raw_byte_buffer_from_reader_type) GetProcAddress(library, "grpc_raw_byte_buffer_from_reader"); - grpc_google_default_credentials_create_import = (grpc_google_default_credentials_create_type) GetProcAddress(library, "grpc_google_default_credentials_create"); grpc_compression_algorithm_is_message_import = (grpc_compression_algorithm_is_message_type) GetProcAddress(library, "grpc_compression_algorithm_is_message"); grpc_compression_algorithm_is_stream_import = (grpc_compression_algorithm_is_stream_type) GetProcAddress(library, "grpc_compression_algorithm_is_stream"); grpc_compression_algorithm_parse_import = (grpc_compression_algorithm_parse_type) GetProcAddress(library, "grpc_compression_algorithm_parse"); @@ -424,6 +423,7 @@ void grpc_rb_load_imports(HMODULE library) { grpc_ssl_session_cache_destroy_import = (grpc_ssl_session_cache_destroy_type) GetProcAddress(library, "grpc_ssl_session_cache_destroy"); grpc_ssl_session_cache_create_channel_arg_import = (grpc_ssl_session_cache_create_channel_arg_type) GetProcAddress(library, "grpc_ssl_session_cache_create_channel_arg"); grpc_call_credentials_release_import = (grpc_call_credentials_release_type) GetProcAddress(library, "grpc_call_credentials_release"); + grpc_google_default_credentials_create_import = (grpc_google_default_credentials_create_type) GetProcAddress(library, "grpc_google_default_credentials_create"); grpc_set_ssl_roots_override_callback_import = (grpc_set_ssl_roots_override_callback_type) GetProcAddress(library, "grpc_set_ssl_roots_override_callback"); grpc_ssl_credentials_create_import = (grpc_ssl_credentials_create_type) GetProcAddress(library, "grpc_ssl_credentials_create"); grpc_ssl_credentials_create_ex_import = (grpc_ssl_credentials_create_ex_type) GetProcAddress(library, "grpc_ssl_credentials_create_ex"); diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.h b/src/ruby/ext/grpc/rb_grpc_imports.generated.h index d8332b61bb0..e7c46baa812 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.h +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.h @@ -26,7 +26,6 @@ #include #include -#include #include #include #include @@ -75,9 +74,6 @@ extern grpc_byte_buffer_reader_readall_type grpc_byte_buffer_reader_readall_impo typedef grpc_byte_buffer*(*grpc_raw_byte_buffer_from_reader_type)(grpc_byte_buffer_reader* reader); extern grpc_raw_byte_buffer_from_reader_type grpc_raw_byte_buffer_from_reader_import; #define grpc_raw_byte_buffer_from_reader grpc_raw_byte_buffer_from_reader_import -typedef grpc_channel_credentials*(*grpc_google_default_credentials_create_type)(grpc_call_credentials* call_credentials); -extern grpc_google_default_credentials_create_type grpc_google_default_credentials_create_import; -#define grpc_google_default_credentials_create grpc_google_default_credentials_create_import typedef int(*grpc_compression_algorithm_is_message_type)(grpc_compression_algorithm algorithm); extern grpc_compression_algorithm_is_message_type grpc_compression_algorithm_is_message_import; #define grpc_compression_algorithm_is_message grpc_compression_algorithm_is_message_import @@ -393,6 +389,9 @@ extern grpc_ssl_session_cache_create_channel_arg_type grpc_ssl_session_cache_cre typedef void(*grpc_call_credentials_release_type)(grpc_call_credentials* creds); extern grpc_call_credentials_release_type grpc_call_credentials_release_import; #define grpc_call_credentials_release grpc_call_credentials_release_import +typedef grpc_channel_credentials*(*grpc_google_default_credentials_create_type)(grpc_call_credentials* call_credentials); +extern grpc_google_default_credentials_create_type grpc_google_default_credentials_create_import; +#define grpc_google_default_credentials_create grpc_google_default_credentials_create_import typedef void(*grpc_set_ssl_roots_override_callback_type)(grpc_ssl_roots_override_callback cb); extern grpc_set_ssl_roots_override_callback_type grpc_set_ssl_roots_override_callback_import; #define grpc_set_ssl_roots_override_callback grpc_set_ssl_roots_override_callback_import diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index efe2ecb6e24..69f4a586bc5 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -33,7 +33,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_replace.h" -#include #include #include #include diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc index b857c1b165e..11bac97eb55 100644 --- a/test/core/security/print_google_default_creds_token.cc +++ b/test/core/security/print_google_default_creds_token.cc @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/test/core/surface/public_headers_must_be_c89.c b/test/core/surface/public_headers_must_be_c89.c index e8d02c40d3f..566f6397b37 100644 --- a/test/core/surface/public_headers_must_be_c89.c +++ b/test/core/surface/public_headers_must_be_c89.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -80,7 +79,6 @@ int main(int argc, char **argv) { printf("%lx", (unsigned long) grpc_byte_buffer_reader_peek); printf("%lx", (unsigned long) grpc_byte_buffer_reader_readall); printf("%lx", (unsigned long) grpc_raw_byte_buffer_from_reader); - printf("%lx", (unsigned long) grpc_google_default_credentials_create); printf("%lx", (unsigned long) grpc_compression_algorithm_is_message); printf("%lx", (unsigned long) grpc_compression_algorithm_is_stream); printf("%lx", (unsigned long) grpc_compression_algorithm_parse); @@ -184,6 +182,7 @@ int main(int argc, char **argv) { printf("%lx", (unsigned long) grpc_ssl_session_cache_destroy); printf("%lx", (unsigned long) grpc_ssl_session_cache_create_channel_arg); printf("%lx", (unsigned long) grpc_call_credentials_release); + printf("%lx", (unsigned long) grpc_google_default_credentials_create); printf("%lx", (unsigned long) grpc_set_ssl_roots_override_callback); printf("%lx", (unsigned long) grpc_ssl_credentials_create); printf("%lx", (unsigned long) grpc_ssl_credentials_create_ex); diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index fe879f69f4b..cf0d48f81b9 100644 --- a/tools/doxygen/Doxyfile.c++ +++ b/tools/doxygen/Doxyfile.c++ @@ -880,7 +880,6 @@ include/grpc++/support/time.h \ include/grpc/byte_buffer.h \ include/grpc/byte_buffer_reader.h \ include/grpc/census.h \ -include/grpc/channel_credentials/google_default.h \ include/grpc/compression.h \ include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/event_engine.h \ diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index a7266ff5c11..62a5378e9a1 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -880,7 +880,6 @@ include/grpc++/support/time.h \ include/grpc/byte_buffer.h \ include/grpc/byte_buffer_reader.h \ include/grpc/census.h \ -include/grpc/channel_credentials/google_default.h \ include/grpc/compression.h \ include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/event_engine.h \ diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index ff326e96b07..12943922b28 100644 --- a/tools/doxygen/Doxyfile.core +++ b/tools/doxygen/Doxyfile.core @@ -810,7 +810,6 @@ doc/xds-test-descriptions.md \ include/grpc/byte_buffer.h \ include/grpc/byte_buffer_reader.h \ include/grpc/census.h \ -include/grpc/channel_credentials/google_default.h \ include/grpc/compression.h \ include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/event_engine.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 422a4b0a8e9..aa170a63d54 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -810,7 +810,6 @@ doc/xds-test-descriptions.md \ include/grpc/byte_buffer.h \ include/grpc/byte_buffer_reader.h \ include/grpc/census.h \ -include/grpc/channel_credentials/google_default.h \ include/grpc/compression.h \ include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/event_engine.h \