From 68453275ab4da6a90ba7a56f901506df9fa348ab Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Tue, 6 Sep 2022 14:04:18 -0700
Subject: [PATCH] XdsBootstrap: move two more methods out of the interface
 (#30820)

* XdsBootstrap: move two more methods out of the interface

* Automated change: Fix sanity tests

Co-authored-by: markdroth <markdroth@users.noreply.github.com>
---
 .../client_channel/resolver/xds/xds_resolver.cc     |  3 ++-
 src/core/ext/xds/xds_bootstrap.h                    |  3 ---
 src/core/ext/xds/xds_bootstrap_grpc.h               | 13 ++++++-------
 src/core/ext/xds/xds_server_config_fetcher.cc       | 12 +++++++-----
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
index 50821828116..5c50a7dc877 100644
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
+++ b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
@@ -56,6 +56,7 @@
 #include "src/core/ext/filters/client_channel/config_selector.h"
 #include "src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h"
 #include "src/core/ext/xds/xds_bootstrap.h"
+#include "src/core/ext/xds/xds_bootstrap_grpc.h"
 #include "src/core/ext/xds/xds_client.h"
 #include "src/core/ext/xds/xds_client_grpc.h"
 #include "src/core/ext/xds/xds_http_filters.h"
@@ -838,7 +839,7 @@ void XdsResolver::StartLocked() {
   } else {
     // target_uri.authority not set
     absl::string_view name_template =
-        xds_client_->bootstrap()
+        static_cast<const GrpcXdsBootstrap&>(xds_client_->bootstrap())
             .client_default_listener_resource_name_template();
     if (name_template.empty()) {
       name_template = "%s";
diff --git a/src/core/ext/xds/xds_bootstrap.h b/src/core/ext/xds/xds_bootstrap.h
index 865a1d731af..307c0ed0a58 100644
--- a/src/core/ext/xds/xds_bootstrap.h
+++ b/src/core/ext/xds/xds_bootstrap.h
@@ -87,9 +87,6 @@ class XdsBootstrap {
   // add support for fallback for the xds channel.
   virtual const XdsServer& server() const = 0;
   virtual const Node* node() const = 0;
-  virtual const std::string& client_default_listener_resource_name_template()
-      const = 0;
-  virtual const std::string& server_listener_resource_name_template() const = 0;
   virtual const std::map<std::string, Authority>& authorities() const = 0;
 
   // Returns a pointer to the specified authority, or null if it does
diff --git a/src/core/ext/xds/xds_bootstrap_grpc.h b/src/core/ext/xds/xds_bootstrap_grpc.h
index 542fd465414..befce66f9c9 100644
--- a/src/core/ext/xds/xds_bootstrap_grpc.h
+++ b/src/core/ext/xds/xds_bootstrap_grpc.h
@@ -67,17 +67,16 @@ class GrpcXdsBootstrap : public XdsBootstrap {
 
   const XdsServer& server() const override { return servers_[0]; }
   const Node* node() const override { return node_.get(); }
-  const std::string& client_default_listener_resource_name_template()
-      const override {
-    return client_default_listener_resource_name_template_;
-  }
-  const std::string& server_listener_resource_name_template() const override {
-    return server_listener_resource_name_template_;
-  }
   const std::map<std::string, Authority>& authorities() const override {
     return authorities_;
   }
 
+  const std::string& client_default_listener_resource_name_template() const {
+    return client_default_listener_resource_name_template_;
+  }
+  const std::string& server_listener_resource_name_template() const {
+    return server_listener_resource_name_template_;
+  }
   const XdsCertificateProviderPluginMapInterface*
   certificate_provider_plugin_map() const {
     return certificate_provider_plugin_map_.get();
diff --git a/src/core/ext/xds/xds_server_config_fetcher.cc b/src/core/ext/xds/xds_server_config_fetcher.cc
index 1e7224935ea..c1727cd1c22 100644
--- a/src/core/ext/xds/xds_server_config_fetcher.cc
+++ b/src/core/ext/xds/xds_server_config_fetcher.cc
@@ -51,7 +51,7 @@
 #include "src/core/ext/filters/server_config_selector/server_config_selector.h"
 #include "src/core/ext/filters/server_config_selector/server_config_selector_filter.h"
 #include "src/core/ext/xds/certificate_provider_store.h"
-#include "src/core/ext/xds/xds_bootstrap.h"
+#include "src/core/ext/xds/xds_bootstrap_grpc.h"
 #include "src/core/ext/xds/xds_certificate_provider.h"
 #include "src/core/ext/xds/xds_channel_stack_modifier.h"
 #include "src/core/ext/xds/xds_client_grpc.h"
@@ -502,7 +502,8 @@ void XdsServerConfigFetcher::StartWatch(
   XdsListenerResourceType::StartWatch(
       xds_client_.get(),
       ListenerResourceName(
-          xds_client_->bootstrap().server_listener_resource_name_template(),
+          static_cast<const GrpcXdsBootstrap&>(xds_client_->bootstrap())
+              .server_listener_resource_name_template(),
           listening_address),
       std::move(listener_watcher));
   MutexLock lock(&mu_);
@@ -518,7 +519,8 @@ void XdsServerConfigFetcher::CancelWatch(
     XdsListenerResourceType::CancelWatch(
         xds_client_.get(),
         ListenerResourceName(
-            xds_client_->bootstrap().server_listener_resource_name_template(),
+            static_cast<const GrpcXdsBootstrap&>(xds_client_->bootstrap())
+                .server_listener_resource_name_template(),
             it->second->listening_address()),
         it->second, false /* delay_unsubscription */);
     listener_watchers_.erase(it);
@@ -1344,8 +1346,8 @@ grpc_server_config_fetcher* grpc_server_config_fetcher_xds_create(
             xds_client.status().ToString().c_str());
     return nullptr;
   }
-  if ((*xds_client)
-          ->bootstrap()
+  if (static_cast<const grpc_core::GrpcXdsBootstrap&>(
+          (*xds_client)->bootstrap())
           .server_listener_resource_name_template()
           .empty()) {
     gpr_log(GPR_ERROR,