foreman_rh_cloud 12.2.0 → 12.2.2

data/lib/foreman_rh_cloud/plugin.rb

@@ -0,0 +1,150 @@
+module ForemanRhCloud
+  module Plugin
+    def self.register
+      # This module is auto-loaded, but plugin settings cannot be redefined
+      # Ensure that we don't try to re-register the plugin on code reload
+      return if Foreman::Plugin.find(:foreman_rh_cloud)
+
+      Foreman::Plugin.register :foreman_rh_cloud do
+        requires_foreman '>= 3.13'
+        register_gettext
+
+        apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
+
+        settings do
+          category(:rh_cloud, N_('Insights')) 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: true, 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. (If insights_minimal_data_collection is set to true, this setting is ignored because host names are not included in the report.)'), 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.  (If insights_minimal_data_collection is set to true, this setting is ignored because host IPv4 addresses are not included in the report.)'), 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. (If insights_minimal_data_collection is set to true, this setting is ignored and installed packages are always excluded.)'), default: false, full_name: N_("Exclude installed packages"))
+            setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman?'), default: false, full_name: N_('Include parameters in insights-client reports'))
+            setting('rhc_instance_id', type: :string, description: N_('RHC daemon id'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
+            setting('insights_minimal_data_collection', type: :boolean, default: false, full_name: N_('Minimal data collection'), description: N_('Only include the minimum required data in inventory reports for uploading to Red Hat cloud. When this is true, installed packages are excluded from the report regardless of the exclude_installed_packages setting, and host names and IPv4 addresses are excluded from the report regardless of obfuscation settings.'))
+          end
+        end
+
+        # Add permissions
+        security_block :foreman_rh_cloud do
+          permission(
+            :generate_foreman_rh_cloud,
+            'foreman_inventory_upload/reports': [:generate],
+            'foreman_inventory_upload/tasks': [:create],
+            'api/v2/rh_cloud/inventory': [:get_hosts, :remove_hosts, :sync_inventory_status, :download_file, :generate_report, :enable_cloud_connector],
+            'foreman_inventory_upload/uploads': [:enable_cloud_connector],
+            'foreman_inventory_upload/uploads_settings': [:set_advanced_setting],
+            'foreman_inventory_upload/missing_hosts': [:remove_hosts],
+            'insights_cloud/settings': [:update],
+            'insights_cloud/tasks': [:create]
+          )
+          permission(
+            :view_foreman_rh_cloud,
+            'foreman_inventory_upload/accounts': [:index],
+            'foreman_inventory_upload/reports': [:last],
+            'foreman_inventory_upload/uploads': [:auto_upload, :show_auto_upload, :download_file, :last],
+            'foreman_inventory_upload/tasks': [:show],
+            'foreman_inventory_upload/cloud_status': [:index],
+            'foreman_inventory_upload/uploads_settings': [:index],
+            'foreman_inventory_upload/missing_hosts': [:index],
+            'api/v2/rh_cloud/advisor_engine_config': [:show],
+            'foreman_rh_cloud/foreman_rh_cloud': [:inventory_upload, :recommendations],
+            'react': [:index]
+          )
+          permission(
+            :view_insights_hits,
+            {
+              '/foreman_rh_cloud/insights_cloud': [:index], # for bookmarks and later for showing the page
+              'insights_cloud/hits': [:index, :show, :auto_complete_search, :resolutions],
+              'insights_cloud/settings': [:index, :show],
+              'insights_cloud/ui_requests': [:forward_request, :translate_insights_host],
+              'react': [:index],
+            },
+            :resource_type => ::InsightsHit.name
+          )
+          permission(
+            :dispatch_cloud_requests,
+            'api/v2/rh_cloud/cloud_request': [:update]
+          )
+          permission(
+            :control_organization_insights,
+            'insights_cloud/settings': [:set_org_parameter]
+          )
+        end
+
+        plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud, :view_insights_hits, :dispatch_cloud_requests, :control_organization_insights]
+
+        role 'ForemanRhCloud', plugin_permissions, 'Role granting permissions to view the hosts inventory,
+                                                    generate a report, upload it to the cloud and download it locally'
+
+        add_permissions_to_default_roles Role::ORG_ADMIN => plugin_permissions,
+          Role::MANAGER => plugin_permissions,
+          Role::SYSTEM_ADMIN => plugin_permissions
+
+        # Adding a top-level menu item
+        sub_menu :top_menu, :insights_menu, caption: N_('Insights'), icon: 'fa fa-cloud', after: :hosts_menu do
+          menu :top_menu,
+            :inventory_upload,
+            caption: N_('Inventory Upload'),
+            url: '/foreman_rh_cloud/inventory_upload',
+            url_hash: { controller: :react, action: :index },
+            parent: :insights_menu,
+            if: -> { !ForemanRhCloud.with_iop_smart_proxy? }
+          menu :top_menu, :insights_hits, caption: N_('Recommendations'), url: '/foreman_rh_cloud/insights_cloud', url_hash: { controller: :react, action: :index }, parent: :insights_menu
+          menu :top_menu,
+            :insights_vulnerability,
+            caption: N_('Vulnerability'),
+            url: '/foreman_rh_cloud/insights_vulnerability',
+            url_hash: { controller: :react, action: :index },
+            parent: :insights_menu,
+            if: -> { ForemanRhCloud.with_iop_smart_proxy? }
+        end
+
+        # In IoP case we want the page to be in the admin menu
+        menu :admin_menu,
+          :inventory_upload,
+          caption: N_('Inventory Upload'),
+          url: '/foreman_rh_cloud/inventory_upload',
+          url_hash: { controller: :react, action: :index },
+          parent: :administer_menu,
+          before: :upgrade,
+          if: -> { ForemanRhCloud.with_iop_smart_proxy? }
+
+        register_facet InsightsFacet, :insights do
+          configure_host do
+            api_view :list => 'api/v2/hosts/insights/insights', :single => 'api/v2/hosts/insights/single'
+            set_dependent_action :destroy
+          end
+        end
+
+        register_global_js_file 'global'
+
+        register_custom_status InventorySync::InventoryStatus
+        register_custom_status InsightsClientReportStatus
+
+        describe_host do
+          overview_buttons_provider :insights_host_overview_buttons
+        end
+
+        extend_page 'hosts/show' do |context|
+          context.add_pagelet :main_tabs,
+            partial: 'hosts/insights_tab',
+            name: _('Insights'),
+            id: 'insights',
+            onlyif: proc { |host| host.insights }
+        end
+
+        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,
+                        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
+
+        extend_template_helpers ForemanRhCloud::TemplateRendererHelper
+        allowed_template_helpers :remediations_playbook, :download_rh_playbook
+      end
+    end
+  end
+end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.2.0'.freeze
+  VERSION = '12.2.2'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -4,13 +4,12 @@ require 'uri'
 
 module ForemanRhCloud
   def self.on_premise_url
-    return unless ForemanRhCloud.with_local_advisor_engine?
-    port = ENV['ADVISOR_ENGINE_PORT'] || "24443"
-    ENV['ADVISOR_ENGINE_URL'] || "https://localhost:#{port}"
+    return unless ForemanRhCloud.with_iop_smart_proxy?
+    ForemanRhCloud.iop_smart_proxy&.url
   end
 
   def self.env_or_on_premise_url(env_var_name)
-    ENV[env_var_name] || on_premise_url
+    on_premise_url || ENV[env_var_name]
   end
 
   def self.base_url
@@ -47,7 +46,7 @@ module ForemanRhCloud
   end
 
   def self.proxy_string
-    return '' if ForemanRhCloud.with_local_advisor_engine?
+    return '' if ForemanRhCloud.with_iop_smart_proxy?
 
     HttpProxy.default_global_content_proxy&.full_url ||
     ForemanRhCloud.global_foreman_proxy ||
@@ -106,7 +105,7 @@ module ForemanRhCloud
   end
 
   def self.legacy_insights_ca
-    "#{ForemanRhCloud::Engine.root}/config/rh_cert-api_chain.pem" unless ForemanRhCloud.with_local_advisor_engine?
+    "#{ForemanRhCloud::Engine.root}/config/rh_cert-api_chain.pem" unless ForemanRhCloud.with_iop_smart_proxy?
   end
 
   def self.cloud_url_validator

data/lib/insights_cloud/async/insights_scheduled_sync.rb

@@ -13,7 +13,7 @@ module InsightsCloud
           return
         end
 
-        if ForemanRhCloud.with_local_advisor_engine?
+        if ForemanRhCloud.with_iop_smart_proxy?
           plan_self
         else
           after_delay do
@@ -23,7 +23,7 @@ module InsightsCloud
       end
 
       def run
-        output[:status] = _('The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.') if ForemanRhCloud.with_local_advisor_engine?
+        output[:status] = _('The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy.') if ForemanRhCloud.with_iop_smart_proxy?
       end
 
       def plan_full_sync

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -9,7 +9,7 @@ module InventorySync
 
       def plan(organizations)
         # Do not run for local advisor, since we use sub-man id to identify hosts.
-        return if ForemanRhCloud.with_local_advisor_engine?
+        return if ForemanRhCloud.with_iop_smart_proxy?
         # by default the tasks will be executed concurrently
         super(organizations)
         plan_self_host_sync

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -13,7 +13,7 @@ module InventorySync
           return
         end
 
-        if ForemanRhCloud.with_local_advisor_engine?
+        if ForemanRhCloud.with_iop_smart_proxy?
           plan_self # so that 'run' runs
         else
           after_delay do
@@ -35,7 +35,7 @@ module InventorySync
       end
 
       def run
-        output[:status] = _('The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.') if ForemanRhCloud.with_local_advisor_engine?
+        output[:status] = _('The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy.') if ForemanRhCloud.with_iop_smart_proxy?
       end
 
       def plan_remove_insights_hosts(org_id)

data/lib/tasks/insights.rake

@@ -24,7 +24,7 @@ namespace :rh_cloud_insights do
   desc "Re-announce all organizations into Sources on RH cloud."
   task announce_to_sources: [:environment] do
     logger = Logging::Logger.new(STDOUT)
-    if ForemanRhCloud.with_local_advisor_engine?
+    if ForemanRhCloud.with_iop_smart_proxy?
       logger.warn('Task announce_to_sources is not available when using local advisor engine')
     else
       Organization.unscoped.each do |org|

data/lib/tasks/rh_cloud_inventory.rake

@@ -9,7 +9,7 @@ namespace :rh_cloud_inventory do
       else
         organizations = [Organization.where(:id => ENV['organization_id']).first]
       end
-      disconnected = ForemanRhCloud.with_local_advisor_engine?
+      disconnected = ForemanRhCloud.with_iop_smart_proxy?
       User.as_anonymous_admin do
         organizations.each do |organization|
           ForemanTasks.async_task(
@@ -45,6 +45,24 @@ namespace :rh_cloud_inventory do
           archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
           archived_report_generator.render(organization: organization, filter: filter)
           puts "Successfully generated #{target} for organization id #{organization}"
+
+          next unless ForemanRhCloud.with_iop_smart_proxy?
+
+          puts 'Creating missing insights facets'
+          hosts_without_facets = ForemanInventoryUpload::Generators::Queries.for_org(organization, hosts_query: 'null? insights_uuid')
+          hosts_without_facets.each do |batch|
+            facets = batch.pluck(:id, 'katello_subscription_facets.uuid').map do |host_id, uuid|
+              {
+                host_id: host_id,
+                uuid: uuid,
+              }
+            end
+            # We don't need to validate the facets here as we create the necessary fields.
+            # rubocop:disable Rails/SkipsModelValidations
+            InsightsFacet.upsert_all(facets, unique_by: :host_id) unless facets.empty?
+            # rubocop:enable Rails/SkipsModelValidations
+          end
+          puts 'Missing Insights facets created'
         end
       end
     end
@@ -53,7 +71,7 @@ namespace :rh_cloud_inventory do
       base_folder = ENV['target'] || ForemanInventoryUpload.generated_reports_folder
       organization_id = ENV['organization_id']
       report_file = ForemanInventoryUpload.facts_archive_name(organization_id)
-      disconnected = ForemanRhCloud.with_local_advisor_engine?
+      disconnected = ForemanRhCloud.with_iop_smart_proxy?
       ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization_id, disconnected)
       puts "Uploaded #{report_file}"
     end

data/package.json

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

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

@@ -17,8 +17,8 @@ module InsightsCloud::Api
         @http_req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org')
 
         org = FactoryBot.create(:organization)
-        host = FactoryBot.create(:host, :with_subscription, :organization => org)
-        User.current = ::Katello::CpConsumerUser.new(:uuid => host.subscription_facet.uuid, :login => host.subscription_facet.uuid)
+        @host = FactoryBot.create(:host, :with_subscription, :organization => org)
+        User.current = ::Katello::CpConsumerUser.new(:uuid => @host.subscription_facet.uuid, :login => @host.subscription_facet.uuid)
         InsightsCloud::Api::MachineTelemetriesController.any_instance.stubs(:upstream_owner).returns({ 'uuid' => 'abcdefg' })
 
         setup_certs_expectation do
@@ -151,6 +151,20 @@ module InsightsCloud::Api
         assert_equal 'Cloud request failed', JSON.parse(@response.body)['message']
         assert_match /#{@body}/, JSON.parse(@response.body)['response']
       end
+
+      test "should create insights facet" do
+        assert_nil InsightsFacet.find_by(host_id: @host.id)
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+        req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org/')
+        net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
+        net_http_resp[:content_type] = 'application/zip'
+        res = RestClient::Response.create(@body, net_http_resp, req)
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
+
+        get :forward_request, params: { "path" => "/redhat_access/r/insights/uploads/" }
+
+        assert_not_nil InsightsFacet.find_by(host_id: @host.id)
+      end
     end
 
     context '#branch_info' do
@@ -166,7 +180,10 @@ module InsightsCloud::Api
           :with_content,
           :with_hostgroup,
           :with_parameter,
-          content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)],
+          content_facet: FactoryBot.build(
+            :content_facet,
+            content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
+          ),
           organization: env.organization
         )
 

data/test/controllers/insights_cloud/ui_requests_controller_test.rb

@@ -9,6 +9,29 @@ module InsightsCloud
       FactoryBot.create(:common_parameter, name: InsightsCloud.enable_client_param, key_type: 'boolean', value: true)
     end
 
+    context '#translate_insights_host' do
+      setup do
+        @org = FactoryBot.create(:organization)
+        @loc = FactoryBot.create(:location)
+        @host = FactoryBot.create(:host, :with_subscription, :organization => @org)
+        @facet = InsightsFacet.create(host: @host, uuid: @host.subscription_facet.uuid)
+      end
+
+      test "should redirect to host details page by id" do
+        get :translate_insights_host, params: { "uuid" => @host.subscription_facet.uuid }, session: set_session
+        assert_equal 302, @response.status
+        assert @response.redirect?
+        assert_equal "http://test.host/new/hosts/#{@host.id}", @response.redirect_url
+      end
+
+      test "should redirect to not-found page" do
+        get :translate_insights_host, params: { "uuid" => "foo" }, session: set_session
+        assert_equal 302, @response.status
+        assert @response.redirect?
+        assert_equal "http://test.host/page-not-found", @response.redirect_url
+      end
+    end
+
     context '#forward_request' do
       include MockCerts
 

data/test/controllers/insights_sync/settings_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_plugin_helper'
 class SettingsControllerTest < ActionController::TestCase
   tests InsightsCloud::SettingsController
   def setup
-    ForemanRhCloud.stubs(:with_local_advisor_engine?).returns(false)
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
   end
 
   test 'should return allow_auto_insights_sync setting' do

data/test/factories/inventory_upload_factories.rb

@@ -1,87 +1,3 @@
-# redefine katello factories, as long as katello is not compatible with dynamic properties
-FactoryBot.define do
-  factory :katello_organization, :class => "Organization" do
-    type { "Organization" }
-    sequence(:name) { |n| "Organization#{n}" }
-    sequence(:label) { |n| "org#{n}" }
-    sequence(:id) { |n| n }
-
-    trait :acme_corporation do
-      name { "ACME_Corporation" }
-      type { "Organization" }
-      description { "This is the first Organization." }
-      label { "acme_corporation_label" }
-    end
-
-    trait :with_library do
-      association :library, :factory => :katello_library
-    end
-
-    factory :acme_corporation, :traits => [:acme_corporation]
-  end
-end
-
-FactoryBot.define do
-  factory :katello_content_view, :class => Katello::ContentView do
-    sequence(:name) { |n| "Database#{n}" }
-    description { "This content view is for database content" }
-    association :organization, :factory => :katello_organization
-
-    trait :composite do
-      composite { true }
-    end
-  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}" }
-    sequence(:label) { |n| "environment#{n}" }
-    association :organization, :factory => :katello_organization
-  end
-end
-
-FactoryBot.define do
-  factory :katello_content_facets, :aliases => [:content_facet], :class => ::Katello::Host::ContentFacet do
-    sequence(:uuid) { |n| "uuid-#{n}" }
-  end
-end
-
-FactoryBot.define do
-  factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
-    sequence(:uuid) { |n| "00000000-%<n>04d-%<r>04d-0000-000000000000" % { n: n, r: rand(500) } }
-    facts { { 'memory.memtotal' => "12 GB" } }
-  end
-end
-
-FactoryBot.define do
-  factory :katello_subscription, :class => Katello::Subscription do
-  end
-end
-
-FactoryBot.define do
-  factory :katello_pool, :class => Katello::Pool do
-    active { true }
-    end_date { Date.today + 1.year }
-    cp_id { 1 }
-
-    association :organization, :factory => :katello_organization
-
-    after(:build) do |pool, _evaluator|
-      pool.subscription.organization = pool.organization
-    end
-
-    association :subscription, :factory => :katello_subscription
-  end
-end
-
 FactoryBot.define do
   factory :katello_host_collection_host, :class => Katello::HostCollectionHosts do
     host_id { nil }
@@ -94,34 +10,10 @@ FactoryBot.define do
   end
 end
 
+# Fix Katello factories to return a valid UUID
 FactoryBot.modify do
-  factory :host do
-    transient do
-      content_view { nil }
-      lifecycle_environment { nil }
-      content_source { nil }
-      content_view_environments { [] }
-    end
-
-    trait :with_content do
-      association :content_facet, :factory => :content_facet, :strategy => :build
-
-      after(:build) do |host, evaluator|
-        if host.content_facet
-          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
-
-    trait :with_subscription do
-      association :subscription_facet, :factory => :subscription_facet, :strategy => :build
-    end
+  factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
+    sequence(:uuid) { |n| "00000000-%<n>04d-%<r>04d-0000-000000000000" % { n: n, r: rand(500) } }
+    facts { { 'memory.memtotal' => "12 GB" } }
   end
 end

data/test/jobs/inventory_scheduled_sync_test.rb

@@ -14,14 +14,14 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
     ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
   end
 
-  test 'Skips execution if with_local_advisor_engine? is true' do
-    ForemanRhCloud.stubs(:with_local_advisor_engine?).returns(true)
+  test 'Skips execution if with_iop_smart_proxy? is true' do
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
 
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).never
 
     task = ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
     status = task.output[:status].to_s
-    assert_match(/Foreman is configured with the use_local_advisor_engine option/, status)
+    assert_match(/Foreman is configured with a local IoP Smart Proxy/, status)
   end
 
   test 'Skips execution if auto upload is disabled' do

data/test/test_plugin_helper.rb

@@ -2,10 +2,16 @@
 require 'test_helper'
 
 # Add plugin to FactoryBot's paths
-FactoryBot.definition_file_paths << "#{ForemanTasks::Engine.root}/test/factories"
+katello_files = Dir.glob("#{Katello::Engine.root}/test/factories/**/*.rb")
+FactoryBot.definition_file_paths +=
+  katello_files
+  # skip foreman_task factories, since we already have those definitions in ForemanTasks
+  .reject { |f| f =~ /foreman_task|recurring_logic/ }
+  .map { |f| f.gsub('.rb', '') } # .rb extension is will be appended by factorybot
 FactoryBot.definition_file_paths << "#{ForemanRemoteExecution::Engine.root}/test/factories"
+FactoryBot.definition_file_paths << "#{ForemanTasks::Engine.root}/test/factories"
+
 FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-# FactoryBot.definition_file_paths << "#{Katello::Engine.root}/test/factories"
 FactoryBot.reload
 
 begin

data/test/unit/rh_cloud_http_proxy_test.rb

@@ -4,7 +4,7 @@ class RhCloudHttpProxyTest < ActiveSupport::TestCase
   setup do
     @global_content_proxy_mock = 'http://global:content@localhost:80'
     @global_foreman_proxy_mock = 'http://global:foreman@localhost:80'
-    ForemanRhCloud.stubs(:with_local_advisor_engine?).returns(false)
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
   end
 
   test 'selects global content proxy' do
@@ -20,8 +20,8 @@ class RhCloudHttpProxyTest < ActiveSupport::TestCase
   end
 
   test 'returns empty string in on-prem setup' do
-    ForemanRhCloud.unstub(:with_local_advisor_engine?)
-    ForemanRhCloud.stubs(:with_local_advisor_engine?).returns(true)
+    ForemanRhCloud.unstub(:with_iop_smart_proxy?)
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
 
     assert_empty ForemanRhCloud.proxy_setting
   end

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

@@ -22,7 +22,10 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
       :with_content,
       :with_hostgroup,
       :with_parameter,
-      content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)],
+      content_facet: FactoryBot.build(
+        :content_facet,
+        content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
+      ),
       organization: env.organization
     )
 

data/test/unit/slice_generator_test.rb

@@ -998,6 +998,39 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_not_nil actual_host['insights_id']
   end
 
+  test 'reports yum repos' do
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+    FactoryBot.create(:katello_content, cp_content_id: '1', organization: @host.organization, name: 'Test Content', label: 'test-content')
+    repo = FactoryBot.build(
+      :katello_repository,
+      :fedora_17_x86_64_dev,
+      :with_content_view,
+      product: FactoryBot.create(:katello_product, :redhat, :with_provider, organization: @host.organization)
+    )
+    # force-save the root repo to avoid validation errors
+    repo.root.save(validate: false)
+    repo.save(validate: false)
+    @host.content_facet.bound_repositories << repo
+    @host.content_facet.content_source = FactoryBot.create(:smart_proxy, :with_pulp3)
+    @host.save(validate: false)
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil(actual_yum_repos = actual_system_profile['yum_repos'])
+    assert_equal 1, actual_yum_repos.count
+    assert_not_nil(actual_yum_repo = actual_yum_repos.first)
+    assert_equal 'Test Content', actual_yum_repo['name']
+    assert_equal 'test-content', actual_yum_repo['id']
+    assert_match(/fedora_17/, actual_yum_repo['base_url'])
+    assert_equal true, actual_yum_repo['enabled']
+    assert_equal true, actual_yum_repo['gpgcheck']
+  end
+
   private
 
   def create_generator(batch, name = '00000000-0000-0000-0000-000000000000')

data/test/unit/tags_generator_test.rb

@@ -26,7 +26,10 @@ class TagsGeneratorTest < ActiveSupport::TestCase
       organization: env.organization,
       location: @location2,
       hostgroup: @hostgroup2,
-      content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
+      content_facet: FactoryBot.build(
+        :content_facet,
+        content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
+      )
     )
 
     @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)

data/webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js

@@ -2,12 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
 import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
+import './CVEsHostDetailsTab.scss';
 
 const CVEsHostDetailsTab = ({ systemId }) => {
   const scope = 'vulnerability';
   const module = './SystemDetailTable';
   return (
-    <div className="rh-cloud-insights-vulnerability-host-details-component">
+    <div className="rh-cloud-insights-vulnerability-host-details-component vulnerability">
       <ScalprumComponent scope={scope} module={module} systemId={systemId} />
     </div>
   );