Moved convertion of name uniqueness sql error into the action

Author: FelisiaM

app/actions/service_credential_binding_key_create.rb

@@ -17,6 +17,7 @@ def precursor(service_instance, name)
           ServiceKey.create(**binding_details)
         end
       rescue Sequel::ValidationFailed => e
+        key_already_exists!(name) if e.message == 'name and service_instance_id unique'
         raise UnprocessableCreate.new(e.message)
       end
 
@@ -36,6 +37,10 @@ def key_not_supported_for_user_provided_service!
         raise UnprocessableCreate.new("Service credential bindings of type 'key' are not supported for user-provided service instances.")
       end
 
+      def key_already_exists!(key_name)
+        raise UnprocessableCreate.new("The binding name is invalid. Key binding names must be unique. The service instance already has a key binding with name '#{key_name}'.")
+      end
+
       def operation_in_progress!
         raise UnprocessableCreate.new('There is an operation in progress for the service instance.')
       end

app/models/services/service_key.rb

@@ -33,8 +33,7 @@ def space
     def validate
       validates_presence :name
       validates_presence :service_instance
-      validates_unique [:name, :service_instance_id], message: Sequel.lit(
-        "The binding name is invalid. Key binding names must be unique. The service instance already has a key binding with name '#{name}'.")
+      validates_unique [:name, :service_instance_id]
 
       if service_instance
         MaxServiceKeysPolicy.new(

spec/unit/models/services/service_key_spec.rb

@@ -19,6 +19,7 @@ module VCAP::CloudController
       it { is_expected.to validate_presence :name }
       it { is_expected.to validate_db_presence :service_instance_id }
       it { is_expected.to validate_db_presence :credentials }
+      it { is_expected.to validate_uniqueness [:name, :service_instance_id] }
 
       context 'MaxServiceKeysPolicy' do
         let(:service_key) { ServiceKey.make }