From 447a058837ca5e96a80cabbfe2f06d69a536c12d Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Wed, 26 Oct 2022 14:53:57 -0700 Subject: [PATCH] xDS: remove deprecated C++ APIs in the experimental namespace (#31451) --- examples/cpp/helloworld/xds_greeter_client.cc | 8 ++++---- examples/cpp/helloworld/xds_greeter_server.cc | 8 ++++---- include/grpcpp/security/credentials.h | 6 ------ include/grpcpp/security/server_credentials.h | 8 -------- include/grpcpp/xds_server_builder.h | 12 ------------ test/cpp/end2end/xds/xds_end2end_test_lib.h | 2 +- test/cpp/interop/xds_interop_client.cc | 12 ++++++------ 7 files changed, 15 insertions(+), 41 deletions(-) diff --git a/examples/cpp/helloworld/xds_greeter_client.cc b/examples/cpp/helloworld/xds_greeter_client.cc index 839625eca1f..093204ec3e0 100644 --- a/examples/cpp/helloworld/xds_greeter_client.cc +++ b/examples/cpp/helloworld/xds_greeter_client.cc @@ -80,10 +80,10 @@ class GreeterClient { int main(int argc, char** argv) { absl::ParseCommandLine(argc, argv); GreeterClient greeter(grpc::CreateChannel( - absl::GetFlag(FLAGS_target), absl::GetFlag(FLAGS_secure) - ? grpc::experimental::XdsCredentials( - grpc::InsecureChannelCredentials()) - : grpc::InsecureChannelCredentials())); + absl::GetFlag(FLAGS_target), + absl::GetFlag(FLAGS_secure) + ? grpc::XdsCredentials(grpc::InsecureChannelCredentials()) + : grpc::InsecureChannelCredentials())); std::string user("world"); std::string reply = greeter.SayHello(user); std::cout << "Greeter received: " << reply << std::endl; diff --git a/examples/cpp/helloworld/xds_greeter_server.cc b/examples/cpp/helloworld/xds_greeter_server.cc index 21a964dedd6..9e4ca2a0549 100644 --- a/examples/cpp/helloworld/xds_greeter_server.cc +++ b/examples/cpp/helloworld/xds_greeter_server.cc @@ -64,7 +64,7 @@ void RunServer() { grpc::reflection::InitProtoReflectionServerBuilderPlugin(); int port = absl::GetFlag(FLAGS_port); int maintenance_port = absl::GetFlag(FLAGS_maintenance_port); - grpc::experimental::XdsServerBuilder xds_builder; + grpc::XdsServerBuilder xds_builder; ServerBuilder builder; std::unique_ptr xds_enabled_server; std::unique_ptr server; @@ -75,9 +75,9 @@ void RunServer() { if (absl::GetFlag(FLAGS_secure)) { // Listen on the given address with XdsServerCredentials and a fallback of // InsecureServerCredentials - xds_builder.AddListeningPort(absl::StrCat("0.0.0.0:", port), - grpc::experimental::XdsServerCredentials( - grpc::InsecureServerCredentials())); + xds_builder.AddListeningPort( + absl::StrCat("0.0.0.0:", port), + grpc::XdsServerCredentials(grpc::InsecureServerCredentials())); xds_enabled_server = xds_builder.BuildAndStart(); gpr_log(GPR_INFO, "Server starting on 0.0.0.0:%d", port); grpc::AddAdminServices(&builder); diff --git a/include/grpcpp/security/credentials.h b/include/grpcpp/security/credentials.h index d9b439342cd..eb0f011d2d8 100644 --- a/include/grpcpp/security/credentials.h +++ b/include/grpcpp/security/credentials.h @@ -54,12 +54,6 @@ std::shared_ptr CreateCustomChannelWithInterceptors( std::vector< std::unique_ptr> interceptor_creators); - -GRPC_DEPRECATED( - "Use grpc::XdsCredentials instead. The experimental version will be " - "deleted after the 1.41 release.") -std::shared_ptr XdsCredentials( - const std::shared_ptr& fallback_creds); } // namespace experimental /// Builds XDS Credentials. diff --git a/include/grpcpp/security/server_credentials.h b/include/grpcpp/security/server_credentials.h index 2d1bc07a2c2..b79816c9bcb 100644 --- a/include/grpcpp/security/server_credentials.h +++ b/include/grpcpp/security/server_credentials.h @@ -64,14 +64,6 @@ struct SslServerCredentialsOptions { std::shared_ptr XdsServerCredentials( const std::shared_ptr& fallback_credentials); -namespace experimental { -GRPC_DEPRECATED( - "Use grpc::XdsServerCredentials instead. The experimental version will be " - "deleted after the 1.41 release.") -std::shared_ptr XdsServerCredentials( - const std::shared_ptr& fallback_credentials); -} // namespace experimental - /// Wrapper around \a grpc_server_credentials, a way to authenticate a server. class ServerCredentials : private grpc::GrpcLibraryCodegen { public: diff --git a/include/grpcpp/xds_server_builder.h b/include/grpcpp/xds_server_builder.h index e2fde72fe42..aaeb45628bd 100644 --- a/include/grpcpp/xds_server_builder.h +++ b/include/grpcpp/xds_server_builder.h @@ -106,18 +106,6 @@ class XdsServerBuilder : public grpc::ServerBuilder { int drain_grace_time_ms_ = -1; }; -namespace experimental { -// TODO(yashykt): Delete this after the 1.42 release. -GRPC_DEPRECATED( - "Use grpc::XdsServerServingStatusNotifierInterface instead. The " - "experimental version will be deleted after the 1.42 release.") -typedef grpc::XdsServerServingStatusNotifierInterface - XdsServerServingStatusNotifierInterface; -GRPC_DEPRECATED( - "Use grpc::XdsServerBuilder instead. The experimental version will be " - "deleted after the 1.42 release.") -typedef grpc::XdsServerBuilder XdsServerBuilder; -} // namespace experimental } // namespace grpc #endif /* GRPCPP_XDS_SERVER_BUILDER_H */ diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.h b/test/cpp/end2end/xds/xds_end2end_test_lib.h index 1791cdf9394..401ceb87f89 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.h +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.h @@ -208,7 +208,7 @@ class XdsEnd2endTest : public ::testing::TestWithParam { public: // A status notifier for xDS-enabled servers. class XdsServingStatusNotifier - : public grpc::experimental::XdsServerServingStatusNotifierInterface { + : public grpc::XdsServerServingStatusNotifierInterface { public: void OnServingStatusUpdate(std::string uri, ServingStatusUpdate update) override; diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc index 627ed1083bd..065b8008a21 100644 --- a/test/cpp/interop/xds_interop_client.cc +++ b/test/cpp/interop/xds_interop_client.cc @@ -469,12 +469,12 @@ void RunTestLoop(std::chrono::duration duration_per_query, grpc::ChannelArguments channel_args; channel_args.SetInt(GRPC_ARG_ENABLE_RETRIES, 1); TestClient client( - grpc::CreateCustomChannel(absl::GetFlag(FLAGS_server), - absl::GetFlag(FLAGS_secure_mode) - ? grpc::experimental::XdsCredentials( - grpc::InsecureChannelCredentials()) - : grpc::InsecureChannelCredentials(), - channel_args), + grpc::CreateCustomChannel( + absl::GetFlag(FLAGS_server), + absl::GetFlag(FLAGS_secure_mode) + ? grpc::XdsCredentials(grpc::InsecureChannelCredentials()) + : grpc::InsecureChannelCredentials(), + channel_args), stats_watchers); std::chrono::time_point start = std::chrono::system_clock::now();