foreman_rh_cloud 7.0.46 → 8.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1383b077fcadc72b19517f0ed1173aec5ac958a207e8b04a6119e91b75b062c0
-  data.tar.gz: 98783f069cfd8cbc89e2a295b0433437ec3d88b168ccef7c2b7c42b851d07929
+  metadata.gz: e4c84356ce25f9683795e8adb7ab42d223cef0a4ba84a4a8d9f5836cc6b80986
+  data.tar.gz: 5f86cd9c8240aff463e25620a5e0bb47fbc15ab7318647f40918d98a85513ab8
 SHA512:
-  metadata.gz: 711977116c1b74dfd5b528bf7298df5f9c5da3dda6f63a788ed4ea8f82e76b62139d5d4417b4af19ca3e564e0764d99cc38ca30a496b1f78fd170829fef11017
-  data.tar.gz: 78f1a3584c4eea9f64d49cf4be866cd41074e04264c860d22332205124c312c62372cde26435e1e4bfe7303a7574754cbab3f49e3f1c3a31a6abe65c4363890c
+  metadata.gz: 0a7765f56a4d7e695dd253b17fd87820e8455fbe95a23450e2577125f65f20acc813723a2ff036c81d6b41c4d75d1bcf3b3aea65fb1b4042b916a68a117340a5
+  data.tar.gz: d8e8db10a0fc49b9741d38f93e5d59917f85b7ac6fcc8e3007dcb84346ccd15c07bd644a91de1a5ea38942cbb5b27553d5a7c59315e317fe79d1b13b542151bd

data/app/controllers/foreman_inventory_upload/uploads_settings_controller.rb

@@ -6,6 +6,7 @@ module ForemanInventoryUpload
         hostObfuscationEnabled: Setting[:obfuscate_inventory_hostnames],
         ipsObfuscationEnabled: Setting[:obfuscate_inventory_ips],
         excludePackagesEnabled: Setting[:exclude_installed_packages],
+        allowAutoInsightsMismatchDelete: Setting[:allow_auto_insights_mismatch_delete],
         CloudConnectorStatus: ForemanInventoryUpload::UploadsSettingsController.cloud_connector_status,
         lastSyncTask: last_successful_inventory_sync_task,
       }, status: :ok

data/app/models/insights_missing_host.rb

@@ -0,0 +1,5 @@
+class InsightsMissingHost < ApplicationRecord
+  belongs_to :organization
+
+  scoped_search on: [:name, :insights_id, :rhsm_id, :ip_address]
+end

data/db/migrate/20230515140211_add_missing_hosts_table.foreman_rh_cloud.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddMissingHostsTable < ActiveRecord::Migration[6.1]
+  def change
+    create_table :insights_missing_hosts do |t|
+      t.integer :organization_id
+      t.string :name
+      t.string :insights_id
+      t.string :rhsm_id
+      t.string :ip_address
+    end
+  end
+end

data/lib/foreman_inventory_upload/async/remove_insights_hosts_job.rb

@@ -0,0 +1,68 @@
+module ForemanInventoryUpload
+  module Async
+    class RemoveInsightsHostsJob < ::Actions::EntryAction
+      include ForemanRhCloud::CertAuth
+
+      def plan(search_term, organization_id)
+        plan_self(search_term: search_term, organization_id: organization_id)
+      end
+
+      def run
+        logger.debug("Attempting to remove hosts by search term: #{search_term}")
+
+        host_uuids = InsightsMissingHost.search_for(search_term).pluck(:insights_id)
+
+        page_number = 1
+        while (current_page = host_uuids.paginate(page: page_number, per_page: page_size)).present?
+          logger.debug("Removing #{(page_number - 1) * page_size} - #{page_number * page_size}/#{current_page.total_entries} hosts: #{current_page.join(',')}")
+          response = delete_page(current_page, organization)
+          # write the response in case we want to track it later
+          output["response_page#{page_number}"] = response.body
+
+          # remove host records that reported success after deletion
+          if response.code >= 200 && response.code < 300
+            remove_host_records(current_page)
+          else
+            error! "Cloud responded with code: #{response.code}"
+          end
+
+          page_number += 1
+        end
+      end
+
+      def logger
+        Foreman::Logging.logger('background')
+      end
+
+      def search_term
+        input[:search_term]
+      end
+
+      def organization
+        @organization ||= Organization.find_by(id: input[:organization_id])
+      end
+
+      def delete_page(host_uuids, organization)
+        execute_cloud_request(
+          organization: organization,
+          method: :delete,
+          url: ForemanInventoryUpload.hosts_by_ids_url(host_uuids),
+          headers: {
+            content_type: :json,
+          }
+        )
+      rescue RestClient::ExceptionWithResponse => error_response
+        error_response.response
+      end
+
+      def remove_host_records(uuids)
+        InsightsMissingHost.where(insights_id: uuids).delete_all
+      end
+
+      def page_size
+        # the_most_conservative_url_size_limit(2083) / uri_size(36) with some spares for the domain name
+        40
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload/generators/tags.rb

@@ -45,11 +45,9 @@ module ForemanInventoryUpload
       end
 
       def content_data
-        [
-          ['lifecycle_environment', @host.lifecycle_environment&.name],
-          ['content_view', @host.content_view&.name],
-        ] +
-        (@host.activation_keys || []).map { |item| ['activation_key', item.name] }
+        (@host.lifecycle_environments.uniq || []).map { |item| ['lifecycle_environment', item.name] } +
+        (@host.activation_keys || []).map { |item| ['activation_key', item.name] } +
+        (@host.content_views || []).map { |item| ['content_view', item.name] }
       end
 
       def satellite_server_data

data/lib/foreman_inventory_upload.rb

@@ -71,7 +71,7 @@ module ForemanInventoryUpload
   end
 
   def self.inventory_base_url
-    ForemanRhCloud.cert_base_url + "/api/inventory/v1/hosts"
+    "#{ForemanRhCloud.cert_base_url}/api/inventory/v1/hosts"
   end
 
   def self.inventory_export_url
@@ -82,4 +82,9 @@ module ForemanInventoryUpload
   def self.inventory_self_url
     inventory_base_url + "?hostname_or_id=#{ForemanRhCloud.foreman_host.fqdn}"
   end
+
+  def self.hosts_by_ids_url(host_ids)
+    host_ids_string = host_ids.join(',')
+    "#{inventory_base_url}/#{host_ids_string}"
+  end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -127,7 +127,8 @@ module ForemanRhCloud
 
         extend_page 'hosts/_list' do |context|
           context.with_profile :cloud, _('RH Cloud'), default: true do
-            add_pagelet :hosts_table_column_header, key: :insights_recommendations_count, label: _('Recommendations'), sortable: true, width: '12%', class: 'hidden-xs ellipsis', priority: 100
+            add_pagelet :hosts_table_column_header, key: :insights_recommendations_count, label: _('Recommendations'), sortable: true, width: '12%', class: 'hidden-xs ellipsis', priority: 100,
+                        export_data: CsvExporter::ExportDefinition.new(:insights_recommendations_count, callback: ->(host) { host&.insights_hits&.count })
             add_pagelet :hosts_table_column_content, key: :insights_recommendations_count, callback: ->(host) { hits_counts_cell(host) }, class: 'hidden-xs ellipsis text-center', priority: 100
           end
         end

data/lib/foreman_rh_cloud/settings.rb

@@ -2,6 +2,7 @@ Foreman::SettingManager.define(:foreman) do
   category(:rh_cloud, N_('RHCloud')) do
     setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud'), default: true, full_name: N_('Automatic inventory upload'))
     setting('allow_auto_insights_sync', type: :boolean, description: N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), default: false, full_name: N_('Synchronize recommendations Automatically'))
+    setting('allow_auto_insights_mismatch_delete', type: :boolean, description: N_('Enable automatic deletion of mismatched host records from the Red Hat cloud'), default: false, full_name: N_('Automatic mismatch deletion'))
     setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host names'))
     setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host ipv4 addresses'))
     setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud'), default: false, full_name: N_("Exclude installed Packages"))

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '7.0.46'.freeze
+  VERSION = '8.0.47'.freeze
 end

data/lib/inventory_sync/async/host_result.rb

@@ -12,6 +12,7 @@ module InventorySync
         @sub_ids = result["results"].map { |host| host['subscription_manager_id'] }
         @uuid_by_sub_id = Hash[result["results"].map { |host| [host['subscription_manager_id'], host['id']] }]
         @uuid_by_fqdn = Hash[result["results"].map { |host| [host['fqdn']&.downcase, host['id']] }]
+        @results = result["results"]
       end
 
       def status_hashes
@@ -42,6 +43,10 @@ module InventorySync
         @host_uuids ||= Hash[@sub_ids.map { |sub_id| [host_id(sub_id), @uuid_by_sub_id[sub_id]] }].except(nil)
       end
 
+      def missing_hosts
+        @results.select { |host| hosts[host['subscription_manager_id']].nil? }
+      end
+
       def percentage
         ratio = @per_page * @page * 1.0 / @total * 100
         ratio > 100 ? 100 : ratio.truncate(2)

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -1,8 +1,11 @@
 module InventorySync
   module Async
     class InventoryHostsSync < QueryInventoryJob
+      MAX_IP_STRING_SIZE = 254
+
       set_callback :iteration, :around, :setup_facet_transaction
       set_callback :step, :around, :create_facets
+      set_callback :step, :around, :create_missing_hosts
 
       def plan(organizations)
         # by default the tasks will be executed concurrently
@@ -11,7 +14,7 @@ module InventorySync
       end
 
       def setup_facet_transaction
-        InsightsFacet.transaction do
+        ActiveRecord::Base.transaction do
           yield
         end
       end
@@ -23,6 +26,17 @@ module InventorySync
         results
       end
 
+      def create_missing_hosts
+        results = yield
+        missing_hosts = results.missing_hosts.map { |host| to_missing_host_record(host, results.organization) }
+        # remove records that are no longer in the query results
+        InsightsMissingHost.
+          where.not(insights_id: missing_hosts.map { |host_hash| host_hash[:insights_id] }).
+          where(organization_id: results.organization.id).delete_all
+        # readd new hosts that appear in the results, but the subscription_id is missing from the DB.
+        InsightsMissingHost.upsert_all(missing_hosts) if missing_hosts.present?
+      end
+
       def rescue_strategy_for_self
         Dynflow::Action::Rescue::Fail
       end
@@ -42,6 +56,21 @@ module InventorySync
         InsightsFacet.upsert_all(all_facets, unique_by: :host_id) unless all_facets.empty?
       end
 
+      def to_missing_host_record(host_result, organization)
+        {
+          name: host_result['fqdn'],
+          insights_id: host_result['id'],
+          rhsm_id: host_result['subscription_manager_id'],
+          ip_address: to_ip_address_string(host_result['ip_addresses']),
+          organization_id: organization.id,
+        }
+      end
+
+      def to_ip_address_string(ip_addresses)
+        string_size = 0
+        ip_addresses.take_while { |address| (string_size += address.length) <= MAX_IP_STRING_SIZE }
+      end
+
       def plan_self_host_sync
         plan_action InventorySync::Async::InventorySelfHostSync
       end

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -14,8 +14,14 @@ module InventorySync
         end
 
         after_delay do
-          Organization.unscoped.each do |org|
-            plan_org_sync(org)
+          # perform a sequence of sync then delete in parallel for all organizations
+          concurrence do
+            Organization.unscoped.each do |org|
+              sequence do
+                plan_org_sync(org)
+                plan_remove_insights_hosts(org) if Setting[:allow_auto_insights_mismatch_delete]
+              end
+            end
           end
         end
       end
@@ -24,6 +30,11 @@ module InventorySync
         plan_action InventoryFullSync, org
       end
 
+      def plan_remove_insights_hosts
+        # plan a remove hosts action with search set to empty (all records)
+        plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', org.id)
+      end
+
       def logger
         action_logger
       end

data/lib/tasks/hybrid_cloud.rake

@@ -22,9 +22,9 @@ namespace :rh_cloud do |args|
       exit(1)
     end
     
-    organization = Organization.find_by(id: ENV['org_id'].to_i) # saw this coming in as a string, so making sure it gets passed as an integer.
-    
-    @uid = cp_owner_id(organization)
+    @organization = Organization.find_by(id: ENV['org_id'].to_i) # saw this coming in as a string, so making sure it gets passed as an integer.
+    @uid = cp_owner_id(@organization)
+    @hostname = ForemanRhCloud.foreman_host_name
     logger.error('Organization provided does not have a manifest imported.') + exit(1) if @uid.nil?
 
     puts 'Paste your token, output will be hidden.'
@@ -39,7 +39,8 @@ namespace :rh_cloud do |args|
 
     def payload
       {
-        "uid": @uid
+        "uid": @uid,
+        "display_name": "#{@hostname}+#{@organization.label}"
       }
     end
 
@@ -49,7 +50,7 @@ namespace :rh_cloud do |args|
 
     begin
       response = execute_cloud_request(
-        organization: organization,
+        organization: @organization,
         method: method,
         url: registrations_url,
         headers: headers,

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "7.0.46",
+  "version": "8.0.47",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -110,7 +110,7 @@ module InsightsCloud::Api
         User.current = User.find_by(login: 'secret_admin')
 
         @env = FactoryBot.create(:katello_k_t_environment)
-        cv = @env.content_views << FactoryBot.create(:katello_content_view, organization: @env.organization)
+        @env2 = FactoryBot.create(:katello_k_t_environment, organization: @env.organization)
 
         @host = FactoryBot.create(
           :host,
@@ -118,8 +118,16 @@ module InsightsCloud::Api
           :with_content,
           :with_hostgroup,
           :with_parameter,
-          content_view: cv.first,
-          lifecycle_environment: @env,
+          content_view_environments: [
+            FactoryBot.create(
+              :katello_content_view_environment,
+              content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
+              lifecycle_environment: @env),
+            FactoryBot.create(
+              :katello_content_view_environment,
+              content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
+              lifecycle_environment: @env2),
+          ],
           organization: @env.organization
         )
 

data/test/factories/insights_factories.rb

@@ -41,6 +41,14 @@ FactoryBot.define do
     resolution_risk { 1 }
     resolution_type { 'fix' }
   end
+
+  factory :insights_missing_host do
+    organization { association :organization }
+    sequence(:name) { |n| "removed.host#{n}.test" }
+    insights_id { Foreman.uuid }
+    rhsm_id { Foreman.uuid }
+    ip_address { "192.168.1.1,192.168.2.1" }
+  end
 end
 
 FactoryBot.modify do

data/test/factories/inventory_upload_factories.rb

@@ -33,6 +33,13 @@ FactoryBot.define do
   end
 end
 
+FactoryBot.define do
+  factory :katello_content_view_environment, :class => Katello::ContentViewEnvironment do
+    sequence(:name) { |n| "name#{n}" }
+    sequence(:label) { |n| "label#{n}" }
+  end
+end
+
 FactoryBot.define do
   factory :katello_k_t_environment, :aliases => [:katello_environment], :class => Katello::KTEnvironment do
     sequence(:name) { |n| "Environment#{n}" }
@@ -93,6 +100,7 @@ FactoryBot.modify do
       content_view { nil }
       lifecycle_environment { nil }
       content_source { nil }
+      content_view_environments { [] }
     end
 
     trait :with_content do
@@ -100,9 +108,14 @@ FactoryBot.modify do
 
       after(:build) do |host, evaluator|
         if host.content_facet
-          host.content_facet.content_view = evaluator.content_view if evaluator.content_view
-          host.content_facet.lifecycle_environment = evaluator.lifecycle_environment if evaluator.lifecycle_environment
+          if evaluator.content_view && evaluator.lifecycle_environment
+            host.content_facet.assign_single_environment(
+              content_view_id: evaluator.content_view.id,
+              lifecycle_environment_id: evaluator.lifecycle_environment.id
+            )
+          end
           host.content_facet.content_source = evaluator.content_source if evaluator.content_source
+          host.content_facet.content_view_environments = evaluator.content_view_environments unless evaluator.content_view_environments.empty?
         end
       end
     end

data/test/jobs/inventory_hosts_sync_test.rb

@@ -294,4 +294,36 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     assert_nil @host2.insights
   end
+
+  test 'Inventory should create new missing host records' do
+    org = FactoryBot.create(:organization)
+
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:query_inventory).returns(@inventory)
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:plan_self_host_sync)
+
+    setup_certs_expectation do
+      InventorySync::Async::InventoryHostsSync.any_instance.stubs(:candlepin_id_cert)
+    end
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [org])
+
+    assert_equal 2, InsightsMissingHost.count
+  end
+
+  test 'Inventory should remove old missing host records' do
+    org = FactoryBot.create(:organization)
+
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:query_inventory).returns(@inventory)
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:plan_self_host_sync)
+
+    FactoryBot.create(:insights_missing_host, organization: org)
+
+    setup_certs_expectation do
+      InventorySync::Async::InventoryHostsSync.any_instance.stubs(:candlepin_id_cert)
+    end
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [org])
+
+    assert_equal 2, InsightsMissingHost.count
+  end
 end

data/test/jobs/inventory_scheduled_sync_test.rb

@@ -6,8 +6,10 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
 
   test 'Schedules an execution if auto upload is enabled' do
     Setting[:allow_auto_inventory_upload] = true
+    Setting[:allow_auto_insights_mismatch_delete] = true
 
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).times(Organization.unscoped.count)
+    InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_remove_insights_hosts).times(Organization.unscoped.count)
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
   end
@@ -19,4 +21,14 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
   end
+
+  test 'Skips mismatch deletion if the setting is disabled' do
+    Setting[:allow_auto_inventory_upload] = true
+    Setting[:allow_auto_insights_mismatch_delete] = false
+
+    InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).times(Organization.unscoped.count)
+    InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_remove_insights_hosts).never
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
+  end
 end

data/test/jobs/remove_insights_hosts_job_test.rb

@@ -0,0 +1,90 @@
+require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
+
+class RemoveInsightsHostJobTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+
+  setup do
+    User.current = User.find_by(login: 'secret_admin')
+
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    @org = FactoryBot.create(:organization)
+  end
+
+  test 'Deletes host records on cloud success' do
+    ForemanInventoryUpload::Async::RemoveInsightsHostsJob.any_instance.expects(:execute_cloud_request).returns(
+      mock_response
+    )
+
+    FactoryBot.create(:insights_missing_host, organization: @org)
+
+    task = ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
+
+    assert_equal 0, InsightsMissingHost.count
+    assert_equal 'success', task.result
+  end
+
+  test 'Does not delete hosts on cloud failure' do
+    ForemanInventoryUpload::Async::RemoveInsightsHostsJob.any_instance.expects(:execute_cloud_request).raises(
+      RestClient::Exceptions::EXCEPTIONS_MAP.fetch(500).new(mock_response(code: 500), 500)
+    )
+
+    FactoryBot.create(:insights_missing_host, organization: @org)
+
+    begin
+      ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
+    rescue ForemanTasks::TaskError => ex
+      task = ex.task
+    end
+
+    assert_equal 1, InsightsMissingHost.count
+    assert_equal 'error', task.result
+  end
+
+  test 'Paginates the hosts list' do
+    ForemanInventoryUpload::Async::RemoveInsightsHostsJob.any_instance.stubs(:page_size).returns(1)
+
+    ForemanInventoryUpload::Async::RemoveInsightsHostsJob.any_instance.expects(:execute_cloud_request).returns(
+      mock_response(body: 'response2')
+    )
+    ForemanInventoryUpload::Async::RemoveInsightsHostsJob.any_instance.expects(:execute_cloud_request).returns(
+      mock_response(body: 'response1')
+    )
+
+    FactoryBot.create(:insights_missing_host, organization: @org)
+    FactoryBot.create(:insights_missing_host, organization: @org)
+
+    task = ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
+
+    assert_equal 0, InsightsMissingHost.count
+    assert_equal 'success', task.result
+    assert_equal 'response1', task.output[:response_page1]
+    assert_equal 'response2', task.output[:response_page2]
+  end
+
+  test 'Uses scoped_search to select hosts' do
+    ForemanInventoryUpload::Async::RemoveInsightsHostsJob.any_instance.stubs(:page_size).returns(1)
+
+    # Since the request is paginated per 1 host, I would expect only one call to execute_cloud_request
+    ForemanInventoryUpload::Async::RemoveInsightsHostsJob.any_instance.expects(:execute_cloud_request).returns(
+      mock_response(body: 'response1')
+    )
+
+    FactoryBot.create(:insights_missing_host, name: 'test a', organization: @org)
+    FactoryBot.create(:insights_missing_host, name: 'test b', organization: @org)
+
+    task = ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, 'name ~ b', @org.id)
+
+    assert_equal 1, InsightsMissingHost.count
+    assert_equal 'test a', InsightsMissingHost.first.name
+    assert_equal 'success', task.result
+    assert_equal 'response1', task.output[:response_page1]
+  end
+
+  def mock_response(code: 200, body: '')
+    response = mock('response')
+    response.stubs(:code).returns(code)
+    response.stubs(:body).returns(body)
+    response
+  end
+end

data/test/test_plugin_helper.rb

@@ -8,6 +8,13 @@ FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories
 # FactoryBot.definition_file_paths << "#{Katello::Engine.root}/test/factories"
 FactoryBot.reload
 
+begin
+  require 'pry-rescue/minitest'
+  require 'pry-byebug'
+rescue LoadError
+  # if the extension is not loaded - please continue, no harm done.
+end
+
 module FolderIsolation
   extend ActiveSupport::Concern
 
@@ -100,3 +107,13 @@ module MockForemanHostname
     end
   end
 end
+
+module CandlepinIsolation
+  extend ActiveSupport::Concern
+
+  included do
+    setup do
+      Katello::Host::SubscriptionFacet.any_instance.stubs(:backend_update_needed?).returns(false)
+    end
+  end
+end

data/test/unit/slice_generator_test.rb

@@ -2,6 +2,7 @@ require 'test_plugin_helper'
 
 class SliceGeneratorTest < ActiveSupport::TestCase
   include KatelloLocationFix
+  include CandlepinIsolation
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
@@ -30,7 +31,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       subscription: FactoryBot.create(:katello_subscription, organization_id: env.organization.id)
     )
     @host.interfaces.first.identifier = 'test_nic1'
-    @host.save!
+    @host.interfaces.first.save!
 
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
   end
@@ -300,6 +301,11 @@ class SliceGeneratorTest < ActiveSupport::TestCase
 
   test 'generates a report with satellite facts' do
     hostgroup = FactoryBot.create(:hostgroup, name: 'Special"name')
+    # Don't try to update CP in tests
+    Katello::Resources::Candlepin::Consumer.stubs(:update)
+    # Don't try update facts for the host
+    Katello::Host::SubscriptionFacet.stubs(:update_facts)
+
     @host.hostgroup = hostgroup
     @host.save!
 
@@ -326,7 +332,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     actual_host = actual['hosts'].first
     assert_tag('satellite-id', actual_host, 'satellite_instance_id')
     assert_tag(@host.organization_id.to_s, actual_host, 'organization_id')
-    assert_tag(@host.content_view.name, actual_host, 'content_view')
+    assert_tag(@host.content_views.first.name, actual_host, 'content_view')
     assert_tag(@host.location.name, actual_host, 'location')
     assert_tag(@host.organization.name, actual_host, 'organization')
     assert_tag(@host.hostgroup.name, actual_host, 'hostgroup')
@@ -348,13 +354,13 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: @host.content_view,
-      lifecycle_environment: @host.lifecycle_environment,
+      content_view: @host.content_views.first,
+      lifecycle_environment: @host.lifecycle_environments.first,
       organization: @host.organization
     )
 
     @host.subscription_facet.hypervisor_host = hypervisor_host
-    @host.save!
+    @host.subscription_facet.save!
 
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
@@ -497,8 +503,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: @host.content_view,
-      lifecycle_environment: @host.lifecycle_environment,
+      content_view: @host.content_views.first,
+      lifecycle_environment: @host.lifecycle_environments.first,
       organization: new_org
     )
 
@@ -644,8 +650,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: @host.content_view,
-      lifecycle_environment: @host.lifecycle_environment,
+      content_view: @host.content_views.first,
+      lifecycle_environment: @host.lifecycle_environments.first,
       organization: @host.organization,
       installed_packages: [installed_package]
     )

data/test/unit/tags_generator_test.rb

@@ -2,12 +2,13 @@ require 'test_plugin_helper'
 
 class TagsGeneratorTest < ActiveSupport::TestCase
   include KatelloLocationFix
+  include CandlepinIsolation
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
 
     env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
+    env2 = FactoryBot.create(:katello_k_t_environment, organization: env.organization)
 
     @location1 = FactoryBot.create(:location)
     @location2 = FactoryBot.create(:location, parent: @location1)
@@ -20,15 +21,27 @@ class TagsGeneratorTest < ActiveSupport::TestCase
       :redhat,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
-      lifecycle_environment: env,
       organization: env.organization,
       location: @location2,
-      hostgroup: @hostgroup2
+      hostgroup: @hostgroup2,
+      content_view_environments: [
+        FactoryBot.create(
+          :katello_content_view_environment,
+          content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
+          lifecycle_environment: env),
+        FactoryBot.create(
+          :katello_content_view_environment,
+          content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
+          lifecycle_environment: env2),
+      ]
     )
 
     @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
     @host.interfaces.first.identifier = 'test_nic1'
+    # Don't try to update CP in tests
+    Katello::Resources::Candlepin::Consumer.stubs(:update)
+    # Don't try update facts for the host
+    Katello::Host::SubscriptionFacet.stubs(:update_facts)
     @host.save!
   end
 
@@ -46,8 +59,10 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     assert_nil actual['host collection']
 
     assert_equal @host.organization.name, actual['organization'].first.last
-    assert_equal @host.lifecycle_environment.name, actual['lifecycle_environment'].first.last
-    assert_equal @host.content_view.name, actual['content_view'].first.last
+    assert_equal @host.lifecycle_environments.pluck(:name).min, actual['lifecycle_environment'].map(&:second).min
+    assert_equal @host.lifecycle_environments.pluck(:name).max, actual['lifecycle_environment'].map(&:second).max
+    assert_equal @host.content_views.pluck(:name).min, actual['content_view'].map(&:second).min
+    assert_equal @host.content_views.pluck(:name).max, actual['content_view'].map(&:second).max
     assert_equal Foreman.instance_id, actual['satellite_instance_id'].first.last
     assert_equal @host.organization_id.to_s, actual['organization_id'].first.last
   end
@@ -55,7 +70,7 @@ class TagsGeneratorTest < ActiveSupport::TestCase
   test 'filters tags with empty values' do
     generator = create_generator
 
-    @host.stubs(:content_view)
+    @host.stubs(:content_views).returns([])
 
     actual = generator.generate.group_by { |key, value| key }
 

data/webpack/ForemanInventoryUpload/Components/InventorySettings/AdvancedSetting/AdvancedSettingsConstants.js

@@ -25,4 +25,11 @@ export const settingsDict = {
       'Exclude installed packages from being uploaded to the Red Hat cloud'
     ),
   },
+  allowAutoInsightsMismatchDelete: {
+    name: 'allow_auto_insights_mismatch_delete',
+    label: __('Automatic mismatch deletion'),
+    tooltip: __(
+      'Enable automatic deletion of mismatched host records from the Red Hat cloud'
+    ),
+  },
 };

data/webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettingsSelectors.js

@@ -15,3 +15,6 @@ export const selectIpsObfuscationEnabled = state =>
 
 export const selectExcludePackages = state =>
   selectSettings(state).excludePackagesEnabled;
+
+export const selectMismatchDelete = state =>
+  selectSettings(state).allowAutoInsightsMismatchDelete;

data/webpack/ForemanInventoryUpload/Components/InventorySettings/__tests__/__snapshots__/InventorySettings.test.js.snap

@@ -23,5 +23,9 @@ exports[`InventorySettings rendering render without Props 1`] = `
     key="excludePackagesEnabled"
     setting="excludePackagesEnabled"
   />
+  <AdvancedSetting
+    key="allowAutoInsightsMismatchDelete"
+    setting="allowAutoInsightsMismatchDelete"
+  />
 </div>
 `;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 7.0.46
+  version: 8.0.47
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-12 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -141,6 +141,7 @@ files:
 - app/models/insights_client_report_status.rb
 - app/models/insights_facet.rb
 - app/models/insights_hit.rb
+- app/models/insights_missing_host.rb
 - app/models/insights_resolution.rb
 - app/models/insights_rule.rb
 - app/models/inventory_sync/inventory_status.rb
@@ -183,6 +184,7 @@ files:
 - db/migrate/20211027000001_create_task_output.foreman_rh_cloud.rb
 - db/migrate/20220321000001_add_unique_to_insights_rules.foreman_rh_cloud.rb
 - db/migrate/20221102110254_fix_rh_cloud_settings_category_to_dsl.rb
+- db/migrate/20230515140211_add_missing_hosts_table.foreman_rh_cloud.rb
 - db/seeds.d/179_ui_notifications.rb
 - db/seeds.d/50_job_templates.rb
 - lib/foreman_inventory_upload.rb
@@ -192,6 +194,7 @@ files:
 - lib/foreman_inventory_upload/async/generate_report_job.rb
 - lib/foreman_inventory_upload/async/progress_output.rb
 - lib/foreman_inventory_upload/async/queue_for_upload_job.rb
+- lib/foreman_inventory_upload/async/remove_insights_hosts_job.rb
 - lib/foreman_inventory_upload/async/shell_process.rb
 - lib/foreman_inventory_upload/async/upload_report_job.rb
 - lib/foreman_inventory_upload/generators/archived_report.rb
@@ -256,6 +259,7 @@ files:
 - test/jobs/inventory_hosts_sync_test.rb
 - test/jobs/inventory_scheduled_sync_test.rb
 - test/jobs/inventory_self_host_sync_test.rb
+- test/jobs/remove_insights_hosts_job_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
@@ -692,6 +696,7 @@ test_files:
 - test/jobs/inventory_hosts_sync_test.rb
 - test/jobs/inventory_scheduled_sync_test.rb
 - test/jobs/inventory_self_host_sync_test.rb
+- test/jobs/remove_insights_hosts_job_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb