grpc 1.72.0 → 1.73.0

data/src/core/xds/grpc/xds_common_types_parser.cc

@@ -113,14 +113,6 @@ std::optional<grpc_resolved_address> ParseXdsAddress(
 
 namespace {
 
-bool XdsSystemRootCertsEnabled() {
-  auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_SYSTEM_ROOT_CERTS");
-  if (!value.has_value()) return false;
-  bool parsed_value;
-  bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
-  return parse_succeeded && parsed_value;
-}
-
 // CertificateProviderInstance is deprecated but we are still supporting it for
 // backward compatibility reasons. Note that we still parse the data into the
 // same CertificateProviderPluginInstance struct since the fields are the same.
@@ -250,7 +242,7 @@ CertificateValidationContextParse(
     certificate_validation_context.ca_certs =
         CertificateProviderPluginInstanceParse(
             context, ca_certificate_provider_instance, errors);
-  } else if (XdsSystemRootCertsEnabled()) {
+  } else {
     auto* system_root_certs =
         envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_system_root_certs(
             certificate_validation_context_proto);

data/src/core/xds/grpc/xds_http_filter_registry.cc

@@ -90,9 +90,7 @@ XdsHttpFilterRegistry::XdsHttpFilterRegistry(bool register_builtins) {
     RegisterFilter(std::make_unique<XdsHttpFaultFilter>());
     RegisterFilter(std::make_unique<XdsHttpRbacFilter>());
     RegisterFilter(std::make_unique<XdsHttpStatefulSessionFilter>());
-    if (XdsGcpAuthFilterEnabled()) {
-      RegisterFilter(std::make_unique<XdsHttpGcpAuthnFilter>());
-    }
+    RegisterFilter(std::make_unique<XdsHttpGcpAuthnFilter>());
   }
 }
 

data/src/core/xds/grpc/xds_http_rbac_filter.cc

@@ -452,24 +452,17 @@ 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;
-      // 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));
-        }
+      size_t iter = kUpb_Map_Begin;
+      upb_StringView key_view;
+      const envoy_config_rbac_v3_Policy* val;
+      while (envoy_config_rbac_v3_RBAC_policies_next(rules_upb, &key_view, &val,
+                                                     &iter)) {
+        absl::string_view key = UpbStringToAbsl(key_view);
+        ValidationErrors::ScopedField field(
+            errors, absl::StrCat(".policies[", key, "]"));
+        Json policy = ParsePolicyToJson(val, errors);
+        policies_object.emplace(key, std::move(policy));
       }
       inner_rbac_json.emplace("policies",
                               Json::FromObject(std::move(policies_object)));

data/src/core/xds/grpc/xds_metadata_parser.cc

@@ -41,15 +41,6 @@
 
 namespace grpc_core {
 
-// TODO(roth): Remove this once GCP auth filter support is stable.
-bool XdsGcpAuthFilterEnabled() {
-  auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_GCP_AUTHENTICATION_FILTER");
-  if (!value.has_value()) return false;
-  bool parsed_value;
-  bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
-  return parse_succeeded && parsed_value;
-}
-
 namespace {
 
 std::unique_ptr<XdsMetadataValue> ParseGcpAuthnAudience(
@@ -129,66 +120,51 @@ XdsMetadataMap ParseXdsMetadataMap(
   XdsMetadataMap metadata_map;
   if (metadata == nullptr) return metadata_map;  // Not present == empty.
   // First, try typed_filter_metadata.
-  // 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));
-      }
+  size_t iter = kUpb_Map_Begin;
+  upb_StringView typed_filter_metadata_key_view;
+  const google_protobuf_Any* typed_filter_metadata_val;
+  while (envoy_config_core_v3_Metadata_typed_filter_metadata_next(
+      metadata_upb, &typed_filter_metadata_key_view, &typed_filter_metadata_val,
+      &iter)) {
+    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 (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.
-  // 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)));
-      }
+  size_t iter2 = kUpb_Map_Begin;
+  upb_StringView filter_metadata_key_view;
+  const google_protobuf_Struct* filter_metadata_val;
+  while (envoy_config_core_v3_Metadata_filter_metadata_next(
+      metadata_upb, &filter_metadata_key_view, &filter_metadata_val, &iter2)) {
+    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;

data/src/core/xds/grpc/xds_metadata_parser.h

@@ -24,8 +24,6 @@
 
 namespace grpc_core {
 
-bool XdsGcpAuthFilterEnabled();
-
 XdsMetadataMap ParseXdsMetadataMap(
     const XdsResourceType::DecodeContext& context,
     const envoy_config_core_v3_Metadata* metadata, ValidationErrors* errors);

data/src/core/xds/grpc/xds_route_config_parser.cc

@@ -88,15 +88,6 @@ bool XdsRlsEnabled() {
   return parse_succeeded && parsed_value;
 }
 
-// TODO(roth): Remove this once the feature passes interop tests.
-bool XdsAuthorityRewriteEnabled() {
-  auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_AUTHORITY_REWRITE");
-  if (!value.has_value()) return false;
-  bool parsed_value;
-  bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
-  return parse_succeeded && parsed_value;
-}
-
 //
 // XdsRouteConfigResourceParse()
 //
@@ -389,62 +380,57 @@ void RouteRuntimeFractionParse(const envoy_config_route_v3_RouteMatch* match,
 template <typename ParentType>
 XdsRouteConfigResource::TypedPerFilterConfig ParseTypedPerFilterConfig(
     const XdsResourceType::DecodeContext& context, const ParentType* parent,
-    const upb_Map* (*upb_map_func)(ParentType*), ValidationErrors* errors) {
+    bool (*upb_next_func)(const ParentType*, upb_StringView*,
+                          const struct google_protobuf_Any**, size_t* iter),
+    ValidationErrors* errors) {
   XdsRouteConfigResource::TypedPerFilterConfig typed_per_filter_config;
-  // TODO(b/397931390): Clean up the code after gRPC OSS migrates to proto
-  // v30.0.
-  const upb_Map* parent_upb_map = upb_map_func((ParentType*)parent);
-  if (parent_upb_map) {
-    size_t filter_it = kUpb_Map_Begin;
-    upb_MessageValue k, v;
-    while (upb_Map_Next(parent_upb_map, &k, &v, &filter_it)) {
-      upb_StringView key_view = k.str_val;
-      const google_protobuf_Any* any = (google_protobuf_Any*)v.msg_val;
-      absl::string_view key = UpbStringToAbsl(key_view);
-      ValidationErrors::ScopedField field(errors, absl::StrCat("[", key, "]"));
-      if (key.empty()) errors->AddError("filter name must be non-empty");
-      auto extension = ExtractXdsExtension(context, any, errors);
-      if (!extension.has_value()) continue;
-      auto* extension_to_use = &*extension;
-      std::optional<XdsExtension> nested_extension;
-      bool is_optional = false;
-      if (extension->type == "envoy.config.route.v3.FilterConfig") {
-        absl::string_view* serialized_config =
-            std::get_if<absl::string_view>(&extension->value);
-        if (serialized_config == nullptr) {
-          errors->AddError("could not parse FilterConfig");
-          continue;
-        }
-        const auto* filter_config = envoy_config_route_v3_FilterConfig_parse(
-            serialized_config->data(), serialized_config->size(),
-            context.arena);
-        if (filter_config == nullptr) {
-          errors->AddError("could not parse FilterConfig");
-          continue;
-        }
-        is_optional =
-            envoy_config_route_v3_FilterConfig_is_optional(filter_config);
-        any = envoy_config_route_v3_FilterConfig_config(filter_config);
-        extension->validation_fields.emplace_back(errors, ".config");
-        nested_extension = ExtractXdsExtension(context, any, errors);
-        if (!nested_extension.has_value()) continue;
-        extension_to_use = &*nested_extension;
-      }
-      const auto& http_filter_registry =
-          DownCast<const GrpcXdsBootstrap&>(context.client->bootstrap())
-              .http_filter_registry();
-      const XdsHttpFilterImpl* filter_impl =
-          http_filter_registry.GetFilterForType(extension_to_use->type);
-      if (filter_impl == nullptr) {
-        if (!is_optional) errors->AddError("unsupported filter type");
+  size_t filter_it = kUpb_Map_Begin;
+  upb_StringView key_view;
+  const struct google_protobuf_Any* any;
+  while (upb_next_func(parent, &key_view, &any, &filter_it)) {
+    absl::string_view key = UpbStringToAbsl(key_view);
+    ValidationErrors::ScopedField field(errors, absl::StrCat("[", key, "]"));
+    if (key.empty()) errors->AddError("filter name must be non-empty");
+    auto extension = ExtractXdsExtension(context, any, errors);
+    if (!extension.has_value()) continue;
+    auto* extension_to_use = &*extension;
+    std::optional<XdsExtension> nested_extension;
+    bool is_optional = false;
+    if (extension->type == "envoy.config.route.v3.FilterConfig") {
+      absl::string_view* serialized_config =
+          std::get_if<absl::string_view>(&extension->value);
+      if (serialized_config == nullptr) {
+        errors->AddError("could not parse FilterConfig");
         continue;
       }
-      std::optional<XdsHttpFilterImpl::FilterConfig> filter_config =
-          filter_impl->GenerateFilterConfigOverride(
-              key, context, std::move(*extension_to_use), errors);
-      if (filter_config.has_value()) {
-        typed_per_filter_config[std::string(key)] = std::move(*filter_config);
+      const auto* filter_config = envoy_config_route_v3_FilterConfig_parse(
+          serialized_config->data(), serialized_config->size(), context.arena);
+      if (filter_config == nullptr) {
+        errors->AddError("could not parse FilterConfig");
+        continue;
       }
+      is_optional =
+          envoy_config_route_v3_FilterConfig_is_optional(filter_config);
+      any = envoy_config_route_v3_FilterConfig_config(filter_config);
+      extension->validation_fields.emplace_back(errors, ".config");
+      nested_extension = ExtractXdsExtension(context, any, errors);
+      if (!nested_extension.has_value()) continue;
+      extension_to_use = &*nested_extension;
+    }
+    const auto& http_filter_registry =
+        DownCast<const GrpcXdsBootstrap&>(context.client->bootstrap())
+            .http_filter_registry();
+    const XdsHttpFilterImpl* filter_impl =
+        http_filter_registry.GetFilterForType(extension_to_use->type);
+    if (filter_impl == nullptr) {
+      if (!is_optional) errors->AddError("unsupported filter type");
+      continue;
+    }
+    std::optional<XdsHttpFilterImpl::FilterConfig> filter_config =
+        filter_impl->GenerateFilterConfigOverride(
+            key, context, std::move(*extension_to_use), errors);
+    if (filter_config.has_value()) {
+      typed_per_filter_config[std::string(key)] = std::move(*filter_config);
     }
   }
   return typed_per_filter_config;
@@ -628,8 +614,7 @@ std::optional<XdsRouteConfigResource::Route::RouteAction> RouteActionParse(
     route_action.retry_policy = RetryPolicyParse(retry_policy, errors);
   }
   // Host rewrite field.
-  if (XdsAuthorityRewriteEnabled() &&
-      DownCast<const GrpcXdsServer&>(context.server).TrustedXdsServer()) {
+  if (DownCast<const GrpcXdsServer&>(context.server).TrustedXdsServer()) {
     route_action.auto_host_rewrite =
         ParseBoolValue(envoy_config_route_v3_RouteAction_auto_host_rewrite(
             route_action_proto));
@@ -668,12 +653,10 @@ std::optional<XdsRouteConfigResource::Route::RouteAction> RouteActionParse(
       // typed_per_filter_config
       {
         ValidationErrors::ScopedField field(errors, ".typed_per_filter_config");
-        // TODO(b/397931390): Clean up the code after gRPC OSS migrates to
-        // proto v30.0.
         cluster.typed_per_filter_config = ParseTypedPerFilterConfig<
             envoy_config_route_v3_WeightedCluster_ClusterWeight>(
             context, cluster_proto,
-            _envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_filter_config_upb_map,
+            envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_filter_config_next,
             errors);
       }
       // name
@@ -797,13 +780,10 @@ std::optional<XdsRouteConfigResource::Route> ParseRoute(
   // Parse typed_per_filter_config.
   {
     ValidationErrors::ScopedField field(errors, ".typed_per_filter_config");
-    // TODO(b/397931390): Clean up the code after gRPC OSS migrates to proto
-    // v30.0.
     route.typed_per_filter_config =
         ParseTypedPerFilterConfig<envoy_config_route_v3_Route>(
             context, route_proto,
-            _envoy_config_route_v3_Route_typed_per_filter_config_upb_map,
-            errors);
+            envoy_config_route_v3_Route_typed_per_filter_config_next, errors);
   }
   return route;
 }
@@ -858,13 +838,11 @@ std::shared_ptr<const XdsRouteConfigResource> XdsRouteConfigResourceParse(
     // Parse typed_per_filter_config.
     {
       ValidationErrors::ScopedField field(errors, ".typed_per_filter_config");
-      // TODO(b/397931390): Clean up the code after gRPC OSS migrates to proto
-      // v30.0.
-      vhost.typed_per_filter_config = ParseTypedPerFilterConfig<
-          envoy_config_route_v3_VirtualHost>(
-          context, virtual_hosts[i],
-          _envoy_config_route_v3_VirtualHost_typed_per_filter_config_upb_map,
-          errors);
+      vhost.typed_per_filter_config =
+          ParseTypedPerFilterConfig<envoy_config_route_v3_VirtualHost>(
+              context, virtual_hosts[i],
+              envoy_config_route_v3_VirtualHost_typed_per_filter_config_next,
+              errors);
     }
     // Parse retry policy.
     std::optional<XdsRouteConfigResource::RetryPolicy>

data/src/core/xds/xds_client/xds_client.cc

@@ -1879,7 +1879,7 @@ std::string XdsClient::ConstructFullXdsResourceName(
     absl::string_view authority, absl::string_view resource_type,
     const XdsResourceKey& key) {
   if (authority != kOldStyleAuthority) {
-    auto uri = URI::Create("xdstp", std::string(authority),
+    auto uri = URI::Create("xdstp", /*user_info=*/"", std::string(authority),
                            absl::StrCat("/", resource_type, "/", key.id),
                            key.query_params, /*fragment=*/"");
     CHECK(uri.ok());

data/src/ruby/ext/grpc/extconf.rb

@@ -231,7 +231,7 @@ File.rename('Makefile.new', 'Makefile')
 
 if grpc_config == 'opt'
   File.open('Makefile.new', 'w') do |o|
-    o.puts 'hijack: all strip'
+    o.puts 'hijack: all strip remove_unused_artifacts'
     o.puts
     o.write(File.read('Makefile'))
     o.puts

data/src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.72.0'
+  VERSION = '1.73.0'
 end

data/src/ruby/spec/generic/client_stub_spec.rb

@@ -64,12 +64,8 @@ end
 def sanity_check_values_of_accessors(op_view,
                                      expected_metadata,
                                      expected_trailing_metadata)
-  expected_status = Struct::Status.new
-  expected_status.code = 0
-  expected_status.details = 'OK'
-  expected_status.metadata = expected_trailing_metadata
-
-  expect(op_view.status).to eq(expected_status)
+  expect(op_view.status.code).to eq(0)
+  expect(op_view.status.metadata).to eq(expected_trailing_metadata)
   expect(op_view.metadata).to eq(expected_metadata)
   expect(op_view.trailing_metadata).to eq(expected_trailing_metadata)
 

data/src/ruby/spec/generic/rpc_server_spec.rb

@@ -46,7 +46,7 @@ class FailingService
 
   def initialize(_default_var = 'ignored')
     @details = 'app error'
-    @code = 101
+    @code = 3
     @md = { 'failed_method' => 'an_rpc' }
   end
 

data/third_party/abseil-cpp/absl/algorithm/algorithm.h

@@ -53,8 +53,8 @@ using std::rotate;
 // n = (`last` - `first`) comparisons. A linear search over short containers
 // may be faster than a binary search, even when the container is sorted.
 template <typename InputIterator, typename EqualityComparable>
-bool linear_search(InputIterator first, InputIterator last,
-                   const EqualityComparable& value) {
+ABSL_INTERNAL_CONSTEXPR_SINCE_CXX20 bool linear_search(
+    InputIterator first, InputIterator last, const EqualityComparable& value) {
   return std::find(first, last, value) != last;
 }