grpc 1.33.0.pre1-x86-linux → 1.37.0.pre1-x86-linux

data/src/ruby/spec/call_spec.rb

@@ -171,7 +171,7 @@ describe GRPC::Core::Call do
   end
 
   def make_test_call
-    @ch.create_call(nil, nil, 'dummy_method', nil, deadline)
+    @ch.create_call(nil, nil, 'phony_method', nil, deadline)
   end
 
   def deadline

data/src/ruby/spec/channel_credentials_spec.rb

@@ -60,6 +60,38 @@ describe GRPC::Core::ChannelCredentials do
       blk = proc { GRPC::Core::ChannelCredentials.new(nil, '', nil) }
       expect(&blk).to raise_error
     end
+
+    it 'can be constructed with a fallback credential' do
+      blk = proc {
+        fallback = GRPC::Core::ChannelCredentials.new
+        GRPC::Core::XdsChannelCredentials.new(fallback)
+      }
+      expect(&blk).not_to raise_error
+    end
+
+    it 'fails gracefully constructed with nil' do
+      blk = proc {
+        GRPC::Core::XdsChannelCredentials.new(nil)
+      }
+      expect(&blk).to raise_error TypeError, /expected grpc_channel_credentials/
+    end
+
+    it 'fails gracefully constructed with a non-C-extension object' do
+      blk = proc {
+        not_a_fallback = 100
+        GRPC::Core::XdsChannelCredentials.new(not_a_fallback)
+      }
+      expect(&blk).to raise_error TypeError, /expected grpc_channel_credentials/
+    end
+
+    it 'fails gracefully constructed with a non-ChannelCredentials object' do
+      blk = proc {
+        not_a_fallback = GRPC::Core::Channel.new('dummy_host', nil,
+                                                 :this_channel_is_insecure)
+        GRPC::Core::XdsChannelCredentials.new(not_a_fallback)
+      }
+      expect(&blk).to raise_error TypeError, /expected grpc_channel_credentials/
+    end
   end
 
   describe '#compose' do

data/src/ruby/spec/channel_spec.rb

@@ -53,7 +53,7 @@ describe GRPC::Core::Channel do
   shared_examples '#new' do
     it 'take a host name without channel args' do
       blk = proc do
-        GRPC::Core::Channel.new('dummy_host', nil, :this_channel_is_insecure)
+        GRPC::Core::Channel.new('phony_host', nil, :this_channel_is_insecure)
       end
       expect(&blk).not_to raise_error
     end
@@ -114,7 +114,7 @@ describe GRPC::Core::Channel do
 
   describe '#new for secure channels' do
     def construct_with_args(a)
-      proc { GRPC::Core::Channel.new('dummy_host', a, create_test_cert) }
+      proc { GRPC::Core::Channel.new('phony_host', a, create_test_cert) }
     end
 
     it_behaves_like '#new'
@@ -125,7 +125,18 @@ describe GRPC::Core::Channel do
 
     def construct_with_args(a)
       proc do
-        GRPC::Core::Channel.new('dummy_host', a, :this_channel_is_insecure)
+        GRPC::Core::Channel.new('phony_host', a, :this_channel_is_insecure)
+      end
+    end
+  end
+
+  describe '#new for XDS channels' do
+    it_behaves_like '#new'
+
+    def construct_with_args(a)
+      proc do
+        xds_creds = GRPC::Core::XdsChannelCredentials.new(create_test_cert)
+        GRPC::Core::Channel.new('dummy_host', a, xds_creds)
       end
     end
   end
@@ -137,7 +148,7 @@ describe GRPC::Core::Channel do
       deadline = Time.now + 5
 
       blk = proc do
-        ch.create_call(nil, nil, 'dummy_method', nil, deadline)
+        ch.create_call(nil, nil, 'phony_method', nil, deadline)
       end
       expect(&blk).to_not raise_error
     end
@@ -148,7 +159,7 @@ describe GRPC::Core::Channel do
 
       deadline = Time.now + 5
       blk = proc do
-        ch.create_call(nil, nil, 'dummy_method', nil, deadline)
+        ch.create_call(nil, nil, 'phony_method', nil, deadline)
       end
       expect(&blk).to raise_error(RuntimeError)
     end
@@ -160,7 +171,7 @@ describe GRPC::Core::Channel do
 
       blk = proc do
         fork_with_propagated_error_message do
-          ch.create_call(nil, nil, 'dummy_method', nil, deadline)
+          ch.create_call(nil, nil, 'phony_method', nil, deadline)
         end
       end
       expect(&blk).to raise_error(RuntimeError, 'grpc cannot be used before and after forking')

data/src/ruby/spec/client_auth_spec.rb

@@ -85,7 +85,10 @@ describe 'client-server auth' do
       poll_period: 1
     }
     @srv = new_rpc_server_for_testing(**server_opts)
-    port = @srv.add_http2_port('0.0.0.0:0', create_server_creds)
+    ssl_creds = create_server_creds
+    xds_creds = GRPC::Core::XdsServerCredentials.new(ssl_creds)
+    port = @srv.add_http2_port('0.0.0.0:0', ssl_creds)
+    xds_port = @srv.add_http2_port('0.0.0.0:0', xds_creds)
     @srv.handle(SslTestService)
     @srv_thd = Thread.new { @srv.run }
     @srv.wait_till_running
@@ -98,6 +101,11 @@ describe 'client-server auth' do
     @stub = SslTestServiceStub.new("localhost:#{port}",
                                    create_channel_creds,
                                    **client_opts)
+    # auth should success as the fallback creds wil be used
+    xds_channel_creds = GRPC::Core::XdsChannelCredentials.new(create_channel_creds)
+    @xds_stub = SslTestServiceStub.new("localhost:#{xds_port}",
+                                       xds_channel_creds,
+                                       **client_opts)
   end
 
   after(:all) do
@@ -123,4 +131,22 @@ describe 'client-server auth' do
     responses = @stub.a_bidi_rpc([EchoMsg.new, EchoMsg.new])
     responses.each { |r| GRPC.logger.info(r) }
   end
+
+  it 'xds_client-xds_server ssl fallback auth with unary RPCs' do
+    @xds_stub.an_rpc(EchoMsg.new)
+  end
+
+  it 'xds_client-xds_server ssl fallback auth with client streaming RPCs' do
+    @xds_stub.a_client_streaming_rpc([EchoMsg.new, EchoMsg.new])
+  end
+
+  it 'xds_client-xds_server ssl fallback auth with server streaming RPCs' do
+    responses = @xds_stub.a_server_streaming_rpc(EchoMsg.new)
+    responses.each { |r| GRPC.logger.info(r) }
+  end
+
+  it 'xds_client-xds_server ssl fallback auth with bidi RPCs' do
+    responses = @xds_stub.a_bidi_rpc([EchoMsg.new, EchoMsg.new])
+    responses.each { |r| GRPC.logger.info(r) }
+  end
 end

data/src/ruby/spec/errors_spec.rb

@@ -131,7 +131,7 @@ describe GRPC::BadStatus do
 
       error_msg = 'parse error: to_rpc_status failed'
       error_desc = '<Google::Protobuf::ParseError> ' \
-        'Error occurred during parsing: Invalid wire type'
+        'Error occurred during parsing'
 
       # Check that the parse error was logged correctly
       log_contents = @log_output.read

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

@@ -198,11 +198,11 @@ describe GRPC::ActiveCall do
         deadline,
         started: false)
 
-      metadata = { key: 'dummy_val', other: 'other_val' }
+      metadata = { key: 'phony_val', other: 'other_val' }
       expect(@client_call.metadata_sent).to eq(false)
       @client_call.merge_metadata_to_send(metadata)
 
-      message = 'dummy message'
+      message = 'phony message'
 
       expect(call).to(
         receive(:run_batch)

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

@@ -304,7 +304,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
 
     describe 'via a call operation' do
       after(:each) do
-        # make sure op.wait doesn't hang, even if there's a bad status
+        # make sure op.wait doesn't freeze, even if there's a bad status
         @op.wait
       end
       def get_response(stub, run_start_call_first: false, credentials: nil)
@@ -406,7 +406,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
 
     describe 'via a call operation' do
       after(:each) do
-        # make sure op.wait doesn't hang, even if there's a bad status
+        # make sure op.wait doesn't freeze, even if there's a bad status
         @op.wait
       end
       def get_response(stub, run_start_call_first: false)
@@ -547,7 +547,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
 
     describe 'via a call operation' do
       after(:each) do
-        @op.wait # make sure wait doesn't hang
+        @op.wait # make sure wait doesn't freeze
       end
       def get_responses(stub, run_start_call_first: false, unmarshal: noop)
         @op = stub.server_streamer(@method, @sent_msg, noop, unmarshal,
@@ -865,7 +865,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
 
     describe 'via a call operation' do
       after(:each) do
-        @op.wait # make sure wait doesn't hang
+        @op.wait # make sure wait doesn't freeze
       end
       def get_responses(stub, run_start_call_first: false, deadline: nil,
                         marshal_proc: noop)

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

@@ -104,7 +104,7 @@ end
 
 SynchronizedCancellationStub = SynchronizedCancellationService.rpc_stub_class
 
-# a test service that hangs onto call objects
+# a test service that holds onto call objects
 # and uses them after the server-side call has been
 # finished
 class CheckCallAfterFinishedService

data/src/ruby/spec/pb/codegen/package_option_spec.rb

@@ -71,14 +71,10 @@ describe 'Code Generation Options' do
 end
 
 def with_protos(file_paths)
-  fail 'CONFIG env variable unexpectedly unset' unless ENV['CONFIG']
-  bins_sub_dir = ENV['CONFIG']
-
   pb_dir = File.dirname(__FILE__)
-  bins_dir = File.join('..', '..', '..', '..', '..', 'bins', bins_sub_dir)
-
+  bins_dir = File.join('..', '..', '..', '..', '..', 'cmake', 'build')
   plugin = File.join(bins_dir, 'grpc_ruby_plugin')
-  protoc = File.join(bins_dir, 'protobuf', 'protoc')
+  protoc = File.join(bins_dir, 'third_party', 'protobuf', 'protoc')
 
   # Generate the service from the proto
   Dir.mktmpdir(nil, File.dirname(__FILE__)) do |tmp_dir|

data/src/ruby/spec/server_credentials_spec.rb

@@ -23,6 +23,7 @@ end
 
 describe GRPC::Core::ServerCredentials do
   Creds = GRPC::Core::ServerCredentials
+  XdsCreds = GRPC::Core::XdsServerCredentials
 
   describe '#new' do
     it 'can be constructed from a fake CA PEM, server PEM and a server key' do
@@ -75,5 +76,29 @@ describe GRPC::Core::ServerCredentials do
       blk = proc { Creds.new(nil, cert_pairs, false) }
       expect(&blk).to_not raise_error
     end
+
+    it 'can be constructed with a fallback credential' do
+      _, cert_pairs, _ = load_test_certs
+      fallback = Creds.new(nil, cert_pairs, false)
+      blk = proc { XdsCreds.new(fallback) }
+      expect(&blk).to_not raise_error
+    end
+
+    it 'cannot be constructed with nil' do
+      blk = proc { XdsCreds.new(nil) }
+      expect(&blk).to raise_error TypeError, /expected grpc_server_credentials/
+    end
+
+    it 'cannot be constructed with a non-C-extension object' do
+      not_a_fallback = 100
+      blk = proc { XdsCreds.new(not_a_fallback) }
+      expect(&blk).to raise_error TypeError, /expected grpc_server_credentials/
+    end
+
+    it 'cannot be constructed with a non-ServerCredentials object' do
+      not_a_fallback = GRPC::Core::ChannelCredentials.new
+      blk = proc { XdsCreds.new(not_a_fallback) }
+      expect(&blk).to raise_error TypeError, /expected grpc_server_credentials/
+    end
   end
 end

data/src/ruby/spec/server_spec.rb

@@ -139,6 +139,28 @@ describe Server do
         expect(&blk).to raise_error(RuntimeError)
       end
     end
+
+    describe 'for xds servers' do
+      let(:cert) { create_test_cert }
+      let(:xds) { GRPC::Core::XdsServerCredentials.new(cert) }
+      it 'runs without failing' do
+        blk = proc do
+          s = new_core_server_for_testing(nil)
+          s.add_http2_port('localhost:0', xds)
+          s.shutdown_and_notify(nil)
+          s.close
+        end
+        expect(&blk).to_not raise_error
+      end
+
+      it 'fails if the server is closed' do
+        s = new_core_server_for_testing(nil)
+        s.shutdown_and_notify(nil)
+        s.close
+        blk = proc { s.add_http2_port('localhost:0', xds) }
+        expect(&blk).to raise_error(RuntimeError)
+      end
+    end
   end
 
   shared_examples '#new' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.33.0.pre1
+  version: 1.37.0.pre1
 platform: x86-linux
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.15'
 - !ruby/object:Gem::Dependency
   name: googleapis-common-protos-types
   requirement: !ruby/object:Gem::Requirement
@@ -245,12 +245,16 @@ files:
 - src/ruby/ext/grpc/rb_server.h
 - src/ruby/ext/grpc/rb_server_credentials.c
 - src/ruby/ext/grpc/rb_server_credentials.h
+- src/ruby/ext/grpc/rb_xds_channel_credentials.c
+- src/ruby/ext/grpc/rb_xds_channel_credentials.h
+- src/ruby/ext/grpc/rb_xds_server_credentials.c
+- src/ruby/ext/grpc/rb_xds_server_credentials.h
 - src/ruby/lib/grpc.rb
-- src/ruby/lib/grpc/2.3/grpc_c.so
 - src/ruby/lib/grpc/2.4/grpc_c.so
 - src/ruby/lib/grpc/2.5/grpc_c.so
 - src/ruby/lib/grpc/2.6/grpc_c.so
 - src/ruby/lib/grpc/2.7/grpc_c.so
+- src/ruby/lib/grpc/3.0/grpc_c.so
 - src/ruby/lib/grpc/core/status_codes.rb
 - src/ruby/lib/grpc/core/time_consts.rb
 - src/ruby/lib/grpc/errors.rb
@@ -340,61 +344,61 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 2.8.dev
+      version: 3.1.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: GRPC system in Ruby
 test_files:
+- src/ruby/spec/call_credentials_spec.rb
+- src/ruby/spec/user_agent_spec.rb
+- src/ruby/spec/error_sanity_spec.rb
+- src/ruby/spec/debug_message_spec.rb
+- src/ruby/spec/server_credentials_spec.rb
+- src/ruby/spec/testdata/client.key
+- src/ruby/spec/testdata/ca.pem
 - src/ruby/spec/testdata/server1.key
-- src/ruby/spec/testdata/server1.pem
 - src/ruby/spec/testdata/client.pem
-- src/ruby/spec/testdata/ca.pem
-- src/ruby/spec/testdata/client.key
 - src/ruby/spec/testdata/README
-- src/ruby/spec/server_credentials_spec.rb
-- src/ruby/spec/error_sanity_spec.rb
-- src/ruby/spec/call_spec.rb
+- src/ruby/spec/testdata/server1.pem
 - src/ruby/spec/client_auth_spec.rb
-- src/ruby/spec/call_credentials_spec.rb
+- src/ruby/spec/google_rpc_status_utils_spec.rb
+- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/server_spec.rb
+- src/ruby/spec/support/services.rb
+- src/ruby/spec/support/helpers.rb
+- src/ruby/spec/time_consts_spec.rb
 - src/ruby/spec/pb/health/checker_spec.rb
-- src/ruby/spec/pb/duplicate/codegen_spec.rb
-- src/ruby/spec/pb/codegen/grpc/testing/package_options_import2.proto
-- src/ruby/spec/pb/codegen/grpc/testing/same_package_service_name.proto
+- src/ruby/spec/pb/codegen/package_option_spec.rb
 - src/ruby/spec/pb/codegen/grpc/testing/package_options_import.proto
+- src/ruby/spec/pb/codegen/grpc/testing/same_package_service_name.proto
 - src/ruby/spec/pb/codegen/grpc/testing/package_options.proto
-- src/ruby/spec/pb/codegen/grpc/testing/same_ruby_package_service_name.proto
 - src/ruby/spec/pb/codegen/grpc/testing/package_options_ruby_style.proto
-- src/ruby/spec/pb/codegen/package_option_spec.rb
+- src/ruby/spec/pb/codegen/grpc/testing/package_options_import2.proto
+- src/ruby/spec/pb/codegen/grpc/testing/same_ruby_package_service_name.proto
+- src/ruby/spec/pb/duplicate/codegen_spec.rb
+- src/ruby/spec/channel_spec.rb
+- src/ruby/spec/channel_credentials_spec.rb
+- src/ruby/spec/client_server_spec.rb
+- src/ruby/spec/call_spec.rb
+- src/ruby/spec/errors_spec.rb
 - src/ruby/spec/spec_helper.rb
-- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/generic/server_interceptors_spec.rb
 - src/ruby/spec/generic/client_interceptors_spec.rb
+- src/ruby/spec/generic/service_spec.rb
+- src/ruby/spec/generic/rpc_server_pool_spec.rb
+- src/ruby/spec/generic/client_stub_spec.rb
 - src/ruby/spec/generic/interceptor_registry_spec.rb
 - src/ruby/spec/generic/rpc_server_spec.rb
 - src/ruby/spec/generic/active_call_spec.rb
-- src/ruby/spec/generic/client_stub_spec.rb
-- src/ruby/spec/generic/service_spec.rb
-- src/ruby/spec/generic/server_interceptors_spec.rb
 - src/ruby/spec/generic/rpc_desc_spec.rb
-- src/ruby/spec/generic/rpc_server_pool_spec.rb
-- src/ruby/spec/channel_spec.rb
-- src/ruby/spec/support/services.rb
-- src/ruby/spec/support/helpers.rb
-- src/ruby/spec/time_consts_spec.rb
-- src/ruby/spec/client_server_spec.rb
-- src/ruby/spec/user_agent_spec.rb
-- src/ruby/spec/channel_credentials_spec.rb
-- src/ruby/spec/google_rpc_status_utils_spec.rb
 - src/ruby/spec/compression_options_spec.rb
-- src/ruby/spec/server_spec.rb
-- src/ruby/spec/errors_spec.rb
-- src/ruby/spec/debug_message_spec.rb