foreman_rh_cloud 13.0.4 → 13.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07f9c21862525b394bf03e7490168fc1f0d66e8af832c4ce8e3f8d5796bde269
-  data.tar.gz: b88f3038b40d623c2d5df92f801d328bd568f9360d17760a6b2c0dff3808bf11
+  metadata.gz: ece8ef4c631103e6c100e8aa8029d0dc3473911e8f276267404c49190b800a47
+  data.tar.gz: cd9f6ab8349eec0d93cdf29fa1b80f8806d7175bc8c0f8af192f1ab4d83214cc
 SHA512:
-  metadata.gz: 8773fa656f0fbd4f50833faf50e7d4a88bca97f9b39d0c62d944ba2bbfbef9fd18f5adaa1647e8d4ece97a0fca330935d1acb46fd54359428aa8f43cb3b9d403
-  data.tar.gz: 98c7cec90e073a517582fcd789add89684e2788c425bab6d2d4793611277d65ce7d21e3b0fc18b66beeb8fd553407c9172308f89e60e7516bdacd49bdfcbadaf
+  metadata.gz: 2e7cfc9880d367c0e558ca87136a66af84ffcdd1d82a852b956cd90c7988209280509325a9442bf6f5ebcbdd58d1cd4e29d87766c79eb4f9830c5f3e9452356c
+  data.tar.gz: a5f4543f5fea79d337002d9b17d4cc51830b2e3b2102426ba0a21b25c875e1a09109816fe1c8f4766d3bc52ae3f6a517e9da8b35faad999f59eeec396a75f628

data/app/controllers/concerns/insights_cloud/package_profile_upload_extensions.rb

@@ -15,11 +15,10 @@ module InsightsCloud
       logger.debug("Generating host-specific report for host #{@host.name}")
 
       ForemanTasks.async_task(
-        ForemanInventoryUpload::Async::GenerateReportJob,
+        ForemanInventoryUpload::Async::SingleHostReportJob,
         ForemanInventoryUpload.generated_reports_folder,
         @host.organization_id,
-        false,
-        "id=#{@host.id}"
+        @host.id
       )
 
       # in IoP case, the hosts are identified by the sub-man ID, and we can assume they already

data/app/services/foreman_rh_cloud/cert_auth.rb

@@ -11,11 +11,21 @@ module ForemanRhCloud
 
     def execute_cloud_request(params)
       organization = params.delete(:organization)
-      certs = ForemanRhCloud.with_iop_smart_proxy? ? foreman_certificate : candlepin_id_cert(organization)
-      final_params = {
+      # Cache the value of with_iop_smart_proxy? to avoid multiple calls to the database
+      with_iop_smart_proxy = ForemanRhCloud.with_iop_smart_proxy?
+      certs = with_iop_smart_proxy ? foreman_certificate : candlepin_id_cert(organization)
+      default_params = {
         ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
         ssl_client_key: OpenSSL::PKey.read(certs[:key]),
-      }.deep_merge(params)
+      }
+
+      if with_iop_smart_proxy && organization&.label
+        default_params[:headers] = {
+          'X-Org-Id' => organization&.label,
+        }
+      end
+
+      final_params = default_params.deep_merge(params)
 
       super(final_params)
     end

data/app/services/foreman_rh_cloud/insights_api_forwarder.rb

@@ -2,7 +2,7 @@ require 'rest-client'
 
 module ForemanRhCloud
   class InsightsApiForwarder
-    include ForemanRhCloud::GatewayRequest
+    include ForemanRhCloud::CertAuth
 
     SCOPED_REQUESTS = [
       { test: %r{api/vulnerability/v1/vulnerabilities/cves}, tag_name: :tags },
@@ -26,6 +26,8 @@ module ForemanRhCloud
 
       request_opts = prepare_request_opts(original_request, path, forward_payload, forward_params)
 
+      request_opts[:organization] = organization
+
       logger.debug("Sending request to: #{request_opts[:url]}")
 
       execute_cloud_request(request_opts)

data/app/services/foreman_rh_cloud/tags_auth.rb

@@ -1,6 +1,6 @@
 module ForemanRhCloud
   class TagsAuth
-    include GatewayRequest
+    include CertAuth
 
     TAG_NAMESPACE = 'sat_iam'.freeze
     TAG_SHORT_NAME = 'scope'.freeze
@@ -24,6 +24,7 @@ module ForemanRhCloud
 
       payload = tags_query_payload
       params = {
+        organization: @org,
         method: :post,
         url: "#{InsightsCloud.gateway_url}/tags",
         headers: {

data/lib/foreman_inventory_upload/async/create_missing_insights_facets.rb

@@ -0,0 +1,29 @@
+module ForemanInventoryUpload
+  module Async
+    class CreateMissingInsightsFacets < ::Actions::EntryAction
+      def plan(organization_id)
+        plan_self(organization_id: organization_id)
+      end
+
+      def run
+        organization = ::Organization.find(input[:organization_id])
+        hosts_without_facets = ::ForemanInventoryUpload::Generators::Queries.for_org(organization, hosts_query: 'null? insights_uuid')
+        facet_count = hosts_without_facets.count
+        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
+        output[:result] = facet_count.zero? ? _("There were no missing Insights facets") : format(_("Missing Insights facets created: %s"), facet_count)
+        Rails.logger.info output[:result]
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload/async/generate_host_report.rb

@@ -0,0 +1,20 @@
+module ForemanInventoryUpload
+  module Async
+    class GenerateHostReport < ::Actions::EntryAction
+      def plan(base_folder, organization_id, filter)
+        plan_self(
+          base_folder: base_folder,
+          organization_id: organization_id,
+          filter: filter
+        )
+        input[:target] = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(input[:organization_id], input[:filter]))
+      end
+
+      def run
+        archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(input[:target])
+        archived_report_generator.render(organization: input[:organization_id], filter: input[:filter])
+        output[:result] = "Generated #{input[:target]} for organization id #{input[:organization_id]}"
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload/async/generate_report_job.rb

@@ -5,7 +5,7 @@ module ForemanInventoryUpload
         "report_for_#{label}"
       end
 
-      def plan(base_folder, organization_id, disconnected, hosts_filter = nil)
+      def plan(base_folder, organization_id, disconnected = false, hosts_filter = nil)
         sequence do
           super(
             GenerateReportJob.output_label("#{organization_id}#{hosts_filter.empty? ? nil : "[#{hosts_filter.to_s.parameterize}]"}"),

data/lib/foreman_inventory_upload/async/host_inventory_report_job.rb

@@ -0,0 +1,39 @@
+module ForemanInventoryUpload
+  module Async
+    class HostInventoryReportJob < ::Actions::EntryAction
+      def plan(base_folder, organization_id, hosts_filter = "", upload = true)
+        sequence do
+          plan_action(
+            GenerateHostReport,
+            base_folder,
+            organization_id,
+            hosts_filter
+          )
+          if upload
+            plan_action(
+              QueueForUploadJob,
+              base_folder,
+              ForemanInventoryUpload.facts_archive_name(organization_id, hosts_filter),
+              organization_id
+            )
+          end
+
+          if ForemanRhCloud.with_iop_smart_proxy?
+            plan_action(
+              CreateMissingInsightsFacets,
+              organization_id
+            )
+          end
+        end
+      end
+
+      def humanized_name
+        _("Host inventory report job")
+      end
+
+      def organization_id
+        input[:organization_id]
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload/async/single_host_report_job.rb

@@ -0,0 +1,20 @@
+module ForemanInventoryUpload
+  module Async
+    class SingleHostReportJob < HostInventoryReportJob
+      def plan(base_folder, organization_id, host_id)
+        input[:host_id] = host_id
+        super(base_folder, organization_id, "id=#{input[:host_id]}")
+      end
+
+      def hostname(host_id)
+        host = ::Host.find_by(id: host_id)
+        host&.name
+      end
+
+      def humanized_name
+        hostname_result = hostname(input[:host_id])
+        hostname_result.present? ? format(_("Single-host report job for host %s"), hostname_result) : _("Single-host report job")
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -48,7 +48,8 @@ module ForemanInventoryUpload
       def env
         env_vars = super.merge(
           'FILES' => filename,
-          'CER_PATH' => @cer_path
+          'CER_PATH' => @cer_path,
+          'ORG_ID' => organization.label
         )
 
         http_proxy_string = ForemanRhCloud.http_proxy_string

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -59,7 +59,7 @@ module ForemanInventoryUpload
       def obfuscate_hostname?(host)
         # Returns true if hostname obfuscation should be applied for a given host, based on hierarchy:
         # 1. Global setting for hostname obfuscation.
-        return true if Setting[:obfuscate_inventory_hostnames]
+        return true if Setting[:obfuscate_inventory_hostnames] && !ForemanRhCloud.with_iop_smart_proxy?
 
         insights_client_setting = fact_value(host, 'insights_client::obfuscate_hostname_enabled')
         insights_client_setting = ActiveModel::Type::Boolean.new.cast(insights_client_setting)
@@ -99,7 +99,7 @@ module ForemanInventoryUpload
       def obfuscate_ips?(host)
         # Returns true if IP obfuscation should be applied for a given host, based on hierarchy:
         # 1. Global setting for IP obfuscation.
-        return true if Setting[:obfuscate_inventory_ips]
+        return true if Setting[:obfuscate_inventory_ips] && !ForemanRhCloud.with_iop_smart_proxy?
 
         insights_client_ipv4_setting = fact_value(host, 'insights_client::obfuscate_ipv4_enabled')
         insights_client_ipv6_setting = fact_value(host, 'insights_client::obfuscate_ipv6_enabled')

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -90,7 +90,7 @@ module ForemanInventoryUpload
       def report_host(host)
         host_ips_cache = host_ips(host)
         @stream.object do
-          if Setting[:insights_minimal_data_collection]
+          if Setting[:insights_minimal_data_collection] && !ForemanRhCloud.with_iop_smart_proxy?
             insights_minimal_data_collection(host)
           else
             @stream.simple_field('fqdn', fqdn(host))
@@ -205,7 +205,7 @@ module ForemanInventoryUpload
             end.join(', '))
           end
         end
-        if !Setting[:insights_minimal_data_collection] && !Setting[:exclude_installed_packages]
+        if ForemanRhCloud.with_iop_smart_proxy? || (!Setting[:insights_minimal_data_collection] && !Setting[:exclude_installed_packages])
           @stream.array_field('installed_packages') do
             first = true
             host.installed_packages.each do |package|
@@ -256,7 +256,7 @@ module ForemanInventoryUpload
 
         @stream.array_field('yum_repos') do
           host.content_facet.bound_repositories.each_with_index do |repo, index|
-            report_yum_repo(host.content_source.load_balancer_pulp_content_url, repo)
+            report_yum_repo(host.content_source&.load_balancer_pulp_content_url || ::SmartProxy.pulp_primary.pulp_content_url, repo)
             @stream.comma unless index == host.content_facet.bound_repositories.count - 1
           end
         end

data/lib/foreman_inventory_upload/scripts/uploader.sh.erb

@@ -27,6 +27,12 @@ else
         AUTH_VAL="\"$RH_USERNAME\":\"$RH_PASSWORD\""
 fi
 
+ORG_HEADER=()
+if [ -n "$ORG_ID" ]
+then
++        ORG_HEADER=("-H" "X-Org-Id: $ORG_ID")
+fi
+
 # /tmp/a b/x.pem
 # curl --cert /tmp/a\ b/x.pem
 
@@ -36,7 +42,7 @@ mkdir -p $DONE_DIR
 
 for f in $FILES
 do
-  curl -k -vvv -# --fail -F "file=@$f;type=application/vnd.redhat.qpc.tar+tgz" $DEST "$AUTH_KEY" "$AUTH_VAL"
+  curl -k -vvv -# --fail -F "file=@$f;type=application/vnd.redhat.qpc.tar+tgz" $DEST "$AUTH_KEY" "$AUTH_VAL" "${ORG_HEADER[@]}"
   status=$?
   if [ $status -eq 0 ]; then
     mv $f $DONE_DIR

data/lib/foreman_rh_cloud/plugin.rb

@@ -13,15 +13,15 @@ module ForemanRhCloud
 
         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.'))
+            setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud. Ignored when using local Insights.'), 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. Ignored when using local Insights.'), 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. Ignored when using local Insights.'), 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.) Ignored when using local Insights.'), 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.) Ignored when using local Insights.'), 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.) Ignored when using local Insights.'), default: false, full_name: N_("Exclude installed packages"))
+            setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman? Ignored when using local Insights.'), default: false, full_name: N_('Include parameters in insights-client reports'))
+            setting('rhc_instance_id', type: :string, description: N_('RHC daemon id. Ignored when using local Insights.'), 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. Ignored when using local Insights.'))
           end
         end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.0.4'.freeze
+  VERSION = '13.0.5'.freeze
 end

data/lib/insights_cloud/async/vmaas_reposcan_sync.rb

@@ -23,13 +23,16 @@ module InsightsCloud
           return
         end
 
-        plan_self
+        organization_id = Katello::Repository.find(repo_id).organization_id
+
+        plan_self(organization_id: organization_id)
       end
 
       def run
         url = ::InsightsCloud.vmaas_reposcan_sync_url
 
         response = execute_cloud_request(
+          organization: organization,
           method: :put,
           url: url,
           headers: { 'Content-Type' => 'application/json' }
@@ -61,6 +64,10 @@ module InsightsCloud
         Dynflow::Action::Rescue::Skip
       end
 
+      def organization
+        @organization ||= Organization.find(input[:organization_id])
+      end
+
       private
 
       def logger

data/lib/tasks/rh_cloud_inventory.rake

@@ -9,22 +9,20 @@ namespace :rh_cloud_inventory do
       else
         organizations = [Organization.where(:id => ENV['organization_id']).first]
       end
-      disconnected = ForemanRhCloud.with_iop_smart_proxy?
       User.as_anonymous_admin do
         organizations.each do |organization|
           ForemanTasks.async_task(
             ForemanInventoryUpload::Async::GenerateReportJob,
             ForemanInventoryUpload.generated_reports_folder,
-            organization.id,
-            disconnected
+            organization.id
           )
           puts "Generated and uploaded inventory report for organization '#{organization.name}'"
         end
       end
     end
     desc 'Generate inventory report to be sent to Red Hat cloud'
-    task generate: :environment do
-      organizations = [ENV['organization_id']]
+    task generate: [:environment, 'dynflow:client'] do
+      organization_ids = [ENV['organization_id']]
       base_folder = ENV['target'] || Dir.pwd
       filter = ENV['hosts_filter']
 
@@ -34,37 +32,22 @@ namespace :rh_cloud_inventory do
         puts "Using #{base_folder} for the output"
       end
 
-      if organizations.empty?
+      if organization_ids.empty?
         puts "Must specify organization_id"
         return
       end
 
       User.as_anonymous_admin do
-        organizations.each do |organization|
-          target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization, filter))
-          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}"
-          puts "Check the Uploading tab for report uploading status." if Setting[:subscription_connection_enabled]
-
-          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'
+        organization_ids.each do |organization_id|
+          ForemanTasks.sync_task(
+            ForemanInventoryUpload::Async::HostInventoryReportJob,
+            base_folder,
+            organization_id,
+            filter,
+            false # don't upload; the user ran report:generate and not report:generate_upload
+          )
         end
+        puts "Check the Uploading tab for report uploading status." if Setting[:subscription_connection_enabled]
       end
     end
     desc 'Upload generated inventory report to Red Hat cloud'
@@ -72,8 +55,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_iop_smart_proxy?
-      ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization_id, disconnected)
+      ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization_id)
       puts "Uploaded #{report_file}"
     end
   end

data/package.json

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

data/test/unit/fact_helpers_test.rb

@@ -313,4 +313,51 @@ class FactHelpersTest < ActiveSupport::TestCase
       assert_equal '10.230.230.3', ip3
     end
   end
+
+  describe 'IoP smart proxy checks' do
+    test 'obfuscate_hostname? returns false when global setting is enabled but IoP is present' do
+      Setting.expects(:[]).with(:obfuscate_inventory_hostnames).returns(true)
+      ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(true)
+      host = mock('host')
+      # When IoP is present, it falls back to checking host-specific facts
+      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_hostname_enabled').returns(nil)
+
+      result = @instance.obfuscate_hostname?(host)
+
+      refute result
+    end
+
+    test 'obfuscate_hostname? returns true when global setting is enabled and IoP is not present' do
+      Setting.expects(:[]).with(:obfuscate_inventory_hostnames).returns(true)
+      ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(false)
+      host = mock('host')
+
+      result = @instance.obfuscate_hostname?(host)
+
+      assert result
+    end
+
+    test 'obfuscate_ips? returns false when global setting is enabled but IoP is present' do
+      Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(true)
+      ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(true)
+      host = mock('host')
+      # When IoP is present, it falls back to checking host-specific facts
+      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv4_enabled').returns(nil)
+      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv6_enabled').returns(nil)
+
+      result = @instance.obfuscate_ips?(host)
+
+      refute result
+    end
+
+    test 'obfuscate_ips? returns true when global setting is enabled and IoP is not present' do
+      Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(true)
+      ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(false)
+      host = mock('host')
+
+      result = @instance.obfuscate_ips?(host)
+
+      assert result
+    end
+  end
 end

data/test/unit/lib/insights_cloud/async/vmaas_reposcan_sync_test.rb

@@ -5,7 +5,16 @@ class VmaasReposcanSyncTest < ActiveSupport::TestCase
   include ForemanTasks::TestHelpers::WithInThreadExecutor
 
   setup do
-    @repo_payload = { id: 123 }
+    @root = FactoryBot.build(:katello_root_repository, :fedora_17_x86_64_dev_root)
+    @root.save(validate: false)
+    @repo = FactoryBot.create(
+      :katello_repository,
+      :with_product,
+      distribution_family: 'Red Hat',
+      distribution_version: '7.5',
+      root: @root
+    )
+    @repo_payload = { id: @repo.id }
     @expected_url = 'https://example.com/api/v1/vmaas/reposcan/sync'
     InsightsCloud.stubs(:vmaas_reposcan_sync_url).returns(@expected_url)
     ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
@@ -68,7 +77,8 @@ class VmaasReposcanSyncTest < ActiveSupport::TestCase
       params[:method] == :put &&
         params[:url] == @expected_url &&
         params[:headers].is_a?(Hash) &&
-        params[:headers]['Content-Type'] == 'application/json'
+        params[:headers]['Content-Type'] == 'application/json' &&
+        params[:organization] == @repo.organization
     end
                                            .returns(mock_response)
 

data/test/unit/slice_generator_test.rb

@@ -107,6 +107,36 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 'test_nic1', actual_nic['name']
   end
 
+  test 'does not generate a report with minimal data collection when iop is present' do
+    Setting[:insights_minimal_data_collection] = true
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+
+    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_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_nil actual_host['ip_addresses']
+    assert_nil actual_host['mac_addresses']
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_nil actual_system_profile['number_of_cpus']
+    assert_nil actual_system_profile['number_of_sockets']
+    assert_nil actual_system_profile['cores_per_socket']
+    assert_nil actual_system_profile['system_memory_bytes']
+    assert_nil actual_system_profile['os_release']
+    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
+    assert_not_nil(actual_nic = actual_network_interfaces.first)
+    refute actual_nic.key?('mtu')
+    refute actual_nic.key?('mac_address')
+    assert_equal 'test_nic1', actual_nic['name']
+  end
+
   test 'generates a report with minimal data collection' do
     Setting[:insights_minimal_data_collection] = true
     create_fact_values(@host,
@@ -930,6 +960,33 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 'alibaba', actual_profile['cloud_provider']
   end
 
+  test 'do not exclude packages when iop is present' do
+    Setting[:exclude_installed_packages] = true
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+    installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvrea: 'test-package-1.0.x86_64', nvra: 'test-package-1.0.x86_64')
+
+    another_host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: @host.content_views.first,
+      lifecycle_environment: @host.lifecycle_environments.first,
+      organization: @host.organization,
+      installed_packages: [installed_package]
+    )
+
+    batch = Host.where(id: another_host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_profile = actual_host['system_profile'])
+    assert_not_nil(actual_profile['installed_packages'])
+  end
+
   test 'include packages installed in the report' do
     Setting[:exclude_installed_packages] = false
     installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvrea: 'test-package-1.0.x86_64', nvra: 'test-package-1.0.x86_64')

data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js

@@ -18,36 +18,67 @@ import SkeletonLoader from 'foremanReact/components/common/SkeletonLoader';
 import { insightsCloudUrl } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
 import { getInitialRisks, theme } from './InsightsTabConstants';
 
-const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
+const InsightsTotalRiskCard = ({ hostDetails }) => {
+  const { id, insights_attributes: insightsFacet } = hostDetails;
+  const uuid = insightsFacet?.uuid;
+  // eslint-disable-next-line camelcase
+  const isIop = insightsFacet?.use_iop_mode;
   const [totalRisks, setTotalRisks] = useState(getInitialRisks());
   const hashHistory = useHistory();
   const dispatch = useDispatch();
   const API_KEY = `HOST_${id}_RECOMMENDATIONS`;
   const API_OPTIONS = useMemo(() => ({ key: API_KEY }), [API_KEY]);
-  const url = id && insightsCloudUrl(`hits/${id}`); // This will keep the API call from being triggered if there's no host id.
-  const {
-    status = STATUS.PENDING,
-    response: { hits = [] },
-  } = useAPI('get', url, API_OPTIONS);
 
-  useEffect(() => {
-    if (status === STATUS.RESOLVED) {
-      const risks = getInitialRisks();
+  // This will keep the API call from being triggered if there's no host id.
+  const url = isIop
+    ? uuid && insightsCloudUrl(`api/insights/v1/system/${uuid}`)
+    : id && insightsCloudUrl(`hits/${id}`);
+  const { status = STATUS.PENDING, response } = useAPI('get', url, API_OPTIONS);
+
+  const checkRisks = useMemo(() => {
+    if (!response || status !== STATUS.RESOLVED) {
+      return getInitialRisks();
+    }
+
+    const risks = getInitialRisks();
+    if (isIop) {
+      const {
+        low_hits: lowHits = 0,
+        moderate_hits: moderateHits = 0,
+        important_hits: importantHits = 0,
+        critical_hits: criticalHits = 0,
+        hits = 0,
+      } = response;
+
+      risks[1].value += lowHits;
+      risks[2].value += moderateHits;
+      risks[3].value += importantHits;
+      risks[4].value += criticalHits;
+      risks.total = hits;
+    } else {
+      const { hits = [] } = response;
       hits.forEach(({ total_risk: risk }) => {
         risks[risk].value += 1;
       });
       risks.total = hits.length;
-      setTotalRisks(risks);
     }
-  }, [hits, status]);
+    return risks;
+  }, [response, status, isIop]);
+
+  useEffect(() => {
+    setTotalRisks(checkRisks);
+  }, [checkRisks]);
+
+  if (!insightsFacet) return null;
 
   const onChartClick = (evt, { index }) => {
     hashHistory.push(`/Insights`);
-    dispatch(
-      push({
-        search: `search=total_risk+%3D+${index + 1}`,
-      })
-    );
+    !isIop &&
+      dispatch(
+        push({
+          search: `search=total_risk+%3D+${index + 1}`,
+        })
+      );
   };
 
   const onChartHover = (evt, { index }) => [
@@ -61,11 +92,16 @@ const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
   const { 1: low, 2: moderate, 3: important, 4: critical, total } = totalRisks;
 
   // eslint-disable-next-line react/prop-types
-  const LegendLabel = ({ index, ...rest }) => (
-    <a key={index} onClick={() => onChartClick(null, { index })}>
-      <ChartLabel {...rest} />
-    </a>
-  );
+  const LegendLabel = ({ index, ...rest }) => {
+    if (isIop) {
+      return <ChartLabel {...rest} />;
+    }
+    return (
+      <a key={index} onClick={() => onChartClick(null, { index })}>
+        <ChartLabel {...rest} />
+      </a>
+    );
+  };
 
   const legend = (
     <ChartLegend

data/webpack/InsightsHostDetailsTab/__tests__/InsightsTotalRiskChart.test.js

@@ -0,0 +1,194 @@
+import React from 'react';
+import { render, screen, waitFor } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { Provider } from 'react-redux';
+import { ConnectedRouter } from 'connected-react-router';
+import { createMemoryHistory } from 'history';
+import configureMockStore from 'redux-mock-store';
+import { STATUS } from 'foremanReact/constants';
+import * as APIHooks from 'foremanReact/common/hooks/API/APIHooks';
+import InsightsTotalRiskCard from '../InsightsTotalRiskChart';
+
+jest.mock('foremanReact/common/hooks/API/APIHooks');
+jest.mock('foremanReact/common/I18n', () => ({
+  translate: jest.fn(str => str),
+}));
+
+const mockStore = configureMockStore();
+const history = createMemoryHistory();
+const store = mockStore({
+  router: {
+    location: {
+      pathname: '/',
+      search: '',
+      hash: '',
+      state: null,
+    },
+    action: 'POP',
+  },
+});
+
+const defaultHostDetails = {
+  id: 1,
+  insights_attributes: {
+    uuid: 'test-uuid',
+    use_iop_mode: false,
+  },
+};
+
+const renderComponent = (props = {}) => {
+  const allProps = {
+    hostDetails: defaultHostDetails,
+    ...props,
+  };
+
+  return render(
+    <Provider store={store}>
+      <ConnectedRouter history={history}>
+        <InsightsTotalRiskCard {...allProps} />
+      </ConnectedRouter>
+    </Provider>
+  );
+};
+
+describe('InsightsTotalRiskChart', () => {
+  beforeEach(() => {
+    store.clearActions();
+    jest.clearAllMocks();
+  });
+
+  it('should show loading state initially', () => {
+    APIHooks.useAPI.mockReturnValue({
+      status: STATUS.PENDING,
+      response: null,
+    });
+
+    renderComponent();
+    // SkeletonLoader shows loading state when status is PENDING
+    expect(screen.queryByText('No results found')).not.toBeInTheDocument();
+    expect(
+      screen.queryByTestId('rh-cloud-total-risk-card')
+    ).not.toBeInTheDocument();
+  });
+
+  it('should display error state when API fails', async () => {
+    APIHooks.useAPI.mockReturnValue({
+      status: STATUS.ERROR,
+      response: null,
+    });
+
+    renderComponent();
+    expect(screen.getByText('No results found')).toBeInTheDocument();
+    expect(
+      screen.queryByTestId('rh-cloud-total-risk-card')
+    ).not.toBeInTheDocument();
+  });
+
+  it('should handle non-IoP mode API response correctly', async () => {
+    const mockResponse = {
+      hits: [
+        { total_risk: 1 },
+        { total_risk: 2 },
+        { total_risk: 2 },
+        { total_risk: 3 },
+        { total_risk: 4 },
+      ],
+    };
+
+    APIHooks.useAPI.mockReturnValue({
+      status: STATUS.RESOLVED,
+      response: mockResponse,
+    });
+
+    renderComponent();
+
+    await waitFor(() => {
+      // Check if total number of recommendations is displayed
+      expect(screen.getByText('5')).toBeInTheDocument();
+      // Check if risk levels are displayed correctly
+      expect(screen.getByText(/Low: 1/)).toBeInTheDocument();
+      expect(screen.getByText(/Moderate: 2/)).toBeInTheDocument();
+      expect(screen.getByText(/Important: 1/)).toBeInTheDocument();
+      expect(screen.getByText(/Critical: 1/)).toBeInTheDocument();
+    });
+  });
+
+  it('should handle IOP mode API response correctly', async () => {
+    const mockResponse = {
+      low_hits: 2,
+      moderate_hits: 3,
+      important_hits: 1,
+      critical_hits: 2,
+      hits: 8,
+    };
+
+    APIHooks.useAPI.mockReturnValue({
+      status: STATUS.RESOLVED,
+      response: mockResponse,
+    });
+
+    renderComponent({
+      hostDetails: {
+        ...defaultHostDetails,
+        insights_attributes: {
+          ...defaultHostDetails.insights_attributes,
+          use_iop_mode: true,
+        },
+      },
+    });
+
+    await waitFor(() => {
+      // Check if total number of recommendations is displayed
+      expect(screen.getByText('8')).toBeInTheDocument();
+      // Check if risk levels are displayed correctly
+      expect(screen.getByText(/Low: 2/)).toBeInTheDocument();
+      expect(screen.getByText(/Moderate: 3/)).toBeInTheDocument();
+      expect(screen.getByText(/Important: 1/)).toBeInTheDocument();
+      expect(screen.getByText(/Critical: 2/)).toBeInTheDocument();
+    });
+  });
+
+  it('should show empty state when no recommendations exist', async () => {
+    APIHooks.useAPI.mockReturnValue({
+      status: STATUS.RESOLVED,
+      response: { hits: [] },
+    });
+
+    renderComponent();
+
+    await waitFor(() => {
+      expect(screen.getByText(/Low: 0/)).toBeInTheDocument();
+      expect(screen.getByText(/Moderate: 0/)).toBeInTheDocument();
+      expect(screen.getByText(/Important: 0/)).toBeInTheDocument();
+      expect(screen.getByText(/Critical: 0/)).toBeInTheDocument();
+    });
+  });
+
+  it('should use correct API endpoint based on IOP mode', () => {
+    renderComponent({
+      hostDetails: {
+        ...defaultHostDetails,
+        insights_attributes: {
+          ...defaultHostDetails.insights_attributes,
+          use_iop_mode: true,
+        },
+      },
+    });
+
+    expect(APIHooks.useAPI).toHaveBeenCalledWith(
+      'get',
+      expect.stringContaining('/api/insights/v1/system/test-uuid'),
+      expect.any(Object)
+    );
+
+    jest.clearAllMocks();
+
+    renderComponent();
+
+    expect(APIHooks.useAPI).toHaveBeenCalledWith(
+      'get',
+      expect.stringContaining('/hits/1'),
+      expect.any(Object)
+    );
+  });
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 13.0.4
+  version: 13.0.5
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -139,7 +139,6 @@ files:
 - app/services/foreman_rh_cloud/cloud_presence.rb
 - app/services/foreman_rh_cloud/cloud_request.rb
 - app/services/foreman_rh_cloud/cloud_request_forwarder.rb
-- app/services/foreman_rh_cloud/gateway_request.rb
 - app/services/foreman_rh_cloud/hit_remediations_retriever.rb
 - app/services/foreman_rh_cloud/hits_uploader.rb
 - app/services/foreman_rh_cloud/insights_api_forwarder.rb
@@ -185,13 +184,17 @@ files:
 - db/seeds.d/50_job_templates.rb
 - lib/foreman_inventory_upload.rb
 - lib/foreman_inventory_upload/async/async_helpers.rb
+- lib/foreman_inventory_upload/async/create_missing_insights_facets.rb
 - lib/foreman_inventory_upload/async/delayed_start.rb
 - lib/foreman_inventory_upload/async/generate_all_reports_job.rb
+- lib/foreman_inventory_upload/async/generate_host_report.rb
 - lib/foreman_inventory_upload/async/generate_report_job.rb
+- lib/foreman_inventory_upload/async/host_inventory_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/single_host_report_job.rb
 - lib/foreman_inventory_upload/async/upload_report_job.rb
 - lib/foreman_inventory_upload/generators/archived_report.rb
 - lib/foreman_inventory_upload/generators/fact_helpers.rb
@@ -621,6 +624,7 @@ files:
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTabIntegration.test.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTabReducer.test.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTabSelectors.test.js
+- webpack/InsightsHostDetailsTab/__tests__/InsightsTotalRiskChart.test.js
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTab.test.js.snap
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabActions.test.js.snap
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabReducer.test.js.snap

data/app/services/foreman_rh_cloud/gateway_request.rb

@@ -1,26 +0,0 @@
-module ForemanRhCloud
-  module GatewayRequest
-    extend ActiveSupport::Concern
-
-    include CloudRequest
-
-    def execute_cloud_request(params)
-      certs = params.delete(:certs) || foreman_certificates
-      final_params = {
-        ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-        ssl_client_key: OpenSSL::PKey.read(certs[:key]),
-        ssl_ca_file: Setting[:ssl_ca_file],
-        verify_ssl: OpenSSL::SSL::VERIFY_PEER,
-      }.deep_merge(params)
-
-      super(final_params)
-    end
-
-    def foreman_certificates
-      {
-        cert: File.read(Setting[:ssl_certificate]),
-        key: File.read(Setting[:ssl_priv_key]),
-      }
-    end
-  end
-end