google-gax 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9847ac9e9a0a70858ef968b78959f0a937683b615a42d0c68bbad0afc6c6b177
-  data.tar.gz: 074c7489303474af0d4fcbb3274284752dbb2a8df4a32ddbd3587e262946abf0
+  metadata.gz: 7271bd48161698b84de9f66e337c3742e44b765f75fa1344c2e59b3608359e65
+  data.tar.gz: d2483f6d0f41e82f6655a1d5893712785721b73b7c675772752f457c9de0986e
 SHA512:
-  metadata.gz: c72b11044418c8e9f83fdad9e218e5ecf7b48b981b5dc7b824d73b5aff270ade922f9725e382ab2edd8823c6abaf5acc9f03df09d6769b01c85a31cc5046c582
-  data.tar.gz: 62af70fe132c6c8dd47a5ea6fac5eaa702bf4ae522faa5055b0c76c6fa6f5ab35025137e9375f9cee5cebdcae99dab078b8886bbdea2efbc2340884a1012e1f7
+  metadata.gz: 8b92de0ba1398fd9d71a7cdd66aa000975677996fefcfdcf4828d12c6fff7194c0b93da9178eaf26d51d924f77dc3b493ad3bffba5011d1e8ea7bfb670d92311
+  data.tar.gz: cf0103edeab0f7e8244b2e008d72974bb7562236281d6eed0ce2466740f48a56a433d934286d9205d89d84382003ace8f55527250cba09b4868b6b57b80b74e1

data/lib/google/gax/grpc.rb

@@ -122,11 +122,13 @@ module Google
                       interceptors: [])
         verify_params(channel, chan_creds, updater_proc)
         address = "#{service_path}:#{port}"
+        default_channel_args = { 'grpc.service_config_disable_resolution' => 1 }
         if channel
           yield(address, nil, channel_override: channel,
                               interceptors: interceptors)
         elsif chan_creds
-          yield(address, chan_creds, interceptors: interceptors)
+          yield(address, chan_creds, interceptors: interceptors,
+                                     channel_args: default_channel_args)
         else
           if updater_proc.nil?
             auth_creds = Google::Auth.get_application_default(scopes)
@@ -134,7 +136,8 @@ module Google
           end
           call_creds = GRPC::Core::CallCredentials.new(updater_proc)
           chan_creds = GRPC::Core::ChannelCredentials.new.compose(call_creds)
-          yield(address, chan_creds, interceptors: interceptors)
+          yield(address, chan_creds, interceptors: interceptors,
+                                     channel_args: default_channel_args)
         end
       end
 

data/lib/google/gax/version.rb

@@ -29,6 +29,6 @@
 
 module Google
   module Gax
-    VERSION = '1.6.3'.freeze
+    VERSION = '1.7.0'.freeze
   end
 end

data/lib/google/longrunning/operations_client.rb

@@ -1,4 +1,5 @@
-# Copyright 2017, Google LLC All rights reserved.
+# Copyright 2017, Google LLC
+# All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -108,6 +109,10 @@ module Google
       #   or the specified config is missing data points.
       # @param timeout [Numeric]
       #   The default timeout, in seconds, for calls made through this client.
+      # @param service_address [String]
+      #   The hostname of the backend service. Defaults to {SERVICE_ADDRESS}.
+      # @param service_port [Integer]
+      #   The port of the backend service. Defaults to {DEFAULT_SERVICE_PORT}.
       # @param metadata [Hash]
       #   The request metadata headers.
       def initialize \
@@ -117,6 +122,8 @@ module Google
           timeout: DEFAULT_TIMEOUT,
           lib_name: nil,
           lib_version: "",
+          service_address: nil,
+          service_port: nil,
           metadata: nil
         # These require statements are intentionally placed here to initialize
         # the gRPC module only when it's required.
@@ -169,8 +176,8 @@ module Google
         end
 
         # Allow overriding the service path/port in subclasses.
-        service_path = self.class::SERVICE_ADDRESS
-        port = self.class::DEFAULT_SERVICE_PORT
+        service_path = service_address || self.class::SERVICE_ADDRESS
+        port = service_port || self.class::DEFAULT_SERVICE_PORT
         @operations_stub = Google::Gax::Grpc.create_stub(
           service_path,
           port,

data/spec/google/gax/grpc_spec.rb

@@ -35,6 +35,7 @@ describe Google::Gax::Grpc do
       mock = instance_double(GRPC::Core::ChannelCredentials)
       composed_mock = instance_double(GRPC::Core::ChannelCredentials)
       default_creds = instance_double(Google::Auth::ServiceAccountCredentials)
+      channel_args = { 'grpc.service_config_disable_resolution' => 1 }
       updater_proc = proc {}
 
       allow(Google::Auth)
@@ -45,7 +46,10 @@ describe Google::Gax::Grpc do
 
       expect do |blk|
         Google::Gax::Grpc.create_stub('service', 'port', &blk)
-      end.to yield_with_args('service:port', composed_mock, interceptors: [])
+      end.to yield_with_args(
+        'service:port', composed_mock,
+        interceptors: [], channel_args: channel_args
+      )
     end
 
     it 'yields given channel' do
@@ -85,25 +89,28 @@ describe Google::Gax::Grpc do
     end
 
     it 'yields given channel credentials' do
+      channel_args = { 'grpc.service_config_disable_resolution' => 1 }
       mock = instance_double(GRPC::Core::ChannelCredentials)
       expect do |blk|
         Google::Gax::Grpc.create_stub(
           'service', 'port', chan_creds: mock, &blk
         )
       end.to yield_with_args(
-        'service:port', mock, interceptors: []
+        'service:port', mock, interceptors: [], channel_args: channel_args
       )
     end
 
     it 'yields given channel credentials and interceptors' do
       mock = instance_double(GRPC::Core::ChannelCredentials)
       interceptors = instance_double(Array)
+      channel_args = { 'grpc.service_config_disable_resolution' => 1 }
       expect do |blk|
         Google::Gax::Grpc.create_stub(
           'service', 'port', chan_creds: mock, interceptors: interceptors, &blk
         )
       end.to yield_with_args(
-        'service:port', mock, interceptors: interceptors
+        'service:port', mock,
+        interceptors: interceptors, channel_args: channel_args
       )
     end
 
@@ -112,6 +119,7 @@ describe Google::Gax::Grpc do
       composed_chan_creds = instance_double(GRPC::Core::ChannelCredentials)
       call_creds = instance_double(GRPC::Core::CallCredentials)
       updater_proc = proc {}
+      channel_args = { 'grpc.service_config_disable_resolution' => 1 }
 
       allow(GRPC::Core::CallCredentials)
         .to receive(:new).with(updater_proc).and_return(call_creds)
@@ -124,7 +132,8 @@ describe Google::Gax::Grpc do
           'service', 'port', updater_proc: updater_proc, &blk
         )
       end.to yield_with_args(
-        'service:port', composed_chan_creds, interceptors: []
+        'service:port', composed_chan_creds,
+        interceptors: [], channel_args: channel_args
       )
     end
 

data/spec/google/longrunning_spec.rb

@@ -0,0 +1,73 @@
+# Copyright 2019, Google LLC
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google LLC nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+require 'google/gax'
+require 'google/longrunning/operations_client'
+
+class MockCredentials < Google::Auth::Credentials
+  def initialize; end
+
+  def updater_proc
+    proc do
+      raise 'The credentials tried to make an update request. This should' \
+        ' not happen since the grpc layer is being mocked.'
+    end
+  end
+end
+
+describe Google::Longrunning::OperationsClient do
+  it 'uses the default address' do
+    client = Google::Longrunning::OperationsClient.new(
+      credentials: MockCredentials.new
+    )
+    host = client.instance_variable_get(:@operations_stub)
+                 .instance_variable_get(:@host)
+    expect(host).to eq('longrunning.googleapis.com:443')
+  end
+
+  it 'supports subclass overriding of the address' do
+    class CustomClient < Google::Longrunning::OperationsClient
+      SERVICE_ADDRESS = 'my-service.example.com'.freeze
+      DEFAULT_SERVICE_PORT = 8080
+    end
+    client = CustomClient.new(credentials: MockCredentials.new)
+    host = client.instance_variable_get(:@operations_stub)
+                 .instance_variable_get(:@host)
+    expect(host).to eq('my-service.example.com:8080')
+  end
+
+  it 'supports parameter overriding of the address' do
+    client = CustomClient.new(credentials: MockCredentials.new,
+                              service_address: 'foo-service.example.com',
+                              service_port: 8081)
+    host = client.instance_variable_get(:@operations_stub)
+                 .instance_variable_get(:@host)
+    expect(host).to eq('foo-service.example.com:8081')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-gax
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Google API Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: googleauth
@@ -201,6 +201,7 @@ files:
 - spec/google/gax/path_template_spec.rb
 - spec/google/gax/settings_spec.rb
 - spec/google/gax/util_spec.rb
+- spec/google/longrunning_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/googleapis/gax-ruby
 licenses: