foreman_rh_cloud 12.2.13 → 13.0.0

data/webpack/__tests__/ForemanRhCloudHelpers.test.js

@@ -1,5 +1,5 @@
 import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
-import { foremanUrl, vulnerabilityDisabled, hasNoInsightsFacet } from '../ForemanRhCloudHelpers';
+import { foremanUrl, vulnerabilityDisabled } from '../ForemanRhCloudHelpers';
 
 global.URL_PREFIX = 'MY_TEST_URL_PREFIX.example.com';
 
@@ -34,21 +34,6 @@ const fixtures = {
     }),
   'vulnerabilityDisabled returns true for missing hostDetails': () =>
     vulnerabilityDisabled({}),
-  'hasNoInsightsFacet returns false when insights_attributes is present': () =>
-    hasNoInsightsFacet({
-      response: {
-        insights_attributes: {
-          uuid: 'test-uuid',
-          insights_hits_count: 5,
-        },
-      },
-    }),
-  'hasNoInsightsFacet returns true when insights_attributes is missing': () =>
-    hasNoInsightsFacet({
-      response: {},
-    }),
-  'hasNoInsightsFacet returns true when response is missing': () =>
-    hasNoInsightsFacet({}),
 };
 
 describe('ForemanRhCloud helpers', () =>

data/webpack/__tests__/__snapshots__/ForemanRhCloudHelpers.test.js.snap

@@ -1,11 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ForemanRhCloud helpers hasNoInsightsFacet returns false when insights_attributes is present 1`] = `false`;
-
-exports[`ForemanRhCloud helpers hasNoInsightsFacet returns true when insights_attributes is missing 1`] = `true`;
-
-exports[`ForemanRhCloud helpers hasNoInsightsFacet returns true when response is missing 1`] = `true`;
-
 exports[`ForemanRhCloud helpers should return foreman Url 1`] = `"MY_TEST_URL_PREFIX.example.com/test_path"`;
 
 exports[`ForemanRhCloud helpers vulnerabilityDisabled returns false for RHEL host with vulnerability enabled 1`] = `false`;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.2.13
+  version: 13.0.0
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.18'
+        version: 4.14.0.rc1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.18'
+        version: 4.14.0.rc1.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,6 @@ files:
 - app/controllers/api/v2/rh_cloud/cloud_request_controller.rb
 - app/controllers/api/v2/rh_cloud/inventory_controller.rb
 - app/controllers/concerns/foreman_rh_cloud/iop_smart_proxy_access.rb
-- app/controllers/concerns/foreman_rh_cloud/registration_manager_extensions.rb
 - app/controllers/concerns/insights_cloud/candlepin_cache.rb
 - app/controllers/concerns/insights_cloud/client_authentication.rb
 - app/controllers/concerns/insights_cloud/package_profile_upload_extensions.rb
@@ -140,6 +139,7 @@ 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,17 +185,13 @@ 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
@@ -262,11 +258,7 @@ files:
 - test/factories/inventory_upload_factories.rb
 - test/jobs/cloud_connector_announce_task_test.rb
 - test/jobs/connector_playbook_execution_reporter_task_test.rb
-- test/jobs/create_missing_insights_facets_test.rb
 - test/jobs/exponential_backoff_test.rb
-- test/jobs/generate_host_report_test.rb
-- test/jobs/generate_report_job_test.rb
-- test/jobs/host_inventory_report_job_test.rb
 - test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
@@ -275,9 +267,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/queue_for_upload_job_test.rb
 - test/jobs/remove_insights_hosts_job_test.rb
-- test/jobs/single_host_report_job_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
@@ -285,7 +275,6 @@ files:
 - test/unit/fact_helpers_test.rb
 - test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
-- test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/playbook_progress_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
@@ -629,7 +618,6 @@ 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
@@ -722,11 +710,7 @@ test_files:
 - test/factories/inventory_upload_factories.rb
 - test/jobs/cloud_connector_announce_task_test.rb
 - test/jobs/connector_playbook_execution_reporter_task_test.rb
-- test/jobs/create_missing_insights_facets_test.rb
 - test/jobs/exponential_backoff_test.rb
-- test/jobs/generate_host_report_test.rb
-- test/jobs/generate_report_job_test.rb
-- test/jobs/host_inventory_report_job_test.rb
 - test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
@@ -735,9 +719,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/queue_for_upload_job_test.rb
 - test/jobs/remove_insights_hosts_job_test.rb
-- test/jobs/single_host_report_job_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
@@ -745,7 +727,6 @@ test_files:
 - test/unit/fact_helpers_test.rb
 - test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
-- test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/playbook_progress_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb

data/app/controllers/concerns/foreman_rh_cloud/registration_manager_extensions.rb

@@ -1,39 +0,0 @@
-module ForemanRhCloud
-  module RegistrationManagerExtensions
-    include ForemanRhCloud::CertAuth
-
-    def logger
-      Rails.logger
-    end
-
-    def unregister_host(host, options = {})
-      organization_destroy = options.fetch(:organization_destroy, false)
-
-      # Reload to ensure we have fresh association data
-      host.reload
-
-      # Only delete from HBI in IoP mode (hosted mode uses async job for cleanup)
-      hbi_host_destroy(host) if ForemanRhCloud.with_iop_smart_proxy? && !organization_destroy && host.insights_facet&.uuid&.presence
-      host.insights&.destroy!
-      super(host, options)
-    end
-
-    def hbi_host_destroy(host)
-      uuid = host.insights_facet.uuid
-      logger.debug "Unregistering host #{uuid} from HBI"
-      execute_cloud_request(
-        organization: host.organization,
-        method: :delete,
-        url: ForemanInventoryUpload.host_by_id_url(uuid),
-        headers: {
-          content_type: :json,
-        }
-      )
-    rescue RestClient::NotFound
-      Rails.logger.warn(_("Attempted to destroy HBI host %s, but host does not exist in HBI") % uuid)
-    rescue StandardError => e
-      # TODO: Improve error handling - don't break registration if HBI delete fails
-      Rails.logger.error(format(_("Failed to destroy HBI host %s: %s"), uuid, e.message))
-    end
-  end
-end

data/lib/foreman_inventory_upload/async/create_missing_insights_facets.rb

@@ -1,30 +0,0 @@
-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 = 0
-        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
-          facet_count += facets.size
-        end
-        output[:result] = facet_count.zero? ? _("There were no missing Insights facets") : format(_("Missing Insights facets created: %s"), facet_count)
-        Rails.logger.debug output[:result]
-      end
-    end
-  end
-end

data/lib/foreman_inventory_upload/async/generate_host_report.rb

@@ -1,20 +0,0 @@
-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/host_inventory_report_job.rb

@@ -1,39 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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/test/jobs/create_missing_insights_facets_test.rb

@@ -1,151 +0,0 @@
-require 'test_plugin_helper'
-require 'foreman_tasks/test_helpers'
-
-class CreateMissingInsightsFacetsTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
-  include KatelloCVEHelper
-
-  setup do
-    User.current = User.find_by(login: 'secret_admin')
-    @cve = make_cve
-    @env = @cve.lifecycle_environment
-    @organization = @env.organization
-
-    # Create a host with subscription facet but no insights facet
-    @host_without_facet = FactoryBot.create(
-      :host,
-      :with_subscription,
-      :with_content,
-      content_view: @cve.content_view,
-      lifecycle_environment: @env,
-      organization: @organization
-    )
-
-    # Create a host with both subscription and insights facets
-    @host_with_facet = FactoryBot.create(
-      :host,
-      :with_subscription,
-      :with_content,
-      content_view: @cve.content_view,
-      lifecycle_environment: @env,
-      organization: @organization
-    )
-    @host_with_facet.build_insights(uuid: @host_with_facet.subscription_facet.uuid)
-    @host_with_facet.insights.save!
-  end
-
-  test 'creates insights facets for hosts without them' do
-    assert_nil @host_without_facet.insights
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::CreateMissingInsightsFacets,
-      @organization.id
-    )
-    action = run_action(action)
-
-    @host_without_facet.reload
-    assert_not_nil @host_without_facet.insights
-    assert_equal @host_without_facet.subscription_facet.uuid, @host_without_facet.insights.uuid
-    assert_match(/Missing Insights facets created: 1/, action.output[:result])
-  end
-
-  test 'does not create duplicate facets for hosts that already have them' do
-    original_uuid = @host_with_facet.insights.uuid
-    original_id = @host_with_facet.insights.id
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::CreateMissingInsightsFacets,
-      @organization.id
-    )
-    run_action(action)
-
-    @host_with_facet.reload
-    assert_equal original_id, @host_with_facet.insights.id
-    assert_equal original_uuid, @host_with_facet.insights.uuid
-  end
-
-  test 'handles organization with no missing facets' do
-    # Create insights facet for the host that was missing one
-    @host_without_facet.build_insights(uuid: @host_without_facet.subscription_facet.uuid)
-    @host_without_facet.insights.save!
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::CreateMissingInsightsFacets,
-      @organization.id
-    )
-    action = run_action(action)
-
-    assert_match(/There were no missing Insights facets/, action.output[:result])
-  end
-
-  test 'creates multiple facets when multiple hosts are missing them' do
-    # Remove the insights facet from the host that has one
-    @host_with_facet.insights.destroy
-    @host_with_facet.reload
-
-    assert_nil @host_without_facet.insights
-    assert_nil @host_with_facet.insights
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::CreateMissingInsightsFacets,
-      @organization.id
-    )
-    action = run_action(action)
-
-    @host_without_facet.reload
-    @host_with_facet.reload
-    assert_not_nil @host_without_facet.insights
-    assert_not_nil @host_with_facet.insights
-    # After the bug fix, the count should correctly show 2 hosts
-    assert_match(/Missing Insights facets created: 2/, action.output[:result])
-  end
-
-  test 'logs result message' do
-    Rails.logger.expects(:debug).with(regexp_matches(/Missing Insights facets created/))
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::CreateMissingInsightsFacets,
-      @organization.id
-    )
-    run_action(action)
-  end
-
-  test 'correctly counts facets across multiple batches' do
-    # Remove existing insights facet
-    @host_with_facet.insights.destroy
-    @host_with_facet.reload
-
-    # Stub the batch size to force multiple batches with just 2 hosts
-    ForemanInventoryUpload.stubs(:slice_size).returns(1)
-
-    assert_nil @host_without_facet.insights
-    assert_nil @host_with_facet.insights
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::CreateMissingInsightsFacets,
-      @organization.id
-    )
-    action = run_action(action)
-
-    @host_without_facet.reload
-    @host_with_facet.reload
-    assert_not_nil @host_without_facet.insights
-    assert_not_nil @host_with_facet.insights
-    # Count should be 2 even though processed in 2 separate batches
-    assert_match(/Missing Insights facets created: 2/, action.output[:result])
-  end
-
-  test 'handles error when InsightsFacet.upsert_all fails' do
-    # Stub upsert_all to raise an exception
-    InsightsFacet.stubs(:upsert_all).raises(StandardError.new('upsert failed'))
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::CreateMissingInsightsFacets,
-      @organization.id
-    )
-
-    assert_raises(StandardError) do
-      run_action(action)
-    end
-  end
-end

data/test/jobs/generate_host_report_test.rb

@@ -1,100 +0,0 @@
-require 'test_plugin_helper'
-require 'foreman_tasks/test_helpers'
-
-class GenerateHostReportTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
-  include FolderIsolation
-
-  let(:organization) { FactoryBot.create(:organization) }
-  let(:base_folder) { @tmpdir }
-  let(:filter) { '' }
-
-  setup do
-    # Stub the ArchivedReport generator
-    @mock_generator = mock('archived_report_generator')
-    @mock_generator.stubs(:render)
-    ForemanInventoryUpload::Generators::ArchivedReport.stubs(:new).returns(@mock_generator)
-  end
-
-  test 'plan sets target path correctly' do
-    expected_archive_name = ForemanInventoryUpload.facts_archive_name(organization.id, filter)
-    expected_target = File.join(base_folder, expected_archive_name)
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateHostReport,
-      base_folder,
-      organization.id,
-      filter
-    )
-
-    assert_equal expected_target, action.input[:target]
-  end
-
-  test 'run generates report archive' do
-    expected_target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization.id, filter))
-
-    ForemanInventoryUpload::Generators::ArchivedReport.expects(:new).with(expected_target).returns(@mock_generator)
-    @mock_generator.expects(:render).with(organization: organization.id, filter: filter)
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateHostReport,
-      base_folder,
-      organization.id,
-      filter
-    )
-    action = run_action(action)
-
-    assert_match(/Generated #{Regexp.escape(expected_target)} for organization id #{organization.id}/, action.output[:result])
-  end
-
-  test 'generates report with filter' do
-    filter_value = 'id=123'
-    expected_target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization.id, filter_value))
-
-    ForemanInventoryUpload::Generators::ArchivedReport.expects(:new).with(expected_target).returns(@mock_generator)
-    @mock_generator.expects(:render).with(organization: organization.id, filter: filter_value)
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateHostReport,
-      base_folder,
-      organization.id,
-      filter_value
-    )
-    action = run_action(action)
-
-    assert_match(/organization id #{organization.id}/, action.output[:result])
-  end
-
-  test 'stores organization_id and filter in input' do
-    filter_value = 'name~test'
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateHostReport,
-      base_folder,
-      organization.id,
-      filter_value
-    )
-
-    assert_equal organization.id, action.input[:organization_id]
-    assert_equal filter_value, action.input[:filter]
-    assert_equal base_folder, action.input[:base_folder]
-  end
-
-  test 'handles ArchivedReport generator failure' do
-    expected_target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization.id, filter))
-
-    ForemanInventoryUpload::Generators::ArchivedReport.expects(:new).with(expected_target).returns(@mock_generator)
-    @mock_generator.expects(:render).with(organization: organization.id, filter: filter).raises(StandardError.new('Report generation failed'))
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateHostReport,
-      base_folder,
-      organization.id,
-      filter
-    )
-
-    assert_raises(StandardError) do
-      run_action(action)
-    end
-  end
-end