client.rb in google-cloud-compute-v1-1.7.1

- old
+ new

@@ -239,12 +239,15 @@
                   )
                   yield result, response if block_given?
                   return result
                 end
               rescue ::Faraday::Error => e
-                gapic_error = ::Gapic::Rest::Error.wrap_faraday_error e
-                raise ::Google::Cloud::Error.from_error(gapic_error)
+                begin
+                  raise ::Gapic::Rest::Error.wrap_faraday_error e
+                rescue ::Gapic::Rest::Error => gapic_error
+                  raise ::Google::Cloud::Error.from_error gapic_error
+                end
               end
 
               ##
               # Sets the deprecation status of an image. If an empty request body is given, clears the deprecation status instead.
               #
@@ -314,12 +317,15 @@
                   )
                   yield result, response if block_given?
                   return result
                 end
               rescue ::Faraday::Error => e
-                gapic_error = ::Gapic::Rest::Error.wrap_faraday_error e
-                raise ::Google::Cloud::Error.from_error(gapic_error)
+                begin
+                  raise ::Gapic::Rest::Error.wrap_faraday_error e
+                rescue ::Gapic::Rest::Error => gapic_error
+                  raise ::Google::Cloud::Error.from_error gapic_error
+                end
               end
 
               ##
               # Returns the specified image. Gets a list of available images by making a list() request.
               #
@@ -377,12 +383,15 @@
                 @images_stub.get request, options do |result, response|
                   yield result, response if block_given?
                   return result
                 end
               rescue ::Faraday::Error => e
-                gapic_error = ::Gapic::Rest::Error.wrap_faraday_error e
-                raise ::Google::Cloud::Error.from_error(gapic_error)
+                begin
+                  raise ::Gapic::Rest::Error.wrap_faraday_error e
+                rescue ::Gapic::Rest::Error => gapic_error
+                  raise ::Google::Cloud::Error.from_error gapic_error
+                end
               end
 
               ##
               # Returns the latest image that is part of an image family and is not deprecated.
               #
@@ -440,12 +449,15 @@
                 @images_stub.get_from_family request, options do |result, response|
                   yield result, response if block_given?
                   return result
                 end
               rescue ::Faraday::Error => e
-                gapic_error = ::Gapic::Rest::Error.wrap_faraday_error e
-                raise ::Google::Cloud::Error.from_error(gapic_error)
+                begin
+                  raise ::Gapic::Rest::Error.wrap_faraday_error e
+                rescue ::Gapic::Rest::Error => gapic_error
+                  raise ::Google::Cloud::Error.from_error gapic_error
+                end
               end
 
               ##
               # Gets the access control policy for a resource. May be empty if no such policy or resource exists.
               #
@@ -505,12 +517,15 @@
                 @images_stub.get_iam_policy request, options do |result, response|
                   yield result, response if block_given?
                   return result
                 end
               rescue ::Faraday::Error => e
-                gapic_error = ::Gapic::Rest::Error.wrap_faraday_error e
-                raise ::Google::Cloud::Error.from_error(gapic_error)
+                begin
+                  raise ::Gapic::Rest::Error.wrap_faraday_error e
+                rescue ::Gapic::Rest::Error => gapic_error
+                  raise ::Google::Cloud::Error.from_error gapic_error
+                end
               end
 
               ##
               # Creates an image in the specified project using the data included in the request.
               #
@@ -580,12 +595,15 @@
                   )
                   yield result, response if block_given?
                   return result
                 end
               rescue ::Faraday::Error => e
-                gapic_error = ::Gapic::Rest::Error.wrap_faraday_error e
-                raise ::Google::Cloud::Error.from_error(gapic_error)
+                begin
+                  raise ::Gapic::Rest::Error.wrap_faraday_error e
+                rescue ::Gapic::Rest::Error => gapic_error
+                  raise ::Google::Cloud::Error.from_error gapic_error
+                end
               end
 
               ##
               # Retrieves the list of custom images available to the specified project. Custom images are images you create that belong to your project. This method does not get any images that belong to other projects, including publicly-available images, like Debian 8. If you want to get a list of publicly-available images, use this method to make a request to the respective image project, such as debian-cloud or windows-cloud.
               #
@@ -652,12 +670,15 @@
                   result = ::Gapic::Rest::PagedEnumerable.new @images_stub, :list, "items", request, result, options
                   yield result, response if block_given?
                   return result
                 end
               rescue ::Faraday::Error => e
-                gapic_error = ::Gapic::Rest::Error.wrap_faraday_error e
-                raise ::Google::Cloud::Error.from_error(gapic_error)
+                begin
+                  raise ::Gapic::Rest::Error.wrap_faraday_error e
+                rescue ::Gapic::Rest::Error => gapic_error
+                  raise ::Google::Cloud::Error.from_error gapic_error
+                end
               end
 
               ##
               # Patches the specified image with the data included in the request. Only the following fields can be modified: family, description, deprecation status.
               #
@@ -727,12 +748,15 @@
                   )
                   yield result, response if block_given?
                   return result
                 end
               rescue ::Faraday::Error => e
-                gapic_error = ::Gapic::Rest::Error.wrap_faraday_error e
-                raise ::Google::Cloud::Error.from_error(gapic_error)
+                begin
+                  raise ::Gapic::Rest::Error.wrap_faraday_error e
+                rescue ::Gapic::Rest::Error => gapic_error
+                  raise ::Google::Cloud::Error.from_error gapic_error
+                end
               end
 
               ##
               # Sets the access control policy on the specified resource. Replaces any existing policy.
               #
@@ -792,12 +816,15 @@
                 @images_stub.set_iam_policy request, options do |result, response|
                   yield result, response if block_given?
                   return result
                 end
               rescue ::Faraday::Error => e
-                gapic_error = ::Gapic::Rest::Error.wrap_faraday_error e
-                raise ::Google::Cloud::Error.from_error(gapic_error)
+                begin
+                  raise ::Gapic::Rest::Error.wrap_faraday_error e
+                rescue ::Gapic::Rest::Error => gapic_error
+                  raise ::Google::Cloud::Error.from_error gapic_error
+                end
               end
 
               ##
               # Sets the labels on an image. To learn more about labels, read the Labeling Resources documentation.
               #
@@ -865,12 +892,15 @@
                   )
                   yield result, response if block_given?
                   return result
                 end
               rescue ::Faraday::Error => e
-                gapic_error = ::Gapic::Rest::Error.wrap_faraday_error e
-                raise ::Google::Cloud::Error.from_error(gapic_error)
+                begin
+                  raise ::Gapic::Rest::Error.wrap_faraday_error e
+                rescue ::Gapic::Rest::Error => gapic_error
+                  raise ::Google::Cloud::Error.from_error gapic_error
+                end
               end
 
               ##
               # Returns permissions that a caller has on the specified resource.
               #
@@ -930,11 +960,14 @@
                 @images_stub.test_iam_permissions request, options do |result, response|
                   yield result, response if block_given?
                   return result
                 end
               rescue ::Faraday::Error => e
-                gapic_error = ::Gapic::Rest::Error.wrap_faraday_error e
-                raise ::Google::Cloud::Error.from_error(gapic_error)
+                begin
+                  raise ::Gapic::Rest::Error.wrap_faraday_error e
+                rescue ::Gapic::Rest::Error => gapic_error
+                  raise ::Google::Cloud::Error.from_error gapic_error
+                end
               end
 
               ##
               # Configuration class for the Images REST API.
               #