foreman_rh_cloud 12.2.10 → 13.0.0

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -131,15 +131,28 @@ const IopInsightsTabWrapped = props => (
 );
 
 const InsightsTab = props => {
-  const isLocalIop = useAdvisorEngineConfig();
+  const { response } = props;
+  const isLocalAdvisorEngine =
+    // eslint-disable-next-line camelcase
+    response?.insights_attributes?.use_iop_mode;
 
-  return isLocalIop ? (
+  return isLocalAdvisorEngine ? (
     <IopInsightsTabWrapped {...props} />
   ) : (
     <NewHostDetailsTab {...props} />
   );
 };
 
-InsightsTab.defaultProps = {};
+InsightsTab.propTypes = {
+  response: PropTypes.shape({
+    insights_attributes: {
+      use_iop_mode: PropTypes.bool,
+    },
+  }),
+};
+
+InsightsTab.defaultProps = {
+  response: {},
+};
 
 export default InsightsTab;

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.10
+  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
@@ -139,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
@@ -184,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
@@ -270,7 +267,6 @@ 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/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
@@ -622,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
@@ -724,7 +719,6 @@ 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/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb

data/lib/foreman_inventory_upload/async/create_missing_insights_facets.rb

@@ -1,29 +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 = 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

@@ -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/queue_for_upload_job_test.rb

@@ -1,63 +0,0 @@
-require 'test_plugin_helper'
-require 'foreman_tasks/test_helpers'
-
-class QueueForUploadJobTest < ActiveSupport::TestCase
-  include ForemanTasks::TestHelpers::WithInThreadExecutor
-  include FolderIsolation
-
-  let(:organization) { FactoryBot.create(:organization) }
-  let(:base_folder) { @tmpdir }
-  let(:report_file) { 'test_report.tar.xz' }
-  let(:report_path) { File.join(base_folder, report_file) }
-  let(:uploads_folder) { ForemanInventoryUpload.uploads_folder }
-  subject { ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization.id) }
-
-  setup do
-    # Stub the script template source
-    script_source = File.join(ForemanRhCloud::Engine.root, 'lib/foreman_inventory_upload/scripts/uploader.sh.erb')
-    File.stubs(:read).with(script_source).returns('#!/bin/bash\necho "Test script"')
-
-    # Stub template rendering
-    Foreman::Renderer.stubs(:render).returns('#!/bin/bash\necho "Rendered script"')
-
-    # Stub additional settings that are accessed
-    Setting.stubs(:[]).with(:content_default_http_proxy).returns(nil)
-    Setting.stubs(:[]).with(:http_proxy).returns(nil)
-    Setting.stubs(:[]).with("foreman_tasks_sync_task_timeout").returns(120)
-    FileUtils.touch(report_path)
-  end
-
-  teardown do
-    FileUtils.rm_rf(uploads_folder) if Dir.exist?(uploads_folder)
-  end
-
-  test 'plan method sets up the job correctly and calls plan_upload_report' do
-    # Mock plan_upload_report to verify it's called
-    ForemanInventoryUpload::Async::QueueForUploadJob.any_instance.expects(:plan_upload_report).once
-
-    assert_equal 'success', subject.result
-  end
-
-  test 'run method processes file and moves it to uploads folder' do
-    ForemanInventoryUpload::Async::QueueForUploadJob.any_instance.stubs(:plan_upload_report)
-
-    assert_equal 'success', subject.result
-
-    # Verify the file was moved
-    refute File.exist?(report_path), "Original file should be moved"
-    assert File.exist?(File.join(uploads_folder, report_file)), "File should exist in uploads folder"
-  end
-
-  test 'creates necessary folders and scripts' do
-    ForemanInventoryUpload::Async::QueueForUploadJob.any_instance.stubs(:plan_upload_report)
-
-    assert_equal 'success', subject.result
-
-    # Verify the uploads folder was created
-    assert Dir.exist?(uploads_folder), "Uploads folder should be created"
-
-    # Verify the script file was created
-    script_path = File.join(uploads_folder, ForemanInventoryUpload.upload_script_file)
-    assert File.exist?(script_path), "Upload script should be created"
-  end
-end

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

@@ -1,194 +0,0 @@
-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)
-    );
-  });
-});