google-gax 1.5.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ba10bcc638424821c5305ebb861de86bd4b40c5f
-  data.tar.gz: e4bb08f02fa8419dbd78dd367728ccccdb4dcf6a
+SHA256:
+  metadata.gz: b9cab0f97202d451fdc7ac6296ec47ad060d8ca69dcbf563c562994f2fc92402
+  data.tar.gz: '09ebcd41d4d4d03e9230ed98ffac2254e3eaead6531b18e675cfb6d9f2113007'
 SHA512:
-  metadata.gz: 646afd7b05a46f131a73253f1f8deb6ed3a7228dfa1881e231ed6c01a22f815b37241c67b6b9e318651de81b471cb7a0ef0913dacd3161b60d9381fbb2bf4366
-  data.tar.gz: c45da1ed072ed6581f693e57f438e92faaaedb44d4ffd3eb1490b7256026b509666d2fb692ac185cfb78e6d23bbad74c254b4c6248d7962c74a4af5a5a1fe284
+  metadata.gz: 3c1beaad9a521df3f78d6e09ec31bb02da6148e33b0ec01340b46c9df4ce7265d1d36e380c3660c545608258babf864252b40673537d771fc326e7f137469724
+  data.tar.gz: d7a28c5d8158c8bdfeb1753feb35ef02e90bfd53c3181d0b409ac691408a559678dcf62c43b2f9f702ab7b7bfdc101f3da91588ce9bca70c006a3b316da1783f

data/lib/google/gax.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/lib/google/gax/api_callable.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #
@@ -393,12 +393,13 @@ module Google
     # @return [Proc] the original proc updated to the timeout arg
     def add_timeout_arg(a_func, timeout, metadata)
       proc do |request, block|
+        deadline = Time.now + timeout unless timeout.nil?
         op = a_func.call(request,
-                         deadline: Time.now + timeout,
+                         deadline: deadline,
                          metadata: metadata,
                          return_op: true)
         res = op.execute
-        block.call op if block
+        block.call res, op if block
         res
       end
     end

data/lib/google/gax/bundling.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/lib/google/gax/constants.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/lib/google/gax/errors.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/lib/google/gax/grpc.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/lib/google/gax/operation.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/lib/google/gax/path_template.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/lib/google/gax/settings.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #
@@ -83,7 +83,9 @@ module Google
 
       # @return true when it has retry codes.
       def retry_codes?
-        @retry_options && @retry_options.retry_codes
+        @retry_options &&
+          @retry_options.retry_codes &&
+          @retry_options.retry_codes.any?
       end
 
       # @return true when it has valid bundler configuration.
@@ -123,7 +125,8 @@ module Google
                        options.page_token
                      end
 
-        metadata = (metadata.dup if metadata) || {}
+        metadata = @metadata || {}
+        metadata = metadata.dup
         metadata.update(options.metadata) if options.metadata != :OPTION_INHERIT
 
         CallSettings.new(timeout: timeout,

data/lib/google/gax/util.rb

@@ -1,4 +1,4 @@
-# Copyright 2017, Google Inc.
+# Copyright 2017, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/lib/google/gax/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #
@@ -29,6 +29,6 @@
 
 module Google
   module Gax
-    VERSION = '1.5.0'.freeze
+    VERSION = '1.6.2'.freeze
   end
 end

data/lib/google/longrunning/operations_client.rb

@@ -108,13 +108,16 @@ 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 metadata [Hash]
+      #   The request metadata headers.
       def initialize \
           credentials: nil,
           scopes: ALL_SCOPES,
           client_config: {},
           timeout: DEFAULT_TIMEOUT,
           lib_name: nil,
-          lib_version: ""
+          lib_version: "",
+          metadata: nil
         # These require statements are intentionally placed here to initialize
         # the gRPC module only when it's required.
         # See https://github.com/googleapis/toolkit/issues/446
@@ -139,18 +142,19 @@ module Google
           updater_proc = credentials.updater_proc
         end
 
-        package_version = Gem.loaded_specs['google-gax'].version.version
-
-        google_api_client = "gl-ruby/#{RUBY_VERSION}"
-        google_api_client << " #{lib_name}/#{lib_version}" if lib_name
-        google_api_client << " gapic/#{package_version} gax/#{Google::Gax::VERSION}"
-        google_api_client << " grpc/#{GRPC::VERSION}"
-        google_api_client.freeze
+        metadata ||= {}
+        metadata[:"x-goog-api-client"] ||= begin
+          google_api_client = ["gl-ruby/#{RUBY_VERSION}"]
+          google_api_client << "#{lib_name}/#{lib_version}" if lib_name
+          google_api_client << "gax/#{Google::Gax::VERSION}"
+          google_api_client << "grpc/#{GRPC::VERSION}"
+          google_api_client.join(' ').freeze
+        end
 
-        headers = { :"x-goog-api-client" => google_api_client }
         client_config_file = Pathname.new(__dir__).join(
           "operations_client_config.json"
         )
+
         defaults = client_config_file.open do |f|
           Google::Gax.construct_settings(
             "google.longrunning.Operations",
@@ -160,7 +164,7 @@ module Google
             timeout,
             page_descriptors: PAGE_DESCRIPTORS,
             errors: Google::Gax::Grpc::API_ERRORS,
-            kwargs: headers
+            metadata: metadata
           )
         end
 

data/spec/fixtures/fixture.proto

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc.
+// Copyright 2016 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

data/spec/google/gax/api_callable_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #
@@ -353,7 +353,7 @@ describe Google::Gax do
       my_callable = Google::Gax.create_api_call(
         func, CallSettings.new(timeout: 0, retry_options: retry_options)
       )
-      expect { my_callable.call }.to raise_error(Google::Gax::RetryError)
+      expect { my_callable.call }.to raise_error(CustomException)
       expect(call_count).to eq(1)
     end
 

data/spec/google/gax/bundling_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/spec/google/gax/call_settings_spec.rb

@@ -0,0 +1,100 @@
+# Copyright 2019, Google Inc.
+# 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 Inc. 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/settings'
+require 'google/gax'
+
+describe 'Google::Gax::CallSettings' do
+  describe 'merging metadata' do
+    NonPrivateCallSettings = Google::Gax.const_get :CallSettings
+
+    it 'merges nil with :OPTION_INHERIT' do
+      call_settings = NonPrivateCallSettings.new metadata: nil
+      call_options = Google::Gax::CallOptions.new metadata: :OPTION_INHERIT
+      new_settings = call_settings.merge call_options
+      expect(new_settings.metadata).to eq({})
+    end
+
+    it 'merges nil with an empty hash' do
+      call_settings = NonPrivateCallSettings.new metadata: nil
+      call_options = Google::Gax::CallOptions.new metadata: {}
+      new_settings = call_settings.merge call_options
+      expect(new_settings.metadata).to eq({})
+    end
+
+    it 'merges nil hash with a filled hash' do
+      call_settings = NonPrivateCallSettings.new metadata: nil
+      call_options = Google::Gax::CallOptions.new metadata: { foo: :baz }
+      new_settings = call_settings.merge call_options
+      expect(new_settings.metadata).to eq(foo: :baz)
+    end
+
+    it 'merges an empty hash with :OPTION_INHERIT' do
+      call_settings = NonPrivateCallSettings.new metadata: {}
+      call_options = Google::Gax::CallOptions.new metadata: :OPTION_INHERIT
+      new_settings = call_settings.merge call_options
+      expect(new_settings.metadata).to eq({})
+    end
+
+    it 'merges an empty hash with an empty hash' do
+      call_settings = NonPrivateCallSettings.new metadata: {}
+      call_options = Google::Gax::CallOptions.new metadata: {}
+      new_settings = call_settings.merge call_options
+      expect(new_settings.metadata).to eq({})
+    end
+
+    it 'merges an empty hash with a filled hash' do
+      call_settings = NonPrivateCallSettings.new metadata: {}
+      call_options = Google::Gax::CallOptions.new metadata: { foo: :baz }
+      new_settings = call_settings.merge call_options
+      expect(new_settings.metadata).to eq(foo: :baz)
+    end
+
+    it 'merges a filled hash with :OPTION_INHERIT' do
+      call_settings = NonPrivateCallSettings.new metadata: { foo: :bar }
+      call_options = Google::Gax::CallOptions.new metadata: :OPTION_INHERIT
+      new_settings = call_settings.merge call_options
+      expect(new_settings.metadata).to eq(foo: :bar)
+    end
+
+    it 'merges a filled hash with an empty hash' do
+      call_settings = NonPrivateCallSettings.new metadata: { foo: :bar }
+      call_options = Google::Gax::CallOptions.new metadata: {}
+      new_settings = call_settings.merge call_options
+      expect(new_settings.metadata).to eq(foo: :bar)
+    end
+
+    it 'merges a filled hash with a filled hash' do
+      call_settings = NonPrivateCallSettings.new metadata: { foo: :bar }
+      call_options = Google::Gax::CallOptions.new metadata: { foo: :baz }
+      new_settings = call_settings.merge call_options
+      expect(new_settings.metadata).to eq(foo: :baz)
+    end
+  end
+end

data/spec/google/gax/error_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2017, Google Inc.
+# Copyright 2017, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/spec/google/gax/grpc_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2017, Google Inc.
+# Copyright 2017, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/spec/google/gax/operation_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/spec/google/gax/path_template_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/spec/google/gax/settings_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, Google Inc.
+# Copyright 2016, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

data/spec/google/gax/util_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2017, Google Inc.
+# Copyright 2017, Google LLC
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
 # 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 Inc. nor the names of its
+#     * 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.
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-gax
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Google API Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: googleauth
@@ -194,6 +194,7 @@ files:
 - spec/fixtures/fixture_pb.rb
 - spec/google/gax/api_callable_spec.rb
 - spec/google/gax/bundling_spec.rb
+- spec/google/gax/call_settings_spec.rb
 - spec/google/gax/error_spec.rb
 - spec/google/gax/grpc_spec.rb
 - spec/google/gax/operation_spec.rb
@@ -220,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Aids the development of APIs for clients and servers based on GRPC and Google