grpc 1.46.2 → 1.46.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c31b1be1e90650a8f3de72c01beda164c17fbff7505374b5d3bbef98cd72f898
-  data.tar.gz: e6b56e1d0904333778d9d9c8aa8781d6531a4ffad01e3cc58301a1566e5d40cb
+  metadata.gz: c5ff57af23c499f79c41a58dc6d72e9e66292030d1cc53447d748f50254e9ed4
+  data.tar.gz: 6574b399865dc68a9c0117a7ff41def821c912992e14af6f9f3e8b1482da0c8c
 SHA512:
-  metadata.gz: b442e07866c12f1a9c5b27066714a0bf7492fe701cc12b4e3e24cc7e9fc47f7634b38446b94f0cf5707cc335a9a1cb973374ee9e1e3c61259b9f213ba75bd096
-  data.tar.gz: b6c3d28103ea4362b9ba08999675b2679b7feec907bcc59a5caf0d927b66e3fc9253569afe19daeb808d0af0a0799206b20ca70e77d2de1c4bab4ac935847347
+  metadata.gz: 1db2b5302c9ad78001dbf0003e6141a904f01802154b3170eae99d667cdda036ce540006e09771109b31d466ab65ad1d9154cfd3d03ad7f393605f5cf71b6066
+  data.tar.gz: 5748ed655f08f4f4b72d63cbb3d3c444c2ba38fc61c6c0a5921b6753a6178cac2f67f7a32f8546a987d83b6986ad22ef2ef9256f1373501b70b8f40a1c038c0a

data/Makefile

@@ -447,8 +447,8 @@ Q = @
 endif
 
 CORE_VERSION = 24.0.0
-CPP_VERSION = 1.46.2
-CSHARP_VERSION = 2.46.2
+CPP_VERSION = 1.46.3
+CSHARP_VERSION = 2.46.3
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

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

@@ -44,8 +44,6 @@
 
 namespace grpc_core {
 
-namespace {
-
 // TODO(donnadionne): check to see if federation is enabled, this will be
 // removed once federation is fully integrated and enabled by default.
 bool XdsFederationEnabled() {
@@ -56,6 +54,8 @@ bool XdsFederationEnabled() {
   return parse_succeeded && parsed_value;
 }
 
+namespace {
+
 grpc_error_handle ParseChannelCreds(const Json::Object& json, size_t idx,
                                     XdsBootstrap::XdsServer* server) {
   std::vector<grpc_error_handle> error_list;

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

@@ -37,6 +37,8 @@
 
 namespace grpc_core {
 
+bool XdsFederationEnabled();
+
 class XdsClient;
 
 class XdsBootstrap {

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

@@ -788,7 +788,7 @@ void XdsClient::ChannelState::AdsCallState::AdsResponseParser::ParseResource(
   }
   // Check the resource name.
   auto resource_name =
-      XdsClient::ParseXdsResourceName(result->name, result_.type);
+      xds_client()->ParseXdsResourceName(result->name, result_.type);
   if (!resource_name.ok()) {
     result_.errors.emplace_back(absl::StrCat(
         "resource index ", idx, ": Cannot parse xDS resource name \"",
@@ -1788,6 +1788,7 @@ XdsClient::XdsClient(std::unique_ptr<XdsBootstrap> bootstrap,
       bootstrap_(std::move(bootstrap)),
       args_(ModifyChannelArgs(args)),
       request_timeout_(GetRequestTimeout(args)),
+      xds_federation_enabled_(XdsFederationEnabled()),
       interested_parties_(grpc_pollset_set_create()),
       certificate_provider_store_(MakeOrphanable<CertificateProviderStore>(
           bootstrap_->certificate_providers())),
@@ -1930,6 +1931,7 @@ void XdsClient::CancelResourceWatch(const XdsResourceType* type,
   }
   if (shutting_down_) return;
   // Find authority.
+  if (!resource_name.ok()) return;
   auto authority_it = authority_state_map_.find(resource_name->authority);
   if (authority_it == authority_state_map_.end()) return;
   AuthorityState& authority_state = authority_it->second;
@@ -1982,7 +1984,7 @@ absl::StatusOr<XdsClient::XdsResourceName> XdsClient::ParseXdsResourceName(
     absl::string_view name, const XdsResourceType* type) {
   // Old-style names use the empty string for authority.
   // authority is prefixed with "old:" to indicate that it's an old-style name.
-  if (!absl::StartsWith(name, "xdstp:")) {
+  if (!xds_federation_enabled_ || !absl::StartsWith(name, "xdstp:")) {
     return XdsResourceName{"old:", {std::string(name), {}}};
   }
   // New style name.  Parse URI.

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

@@ -286,7 +286,7 @@ class XdsClient : public DualRefCounted<XdsClient> {
   const XdsResourceType* GetResourceTypeLocked(absl::string_view resource_type)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
 
-  static absl::StatusOr<XdsResourceName> ParseXdsResourceName(
+  absl::StatusOr<XdsResourceName> ParseXdsResourceName(
       absl::string_view name, const XdsResourceType* type);
   static std::string ConstructFullXdsResourceName(
       absl::string_view authority, absl::string_view resource_type,
@@ -302,6 +302,7 @@ class XdsClient : public DualRefCounted<XdsClient> {
   std::unique_ptr<XdsBootstrap> bootstrap_;
   grpc_channel_args* args_;
   const Duration request_timeout_;
+  const bool xds_federation_enabled_;
   grpc_pollset_set* interested_parties_;
   OrphanablePtr<CertificateProviderStore> certificate_provider_store_;
   XdsApi api_;

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

@@ -60,7 +60,7 @@ end
 
 ENV['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE'
 ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_NAME_SUFFIX="\"RUBY\"" '
-ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="\"1.46.2\"" '
+ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="\"1.46.3\"" '
 
 output_dir = File.expand_path(RbConfig::CONFIG['topdir'])
 grpc_lib_dir = File.join(output_dir, 'libs', grpc_config)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.46.2
+  version: 1.46.3
 platform: ruby
 authors:
 - gRPC Authors
 autorequire:
 bindir: src/ruby/bin
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf