Merge pull request #17745 from bdunne/bz_1599754

Avoid raising and re-queueing when the remote resource is not found

Gemfile

@@ -42,7 +42,7 @@ gem "inifile",                        "~>3.0",         :require => false
 gem "kubeclient",                     "~>2.4",         :require => false # For scaling pods at runtime
 gem "linux_admin",                    "~>1.2.1",       :require => false
 gem "log_decorator",                  "~>0.1",         :require => false
-gem "manageiq-api-client",            "~>0.3.0",       :require => false
+gem "manageiq-api-client",            "~>0.3.1",       :require => false
 gem "manageiq-messaging",                              :require => false, :git => "https://github.com/ManageIQ/manageiq-messaging", :branch => "master"
 gem "memoist",                        "~>0.15.0",      :require => false
 gem "mime-types",                     "~>3.0",         :path => File.expand_path("mime-types-redirector", __dir__)

app/models/mixins/process_tasks_mixin.rb

@@ -119,9 +119,14 @@ def invoke_api_tasks(api_client, remote_options)
 
       if resource_ids.present?
         resource_ids.each do |id|
-          obj = collection.find(id)
-          _log.info("Invoking task #{action} on collection #{collection_name}, object #{obj.id}, with args #{post_args}")
-          obj.send(action, post_args)
+          begin
+            obj = collection.find(id)
+          rescue ManageIQ::API::Client::ResourceNotFound => err
+            _log.error(err.message)
+          else
+            _log.info("Invoking task #{action} on collection #{collection_name}, object #{obj.id}, with args #{post_args}")
+            obj.send(action, post_args)
+          end
         end
       else
         _log.info("Invoking task #{action} on collection #{collection_name}, with args #{post_args}")

spec/models/mixins/process_tasks_mixin_spec.rb

@@ -166,6 +166,19 @@ def test_method
         end
       end
 
+      it "with missing remote resource does not raise" do
+        resource0 = double("resource0", :id => 0)
+        expect(api_collection).to receive(:find).with(0).and_raise(ManageIQ::API::Client::ResourceNotFound, "Couldn't find resource with 'id' [0]")
+        options = {
+          :ids  => [0],
+          :task => "the_task",
+          :args => {:some => "args"}
+        }
+        expect(resource0).not_to receive(:the_task)
+
+        expect { test_class.invoke_api_tasks(api_connection, options) }.not_to raise_error
+      end
+
       context "when passed resource ids" do
         let(:resource0)     { double("resource0", :id => 0) }
         let(:resource1)     { double("resource1", :id => 1) }