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

- old
+ new

@@ -228,12 +228,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 interconnect. Get a list of available interconnects by making a list() request.
               #
@@ -291,12 +294,15 @@
                 @interconnects_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 interconnectDiagnostics for the specified interconnect.
               #
@@ -354,12 +360,15 @@
                 @interconnects_stub.get_diagnostics 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 a Interconnect in the specified project using the data included in the request.
               #
@@ -427,12 +436,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 interconnect available to the specified project.
               #
@@ -499,12 +511,15 @@
                   result = ::Gapic::Rest::PagedEnumerable.new @interconnects_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
 
               ##
               # Updates the specified interconnect with the data included in the request. This method supports PATCH semantics and uses the JSON merge patch format and processing rules.
               #
@@ -574,12 +589,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 labels on an Interconnect. To learn more about labels, read the Labeling Resources documentation.
               #
@@ -647,11 +665,14 @@
                   )
                   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 Interconnects REST API.
               #