Fix nit comments. Removes watcher methods from python

anniefrchz · anniefrchz · commit b6282f0cf036 · 2026-02-10T19:12:13.000Z
diff --git a/include/grpcpp/security/tls_certificate_provider.h b/include/grpcpp/security/tls_certificate_provider.h
@@ -53,8 +53,8 @@ struct GRPCXX_DLL IdentityKeyCertPair {
 // A basic CertificateProviderInterface implementation that will load credential
 // data from static string during initialization. This provider will always
 // return the same cert data for all cert names, and reloading is not supported.
-class GRPCXX_DLL StaticDataCertificateProvider
-    : public CertificateProviderInterface {
+class [[deprecated("Use InMemoryCertificateProvider instead")]] GRPCXX_DLL
+    StaticDataCertificateProvider : public CertificateProviderInterface {
  public:
   StaticDataCertificateProvider(
       const std::string& root_certificate,
diff --git a/src/core/credentials/transport/tls/grpc_tls_certificate_provider.cc b/src/core/credentials/transport/tls/grpc_tls_certificate_provider.cc
@@ -432,7 +432,6 @@ InMemoryCertificateProvider::InMemoryCertificateProvider()
     if (!info.root_being_watched && !info.identity_being_watched) {
       watcher_info_.erase(cert_name);
     }
-    ExecCtx exec_ctx;
     if (roots != nullptr || pem_key_cert_pairs.has_value()) {
       distributor_->SetKeyMaterials(cert_name, roots, pem_key_cert_pairs);
     }
@@ -469,7 +468,6 @@ absl::Status InMemoryCertificateProvider::Update(
     pem_key_cert_pairs_ = *pem_key_cert_pairs;
   }
   if (root_changed || identity_cert_changed) {
-    ExecCtx exec_ctx;
     grpc_error_handle root_cert_error =
         GRPC_ERROR_CREATE("Unable to get latest root certificates.");
     grpc_error_handle identity_cert_error =
@@ -568,6 +566,7 @@ grpc_tls_certificate_provider_in_memory_create() {
 
 bool grpc_tls_certificate_provider_in_memory_set_root_certificate(
     grpc_tls_certificate_provider* provider, const char* root_cert) {
+  grpc_core::ExecCtx exec_ctx;
   auto in_memory_provider =
       grpc_core::DownCast<grpc_core::InMemoryCertificateProvider*>(provider);
   return in_memory_provider
@@ -578,6 +577,7 @@ bool grpc_tls_certificate_provider_in_memory_set_root_certificate(
 bool grpc_tls_certificate_provider_in_memory_set_identity_certificate(
     grpc_tls_certificate_provider* provider,
     grpc_tls_identity_pairs* pem_key_cert_pairs) {
+  grpc_core::ExecCtx exec_ctx;
   grpc_core::PemKeyCertPairList identity_pairs_core;
   if (pem_key_cert_pairs != nullptr) {
     identity_pairs_core = std::move(pem_key_cert_pairs->pem_key_cert_pairs);
diff --git a/src/cpp/common/tls_certificate_provider.cc b/src/cpp/common/tls_certificate_provider.cc
@@ -94,7 +94,6 @@ absl::Status InMemoryCertificateProvider::UpdateRoot(
              c_provider_, root_certificate.c_str())
              ? absl::OkStatus()
              : absl::InternalError("Unable to update root certificate");
-  ;
 }
 
 absl::Status InMemoryCertificateProvider::UpdateIdentityKeyCertPair(
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi
@@ -625,14 +625,6 @@ cdef extern from "grpc/credentials.h":
     grpc_tls_identity_pairs* pem_key_cert_pairs
   ) nogil
 
-
-
-  void grpc_tls_credentials_options_watch_root_certs(
-    grpc_tls_credentials_options *options) nogil
-
-  void grpc_tls_credentials_options_watch_identity_key_cert_pairs(
-    grpc_tls_credentials_options *options) nogil
-
   void grpc_tls_certificate_provider_release(
     grpc_tls_certificate_provider *provider) nogil
 
diff --git a/test/core/credentials/transport/tls/grpc_tls_certificate_provider_test.cc b/test/core/credentials/transport/tls/grpc_tls_certificate_provider_test.cc
@@ -896,7 +896,6 @@ TEST_F(GrpcTlsCertificateProviderTest,
   // Watcher watching only identity certs.
   WatcherState* identity_watcher =
       MakeWatcher(provider.distributor(), std::nullopt, kCertName);
-
   // Initial State.
   EXPECT_THAT(
       both_watcher->GetCredentialQueue(),

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ absl::Status InMemoryCertificateProvider::UpdateRoot(`
`94`	`94`	`c_provider_, root_certificate.c_str())`
`95`	`95`	`? absl::OkStatus()`
`96`	`96`	`: absl::InternalError("Unable to update root certificate");`
`97`		`- ;`
`98`	`97`	`}`
`99`	`98`
`100`	`99`	`absl::Status InMemoryCertificateProvider::UpdateIdentityKeyCertPair(`