Merge pull request #195 from jntullo/bz/graceful_fail_on_delete

Gracefully fail on resource create
(cherry picked from commit 4812838)

https://bugzilla.redhat.com/show_bug.cgi?id=1513117

app/controllers/api/base_controller/generic.rb

@@ -19,6 +19,7 @@ def add_resource(type, _id, data)
             data.delete(sc.to_s)
           end
         end
+        validate_type(klass, data['type']) if data['type']
         resource = klass.new(data)
         if resource.save
           add_subcollection_data_to_resource(resource, type, subcollection_data)
@@ -122,6 +123,12 @@ def refresh_dialog_fields_action(dialog, refresh_fields, resource_ident)
 
       private
 
+      def validate_type(klass, type)
+        klass.descendant_get(type)
+      rescue ArgumentError => err
+        raise BadRequestError, "Invalid type #{type} specified - #{err}"
+      end
+
       def add_subcollection_data_to_resource(resource, type, subcollection_data)
         subcollection_data.each do |sc, sc_data|
           typed_target = "#{sc}_assign_resource"

spec/requests/orchestration_template_spec.rb

@@ -83,6 +83,21 @@
 
       expect_bad_request(/Resource id or href should not be specified/)
     end
+
+    it 'fails gracefully with invalid type specified' do
+      api_basic_authorize collection_action_identifier(:orchestration_templates, :create)
+
+      post(api_orchestration_templates_url, :params => { :type => 'OrchestrationTemplateCfn' })
+
+      expected = {
+        'error' => a_hash_including(
+          'kind'    => 'bad_request',
+          'message' => a_string_including('Invalid type OrchestrationTemplateCfn specified')
+        )
+      }
+      expect(response).to have_http_status(:bad_request)
+      expect(response.parsed_body).to include(expected)
+    end
   end
 
   context 'orchestration_template edit' do