grpc 1.46.2 → 1.46.3

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of grpc might be problematic. Click here for more details.

checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c31b1be1e90650a8f3de72c01beda164c17fbff7505374b5d3bbef98cd72f898
4
- data.tar.gz: e6b56e1d0904333778d9d9c8aa8781d6531a4ffad01e3cc58301a1566e5d40cb
3
+ metadata.gz: c5ff57af23c499f79c41a58dc6d72e9e66292030d1cc53447d748f50254e9ed4
4
+ data.tar.gz: 6574b399865dc68a9c0117a7ff41def821c912992e14af6f9f3e8b1482da0c8c
5
5
  SHA512:
6
- metadata.gz: b442e07866c12f1a9c5b27066714a0bf7492fe701cc12b4e3e24cc7e9fc47f7634b38446b94f0cf5707cc335a9a1cb973374ee9e1e3c61259b9f213ba75bd096
7
- data.tar.gz: b6c3d28103ea4362b9ba08999675b2679b7feec907bcc59a5caf0d927b66e3fc9253569afe19daeb808d0af0a0799206b20ca70e77d2de1c4bab4ac935847347
6
+ metadata.gz: 1db2b5302c9ad78001dbf0003e6141a904f01802154b3170eae99d667cdda036ce540006e09771109b31d466ab65ad1d9154cfd3d03ad7f393605f5cf71b6066
7
+ data.tar.gz: 5748ed655f08f4f4b72d63cbb3d3c444c2ba38fc61c6c0a5921b6753a6178cac2f67f7a32f8546a987d83b6986ad22ef2ef9256f1373501b70b8f40a1c038c0a
data/Makefile CHANGED
@@ -447,8 +447,8 @@ Q = @
447
447
  endif
448
448
 
449
449
  CORE_VERSION = 24.0.0
450
- CPP_VERSION = 1.46.2
451
- CSHARP_VERSION = 2.46.2
450
+ CPP_VERSION = 1.46.3
451
+ CSHARP_VERSION = 2.46.3
452
452
 
453
453
  CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
454
454
  CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -44,8 +44,6 @@
44
44
 
45
45
  namespace grpc_core {
46
46
 
47
- namespace {
48
-
49
47
  // TODO(donnadionne): check to see if federation is enabled, this will be
50
48
  // removed once federation is fully integrated and enabled by default.
51
49
  bool XdsFederationEnabled() {
@@ -56,6 +54,8 @@ bool XdsFederationEnabled() {
56
54
  return parse_succeeded && parsed_value;
57
55
  }
58
56
 
57
+ namespace {
58
+
59
59
  grpc_error_handle ParseChannelCreds(const Json::Object& json, size_t idx,
60
60
  XdsBootstrap::XdsServer* server) {
61
61
  std::vector<grpc_error_handle> error_list;
@@ -37,6 +37,8 @@
37
37
 
38
38
  namespace grpc_core {
39
39
 
40
+ bool XdsFederationEnabled();
41
+
40
42
  class XdsClient;
41
43
 
42
44
  class XdsBootstrap {
@@ -788,7 +788,7 @@ void XdsClient::ChannelState::AdsCallState::AdsResponseParser::ParseResource(
788
788
  }
789
789
  // Check the resource name.
790
790
  auto resource_name =
791
- XdsClient::ParseXdsResourceName(result->name, result_.type);
791
+ xds_client()->ParseXdsResourceName(result->name, result_.type);
792
792
  if (!resource_name.ok()) {
793
793
  result_.errors.emplace_back(absl::StrCat(
794
794
  "resource index ", idx, ": Cannot parse xDS resource name \"",
@@ -1788,6 +1788,7 @@ XdsClient::XdsClient(std::unique_ptr<XdsBootstrap> bootstrap,
1788
1788
  bootstrap_(std::move(bootstrap)),
1789
1789
  args_(ModifyChannelArgs(args)),
1790
1790
  request_timeout_(GetRequestTimeout(args)),
1791
+ xds_federation_enabled_(XdsFederationEnabled()),
1791
1792
  interested_parties_(grpc_pollset_set_create()),
1792
1793
  certificate_provider_store_(MakeOrphanable<CertificateProviderStore>(
1793
1794
  bootstrap_->certificate_providers())),
@@ -1930,6 +1931,7 @@ void XdsClient::CancelResourceWatch(const XdsResourceType* type,
1930
1931
  }
1931
1932
  if (shutting_down_) return;
1932
1933
  // Find authority.
1934
+ if (!resource_name.ok()) return;
1933
1935
  auto authority_it = authority_state_map_.find(resource_name->authority);
1934
1936
  if (authority_it == authority_state_map_.end()) return;
1935
1937
  AuthorityState& authority_state = authority_it->second;
@@ -1982,7 +1984,7 @@ absl::StatusOr<XdsClient::XdsResourceName> XdsClient::ParseXdsResourceName(
1982
1984
  absl::string_view name, const XdsResourceType* type) {
1983
1985
  // Old-style names use the empty string for authority.
1984
1986
  // authority is prefixed with "old:" to indicate that it's an old-style name.
1985
- if (!absl::StartsWith(name, "xdstp:")) {
1987
+ if (!xds_federation_enabled_ || !absl::StartsWith(name, "xdstp:")) {
1986
1988
  return XdsResourceName{"old:", {std::string(name), {}}};
1987
1989
  }
1988
1990
  // New style name. Parse URI.
@@ -286,7 +286,7 @@ class XdsClient : public DualRefCounted<XdsClient> {
286
286
  const XdsResourceType* GetResourceTypeLocked(absl::string_view resource_type)
287
287
  ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
288
288
 
289
- static absl::StatusOr<XdsResourceName> ParseXdsResourceName(
289
+ absl::StatusOr<XdsResourceName> ParseXdsResourceName(
290
290
  absl::string_view name, const XdsResourceType* type);
291
291
  static std::string ConstructFullXdsResourceName(
292
292
  absl::string_view authority, absl::string_view resource_type,
@@ -302,6 +302,7 @@ class XdsClient : public DualRefCounted<XdsClient> {
302
302
  std::unique_ptr<XdsBootstrap> bootstrap_;
303
303
  grpc_channel_args* args_;
304
304
  const Duration request_timeout_;
305
+ const bool xds_federation_enabled_;
305
306
  grpc_pollset_set* interested_parties_;
306
307
  OrphanablePtr<CertificateProviderStore> certificate_provider_store_;
307
308
  XdsApi api_;
@@ -60,7 +60,7 @@ end
60
60
 
61
61
  ENV['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE'
62
62
  ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_NAME_SUFFIX="\"RUBY\"" '
63
- ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="\"1.46.2\"" '
63
+ ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="\"1.46.3\"" '
64
64
 
65
65
  output_dir = File.expand_path(RbConfig::CONFIG['topdir'])
66
66
  grpc_lib_dir = File.join(output_dir, 'libs', grpc_config)
@@ -14,5 +14,5 @@
14
14
 
15
15
  # GRPC contains the General RPC module.
16
16
  module GRPC
17
- VERSION = '1.46.2'
17
+ VERSION = '1.46.3'
18
18
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: grpc
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.46.2
4
+ version: 1.46.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - gRPC Authors
8
8
  autorequire:
9
9
  bindir: src/ruby/bin
10
10
  cert_chain: []
11
- date: 2022-05-12 00:00:00.000000000 Z
11
+ date: 2022-05-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: google-protobuf