foreman_rh_cloud 3.0.24 → 3.0.28

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -6,6 +6,11 @@ module InsightsCloud
       include ::ForemanRhCloud::CloudAuth
 
       def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping insights sync')
+          return
+        end
+
         sequence do
           # This can be turned off when we enable automatic status syncs
           # This step will query cloud inventory to retrieve inventory uuids for each host

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -7,11 +7,21 @@ module InsightsCloud
 
       RULE_ID_REGEX = /[^:]*:(?<id>.*)/
 
+      def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping resolutions sync')
+          return
+        end
+
+        plan_self
+      end
+
       def run
         InsightsResolution.transaction do
           InsightsResolution.delete_all
-          api_response = query_insights_resolutions(relevant_rules)
-          write_resolutions(api_response)
+          rule_ids = relevant_rules
+          api_response = query_insights_resolutions(rule_ids) unless rule_ids.empty?
+          write_resolutions(api_response) if api_response
         end
       end
 

data/lib/insights_cloud/async/insights_rules_sync.rb

@@ -6,8 +6,17 @@ module InsightsCloud
       include ::ForemanRhCloud::CloudAuth
 
       def plan
-        plan_self
-        plan_resolutions
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping rules sync')
+          return
+        end
+
+        # since the tasks are not connected, we need to force sequence execution here
+        # to make sure we don't run resolutions until we synced all our rules
+        sequence do
+          plan_self
+          plan_resolutions
+        end
       end
 
       def plan_resolutions

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -5,6 +5,11 @@ module InventorySync
       set_callback :step, :around, :update_statuses_batch
 
       def plan(organization)
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping inventory hosts sync')
+          return
+        end
+
         plan_self(organization_id: organization.id)
       end
 

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -5,6 +5,11 @@ module InventorySync
       set_callback :step, :around, :create_facets
 
       def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping inventory hosts sync')
+          return
+        end
+
         # by default the tasks will be executed concurrently
         plan_self
         plan_self_host_sync

data/lib/inventory_sync/async/inventory_self_host_sync.rb

@@ -3,6 +3,15 @@ module InventorySync
     class InventorySelfHostSync < QueryInventoryJob
       set_callback :step, :around, :create_facets
 
+      def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping self host sync')
+          return
+        end
+
+        plan_self
+      end
+
       def create_facets
         # get the results from the event
         results = yield

data/lib/tasks/insights.rake

@@ -4,4 +4,19 @@ namespace :rh_cloud_insights do
     ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
     puts "Synchronized Insights hosts hits data"
   end
+
+  desc "Remove insights client report statuses by searching on host criteria"
+  task clean_statuses: [:environment] do
+    hosts_search = ENV['SEARCH']
+
+    if hosts_search.empty?
+      puts 'Must specify SEARCH= criteria for hosts search'
+      next
+    end
+
+    cleaner = ForemanRhCloud::InsightsStatusCleaner.new
+    deleted_count = cleaner.clean(hosts_search)
+
+    puts "Deleted #{deleted_count} insights statuses"
+  end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "3.0.24",
+  "version": "3.0.28",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,6 @@
   },
   "devDependencies": {
     "@babel/core": "~7.7.0",
-    "@redhat-cloud-services/frontend-components": "^2.5.0",
     "@theforeman/builder": "~4.14.0",
     "@theforeman/stories": "~4.14.0",
     "@theforeman/test": "~4.14.0",
@@ -43,6 +42,7 @@
   },
   "dependencies": {
     "jed": "~1.1.1",
-    "react-intl": "~2.8.0"
+    "react-intl": "~2.8.0",
+    "@redhat-cloud-services/frontend-components": "^2.5.0"
   }
 }

data/test/jobs/insights_client_status_aging_test.rb

@@ -16,18 +16,18 @@ class InsightsClientStatusAgingTest < ActiveSupport::TestCase
   end
 
   test 'stale statuses should change' do
-    InsightsClientReportStatus.find_or_initialize_by(host_id: @host1.id).update(status: InsightsClientReportStatus::REPORTING, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
-    InsightsClientReportStatus.find_or_initialize_by(host_id: @host2.id).update(status: InsightsClientReportStatus::NO_REPORT, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
-    InsightsClientReportStatus.find_or_initialize_by(host_id: @host3.id).update(status: InsightsClientReportStatus::NOT_MANAGED, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
-    InsightsClientReportStatus.find_or_initialize_by(host_id: @host4.id).update(status: InsightsClientReportStatus::NOT_MANAGED_WITH_DATA, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host1.id).update(status: InsightsClientReportStatus::REPORTING, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL + 1.day)
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host2.id).update(status: InsightsClientReportStatus::NO_REPORT, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL + 1.day)
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host3.id).update(status: InsightsClientReportStatus::REPORTING, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host4.id).update(status: InsightsClientReportStatus::NO_REPORT, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL - 1.day)
 
     ForemanTasks.sync_task(InsightsCloud::Async::InsightsClientStatusAging)
 
     @hosts.each(&:reload)
 
-    assert_equal InsightsClientReportStatus::NO_REPORT, @host1.get_status(InsightsClientReportStatus).status
+    assert_equal InsightsClientReportStatus::REPORTING, @host1.get_status(InsightsClientReportStatus).status
     assert_equal InsightsClientReportStatus::NO_REPORT, @host2.get_status(InsightsClientReportStatus).status
-    assert_equal InsightsClientReportStatus::NOT_MANAGED, @host3.get_status(InsightsClientReportStatus).status
-    assert_equal InsightsClientReportStatus::NOT_MANAGED, @host4.get_status(InsightsClientReportStatus).status
+    assert_equal InsightsClientReportStatus::NO_REPORT, @host3.get_status(InsightsClientReportStatus).status
+    assert_equal InsightsClientReportStatus::NO_REPORT, @host4.get_status(InsightsClientReportStatus).status
   end
 end

data/test/jobs/insights_full_sync_test.rb

@@ -7,6 +7,7 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   setup do
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_rules_sync)
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_notifications)
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
 
     uuid1 = 'accdf444-5628-451d-bf3e-cf909ad72756'
     @host1 = FactoryBot.create(:host, :managed, name: 'host1')

data/test/jobs/insights_resolutions_sync_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InsightsResolutionsSyncTest < ActiveSupport::TestCase
@@ -63,6 +63,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     }
 
     @rule = FactoryBot.create(:insights_rule, rule_id: 'network_tcp_connection_hang|NETWORK_TCP_CONNECTION_HANG_WARN')
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
   end
 
   test 'Resolutions data is replaced with data from cloud' do
@@ -74,4 +75,13 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     assert_equal 5, InsightsResolution.all.count
     assert_equal 2, @rule.resolutions.count
   end
+
+  test 'Skips pinging the cloud if no rule ids were found' do
+    InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
+    InsightsRule.all.delete_all
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
+
+    assert_equal 0, InsightsResolution.all.count
+  end
 end

data/test/jobs/insights_rules_sync_test.rb

@@ -112,6 +112,7 @@ class InsightsRulesSyncTest < ActiveSupport::TestCase
     @hit = FactoryBot.create(:insights_hit, host_id: @host.id)
 
     InsightsCloud::Async::InsightsRulesSync.any_instance.stubs(:plan_resolutions)
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
   end
 
   test 'Hits data is replaced with data from cloud' do

data/test/jobs/inventory_full_sync_test.rb

@@ -242,6 +242,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Host status should be SYNC for inventory hosts' do
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'TEST TOKEN')
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host2.organization)
@@ -253,6 +254,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Host status should be DISCONNECT for hosts that are not returned from cloud' do
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'TEST TOKEN')
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
     FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
 
@@ -261,4 +263,12 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
 
     assert_equal InventorySync::InventoryStatus::DISCONNECT, InventorySync::InventoryStatus.where(host_id: @host1.id).first.status
   end
+
+  test 'Task should be aborted if token is not present' do
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: '')
+
+    InventorySync::Async::InventoryFullSync.any_instance.expects(:plan_self).never
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
+  end
 end

data/test/jobs/inventory_hosts_sync_test.rb

@@ -6,6 +6,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
 
     env = FactoryBot.create(:katello_k_t_environment)
     cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)

data/test/jobs/inventory_self_host_sync_test.rb

@@ -6,6 +6,7 @@ class InventorySelfHostSyncTest < ActiveSupport::TestCase
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host1 = FactoryBot.create(:host)

data/test/models/insights_client_report_status_test.rb

@@ -1,77 +1,75 @@
 require 'test_plugin_helper'
 
 class InsightsClientReportStatusTest < ActiveSupport::TestCase
-  describe 'to_status' do
-    let(:host) { FactoryBot.create(:host, :managed) }
-
-    setup do
-      CommonParameter.where(name: 'host_registration_insights').destroy_all
-    end
-
-    test 'host_registration_insights = true & is getting data' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-
-      assert_equal 0, host_status.to_status(data: true)
-    end
-
-    test 'host_registration_insights = true & no data in less than 48 hours' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 1.day.ago)
-      assert_equal 0, host_status.to_status
-    end
-
-    test 'host_registration_insights = true & no data in more than 48 hours' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 3.days.ago)
-      assert_equal 1, host_status.to_status
-    end
-
-    test 'host_registration_insights = false & no data' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 2, host_status.to_status
-    end
-
-    test 'host_registration_insights = false & getting data' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 3, host_status.to_status(data: true)
-    end
-
-    test 'host_registration_insights = nil & is getting data' do
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 3, host_status.to_status(data: true)
-    end
-
-    test 'host_registration_insights = nil & no data in less than 48 hours' do
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 1.day.ago)
-      assert_equal 2, host_status.to_status
-    end
-
-    test 'host_registration_insights = nil & no data in more than 48 hours' do
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 3.days.ago)
-      assert_equal 2, host_status.to_status
-    end
-
-    test 'override param on host level from `false` to `true`' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
-      FactoryBot.create(:host_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true, host: host)
-
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 0, host_status.to_status(data: true)
-    end
-
-    test 'override param on host level from `true` to `false`' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      FactoryBot.create(:host_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false, host: host)
-
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 2, host_status.to_status
-    end
+  setup do
+    @host = FactoryBot.create(:host, :managed)
+  end
+
+  test 'fresh host does not have insights status' do
+    @host.reload
+
+    refute @host.host_statuses.where(type: 'InsightsClientReportStatus').exists?
+    insights_status = @host.get_status(InsightsClientReportStatus)
+    refute insights_status.relevant?
+  end
+
+  test 'host can refresh all its statuses' do
+    @host.refresh_statuses
+    @host.reload
+
+    refute @host.host_statuses.where(type: 'InsightsClientReportStatus').exists?
+  end
+
+  test 'host with correct report status sets global status to OK' do
+    global_status = @host.get_status(HostStatus.find_status_by_humanized_name('Global'))
+    # Status has to be OK before action
+    assert_equal HostStatus::Global::OK, global_status.status
+
+    # force create record
+    @host.get_status(InsightsClientReportStatus).refresh!
+    # now refresh should work
+    @host.refresh_statuses([InsightsClientReportStatus])
+
+    @host.reload
+    global_status = @host.get_status(HostStatus.find_status_by_humanized_name('Global'))
+    # Status has to be OK after the action too
+    assert_equal HostStatus::Global::OK, global_status.status
+
+    insights_status = @host.get_status(InsightsClientReportStatus)
+    # assert the status would be displayed
+    assert insights_status.relevant?
+  end
+
+  test 'host will return to OK once the status is refreshed' do
+    global_status = @host.get_status(HostStatus.find_status_by_humanized_name('Global'))
+    # Status has to be OK before action
+    assert_equal HostStatus::Global::OK, global_status.status
+
+    insights_status = @host.get_status(InsightsClientReportStatus)
+    insights_status.status = InsightsClientReportStatus::NO_REPORT
+    insights_status.save!
+    @host.refresh_global_status!
+    global_status = @host.global_status
+    assert_equal HostStatus::Global::ERROR, global_status
+
+    @host.refresh_statuses([InsightsClientReportStatus])
+
+    @host.reload
+    # Status has to be OK after the action too
+    assert_equal HostStatus::Global::OK, @host.global_status
+  end
+
+  test 'host with stale status would set global to ERROR' do
+    global_status = @host.get_status(HostStatus.find_status_by_humanized_name('Global'))
+    # Status has to be OK before action
+    assert_equal HostStatus::Global::OK, global_status.status
+
+    insights_status = @host.get_status(InsightsClientReportStatus)
+    insights_status.status = InsightsClientReportStatus::NO_REPORT
+    insights_status.save!
+    @host.refresh_global_status!
+    @host.reload
+
+    assert_equal HostStatus::Global::ERROR, @host.global_status
   end
 end

data/test/unit/foreman_rh_cloud_self_host_test.rb

@@ -0,0 +1,28 @@
+require 'test_plugin_helper'
+
+class ForemanRhCloudSelfHostTest < ActiveSupport::TestCase
+  setup do
+    # reset cached value
+    ForemanRhCloud.instance_variable_set(:@foreman_host, nil)
+  end
+
+  test 'finds host by fullname' do
+    @domain
+    @host = FactoryBot.create(:host, :managed)
+    ForemanRhCloud.expects(:foreman_host_name).returns(@host.name)
+
+    actual = ForemanRhCloud.foreman_host
+
+    assert_not_nil actual
+  end
+
+  test 'finds host by shortname' do
+    @host = FactoryBot.create(:host, :managed)
+    Host.where(name: @host.name).update_all(name: @host.shortname)
+    ForemanRhCloud.expects(:foreman_host_name).returns(@host.name)
+
+    actual = ForemanRhCloud.foreman_host
+
+    assert_not_nil actual
+  end
+end

data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb

@@ -48,6 +48,7 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
       "/redhat_access/r/insights/platform/inventory/v1/hosts" => "https://cert.cloud.redhat.com/api/inventory/v1/hosts",
       "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cert.cloud.redhat.com/api/ingress/v1/upload",
       "/redhat_access/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4" => "https://cert-api.access.redhat.com/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4",
+      "/redhat_access/r/insights/" => "https://cert.cloud.redhat.com/api/apicast-tests/ping",
     }
 
     paths.each do |key, value|

data/test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb

@@ -0,0 +1,31 @@
+require 'test_plugin_helper'
+
+class InsightsStatusCleanerTest < ActiveSupport::TestCase
+  setup do
+    @host1 = FactoryBot.create(:host)
+    @host2 = FactoryBot.create(:host)
+
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host1.id).update(status: InsightsClientReportStatus::NO_REPORT, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL + 1.day)
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host2.id).update(status: InsightsClientReportStatus::NO_REPORT, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL + 1.day)
+
+    @host1.refresh_global_status!
+    @host2.refresh_global_status!
+  end
+
+  test 'Cleans hosts by search condition' do
+    assert_equal HostStatus::Global::ERROR, @host1.global_status
+    assert_equal HostStatus::Global::ERROR, @host2.global_status
+
+    instance = ForemanRhCloud::InsightsStatusCleaner.new
+    actual_count = instance.clean("name = #{@host1.name}")
+
+    @host1.reload
+    @host2.refresh_global_status!
+
+    assert_equal 1, actual_count
+    assert_equal HostStatus::Global::OK, @host1.global_status
+    assert_equal HostStatus::Global::ERROR, @host2.global_status
+    assert InsightsClientReportStatus.where(host_id: @host1.id).empty?
+    refute InsightsClientReportStatus.where(host_id: @host2.id).empty?
+  end
+end

data/test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb

@@ -8,6 +8,7 @@ class TemplateRendererHelperTest < ActiveSupport::TestCase
     response.stubs(:body).returns('TEST PLAYBOOK')
     ForemanRhCloud::RemediationsRetriever.any_instance.stubs(:query_playbook).returns(response)
     @host1 = FactoryBot.create(:host)
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
   end
 
   test 'Generates a playbook for hit and remediation' do

data/test/unit/tags_generator_test.rb

@@ -62,6 +62,47 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     assert_equal false, actual.key?('content_view')
   end
 
+  test 'generates parameter tags' do
+    FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
+
+    @host.stubs(:host_inherited_params_objects).returns(
+      [
+        OpenStruct.new(name: 'bool_param', value: true),
+        OpenStruct.new(name: 'false_param', value: false),
+        OpenStruct.new(name: 'int_param', value: 1),
+        OpenStruct.new(name: 'empty_param', value: nil),
+        OpenStruct.new(name: 'empty_str_param', value: ''),
+      ]
+    )
+
+    generator = create_generator
+    actual = Hash[generator.generate_parameters]
+
+    assert_equal 3, actual.count
+    assert_equal true, actual['bool_param']
+    assert_equal false, actual['false_param']
+    assert_equal 1, actual['int_param']
+  end
+
+  test 'skips parameter tags if include_parameter_tags setting is off' do
+    FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+
+    @host.stubs(:host_inherited_params_objects).returns(
+      [
+        OpenStruct.new(name: 'bool_param', value: true),
+        OpenStruct.new(name: 'false_param', value: false),
+        OpenStruct.new(name: 'int_param', value: 1),
+        OpenStruct.new(name: 'empty_param', value: nil),
+        OpenStruct.new(name: 'empty_str_param', value: ''),
+      ]
+    )
+
+    generator = create_generator
+    actual = generator.generate_parameters.group_by { |key, value| key }
+
+    assert_equal 0, actual.count
+  end
+
   private
 
   def create_generator

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationModal.scss

@@ -6,4 +6,18 @@
       margin-top: 5px;
     }
   }
+
+  // applies to the backdrop parent of the modal
+  @at-root .pf-c-backdrop {
+    width: calc(100% - 200px) !important;
+    left: 200px !important;
+  }
+
+  // where the vertical nav breaks: https://github.com/theforeman/foreman/blob/3347fa49d500964f0209122d8d36c920d1feafcc/webpack/assets/javascripts/react_app/components/Layout/components/Toolbar/HeaderToolbar.scss#L26
+  @media (max-width: 768px) {
+    @at-root .pf-c-backdrop {
+      width: 100% !important;
+      left: 0 !important;
+    }
+  }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.24
+  version: 3.0.28
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -180,9 +180,9 @@ files:
 - app/services/foreman_rh_cloud/cloud_connector.rb
 - app/services/foreman_rh_cloud/cloud_request.rb
 - app/services/foreman_rh_cloud/cloud_request_forwarder.rb
+- app/services/foreman_rh_cloud/insights_status_cleaner.rb
 - app/services/foreman_rh_cloud/remediations_retriever.rb
 - app/services/foreman_rh_cloud/template_renderer_helper.rb
-- app/subscribers/foreman_rh_cloud/insights_subscriber.rb
 - app/views/hosts/_insights_tab.html.erb
 - app/views/job_templates/rh_cloud_remediations.erb
 - app/views/layouts/foreman_rh_cloud/application.html.erb
@@ -200,6 +200,7 @@ files:
 - db/migrate/20210214000002_add_rule_id_to_hits.foreman_rh_cloud.rb
 - db/migrate/20210307000001_add_unique_to_insights_facet.foreman_rh_cloud.rb
 - db/migrate/20210404000001_change_resolutions.foreman_rh_cloud.rb
+- db/migrate/20210720000001_remove_old_insights_statuses.foreman_rh_cloud.rb
 - db/seeds.d/179_ui_notifications.rb
 - db/seeds.d/50_job_templates.rb
 - lib/foreman_inventory_upload.rb
@@ -266,11 +267,13 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
+- test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
+- test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
 - test/unit/services/foreman_rh_cloud/remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb
 - test/unit/shell_process_job_test.rb
@@ -669,7 +672,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
@@ -696,11 +699,13 @@ test_files:
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
+- test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
+- test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
 - test/unit/services/foreman_rh_cloud/remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb
 - test/unit/shell_process_job_test.rb

data/app/subscribers/foreman_rh_cloud/insights_subscriber.rb

@@ -1,9 +0,0 @@
-module ForemanRhCloud
-  class InsightsSubscriber < ::Foreman::BaseSubscriber
-    def call(*args)
-      host = args.first.payload[:object]
-      host_status = host.get_status(InsightsClientReportStatus)
-      host_status.update(status: host_status.to_status)
-    end
-  end
-end