Better Error Response (#4524)

LastOperationFailedState error changed with ApiError, ApiError is thrown in failed status during service instance update and create and added to the service binding create/delete

Author: serdarozerr

app/actions/v3/service_binding_create.rb

@@ -53,7 +53,7 @@ def poll(binding)
           raise LastOperationFailedState
         end
       rescue LastOperationFailedState => e
-        raise e
+        raise CloudController::Errors::ApiError.new_from_details('UnableToPerform', 'create', e.message)
       rescue StandardError => e
         save_failed_state(binding, e)
         raise e

app/actions/v3/service_binding_delete.rb

@@ -60,7 +60,7 @@ def poll(binding)
           raise LastOperationFailedState
         end
       rescue LastOperationFailedState => e
-        raise e
+        raise CloudController::Errors::ApiError.new_from_details('UnableToPerform', 'delete', e.message)
       rescue StandardError => e
         update_last_operation(binding, state: 'failed', description: e.message)
         raise e

app/actions/v3/service_instance_create_managed.rb

@@ -73,7 +73,6 @@ def provision(instance, parameters: {}, accepts_incomplete: false)
         end
       rescue StandardError => e
         save_failed_state(instance, e)
-
         raise e
       end
 
@@ -100,7 +99,7 @@ def poll(instance)
           raise LastOperationFailedState.new(last_operation_result[:last_operation][:description])
         end
       rescue LastOperationFailedState => e
-        raise e
+        raise CloudController::Errors::ApiError.new_from_details('UnableToPerform', 'create managed', e.message)
       rescue StandardError => e
         save_failed_state(instance, e)
         raise e

app/actions/v3/service_instance_update_managed.rb

@@ -113,7 +113,6 @@ def update(accepts_incomplete: false)
         end
       rescue StandardError => e
         save_failed_state(service_instance, e)
-
         raise e
       end
 
@@ -140,7 +139,7 @@ def poll
           raise LastOperationFailedState.new(details[:last_operation][:description])
         end
       rescue LastOperationFailedState => e
-        raise e
+        raise CloudController::Errors::ApiError.new_from_details('UnableToPerform', 'update', e.message)
       rescue StandardError => e
         save_failed_state(service_instance, e)
         raise e

app/jobs/v3/create_binding_async_job.rb

@@ -66,10 +66,10 @@ def perform
         finish if polling_status[:finished]
 
         self.polling_interval_seconds = polling_status[:retry_after] if polling_status[:retry_after].present?
+      rescue CloudController::Errors::ApiError => e
+        raise e
       rescue OperationCancelled => e
         raise CloudController::Errors::ApiError.new_from_details('UnableToPerform', operation_type, e.message)
-      rescue BindingNotFound => e
-        raise e
       rescue ServiceBindingCreate::BindingNotRetrievable
         raise CloudController::Errors::ApiError.new_from_details('ServiceBindingInvalid', 'The broker responded asynchronously but does not support fetching binding data')
       rescue StandardError => e

app/jobs/v3/delete_binding_job.rb

@@ -55,6 +55,8 @@ def perform
         return finish if polling_status[:finished]
 
         self.polling_interval_seconds = polling_status[:retry_after] if polling_status[:retry_after].present?
+      rescue CloudController::Errors::ApiError => e
+        raise e
       rescue StandardError => e
         save_failure(e.message) if binding.reload.last_operation.state != 'failed' && !e.is_a?(V3::ServiceRouteBindingDelete::ConcurrencyError)
         raise CloudController::Errors::ApiError.new_from_details('UnableToPerform', 'unbind', e.message)

spec/support/shared_examples/v3_service_binding_create.rb

@@ -1,4 +1,4 @@
-require 'db_spec_helper'
+require 'spec_helper'
 require 'services/service_brokers/v2/errors/service_broker_bad_response'
 require 'services/service_brokers/v2/errors/service_broker_request_rejected'
 require 'cloud_controller/http_request_error'
@@ -207,7 +207,7 @@ class BadError < StandardError; end
       let(:state) { 'failed' }
 
       it 'updates the last operation' do
-        expect { action.poll(binding) }.to raise_error(VCAP::CloudController::V3::LastOperationFailedState)
+        expect { action.poll(binding) }.to raise_error(CloudController::Errors::ApiError)
 
         binding.reload
         expect(binding.last_operation.state).to eq('failed')
@@ -371,7 +371,7 @@ class BadError < StandardError; end
         let(:state) { 'failed' }
 
         it 'does not create an audit event' do
-          expect { action.poll(binding) }.to raise_error(VCAP::CloudController::V3::LastOperationFailedState)
+          expect { action.poll(binding) }.to raise_error(CloudController::Errors::ApiError)
 
           expect(binding_event_repo).not_to have_received(:record_create)
         end

spec/support/shared_examples/v3_service_binding_delete.rb

@@ -255,7 +255,7 @@ class BadError < StandardError; end
       let(:state) { 'failed' }
 
       it 'updates the last operation' do
-        expect { action.poll(binding) }.to raise_error(VCAP::CloudController::V3::LastOperationFailedState)
+        expect { action.poll(binding) }.to raise_error(CloudController::Errors::ApiError)
 
         binding.reload
         expect(binding.last_operation.state).to eq('failed')

spec/unit/actions/service_credential_binding_delete_spec.rb

@@ -134,7 +134,7 @@ module V3
             let(:state) { 'failed' }
 
             it 'does not create an audit event' do
-              expect { action.poll(binding) }.to raise_error(VCAP::CloudController::V3::LastOperationFailedState)
+              expect { action.poll(binding) }.to raise_error(CloudController::Errors::ApiError)
 
               expect(klass.first).to eq(binding)
               expect(binding_event_repo).not_to have_received(:record_delete)

spec/unit/actions/service_route_binding_create_spec.rb

@@ -450,7 +450,7 @@ module V3
             let(:state) { 'failed' }
 
             it 'does not notify diego or create an audit event' do
-              expect { action.poll(binding) }.to raise_error(VCAP::CloudController::V3::LastOperationFailedState)
+              expect { action.poll(binding) }.to raise_error(CloudController::Errors::ApiError)
 
               expect(messenger).not_to have_received(:send_desire_request)
               expect(binding_event_repo).not_to have_received(:record_create)