Change upb C generated map iteration function to not hand out MapEntry pointers.

Users relying on internal upb functions may be broken as these are meant to be *internal*. In the interim,  users may need to update their code by using the new Map iteration API.

PiperOrigin-RevId: 730929091

Author: gRPC Team Bot

src/core/lib/security/authorization/cel_authorization_engine.cc

@@ -69,29 +69,33 @@ CelAuthorizationEngine::CelAuthorizationEngine(
     // Extract array of policies and store their condition fields in either
     // allow_if_matched_ or deny_if_matched_, depending on the policy action.
     upb::Arena temp_arena;
-    size_t policy_num = kUpb_Map_Begin;
-    const envoy_config_rbac_v3_RBAC_PoliciesEntry* policy_entry;
-    while ((policy_entry = envoy_config_rbac_v3_RBAC_policies_next(
-                rbac_policy, &policy_num)) != nullptr) {
-      const upb_StringView policy_name_strview =
-          envoy_config_rbac_v3_RBAC_PoliciesEntry_key(policy_entry);
-      const std::string policy_name(policy_name_strview.data,
-                                    policy_name_strview.size);
-      const envoy_config_rbac_v3_Policy* policy =
-          envoy_config_rbac_v3_RBAC_PoliciesEntry_value(policy_entry);
-      const google_api_expr_v1alpha1_Expr* condition =
-          envoy_config_rbac_v3_Policy_condition(policy);
-      // Parse condition to make a pointer tied to the lifetime of arena_.
-      size_t serial_len;
-      const char* serialized = google_api_expr_v1alpha1_Expr_serialize(
-          condition, temp_arena.ptr(), &serial_len);
-      const google_api_expr_v1alpha1_Expr* parsed_condition =
-          google_api_expr_v1alpha1_Expr_parse(serialized, serial_len,
-                                              arena_.ptr());
-      if (envoy_config_rbac_v3_RBAC_action(rbac_policy) == kAllow) {
-        allow_if_matched_.insert(std::pair(policy_name, parsed_condition));
-      } else {
-        deny_if_matched_.insert(std::pair(policy_name, parsed_condition));
+    // TODO(b/397931390): Clean up the code after gRPC OSS migrates to proto
+    // v30.0.
+    const upb_Map* upb_map =
+        _envoy_config_rbac_v3_RBAC_policies_upb_map(rbac_policy);
+    if (upb_map) {
+      size_t policy_num = kUpb_Map_Begin;
+      upb_MessageValue k, v;
+      while (upb_Map_Next(upb_map, &k, &v, &policy_num)) {
+        upb_StringView policy_name_strview = k.str_val;
+        const envoy_config_rbac_v3_Policy* policy =
+            (envoy_config_rbac_v3_Policy*)v.msg_val;
+        const std::string policy_name(policy_name_strview.data,
+                                      policy_name_strview.size);
+        const google_api_expr_v1alpha1_Expr* condition =
+            envoy_config_rbac_v3_Policy_condition(policy);
+        // Parse condition to make a pointer tied to the lifetime of arena_.
+        size_t serial_len;
+        const char* serialized = google_api_expr_v1alpha1_Expr_serialize(
+            condition, temp_arena.ptr(), &serial_len);
+        const google_api_expr_v1alpha1_Expr* parsed_condition =
+            google_api_expr_v1alpha1_Expr_parse(serialized, serial_len,
+                                                arena_.ptr());
+        if (envoy_config_rbac_v3_RBAC_action(rbac_policy) == kAllow) {
+          allow_if_matched_.insert(std::pair(policy_name, parsed_condition));
+        } else {
+          deny_if_matched_.insert(std::pair(policy_name, parsed_condition));
+        }
       }
     }
   }

src/core/load_balancing/backend_metric_parser.cc

@@ -31,23 +31,23 @@ namespace grpc_core {
 
 namespace {
 
-template <typename EntryType>
+// TODO(b/397931390): Clean up the code after gRPC OSS migrates to proto v30.0.
 std::map<absl::string_view, double> ParseMap(
     xds_data_orca_v3_OrcaLoadReport* msg,
-    const EntryType* (*entry_func)(const xds_data_orca_v3_OrcaLoadReport*,
-                                   size_t*),
-    upb_StringView (*key_func)(const EntryType*),
-    double (*value_func)(const EntryType*),
+    const upb_Map* (*upb_map_func)(xds_data_orca_v3_OrcaLoadReport*),
     BackendMetricAllocatorInterface* allocator) {
+  const upb_Map* map = upb_map_func(msg);
   std::map<absl::string_view, double> result;
-  size_t i = kUpb_Map_Begin;
-  while (true) {
-    const auto* entry = entry_func(msg, &i);
-    if (entry == nullptr) break;
-    upb_StringView key_view = key_func(entry);
-    char* key = allocator->AllocateString(key_view.size);
-    memcpy(key, key_view.data, key_view.size);
-    result[absl::string_view(key, key_view.size)] = value_func(entry);
+  if (map) {
+    size_t i = kUpb_Map_Begin;
+    upb_MessageValue k, v;
+    while (upb_Map_Next(map, &k, &v, &i)) {
+      upb_StringView key_view = k.str_val;
+      double value = v.double_val;
+      char* key = allocator->AllocateString(key_view.size);
+      memcpy(key, key_view.data, key_view.size);
+      result[absl::string_view(key, key_view.size)] = value;
+    }
   }
   return result;
 }
@@ -73,21 +73,14 @@ const BackendMetricData* ParseBackendMetricData(
   backend_metric_data->qps =
       xds_data_orca_v3_OrcaLoadReport_rps_fractional(msg);
   backend_metric_data->eps = xds_data_orca_v3_OrcaLoadReport_eps(msg);
-  backend_metric_data->request_cost =
-      ParseMap<xds_data_orca_v3_OrcaLoadReport_RequestCostEntry>(
-          msg, xds_data_orca_v3_OrcaLoadReport_request_cost_next,
-          xds_data_orca_v3_OrcaLoadReport_RequestCostEntry_key,
-          xds_data_orca_v3_OrcaLoadReport_RequestCostEntry_value, allocator);
-  backend_metric_data->utilization =
-      ParseMap<xds_data_orca_v3_OrcaLoadReport_UtilizationEntry>(
-          msg, xds_data_orca_v3_OrcaLoadReport_utilization_next,
-          xds_data_orca_v3_OrcaLoadReport_UtilizationEntry_key,
-          xds_data_orca_v3_OrcaLoadReport_UtilizationEntry_value, allocator);
-  backend_metric_data->named_metrics =
-      ParseMap<xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry>(
-          msg, xds_data_orca_v3_OrcaLoadReport_named_metrics_next,
-          xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_key,
-          xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_value, allocator);
+  // TODO(b/397931390): Clean up the code after gRPC OSS migrates to proto
+  // v30.0.
+  backend_metric_data->request_cost = ParseMap(
+      msg, _xds_data_orca_v3_OrcaLoadReport_request_cost_upb_map, allocator);
+  backend_metric_data->utilization = ParseMap(
+      msg, _xds_data_orca_v3_OrcaLoadReport_utilization_upb_map, allocator);
+  backend_metric_data->named_metrics = ParseMap(
+      msg, _xds_data_orca_v3_OrcaLoadReport_named_metrics_upb_map, allocator);
   return backend_metric_data;
 }
 

src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc

@@ -347,22 +347,22 @@ tsi_result alts_tsi_handshaker_result_create(grpc_gcp_HandshakerResp* resp,
     return TSI_FAILED_PRECONDITION;
   }
   if (grpc_gcp_Identity_attributes_size(identity) != 0) {
-    size_t iter = kUpb_Map_Begin;
-    grpc_gcp_Identity_AttributesEntry* peer_attributes_entry =
-        grpc_gcp_Identity_attributes_nextmutable(peer_identity, &iter);
-    while (peer_attributes_entry != nullptr) {
-      upb_StringView key = grpc_gcp_Identity_AttributesEntry_key(
-          const_cast<grpc_gcp_Identity_AttributesEntry*>(
-              peer_attributes_entry));
-      upb_StringView val = grpc_gcp_Identity_AttributesEntry_value(
-          const_cast<grpc_gcp_Identity_AttributesEntry*>(
-              peer_attributes_entry));
-      grpc_gcp_AltsContext_peer_attributes_set(context, key, val,
-                                               context_arena.ptr());
-      peer_attributes_entry =
-          grpc_gcp_Identity_attributes_nextmutable(peer_identity, &iter);
+    // TODO(b/397931390): Clean up the code after gRPC OSS migrates to proto
+    // v30.0.
+    const upb_Map* upb_map =
+        _grpc_gcp_Identity_attributes_upb_map(peer_identity);
+    if (upb_map) {
+      size_t iter = kUpb_Map_Begin;
+      upb_MessageValue k, v;
+      while (upb_Map_Next(upb_map, &k, &v, &iter)) {
+        upb_StringView key = k.str_val;
+        upb_StringView val = v.str_val;
+        grpc_gcp_AltsContext_peer_attributes_set(context, key, val,
+                                                 context_arena.ptr());
+      }
     }
   }
+
   size_t serialized_ctx_length;
   char* serialized_ctx = grpc_gcp_AltsContext_serialize(
       context, context_arena.ptr(), &serialized_ctx_length);

src/core/xds/grpc/xds_http_rbac_filter.cc

@@ -52,6 +52,8 @@
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "src/core/xds/xds_client/xds_client.h"
+#include "upb/base/string_view.h"
+#include "upb/message/array.h"
 #include "upb/message/map.h"
 
 namespace grpc_core {
@@ -450,19 +452,24 @@ Json ParseHttpRbacToJson(const XdsResourceType::DecodeContext& context,
         "action", Json::FromNumber(envoy_config_rbac_v3_RBAC_action(rules)));
     if (envoy_config_rbac_v3_RBAC_policies_size(rules) != 0) {
       Json::Object policies_object;
-      size_t iter = kUpb_Map_Begin;
-      while (true) {
-        auto* entry = envoy_config_rbac_v3_RBAC_policies_next(rules, &iter);
-        if (entry == nullptr) {
-          break;
+      // TODO(b/397931390): Clean up the code after gRPC OSS migrates to proto
+      // v30.0.
+      envoy_config_rbac_v3_RBAC* rules_upb = (envoy_config_rbac_v3_RBAC*)rules;
+      const upb_Map* rules_upb_map =
+          _envoy_config_rbac_v3_RBAC_policies_upb_map(rules_upb);
+      if (rules_upb_map) {
+        size_t iter = kUpb_Map_Begin;
+        upb_MessageValue k, v;
+        while (upb_Map_Next(rules_upb_map, &k, &v, &iter)) {
+          upb_StringView key_view = k.str_val;
+          const envoy_config_rbac_v3_Policy* val =
+              (envoy_config_rbac_v3_Policy*)v.msg_val;
+          absl::string_view key = UpbStringToAbsl(key_view);
+          ValidationErrors::ScopedField field(
+              errors, absl::StrCat(".policies[", key, "]"));
+          Json policy = ParsePolicyToJson(val, errors);
+          policies_object.emplace(std::string(key), std::move(policy));
         }
-        absl::string_view key =
-            UpbStringToAbsl(envoy_config_rbac_v3_RBAC_PoliciesEntry_key(entry));
-        ValidationErrors::ScopedField field(
-            errors, absl::StrCat(".policies[", key, "]"));
-        Json policy = ParsePolicyToJson(
-            envoy_config_rbac_v3_RBAC_PoliciesEntry_value(entry), errors);
-        policies_object.emplace(std::string(key), std::move(policy));
       }
       inner_rbac_json.emplace("policies",
                               Json::FromObject(std::move(policies_object)));

src/core/xds/grpc/xds_metadata_parser.cc

@@ -34,6 +34,9 @@
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "upb/base/string_view.h"
+#include "upb/message/array.h"
+#include "upb/message/map.h"
+#include "upb/message/message.h"
 #include "upb/text/encode.h"
 
 namespace grpc_core {
@@ -126,56 +129,66 @@ XdsMetadataMap ParseXdsMetadataMap(
   XdsMetadataMap metadata_map;
   if (metadata == nullptr) return metadata_map;  // Not present == empty.
   // First, try typed_filter_metadata.
-  size_t iter = kUpb_Map_Begin;
-  const envoy_config_core_v3_Metadata_TypedFilterMetadataEntry* typed_entry;
-  while (
-      (typed_entry = envoy_config_core_v3_Metadata_typed_filter_metadata_next(
-           metadata, &iter)) != nullptr) {
-    absl::string_view key = UpbStringToAbsl(
-        envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_key(
-            typed_entry));
-    ValidationErrors::ScopedField field(
-        errors, absl::StrCat(".typed_filter_metadata[", key, "]"));
-    auto extension = ExtractXdsExtension(
-        context,
-        envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_value(
-            typed_entry),
-        errors);
-    if (!extension.has_value()) continue;
-    // TODO(roth): If we start to need a lot of types here, refactor
-    // this into a separate registry.
-    std::unique_ptr<XdsMetadataValue> metadata_value;
-    if (XdsGcpAuthFilterEnabled() &&
-        extension->type == XdsGcpAuthnAudienceMetadataValue::Type()) {
-      metadata_value =
-          ParseGcpAuthnAudience(context, std::move(*extension), errors);
-    } else if (XdsHttpConnectEnabled() &&
-               extension->type == XdsAddressMetadataValue::Type()) {
-      metadata_value = ParseAddress(context, std::move(*extension), errors);
-    }
-    if (metadata_value != nullptr) {
-      metadata_map.Insert(key, std::move(metadata_value));
+  // TODO(b/397931390): Clean up the code after gRPC OSS migrates to proto
+  // v30.0.
+  envoy_config_core_v3_Metadata* metadata_upb =
+      (envoy_config_core_v3_Metadata*)metadata;
+  const upb_Map* typed_filter_metadata_upb_map =
+      _envoy_config_core_v3_Metadata_typed_filter_metadata_upb_map(
+          metadata_upb);
+  if (typed_filter_metadata_upb_map) {
+    size_t iter = kUpb_Map_Begin;
+    upb_MessageValue k, v;
+    while (upb_Map_Next(typed_filter_metadata_upb_map, &k, &v, &iter)) {
+      upb_StringView typed_filter_metadata_key_view = k.str_val;
+      const google_protobuf_Any* typed_filter_metadata_val =
+          (google_protobuf_Any*)v.msg_val;
+      absl::string_view key = UpbStringToAbsl(typed_filter_metadata_key_view);
+      ValidationErrors::ScopedField field(
+          errors, absl::StrCat(".typed_filter_metadata[", key, "]"));
+      auto extension =
+          ExtractXdsExtension(context, typed_filter_metadata_val, errors);
+      if (!extension.has_value()) continue;
+      // TODO(roth): If we start to need a lot of types here, refactor
+      // this into a separate registry.
+      std::unique_ptr<XdsMetadataValue> metadata_value;
+      if (XdsGcpAuthFilterEnabled() &&
+          extension->type == XdsGcpAuthnAudienceMetadataValue::Type()) {
+        metadata_value =
+            ParseGcpAuthnAudience(context, std::move(*extension), errors);
+      } else if (XdsHttpConnectEnabled() &&
+                 extension->type == XdsAddressMetadataValue::Type()) {
+        metadata_value = ParseAddress(context, std::move(*extension), errors);
+      }
+      if (metadata_value != nullptr) {
+        metadata_map.Insert(key, std::move(metadata_value));
+      }
     }
   }
   // Then, try filter_metadata.
-  iter = kUpb_Map_Begin;
-  const envoy_config_core_v3_Metadata_FilterMetadataEntry* entry;
-  while ((entry = envoy_config_core_v3_Metadata_filter_metadata_next(
-              metadata, &iter)) != nullptr) {
-    absl::string_view key = UpbStringToAbsl(
-        envoy_config_core_v3_Metadata_FilterMetadataEntry_key(entry));
-    auto json = ParseProtobufStructToJson(
-        context,
-        envoy_config_core_v3_Metadata_FilterMetadataEntry_value(entry));
-    if (!json.ok()) {
-      ValidationErrors::ScopedField field(
-          errors, absl::StrCat(".filter_metadata[", key, "]"));
-      errors->AddError(json.status().message());
-    }
-    // Add only if not already added from typed_filter_metadata.
-    else if (metadata_map.Find(key) == nullptr) {
-      metadata_map.Insert(
-          key, std::make_unique<XdsStructMetadataValue>(std::move(*json)));
+  // TODO(b/397931390): Clean up the code after gRPC OSS migrates to proto
+  // v30.0.
+  const upb_Map* filter_metadata_upb_map =
+      _envoy_config_core_v3_Metadata_filter_metadata_upb_map(metadata_upb);
+  if (filter_metadata_upb_map) {
+    size_t iter = kUpb_Map_Begin;
+    upb_MessageValue k, v;
+    while (upb_Map_Next(filter_metadata_upb_map, &k, &v, &iter)) {
+      upb_StringView filter_metadata_key_view = k.str_val;
+      const google_protobuf_Struct* filter_metadata_val =
+          (google_protobuf_Struct*)v.msg_val;
+      absl::string_view key = UpbStringToAbsl(filter_metadata_key_view);
+      auto json = ParseProtobufStructToJson(context, filter_metadata_val);
+      if (!json.ok()) {
+        ValidationErrors::ScopedField field(
+            errors, absl::StrCat(".filter_metadata[", key, "]"));
+        errors->AddError(json.status().message());
+      }
+      // Add only if not already added from typed_filter_metadata.
+      else if (metadata_map.Find(key) == nullptr) {
+        metadata_map.Insert(
+            key, std::make_unique<XdsStructMetadataValue>(std::move(*json)));
+      }
     }
   }
   return metadata_map;