Merge pull request #20426 from lfu/compiance_action_loop

Improvement to action_check_compliance to avoid infinite loop.

app/models/miq_action.rb

@@ -369,6 +369,11 @@ def action_check_compliance(action, rec, inputs)
       return
     end
 
+    if inputs[:policy].mode == 'compliance'
+      MiqPolicy.logger.warn("MIQ(action_check_compliance): Invoking action [#{action.description}] for event [#{inputs[:event].description}] would cause infinite loop, skipping")
+      return
+    end
+
     if inputs[:synchronous]
       MiqPolicy.logger.info("MIQ(action_check_compliance): Now executing [#{action.description}] of #{rec.class.name} [#{rec.name}]")
       rec.check_compliance
@@ -982,6 +987,10 @@ def self.create_or_update(action_attributes)
     end
   end
 
+  def self.allowed_for_policies(mode)
+    mode == 'compliance' ? where.not(:name => 'check_compliance') : all
+  end
+
   def self.fixture_path
     FIXTURE_DIR.join("#{to_s.pluralize.underscore}.csv")
   end

spec/models/miq_action_spec.rb

@@ -265,6 +265,25 @@
     end
   end
 
+  context '#action_check_compliance' do
+    let(:vm) { FactoryBot.create(:vm_infra) }
+    let(:action) { FactoryBot.create(:miq_action, :name => 'check_compliance', :description => 'Check Host or Vm Compliance') }
+    let(:policy) { FactoryBot.create(:miq_policy, :mode => 'compliance') }
+    let(:event) { FactoryBot.create(:miq_event_definition, :description => 'vm_compliance_check') }
+
+    it 'will not execute for compliance polices' do
+      expect(vm).not_to receive(:check_compliance)
+      expect(MiqPolicy.logger).to receive(:warn)
+      action.action_check_compliance(action, vm, :policy => policy, :synchronous => true, :event => event)
+    end
+
+    it 'will execute for control polices' do
+      policy.update(:mode => 'control')
+      expect(vm).to receive(:check_compliance)
+      action.action_check_compliance(action, vm, :policy => policy, :synchronous => true, :event => event)
+    end
+  end
+
   context '.create_default_actions' do
     context 'seeding default actions from a file with 3 csv rows and some comments' do
       before do