rename error message, remove obsolete parts in test setups

Author: kathap

app/controllers/v3/application_controller.rb

@@ -221,7 +221,7 @@ def handle_db_connection_error(_)
   end
 
   def handle_key_derivation_error(_)
-    error = CloudController::Errors::V3::ApiError.new_from_details('InternalServerError', 'Failed to decrypt credentials')
+    error = CloudController::Errors::V3::ApiError.new_from_details('InternalServerError', 'Error while processing encrypted data')
     handle_api_error(error)
   end
 

spec/request/apps_spec.rb

@@ -3401,33 +3401,18 @@
 
     context 'when the encryption_key_label is invalid' do
       let(:instance) { VCAP::CloudController::ManagedServiceInstance.make(space:) }
-      let(:app_binding) do
-        VCAP::CloudController::ServiceBinding.make(
-          app: app_model,
-          service_instance_guid: instance.guid,
-          credentials: { key: 'value' },
-          syslog_drain_url: 'syslog-url',
-          volume_mounts: %w[volume1 volume2]
-        )
-      end
 
       before do
-        VCAP::CloudController::Encryptor.database_encryption_keys = {
-          encryption_key_0: 'somevalidkeyvalue',
-          foo: 'fooencryptionkey',
-          death: 'headbangingdeathmetalkey', 'invalid-key-label': 'fakekey'
-        }
         allow_any_instance_of(ErrorPresenter).to receive(:raise_500?).and_return(false)
       end
 
       it 'fails to decrypt the environment variables and returns a 500 error' do
-        app_binding.class.db[:service_bindings].where(id: app_binding.id).update(encryption_key_label: 'invalid-key-label')
-
+        app_model # ensure that app model is created before run_cipher is mocked to throw an error
         allow(VCAP::CloudController::Encryptor).to receive(:run_cipher).and_raise(OpenSSL::Cipher::CipherError)
         api_call.call(admin_headers)
 
         expect(last_response).to have_status_code(500)
-        expect(parsed_response['errors'].first['detail']).to match(/Failed/i)
+        expect(parsed_response['errors'].first['detail']).to match(/Error while processing encrypted data/i)
       end
     end
   end

spec/request/service_brokers_spec.rb

@@ -915,21 +915,16 @@ def expect_empty_list(user_headers)
       end
 
       before do
-        VCAP::CloudController::Encryptor.database_encryption_keys = {
-          encryption_key_0: 'somevalidkeyvalue',
-          foo: 'fooencryptionkey',
-          death: 'headbangingdeathmetalkey', 'invalid-key-label': 'fakekey'
-        }
-        broker.class.db[:service_brokers].where(id: broker.id).update(encryption_key_label: 'invalid-key-label')
-        allow(VCAP::CloudController::Encryptor).to receive(:run_cipher).and_raise(OpenSSL::Cipher::CipherError)
         allow_any_instance_of(ErrorPresenter).to receive(:raise_500?).and_return(false)
       end
 
       it 'fails to decrypt the broker data and returns a 500 error' do
+        broker # ensure the broker is created before run_cipher is mocked to throw an error
+        allow(VCAP::CloudController::Encryptor).to receive(:run_cipher).and_raise(OpenSSL::Cipher::CipherError)
         api_call.call(admin_headers)
 
         expect(last_response).to have_status_code(500)
-        expect(parsed_response['errors'].first['detail']).to match(/Failed/i)
+        expect(parsed_response['errors'].first['detail']).to match(/Error while processing encrypted data/i)
       end
     end
   end

spec/request/service_credential_bindings_spec.rb

@@ -626,22 +626,16 @@ def check_filtered_bindings(*bindings)
 
     context 'when the encryption_key_label is invalid' do
       before do
-        VCAP::CloudController::Encryptor.database_encryption_keys = {
-          encryption_key_0: 'somevalidkeyvalue',
-          foo: 'fooencryptionkey',
-          death: 'headbangingdeathmetalkey', 'invalid-key-label': 'fakekey'
-        }
         allow_any_instance_of(ErrorPresenter).to receive(:raise_500?).and_return(false)
       end
 
       it 'fails to decrypt the credentials and returns a 500 error' do
-        app_binding.class.db[:service_bindings].where(id: app_binding.id).update(encryption_key_label: 'invalid-key-label')
-
+        app_binding # ensure that binding is created before run_cipher is mocked to throw an error
         allow(VCAP::CloudController::Encryptor).to receive(:run_cipher).and_raise(OpenSSL::Cipher::CipherError)
         api_call.call(admin_headers)
 
         expect(last_response).to have_status_code(500)
-        expect(parsed_response['errors'].first['detail']).to match(/Failed/i)
+        expect(parsed_response['errors'].first['detail']).to match(/Error while processing encrypted data/i)
       end
     end
 

spec/unit/controllers/v3/application_controller_spec.rb

@@ -337,7 +337,7 @@ def warnings_incorrect_type
     it 'rescues from OpenSSL::Cipher::CipherError and renders an error presenter' do
       get :key_derivation_error
       expect(response).to have_http_status(:internal_server_error)
-      expect(response).to have_error_message(/Failed to decrypt credentials/)
+      expect(response).to have_error_message(/Error while processing encrypted data/)
     end
   end