google-gax 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71e32189b1fb624d4eea6c700022151e4e94134
-  data.tar.gz: 5885fdf6ce17d16932c891b3677cf60a6b30f574
+  metadata.gz: 716e8277e7cc5439a3f53c73c6cde2a8299ece01
+  data.tar.gz: ddb28ab9299ec05325ca30cdd40d13b5791d03f1
 SHA512:
-  metadata.gz: 251e5b49190d51b23dca1350d45300687ec8b41c632df5f62198385223f25f7391f828cc5475d7ccd15847b0245128cab5b919494bb9fc6a5cbfc6671eb63a16
-  data.tar.gz: f8a733a59af40210710c1e1661fc5ef88692178799b37fe5d8f404e120159a461e8cf68a28fb69877dced9190a4cd8c07e965b11707083530574563bbcf0c063
+  metadata.gz: 7b39b230f9fe8cd4eb4ce9a37f1b5290a2f616e05fa0a646b56287ae9a56f0543687a987db3fa1ec0996cbece43f67cb0cd957d68167c80e8f7b3faa1b035550
+  data.tar.gz: b74ca9b64dcf91794360de8b7055f10f4a70cce756629298fb75273b2e73004c362609b07067e30eeab5765365dde23ddded22775898d4f70d8fe8da68f9ede8

data/lib/google/gax/api_callable.rb

@@ -32,8 +32,6 @@ require 'time'
 require 'google/gax/errors'
 require 'google/gax/bundling'
 
-# rubocop:disable Metrics/ModuleLength
-
 module Google
   module Gax
     # A class to provide the Enumerable interface for page-streaming method.
@@ -246,21 +244,9 @@ module Google
                      add_timeout_arg(func, this_settings.timeout,
                                      this_settings.kwargs)
                    end
-        api_call = catch_errors(api_call, settings.errors)
-        api_caller.call(api_call, request, this_settings)
-      end
-    end
-
-    # Updates a_func to wrap exceptions with GaxError
-    #
-    # @param a_func [Proc]
-    # @param errors [Array<Exception>] Configures the exceptions to wrap.
-    # @return [Proc] A proc that will wrap certain exceptions with GaxError.
-    def catch_errors(a_func, errors)
-      proc do |request|
         begin
-          a_func.call(request)
-        rescue *errors
+          api_caller.call(api_call, request, this_settings)
+        rescue *settings.errors
           raise GaxError, 'RPC failed'
         end
       end
@@ -312,8 +298,6 @@ module Google
       enumerable.method(:start)
     end
 
-    # rubocop:disable Metrics/MethodLength
-
     # Creates a proc equivalent to a_func, but that retries on certain
     # exceptions.
     #
@@ -336,29 +320,24 @@ module Google
         delay = retry_options.backoff_settings.initial_retry_delay_millis
         timeout = (retry_options.backoff_settings.initial_rpc_timeout_millis /
                    MILLIS_PER_SECOND)
-        result = nil
-        now = Time.now
-        deadline = now + total_timeout
-        loop do
-          begin
-            result = add_timeout_arg(a_func, timeout, kwargs).call(request)
-            break
-          rescue => exception
-            unless exception.respond_to?(:code) &&
-                   retry_options.retry_codes.include?(exception.code)
-              raise RetryError, 'Exception occurred in retry method that ' \
-                'was not classified as transient'
-            end
-            sleep(rand(delay) / MILLIS_PER_SECOND)
-            now = Time.now
-            delay = [delay * delay_mult, max_delay].min
-            timeout = [timeout * timeout_mult, max_timeout, deadline - now].min
-            if now >= deadline
-              raise RetryError, 'Retry total timeout exceeded with exception'
-            end
+        deadline = Time.now + total_timeout
+        begin
+          a_func.call(request, deadline: Time.now + timeout, metadata: kwargs)
+        rescue => exception
+          unless exception.respond_to?(:code) &&
+                 retry_options.retry_codes.include?(exception.code)
+            raise RetryError, 'Exception occurred in retry method that ' \
+              'was not classified as transient'
+          end
+          sleep(rand(delay) / MILLIS_PER_SECOND)
+          now = Time.now
+          delay = [delay * delay_mult, max_delay].min
+          timeout = [timeout * timeout_mult, max_timeout, deadline - now].min
+          if now >= deadline
+            raise RetryError, 'Retry total timeout exceeded with exception'
           end
+          retry
         end
-        result
       end
     end
 
@@ -377,9 +356,9 @@ module Google
       end
     end
 
-    module_function :create_api_call, :catch_errors, :bundleable,
+    module_function :create_api_call, :bundleable,
                     :page_streamable, :retryable, :add_timeout_arg
-    private_class_method :catch_errors, :bundleable, :page_streamable,
+    private_class_method :bundleable, :page_streamable,
                          :retryable, :add_timeout_arg
   end
 end

data/lib/google/gax/version.rb

@@ -29,6 +29,6 @@
 
 module Google
   module Gax
-    VERSION = '0.8.6'.freeze
+    VERSION = '0.8.7'.freeze
   end
 end

data/lib/google/longrunning/operations_client.rb

@@ -80,6 +80,7 @@ module Google
       # The scopes needed to make gRPC calls to all of the methods defined in
       # this service.
       ALL_SCOPES = [
+        "https://www.googleapis.com/auth/cloud-platform",
       ].freeze
 
       # @param service_path [String]
@@ -142,7 +143,7 @@ module Google
           warn "`app_name` and `app_version` are no longer being used in the request headers."
         end
 
-        credentials ||= Google::Gax::Credentials.default
+        credentials ||= Google::Gax::Credentials.default(scope: scopes)
 
         if credentials.is_a?(String) || credentials.is_a?(Hash)
           updater_proc = Google::Gax::Credentials.new(credentials).updater_proc

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-gax
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Google API Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: googleauth