google-gax 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d54006c2b0494a7908f5510bc48ef77a98c2ff02
-  data.tar.gz: d19197493f156c95c153f9c8a2cd3501ecdffc67
+  metadata.gz: f85f3914efd1320cd9f01cfe77ec1e7fff36e092
+  data.tar.gz: 7326644db9b2b1157eeab214f9f327b14961c6c1
 SHA512:
-  metadata.gz: 806f18271c7a31698639466e5a6900598226eb53ed807cfc7ca84b17f898aa5c5b77cb68478dc0c329d5e299943143f6d4b974d3045a53b277d3bde272bf97e9
-  data.tar.gz: 671837be39ed1a7fe642f9652ab766535b44e07dc46892cd56499990d57a26ba318846de9fed4918eca8db1ca06c94dd21c52c06769a0e275aef37b6b50d59f0
+  metadata.gz: b48de10a41fbe57711a32e0018a2004134871b115469eafed271dc6a301ff5a732b6866c55dba6b580b2e24d424cb329bce815b2f8ec64d522e2ea30cf950a5d
+  data.tar.gz: 127ad3139e211fd901e3a5943937d0da7f12ea7150a8385365f212a77a12c8a1fdd1e84592ea677190667cfaa8b2c260468eb4389ca5f2ffb5c486360d4023ce

data/lib/google/gax/bundling.rb

@@ -77,8 +77,6 @@ module Google
       result
     end
 
-    # rubocop:disable Metrics/ClassLength
-
     # Coordinates the execution of a single bundle.
     #
     # @!attribute [r] bundle_id

data/lib/google/gax/grpc.rb

@@ -65,12 +65,13 @@ module Google
             error.to_status
           ).details
         details.map do |any|
-          # If the type of the proto wrapped by the Any instance is not
-          # available, do not deserialize.
-          candidate_class_name = class_case(any.type_name.split('.')).join('::')
+          # deserialize the proto wrapped by the Any in the error details
           begin
-            any.unpack(Object.const_get(candidate_class_name))
-          rescue NameError
+            type = Google::Protobuf::DescriptorPool.generated_pool.lookup(
+              any.type_name
+            )
+            any.unpack(type.msgclass)
+          rescue
             any
           end
         end

data/lib/google/gax/operation.rb

@@ -155,8 +155,16 @@ module Google
       # @return [Object, nil]
       #   The metadata of the operation. Can be nil.
       def metadata
-        return nil if @grpc_op.metadata.nil?
-        @grpc_op.metadata.unpack(@metadata_type)
+        return if @grpc_op.metadata.nil?
+
+        return @grpc_op.metadata.unpack(@metadata_type) if @metadata_type
+
+        descriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup(
+          @grpc_op.metadata.type_name
+        )
+        return @grpc_op.metadata.unpack(descriptor.msgclass) if descriptor
+
+        @grpc_op.metadata
       end
 
       # Checks if the operation is done. This does not send a new api call,
@@ -180,7 +188,16 @@ module Google
       # @return [Object, nil]
       #   The response of the operation.
       def response
-        @grpc_op.response.unpack(@result_type) if response?
+        return unless response?
+
+        return @grpc_op.response.unpack(@result_type) if @result_type
+
+        descriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup(
+          @grpc_op.response.type_name
+        )
+        return @grpc_op.response.unpack(descriptor.msgclass) if descriptor
+
+        @grpc_op.response
       end
 
       # Checks if the operation is done and the result is an error.

data/lib/google/gax/version.rb

@@ -29,6 +29,6 @@
 
 module Google
   module Gax
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

data/lib/google/longrunning/operations_client.rb

@@ -121,10 +121,10 @@ module Google
         require "google/gax/grpc"
         require "google/longrunning/operations_services_pb"
 
-        credentials ||= Google::Auth::Credentials.default(scopes: scopes)
+        credentials ||= Google::Auth::Credentials.default(scope: scopes)
 
         if credentials.is_a?(String) || credentials.is_a?(Hash)
-          updater_proc = Google::Auth::Credentials.new(credentials).updater_proc
+          updater_proc = Google::Auth::Credentials.new(credentials, scope: scopes).updater_proc
         end
         if credentials.is_a?(GRPC::Core::Channel)
           channel = credentials

data/spec/google/gax/grpc_spec.rb

@@ -161,6 +161,7 @@ describe Google::Gax::Grpc do
       end.to raise_error(ArgumentError)
     end
   end
+
   describe '#deserialize_error_status_details' do
     it 'deserializes a known error type' do
       expected_error = Google::Rpc::DebugInfo.new(detail: 'shoes are untied')
@@ -177,6 +178,7 @@ describe Google::Gax::Grpc do
       expect(Google::Gax::Grpc.deserialize_error_status_details(error))
         .to eq [expected_error]
     end
+
     it 'does not deserialize an unknown error type' do
       expected_error = Random.new.bytes(8)
 

data/spec/google/gax/operation_spec.rb

@@ -70,17 +70,30 @@ METADATA_ANY = Google::Protobuf::Any.new
 METADATA = Google::Rpc::Status.new(code: 2, message: 'Metadata')
 METADATA_ANY.pack(METADATA)
 
+TIMESTAMP_ANY = Google::Protobuf::Any.new
+TIMESTAMP = Google::Protobuf::Timestamp.new(
+  seconds: 123_456_789,
+  nanos: 987_654_321
+)
+TIMESTAMP_ANY.pack(TIMESTAMP)
+
+UNKNOWN_ANY = Google::Protobuf::Any.new(
+  type_url: 'type.unknown.tld/this.does.not.Exist',
+  value: ''
+)
+
 DONE_GET_METHOD = proc do
   GrpcOp.new(done: true, response: RESULT_ANY, metadata: METADATA_ANY)
 end
 DONE_ON_GET_CLIENT = MockLroClient.new(get_method: DONE_GET_METHOD)
 
-def create_op(operation, client: nil, call_options: nil)
+def create_op(operation, client: nil, result_type: Google::Rpc::Status,
+              metadata_type: Google::Rpc::Status, call_options: nil)
   GaxOp.new(
     operation,
     client || DONE_ON_GET_CLIENT,
-    Google::Rpc::Status,
-    Google::Rpc::Status,
+    result_type,
+    metadata_type,
     call_options: call_options
   )
 end
@@ -116,6 +129,25 @@ describe Google::Gax::Operation do
       op = create_op(GrpcOp.new(done: true, metadata: METADATA_ANY))
       expect(op.metadata).to eq(METADATA)
     end
+
+    it 'should unpack the metadata when metadata_type is set to type class.' do
+      op = create_op(GrpcOp.new(done: true, metadata: TIMESTAMP_ANY),
+                     metadata_type: Google::Protobuf::Timestamp)
+      expect(op.metadata).to eq(TIMESTAMP)
+    end
+
+    it 'should unpack the metadata when metadata_type is looked up.' do
+      op = create_op(GrpcOp.new(done: true, metadata: TIMESTAMP_ANY),
+                     metadata_type: nil)
+      expect(op.metadata).to eq(TIMESTAMP)
+    end
+
+    it 'should return original metadata when metadata_type is not found when ' \
+       'looked up.' do
+      op = create_op(GrpcOp.new(done: true, metadata: UNKNOWN_ANY),
+                     metadata_type: nil)
+      expect(op.metadata).to eq(UNKNOWN_ANY)
+    end
   end
 
   context 'method `done?`' do
@@ -193,6 +225,25 @@ describe Google::Gax::Operation do
       op = create_op(GrpcOp.new(done: true, response: RESULT_ANY))
       expect(op.response).to eq(RESULT)
     end
+
+    it 'should unpack the result when result_type is set to type class.' do
+      op = create_op(GrpcOp.new(done: true, response: TIMESTAMP_ANY),
+                     result_type: Google::Protobuf::Timestamp)
+      expect(op.response).to eq(TIMESTAMP)
+    end
+
+    it 'should unpack the result when result_type is looked up.' do
+      op = create_op(GrpcOp.new(done: true, response: TIMESTAMP_ANY),
+                     result_type: nil)
+      expect(op.response).to eq(TIMESTAMP)
+    end
+
+    it 'should return original response when result_type is not found when ' \
+       'looked up.' do
+      op = create_op(GrpcOp.new(done: true, response: UNKNOWN_ANY),
+                     result_type: nil)
+      expect(op.response).to eq(UNKNOWN_ANY)
+    end
   end
 
   context 'method `cancel`' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-gax
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Google API Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: googleauth