grpc 1.58.0 → 1.62.0

data/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c

@@ -0,0 +1,36 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/typed_struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/reflection/def.h"
+#include "xds/type/v3/typed_struct.upbdefs.h"
+#include "xds/type/v3/typed_struct.upb_minitable.h"
+
+extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
+static const char descriptor[254] = {'\n', '\036', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 't', 'y', 'p', 'e', 'd', '_', 's', 't', 'r', 'u', 'c', 
+'t', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\032', '\034', 'g', 'o', 'o', 
+'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', 
+'\"', 'W', '\n', '\013', 'T', 'y', 'p', 'e', 'd', 'S', 't', 'r', 'u', 'c', 't', '\022', '\031', '\n', '\010', 't', 'y', 'p', 'e', '_', 'u', 
+'r', 'l', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', 'r', 'l', '\022', '-', '\n', '\005', 'v', 'a', 'l', 'u', 
+'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
+'.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\005', 'v', 'a', 'l', 'u', 'e', 'B', 'P', '\n', '\026', 'c', 'o', 'm', '.', 'g', 'i', 't', 
+'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', 'B', '\020', 'T', 'y', 'p', 'e', 'd', 'S', 't', 'r', 
+'u', 'c', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'c', 'n', 
+'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', 'b', '\006', 'p', 'r', 
+'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[2] = {
+  &google_protobuf_struct_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init xds_type_v3_typed_struct_proto_upbdefinit = {
+  deps,
+  &xds_type_v3_typed_struct_proto_upb_file_layout,
+  "xds/type/v3/typed_struct.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 254)
+};

data/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h

@@ -0,0 +1,35 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     xds/type/v3/typed_struct.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
+#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+#include "upb/port/def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/reflection/def.h"
+
+#include "upb/port/def.inc"
+
+extern _upb_DefPool_Init xds_type_v3_typed_struct_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_TypedStruct_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_typed_struct_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.TypedStruct");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_ */

data/src/core/ext/xds/certificate_provider_store.cc

@@ -106,7 +106,8 @@ CertificateProviderStore::CreateOrGetCertificateProvider(
       certificate_providers_map_.insert({result->key(), result.get()});
     }
   } else {
-    result = it->second->RefIfNonZero();
+    result =
+        it->second->RefIfNonZero().TakeAsSubclass<CertificateProviderWrapper>();
     if (result == nullptr) {
       result = CreateCertificateProviderLocked(key);
       it->second = result.get();

data/src/core/ext/xds/certificate_provider_store.h

@@ -36,7 +36,6 @@
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/unique_type_name.h"
 #include "src/core/lib/gprpp/validation_errors.h"
-#include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_args.h"
 #include "src/core/lib/json/json_object_loader.h"
@@ -96,10 +95,6 @@ class CertificateProviderStore
       return certificate_provider_->distributor();
     }
 
-    grpc_pollset_set* interested_parties() const override {
-      return certificate_provider_->interested_parties();
-    }
-
     int CompareImpl(const grpc_tls_certificate_provider* other) const override {
       // TODO(yashykt): This should probably delegate to the `Compare` method of
       // the wrapped certificate_provider_ object.

data/src/core/ext/xds/file_watcher_certificate_provider_factory.cc

@@ -21,7 +21,6 @@
 #include "src/core/ext/xds/file_watcher_certificate_provider_factory.h"
 
 #include <algorithm>
-#include <initializer_list>
 #include <map>
 #include <memory>
 #include <vector>

data/src/core/ext/xds/xds_api.cc

@@ -21,7 +21,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ -41,9 +40,9 @@
 #include "google/protobuf/timestamp.upb.h"
 #include "google/rpc/status.upb.h"
 #include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
 #include "upb/reflection/def.h"
 #include "upb/text/encode.h"
-#include "upb/upb.hpp"
 
 #include <grpc/status.h>
 #include <grpc/support/log.h>
@@ -58,12 +57,12 @@
 namespace grpc_core {
 
 XdsApi::XdsApi(XdsClient* client, TraceFlag* tracer,
-               const XdsBootstrap::Node* node, upb::SymbolTable* symtab,
+               const XdsBootstrap::Node* node, upb::DefPool* def_pool,
                std::string user_agent_name, std::string user_agent_version)
     : client_(client),
       tracer_(tracer),
       node_(node),
-      symtab_(symtab),
+      def_pool_(def_pool),
       user_agent_name_(std::move(user_agent_name)),
       user_agent_version_(std::move(user_agent_version)) {}
 
@@ -72,36 +71,33 @@ namespace {
 struct XdsApiContext {
   XdsClient* client;
   TraceFlag* tracer;
-  upb_DefPool* symtab;
+  upb_DefPool* def_pool;
   upb_Arena* arena;
 };
 
-void PopulateMetadataValue(const XdsApiContext& context,
-                           google_protobuf_Value* value_pb, const Json& value);
+void PopulateMetadataValue(google_protobuf_Value* value_pb, const Json& value,
+                           upb_Arena* arena);
 
-void PopulateListValue(const XdsApiContext& context,
-                       google_protobuf_ListValue* list_value,
-                       const Json::Array& values) {
+void PopulateListValue(google_protobuf_ListValue* list_value,
+                       const Json::Array& values, upb_Arena* arena) {
   for (const auto& value : values) {
-    auto* value_pb =
-        google_protobuf_ListValue_add_values(list_value, context.arena);
-    PopulateMetadataValue(context, value_pb, value);
+    auto* value_pb = google_protobuf_ListValue_add_values(list_value, arena);
+    PopulateMetadataValue(value_pb, value, arena);
   }
 }
 
-void PopulateMetadata(const XdsApiContext& context,
-                      google_protobuf_Struct* metadata_pb,
-                      const Json::Object& metadata) {
+void PopulateMetadata(google_protobuf_Struct* metadata_pb,
+                      const Json::Object& metadata, upb_Arena* arena) {
   for (const auto& p : metadata) {
-    google_protobuf_Value* value = google_protobuf_Value_new(context.arena);
-    PopulateMetadataValue(context, value, p.second);
+    google_protobuf_Value* value = google_protobuf_Value_new(arena);
+    PopulateMetadataValue(value, p.second, arena);
     google_protobuf_Struct_fields_set(
-        metadata_pb, StdStringToUpbString(p.first), value, context.arena);
+        metadata_pb, StdStringToUpbString(p.first), value, arena);
   }
 }
 
-void PopulateMetadataValue(const XdsApiContext& context,
-                           google_protobuf_Value* value_pb, const Json& value) {
+void PopulateMetadataValue(google_protobuf_Value* value_pb, const Json& value,
+                           upb_Arena* arena) {
   switch (value.type()) {
     case Json::Type::kNull:
       google_protobuf_Value_set_null_value(value_pb, 0);
@@ -119,74 +115,29 @@ void PopulateMetadataValue(const XdsApiContext& context,
       break;
     case Json::Type::kObject: {
       google_protobuf_Struct* struct_value =
-          google_protobuf_Value_mutable_struct_value(value_pb, context.arena);
-      PopulateMetadata(context, struct_value, value.object());
+          google_protobuf_Value_mutable_struct_value(value_pb, arena);
+      PopulateMetadata(struct_value, value.object(), arena);
       break;
     }
     case Json::Type::kArray: {
       google_protobuf_ListValue* list_value =
-          google_protobuf_Value_mutable_list_value(value_pb, context.arena);
-      PopulateListValue(context, list_value, value.array());
+          google_protobuf_Value_mutable_list_value(value_pb, arena);
+      PopulateListValue(list_value, value.array(), arena);
       break;
     }
   }
 }
 
-void PopulateNode(const XdsApiContext& context, const XdsBootstrap::Node* node,
-                  const std::string& user_agent_name,
-                  const std::string& user_agent_version,
-                  envoy_config_core_v3_Node* node_msg) {
-  if (node != nullptr) {
-    if (!node->id().empty()) {
-      envoy_config_core_v3_Node_set_id(node_msg,
-                                       StdStringToUpbString(node->id()));
-    }
-    if (!node->cluster().empty()) {
-      envoy_config_core_v3_Node_set_cluster(
-          node_msg, StdStringToUpbString(node->cluster()));
-    }
-    if (!node->metadata().empty()) {
-      google_protobuf_Struct* metadata =
-          envoy_config_core_v3_Node_mutable_metadata(node_msg, context.arena);
-      PopulateMetadata(context, metadata, node->metadata());
-    }
-    if (!node->locality_region().empty() || !node->locality_zone().empty() ||
-        !node->locality_sub_zone().empty()) {
-      envoy_config_core_v3_Locality* locality =
-          envoy_config_core_v3_Node_mutable_locality(node_msg, context.arena);
-      if (!node->locality_region().empty()) {
-        envoy_config_core_v3_Locality_set_region(
-            locality, StdStringToUpbString(node->locality_region()));
-      }
-      if (!node->locality_zone().empty()) {
-        envoy_config_core_v3_Locality_set_zone(
-            locality, StdStringToUpbString(node->locality_zone()));
-      }
-      if (!node->locality_sub_zone().empty()) {
-        envoy_config_core_v3_Locality_set_sub_zone(
-            locality, StdStringToUpbString(node->locality_sub_zone()));
-      }
-    }
-  }
-  envoy_config_core_v3_Node_set_user_agent_name(
-      node_msg, StdStringToUpbString(user_agent_name));
-  envoy_config_core_v3_Node_set_user_agent_version(
-      node_msg, StdStringToUpbString(user_agent_version));
-  envoy_config_core_v3_Node_add_client_features(
-      node_msg,
-      upb_StringView_FromString("envoy.lb.does_not_support_overprovisioning"),
-      context.arena);
-}
-
 void MaybeLogDiscoveryRequest(
     const XdsApiContext& context,
     const envoy_service_discovery_v3_DiscoveryRequest* request) {
   if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) &&
       gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
     const upb_MessageDef* msg_type =
-        envoy_service_discovery_v3_DiscoveryRequest_getmsgdef(context.symtab);
+        envoy_service_discovery_v3_DiscoveryRequest_getmsgdef(context.def_pool);
     char buf[10240];
-    upb_TextEncode(request, msg_type, nullptr, 0, buf, sizeof(buf));
+    upb_TextEncode(reinterpret_cast<const upb_Message*>(request), msg_type,
+                   nullptr, 0, buf, sizeof(buf));
     gpr_log(GPR_DEBUG, "[xds_client %p] constructed ADS request: %s",
             context.client, buf);
   }
@@ -203,12 +154,57 @@ std::string SerializeDiscoveryRequest(
 
 }  // namespace
 
+void XdsApi::PopulateNode(envoy_config_core_v3_Node* node_msg,
+                          upb_Arena* arena) {
+  if (node_ != nullptr) {
+    if (!node_->id().empty()) {
+      envoy_config_core_v3_Node_set_id(node_msg,
+                                       StdStringToUpbString(node_->id()));
+    }
+    if (!node_->cluster().empty()) {
+      envoy_config_core_v3_Node_set_cluster(
+          node_msg, StdStringToUpbString(node_->cluster()));
+    }
+    if (!node_->metadata().empty()) {
+      google_protobuf_Struct* metadata =
+          envoy_config_core_v3_Node_mutable_metadata(node_msg, arena);
+      PopulateMetadata(metadata, node_->metadata(), arena);
+    }
+    if (!node_->locality_region().empty() || !node_->locality_zone().empty() ||
+        !node_->locality_sub_zone().empty()) {
+      envoy_config_core_v3_Locality* locality =
+          envoy_config_core_v3_Node_mutable_locality(node_msg, arena);
+      if (!node_->locality_region().empty()) {
+        envoy_config_core_v3_Locality_set_region(
+            locality, StdStringToUpbString(node_->locality_region()));
+      }
+      if (!node_->locality_zone().empty()) {
+        envoy_config_core_v3_Locality_set_zone(
+            locality, StdStringToUpbString(node_->locality_zone()));
+      }
+      if (!node_->locality_sub_zone().empty()) {
+        envoy_config_core_v3_Locality_set_sub_zone(
+            locality, StdStringToUpbString(node_->locality_sub_zone()));
+      }
+    }
+  }
+  envoy_config_core_v3_Node_set_user_agent_name(
+      node_msg, StdStringToUpbString(user_agent_name_));
+  envoy_config_core_v3_Node_set_user_agent_version(
+      node_msg, StdStringToUpbString(user_agent_version_));
+  envoy_config_core_v3_Node_add_client_features(
+      node_msg,
+      upb_StringView_FromString("envoy.lb.does_not_support_overprovisioning"),
+      arena);
+}
+
 std::string XdsApi::CreateAdsRequest(
     absl::string_view type_url, absl::string_view version,
     absl::string_view nonce, const std::vector<std::string>& resource_names,
     absl::Status status, bool populate_node) {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
+                                 arena.ptr()};
   // Create a request.
   envoy_service_discovery_v3_DiscoveryRequest* request =
       envoy_service_discovery_v3_DiscoveryRequest_new(arena.ptr());
@@ -248,8 +244,7 @@ std::string XdsApi::CreateAdsRequest(
     envoy_config_core_v3_Node* node_msg =
         envoy_service_discovery_v3_DiscoveryRequest_mutable_node(request,
                                                                  arena.ptr());
-    PopulateNode(context, node_, user_agent_name_, user_agent_version_,
-                 node_msg);
+    PopulateNode(node_msg, arena.ptr());
     envoy_config_core_v3_Node_add_client_features(
         node_msg, upb_StringView_FromString("xds.config.resource-in-sotw"),
         context.arena);
@@ -271,9 +266,11 @@ void MaybeLogDiscoveryResponse(
   if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) &&
       gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
     const upb_MessageDef* msg_type =
-        envoy_service_discovery_v3_DiscoveryResponse_getmsgdef(context.symtab);
+        envoy_service_discovery_v3_DiscoveryResponse_getmsgdef(
+            context.def_pool);
     char buf[10240];
-    upb_TextEncode(response, msg_type, nullptr, 0, buf, sizeof(buf));
+    upb_TextEncode(reinterpret_cast<const upb_Message*>(response), msg_type,
+                   nullptr, 0, buf, sizeof(buf));
     gpr_log(GPR_DEBUG, "[xds_client %p] received response: %s", context.client,
             buf);
   }
@@ -284,7 +281,8 @@ void MaybeLogDiscoveryResponse(
 absl::Status XdsApi::ParseAdsResponse(absl::string_view encoded_response,
                                       AdsResponseParserInterface* parser) {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
+                                 arena.ptr()};
   // Decode the response.
   const envoy_service_discovery_v3_DiscoveryResponse* response =
       envoy_service_discovery_v3_DiscoveryResponse_parse(
@@ -357,9 +355,11 @@ void MaybeLogLrsRequest(
   if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) &&
       gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
     const upb_MessageDef* msg_type =
-        envoy_service_load_stats_v3_LoadStatsRequest_getmsgdef(context.symtab);
+        envoy_service_load_stats_v3_LoadStatsRequest_getmsgdef(
+            context.def_pool);
     char buf[10240];
-    upb_TextEncode(request, msg_type, nullptr, 0, buf, sizeof(buf));
+    upb_TextEncode(reinterpret_cast<const upb_Message*>(request), msg_type,
+                   nullptr, 0, buf, sizeof(buf));
     gpr_log(GPR_DEBUG, "[xds_client %p] constructed LRS request: %s",
             context.client, buf);
   }
@@ -378,7 +378,8 @@ std::string SerializeLrsRequest(
 
 std::string XdsApi::CreateLrsInitialRequest() {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
+                                 arena.ptr()};
   // Create a request.
   envoy_service_load_stats_v3_LoadStatsRequest* request =
       envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr());
@@ -386,7 +387,7 @@ std::string XdsApi::CreateLrsInitialRequest() {
   envoy_config_core_v3_Node* node_msg =
       envoy_service_load_stats_v3_LoadStatsRequest_mutable_node(request,
                                                                 arena.ptr());
-  PopulateNode(context, node_, user_agent_name_, user_agent_version_, node_msg);
+  PopulateNode(node_msg, arena.ptr());
   envoy_config_core_v3_Node_add_client_features(
       node_msg,
       upb_StringView_FromString("envoy.lrs.supports_send_all_clusters"),
@@ -448,7 +449,8 @@ void LocalityStatsPopulate(
 std::string XdsApi::CreateLrsRequest(
     ClusterLoadReportMap cluster_load_report_map) {
   upb::Arena arena;
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
+                                 arena.ptr()};
   // Create a request.
   envoy_service_load_stats_v3_LoadStatsRequest* request =
       envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr());
@@ -515,9 +517,11 @@ void MaybeLogLrsResponse(
   if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) &&
       gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) {
     const upb_MessageDef* msg_type =
-        envoy_service_load_stats_v3_LoadStatsResponse_getmsgdef(context.symtab);
+        envoy_service_load_stats_v3_LoadStatsResponse_getmsgdef(
+            context.def_pool);
     char buf[10240];
-    upb_TextEncode(response, msg_type, nullptr, 0, buf, sizeof(buf));
+    upb_TextEncode(reinterpret_cast<const upb_Message*>(response), msg_type,
+                   nullptr, 0, buf, sizeof(buf));
     gpr_log(GPR_DEBUG, "[xds_client %p] received LRS response: %s",
             context.client, buf);
   }
@@ -538,7 +542,8 @@ absl::Status XdsApi::ParseLrsResponse(absl::string_view encoded_response,
   if (decoded_response == nullptr) {
     return absl::UnavailableError("Can't decode response.");
   }
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
+  const XdsApiContext context = {client_, tracer_, def_pool_->ptr(),
+                                 arena.ptr()};
   MaybeLogLrsResponse(context, decoded_response);
   // Check send_all_clusters.
   if (envoy_service_load_stats_v3_LoadStatsResponse_send_all_clusters(
@@ -564,84 +569,4 @@ absl::Status XdsApi::ParseLrsResponse(absl::string_view encoded_response,
   return absl::OkStatus();
 }
 
-namespace {
-
-google_protobuf_Timestamp* EncodeTimestamp(const XdsApiContext& context,
-                                           Timestamp value) {
-  google_protobuf_Timestamp* timestamp =
-      google_protobuf_Timestamp_new(context.arena);
-  gpr_timespec timespec = value.as_timespec(GPR_CLOCK_REALTIME);
-  google_protobuf_Timestamp_set_seconds(timestamp, timespec.tv_sec);
-  google_protobuf_Timestamp_set_nanos(timestamp, timespec.tv_nsec);
-  return timestamp;
-}
-
-}  // namespace
-
-std::string XdsApi::AssembleClientConfig(
-    const ResourceTypeMetadataMap& resource_type_metadata_map) {
-  upb::Arena arena;
-  // Create the ClientConfig for resource metadata from XdsClient
-  auto* client_config = envoy_service_status_v3_ClientConfig_new(arena.ptr());
-  // Fill-in the node information
-  auto* node = envoy_service_status_v3_ClientConfig_mutable_node(client_config,
-                                                                 arena.ptr());
-  const XdsApiContext context = {client_, tracer_, symtab_->ptr(), arena.ptr()};
-  PopulateNode(context, node_, user_agent_name_, user_agent_version_, node);
-  // Dump each resource.
-  std::vector<std::string> type_url_storage;
-  for (const auto& p : resource_type_metadata_map) {
-    absl::string_view type_url = p.first;
-    const ResourceMetadataMap& resource_metadata_map = p.second;
-    type_url_storage.emplace_back(
-        absl::StrCat("type.googleapis.com/", type_url));
-    for (const auto& q : resource_metadata_map) {
-      absl::string_view resource_name = q.first;
-      const ResourceMetadata& metadata = *q.second;
-      auto* entry =
-          envoy_service_status_v3_ClientConfig_add_generic_xds_configs(
-              client_config, context.arena);
-      envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_type_url(
-          entry, StdStringToUpbString(type_url_storage.back()));
-      envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_name(
-          entry, StdStringToUpbString(resource_name));
-      envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_client_status(
-          entry, metadata.client_status);
-      if (!metadata.serialized_proto.empty()) {
-        envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_version_info(
-            entry, StdStringToUpbString(metadata.version));
-        envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_last_updated(
-            entry, EncodeTimestamp(context, metadata.update_time));
-        auto* any_field =
-            envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_xds_config(
-                entry, context.arena);
-        google_protobuf_Any_set_type_url(
-            any_field, StdStringToUpbString(type_url_storage.back()));
-        google_protobuf_Any_set_value(
-            any_field, StdStringToUpbString(metadata.serialized_proto));
-      }
-      if (metadata.client_status == XdsApi::ResourceMetadata::NACKED) {
-        auto* update_failure_state =
-            envoy_admin_v3_UpdateFailureState_new(context.arena);
-        envoy_admin_v3_UpdateFailureState_set_details(
-            update_failure_state,
-            StdStringToUpbString(metadata.failed_details));
-        envoy_admin_v3_UpdateFailureState_set_version_info(
-            update_failure_state,
-            StdStringToUpbString(metadata.failed_version));
-        envoy_admin_v3_UpdateFailureState_set_last_update_attempt(
-            update_failure_state,
-            EncodeTimestamp(context, metadata.failed_update_time));
-        envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_error_state(
-            entry, update_failure_state);
-      }
-    }
-  }
-  // Serialize the upb message to bytes
-  size_t output_length;
-  char* output = envoy_service_status_v3_ClientConfig_serialize(
-      client_config, arena.ptr(), &output_length);
-  return std::string(output, output_length);
-}
-
 }  // namespace grpc_core

data/src/core/ext/xds/xds_api.h

@@ -30,6 +30,7 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "envoy/admin/v3/config_dump_shared.upb.h"
+#include "envoy/service/status/v3/csds.upb.h"
 #include "upb/mem/arena.h"
 #include "upb/reflection/def.hpp"
 
@@ -126,10 +127,6 @@ class XdsApi {
     // Timestamp of the last failed update attempt.
     Timestamp failed_update_time;
   };
-  using ResourceMetadataMap =
-      std::map<std::string /*resource_name*/, const ResourceMetadata*>;
-  using ResourceTypeMetadataMap =
-      std::map<absl::string_view /*type_url*/, ResourceMetadataMap>;
   static_assert(static_cast<ResourceMetadata::ClientResourceStatus>(
                     envoy_admin_v3_REQUESTED) ==
                     ResourceMetadata::ClientResourceStatus::REQUESTED,
@@ -148,7 +145,7 @@ class XdsApi {
                 "");
 
   XdsApi(XdsClient* client, TraceFlag* tracer, const XdsBootstrap::Node* node,
-         upb::SymbolTable* symtab, std::string user_agent_name,
+         upb::DefPool* def_pool, std::string user_agent_name,
          std::string user_agent_version);
 
   // Creates an ADS request.
@@ -176,15 +173,13 @@ class XdsApi {
                                 std::set<std::string>* cluster_names,
                                 Duration* load_reporting_interval);
 
-  // Assemble the client config proto message and return the serialized result.
-  std::string AssembleClientConfig(
-      const ResourceTypeMetadataMap& resource_type_metadata_map);
+  void PopulateNode(envoy_config_core_v3_Node* node_msg, upb_Arena* arena);
 
  private:
   XdsClient* client_;
   TraceFlag* tracer_;
   const XdsBootstrap::Node* node_;  // Do not own.
-  upb::SymbolTable* symtab_;        // Do not own.
+  upb::DefPool* def_pool_;          // Do not own.
   const std::string user_agent_name_;
   const std::string user_agent_version_;
 };

data/src/core/ext/xds/xds_bootstrap.h

@@ -50,9 +50,15 @@ class XdsBootstrap {
 
     virtual bool Equals(const XdsServer& other) const = 0;
 
+    // Returns a key to be used for uniquely identifying this XdsServer.
+    virtual std::string Key() const = 0;
+
     friend bool operator==(const XdsServer& a, const XdsServer& b) {
       return a.Equals(b);
     }
+    friend bool operator!=(const XdsServer& a, const XdsServer& b) {
+      return !a.Equals(b);
+    }
   };
 
   class Authority {
@@ -77,10 +83,6 @@ class XdsBootstrap {
   // Returns a pointer to the specified authority, or null if it does
   // not exist in this bootstrap config.
   virtual const Authority* LookupAuthority(const std::string& name) const = 0;
-
-  // If the server exists in the bootstrap config, returns a pointer to
-  // the XdsServer instance in the config.  Otherwise, returns null.
-  virtual const XdsServer* FindXdsServer(const XdsServer& server) const = 0;
 };
 
 }  // namespace grpc_core

data/src/core/ext/xds/xds_bootstrap_grpc.cc

@@ -21,7 +21,6 @@
 #include <stdlib.h>
 
 #include <algorithm>
-#include <initializer_list>
 #include <set>
 #include <utility>
 #include <vector>
@@ -102,6 +101,10 @@ bool GrpcXdsBootstrap::GrpcXdsServer::Equals(const XdsServer& other) const {
           server_features_ == o.server_features_);
 }
 
+std::string GrpcXdsBootstrap::GrpcXdsServer::Key() const {
+  return JsonDump(ToJson());
+}
+
 const JsonLoaderInterface* GrpcXdsBootstrap::GrpcXdsServer::JsonLoader(
     const JsonArgs&) {
   static const auto* loader =
@@ -359,19 +362,4 @@ const XdsBootstrap::Authority* GrpcXdsBootstrap::LookupAuthority(
   return nullptr;
 }
 
-const XdsBootstrap::XdsServer* GrpcXdsBootstrap::FindXdsServer(
-    const XdsBootstrap::XdsServer& server) const {
-  if (static_cast<const GrpcXdsServer&>(server) == servers_[0]) {
-    return &servers_[0];
-  }
-  for (auto& p : authorities_) {
-    const auto* authority_server =
-        static_cast<const GrpcXdsServer*>(p.second.server());
-    if (authority_server != nullptr && *authority_server == server) {
-      return authority_server;
-    }
-  }
-  return nullptr;
-}
-
 }  // namespace grpc_core

data/src/core/ext/xds/xds_bootstrap_grpc.h

@@ -84,6 +84,8 @@ class GrpcXdsBootstrap : public XdsBootstrap {
 
     bool Equals(const XdsServer& other) const override;
 
+    std::string Key() const override;
+
     RefCountedPtr<ChannelCredsConfig> channel_creds_config() const {
       return channel_creds_config_;
     }
@@ -132,7 +134,6 @@ class GrpcXdsBootstrap : public XdsBootstrap {
     return node_.has_value() ? &*node_ : nullptr;
   }
   const Authority* LookupAuthority(const std::string& name) const override;
-  const XdsServer* FindXdsServer(const XdsServer& server) const override;
 
   const std::string& client_default_listener_resource_name_template() const {
     return client_default_listener_resource_name_template_;