foreman_rh_cloud 11.0.3 → 11.1.0

data/test/controllers/insights_sync/settings_controller_test.rb

@@ -2,6 +2,9 @@ require 'test_plugin_helper'
 
 class SettingsControllerTest < ActionController::TestCase
   tests InsightsCloud::SettingsController
+  def setup
+    ForemanRhCloud.stubs(:with_local_advisor_engine?).returns(false)
+  end
 
   test 'should return allow_auto_insights_sync setting' do
     Setting[:allow_auto_insights_sync] = false

data/test/factories/insights_factories.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :insights_facet do
-    # sequence(:uuid) { |n| "uuid-#{n}" }
+    sequence(:uuid) { |n| "uuid-#{n}" }
 
     trait :with_hits do
       hits do

data/test/jobs/inventory_scheduled_sync_test.rb

@@ -14,6 +14,16 @@ 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)
+
+    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)
+  end
+
   test 'Skips execution if auto upload is disabled' do
     Setting[:allow_auto_inventory_upload] = false
 

data/test/unit/rh_cloud_http_proxy_test.rb

@@ -4,29 +4,12 @@ class RhCloudHttpProxyTest < ActiveSupport::TestCase
   setup do
     @global_content_proxy_mock = 'http://global:content@localhost:80'
     @global_foreman_proxy_mock = 'http://global:foreman@localhost:80'
-    @katello_cdn_proxy_mock = {
-      host: 'localhost',
-      port: '80',
-      user: 'katello',
-      password: 'cdn',
-      scheme: 'http',
-    }
-    @katello_cdn_proxy_string_mock = 'http://katello:cdn@localhost:80'
   end
 
   test 'selects global content proxy' do
     setup_global_content_proxy
     setup_global_foreman_proxy
-    setup_cdn_proxy do
-      assert_equal @global_content_proxy_mock, ForemanRhCloud.proxy_setting
-    end
-  end
-
-  test 'selects cdn proxy' do
-    setup_global_foreman_proxy
-    setup_cdn_proxy do
-      assert_equal @katello_cdn_proxy_string_mock, ForemanRhCloud.proxy_setting
-    end
+    assert_equal @global_content_proxy_mock, ForemanRhCloud.proxy_setting
   end
 
   test 'selects global foreman proxy' do
@@ -44,14 +27,6 @@ class RhCloudHttpProxyTest < ActiveSupport::TestCase
     Setting[:http_proxy] = @global_foreman_proxy_mock
   end
 
-  def setup_cdn_proxy
-    old_cdn_setting = SETTINGS[:katello][:cdn_proxy]
-    SETTINGS[:katello][:cdn_proxy] = @katello_cdn_proxy_mock
-    yield
-  ensure
-    SETTINGS[:katello][:cdn_proxy] = old_cdn_setting
-  end
-
   test 'transform proxy scheme test' do
     mock_http_proxy = 'http://user:password@localhost:8888'
     mock_https_proxy = 'https://user:password@localhost:8888'

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

@@ -0,0 +1,120 @@
+require 'test_plugin_helper'
+
+class HitsUploaderTest < ActiveSupport::TestCase
+  PAYLOAD = {
+    resolutions: [
+      {
+        rule_id: "R123",
+        description: "Apply security patch to fix vulnerability CVE-2025-0001.",
+        needs_reboot: true,
+        resolution_risk: "Medium",
+        resolution_type: "fix",
+      },
+      {
+        rule_id: "R124",
+        description: "Update configuration file to improve system stability.",
+        needs_reboot: false,
+        resolution_risk: "Low",
+        resolution_type: "fix",
+      },
+    ],
+    rules: [
+      {
+        rule_id: "R123",
+        description: "Security patch for CVE-2025-0001.",
+        category_name: "Security",
+        impact_name: "High",
+        summary: "Fixes critical vulnerability.",
+        generic: "Security updates are mandatory.",
+        reason: "Vulnerability exposed in external audit.",
+        total_risk: 5,
+        reboot_required: true,
+        more_info: "https://example.com/security-update",
+        rating: 4.8,
+      },
+      {
+        rule_id: "R124",
+        description: "Configuration update to improve performance.",
+        category_name: "Availability",
+        impact_name: "Medium",
+        summary: "Improves application stability and reduces crashes.",
+        generic: "Periodic updates recommended.",
+        reason: "Frequent crashes observed in logs.",
+        total_risk: 3,
+        reboot_required: false,
+        more_info: "https://example.com/config-update",
+        rating: 4.0,
+      },
+    ],
+    hits: [
+      {
+        rule_id: "R123",
+        title: "Critical Vulnerability Patch",
+        solution_url: "https://example.com/solution",
+        total_risk: 5,
+        likelihood: 4,
+        publish_date: "2025-01-01",
+        results_url: "https://example.com/results",
+      },
+      {
+        rule_id: "R124",
+        title: "Configuration Update",
+        solution_url: "https://example.com/config-solution",
+        total_risk: 3,
+        likelihood: 3,
+        publish_date: "2025-01-02",
+        results_url: "https://example.com/config-results",
+      },
+    ],
+    details: "{\"summary\": \"Detected issues and resolutions applied successfully.\"}",
+  }.freeze
+
+  setup do
+    @host = FactoryBot.create(:host)
+    @uuid = SecureRandom.uuid
+    uploader = ForemanRhCloud::HitsUploader.new(host: @host, payload: PAYLOAD, uuid: @uuid)
+    uploader.upload!
+    @host.reload
+  end
+
+  test 'facets' do
+    assert_equal @uuid, @host.insights_facet.uuid
+  end
+
+  test 'hits' do
+    assert_equal PAYLOAD[:hits].count, @host.insights_facet.hits_count
+    assert_includes @host.insights_facet.hits.pluck(:rule_id), "R124"
+  end
+
+  test "resolutions" do
+    assert_equal 2, InsightsResolution.where(rule_id: ["R123", "R124"]).count
+  end
+
+  test "details" do
+    fact_name = FactName.where(name: "insights::hit_details").first
+    fact_value = @host.fact_values.where(fact_name: fact_name).first
+    refute_nil fact_value
+    assert_equal PAYLOAD[:details], fact_value.value
+  end
+
+  test "empty payload" do
+    payload = {
+      resolutions: [],
+      rules: [],
+      hits: [],
+      details: "",
+    }
+
+    @host = FactoryBot.create(:host)
+    @uuid = SecureRandom.uuid
+    uploader = ForemanRhCloud::HitsUploader.new(host: @host, payload: payload, uuid: @uuid)
+    uploader.upload!
+    @host.reload
+    assert_equal @uuid, @host.insights_facet.uuid
+    assert_empty @host.insights_facet.hits
+    assert_equal 0, @host.insights_facet.hits_count
+    fact_name = FactName.where(name: "insights::hit_details").first
+    fact_value = @host.fact_values.where(fact_name: fact_name).first
+    assert_nil fact_value
+  end
+end

data/webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageTitle.test.js.snap

@@ -24,7 +24,7 @@ exports[`PageTitle rendering render without Props 1`] = `
       dropdownItems={
         Array [
           <DropdownItem
-            href="/foreman_tasks/tasks?search=action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1"
+            href="/foreman_tasks/tasks?search=label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1"
             rel="noopener noreferrer"
             target="_blank"
           >

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/CloudConnectorButton.js

@@ -37,14 +37,14 @@ export const CloudConnectorButton = ({ status, onClick, jobLink }) => {
   if (status === CONNECTOR_STATUS.RESOLVED) {
     return (
       <Button variant="secondary" onClick={onClick}>
-        {__('Reconfigure Cloud Connector')}
+        {__('Reconfigure cloud connector')}
       </Button>
     );
   }
 
   return (
     <Button variant="secondary" onClick={onClick}>
-      {__('Configure Cloud Connector')}
+      {__('Configure cloud connector')}
     </Button>
   );
 };

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/__tests__/__snapshots__/CloudConnectorButton.test.js.snap

@@ -5,7 +5,7 @@ exports[`CloudConnectorButton render no cloud connector 1`] = `
   onClick={[MockFunction]}
   variant="secondary"
 >
-  Configure Cloud Connector
+  Configure cloud connector
 </Button>
 `;
 
@@ -51,6 +51,6 @@ exports[`CloudConnectorButton render resolved cloud connector 1`] = `
   onClick={[MockFunction]}
   variant="secondary"
 >
-  Reconfigure Cloud Connector
+  Reconfigure cloud connector
 </Button>
 `;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js

@@ -34,7 +34,9 @@ export const PageDescription = () => (
           'To manually upload the data for a specific organization, select an organization and click {restartButtonName}.'
         )}
         values={{
-          restartButtonName: <strong>{__('Restart')}</strong>,
+          restartButtonName: (
+            <strong>{__('Generate and upload report')}</strong>
+          ),
         }}
       />
     </Text>

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/__snapshots__/PageDescription.test.js.snap

@@ -30,7 +30,7 @@ exports[`PageDescription rendering render without Props 1`] = `
       values={
         Object {
           "restartButtonName": <strong>
-            Restart
+            Generate and upload report
           </strong>,
         }
       }

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButton.test.js.snap

@@ -9,7 +9,7 @@ exports[`SyncButton rendering render with Props 1`] = `
     size="lg"
     variant="secondary"
   >
-     Sync inventory status
+     Sync all inventory status
   </Button>
 </Fragment>
 `;

data/webpack/ForemanInventoryUpload/Components/TabHeader/TabHeader.js

@@ -19,7 +19,7 @@ const TabHeader = ({ exitCode, onRestart, onDownload, toggleFullScreen }) => (
             onClick={onRestart}
             disabled={isExitCodeLoading(exitCode)}
           >
-            {__('Restart')}
+            {__('Generate and upload report')}
           </Button>
         ) : null}
         {onDownload ? (

data/webpack/ForemanInventoryUpload/ForemanInventoryConstants.js

@@ -6,6 +6,6 @@ export const DOCS_BUTTON_TEXT = __('Documentation');
 
 export const ACTIONS_HISTORY_BUTTON_TEXT = __('Actions history');
 
-export const SYNC_BUTTON_TEXT = __(' Sync inventory status');
+export const SYNC_BUTTON_TEXT = __(' Sync all inventory status');
 
 export const CLOUD_PING_TITLE = __('Connectivity test');

data/webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js

@@ -13,7 +13,7 @@ export const getInventoryDocsUrl = () =>
 
 export const getActionsHistoryUrl = () =>
   foremanUrl(
-    '/foreman_tasks/tasks?search=action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1'
+    '/foreman_tasks/tasks?search=label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1'
   );
 
 export const isExitCodeLoading = exitCode => {

data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettings.js

@@ -1,32 +1,36 @@
-import React, { Component } from 'react';
+import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 import SwitcherPF4 from '../../../common/Switcher/SwitcherPF4';
 import './insightsSettings.scss';
+import { useAdvisorEngineConfig } from '../../../common/Hooks/ConfigHooks';
 
-class InsightsSettings extends Component {
-  componentDidMount() {
-    const { getInsightsSyncSettings } = this.props;
+const InsightsSettings = ({
+  insightsSyncEnabled,
+  getInsightsSyncSettings,
+  setInsightsSyncEnabled,
+}) => {
+  const isLocalAdvisorEngine = useAdvisorEngineConfig();
+  useEffect(() => {
     getInsightsSyncSettings();
-  }
+  }, [getInsightsSyncSettings]);
 
-  render() {
-    const { insightsSyncEnabled, setInsightsSyncEnabled } = this.props;
-    return (
-      <div className="insights_settings">
-        <SwitcherPF4
-          id="insights_sync_switcher"
-          label={__('Sync automatically')}
-          tooltip={__(
-            'Enable automatic synchronization of Insights recommendations from the Red Hat cloud'
-          )}
-          isChecked={insightsSyncEnabled}
-          onChange={() => setInsightsSyncEnabled(!insightsSyncEnabled)}
-        />
-      </div>
-    );
-  }
-}
+  if (isLocalAdvisorEngine) return null;
+
+  return (
+    <div className="insights_settings">
+      <SwitcherPF4
+        id="insights_sync_switcher"
+        label={__('Sync automatically')}
+        tooltip={__(
+          'Enable automatic synchronization of Insights recommendations from the Red Hat cloud'
+        )}
+        isChecked={insightsSyncEnabled}
+        onChange={() => setInsightsSyncEnabled(!insightsSyncEnabled)}
+      />
+    </div>
+  );
+};
 
 InsightsSettings.propTypes = {
   insightsSyncEnabled: PropTypes.bool.isRequired,

data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettingsActions.js

@@ -19,7 +19,8 @@ export const getInsightsSyncSettings = () => async dispatch => {
         },
       },
     });
-  } catch ({ message }) {
+  } catch (err) {
+    const { message } = err;
     dispatch(
       addToast({
         sticky: true,

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTable.js

@@ -12,6 +12,7 @@ import TableEmptyState from '../../../common/table/EmptyState';
 import { modifySelectedRows, getSortColumnIndex } from './InsightsTableHelpers';
 import Pagination from './Pagination';
 import './table.scss';
+import { useAdvisorEngineConfig } from '../../../common/Hooks/ConfigHooks';
 
 const InsightsTable = ({
   page,
@@ -43,9 +44,17 @@ const InsightsTable = ({
     fetchInsights({ page, perPage, query, sortBy, sortOrder });
   }, [hostname]);
 
+  const isLocalAdvisorEngine = useAdvisorEngineConfig();
+
   useEffect(() => {
     setRows(
-      modifySelectedRows(hits, selectedIds, showSelectAllAlert, hideHost)
+      modifySelectedRows(
+        hits,
+        selectedIds,
+        showSelectAllAlert,
+        hideHost,
+        isLocalAdvisorEngine
+      )
     );
 
     if (hideHost) setColumns(getColumnsWithoutHostname());

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableConstants.js

@@ -31,10 +31,11 @@ export const hasPlaybookFormatter = ({ title: hasPlaybook }) => ({
 });
 
 export const actionsFormatter = (props, { rowData = {} }) => {
-  const { recommendationUrl, accessRHUrl } = rowData;
+  const { recommendationUrl, accessRHUrl, isLocalAdvisorEngine } = rowData;
   const dropdownItems = [];
 
   recommendationUrl &&
+    !isLocalAdvisorEngine &&
     dropdownItems.push(
       <DropdownItem key="recommendation-url">
         <a href={recommendationUrl} target="_blank" rel="noopener noreferrer">
@@ -121,4 +122,10 @@ export const INSIGHTS_SET_SELECT_ALL_ALERT = 'INSIGHTS_SET_SELECT_ALL_ALERT';
 
 export const INSIGHTS_SET_SELECT_ALL = 'INSIGHTS_SET_SELECT_ALL';
 
+export const ADVISOR_ENGINE_CONFIG_KEY = 'ADVISOR_ENGINE_CONFIG';
+
+export const ADVISOR_ENGINE_CONFIG_PATH = foremanUrl(
+  '/api/v2/rh_cloud/advisor_engine_config'
+);
+
 export const NEW_HOST_PATH = '/new/hosts/';

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableHelpers.js

@@ -6,7 +6,8 @@ export const modifySelectedRows = (
   hits,
   selectedIds,
   showSelectAllAlert,
-  hideHost
+  hideHost,
+  isLocalAdvisorEngine
 ) => {
   if (hits.length === 0) return [];
 
@@ -34,6 +35,7 @@ export const modifySelectedRows = (
           selected: selectedIds[id] || (disableCheckbox && showSelectAllAlert),
           recommendationUrl: results_url,
           accessRHUrl: solution_url,
+          isLocalAdvisorEngine,
         };
       }
     );

data/webpack/InsightsCloudSync/Components/ToolbarDropdown.js

@@ -4,9 +4,14 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { Dropdown, DropdownItem, KebabToggle } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { redHatAdvisorSystems } from '../InsightsCloudSyncHelpers';
+import { useAdvisorEngineConfig } from '../../common/Hooks/ConfigHooks';
 
 const ToolbarDropdown = ({ onRecommendationSync }) => {
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+  const isLocalAdvisorEngine = useAdvisorEngineConfig();
+  if (isLocalAdvisorEngine) {
+    return null;
+  }
   const dropdownItems = [
     <DropdownItem
       key="recommendation-manual-sync"

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
-import InsightsHeader from './Components/InsightsHeader';
 import InsightsTable from './Components/InsightsTable';
 import RemediationModal from './Components/RemediationModal';
 import {
@@ -37,7 +36,7 @@ const InsightsCloudSync = ({ syncInsights, query, fetchInsights }) => {
         header={INSIGHTS_SYNC_PAGE_TITLE}
         toolbarButtons={toolbarButtons}
         searchQuery={query}
-        beforeToolbarComponent={<InsightsHeader />}
+        beforeToolbarComponent={null}
       >
         <InsightsTable />
       </PageLayout>

data/webpack/InsightsCloudSync/__snapshots__/InsightsCloudSync.test.js.snap

@@ -6,7 +6,7 @@ exports[`InsightsCloudSync render 1`] = `
 >
   <Connect(InsightsSettings) />
   <PageLayout
-    beforeToolbarComponent={<InsightsHeader />}
+    beforeToolbarComponent={null}
     header="Red Hat Insights"
     onSearch={[Function]}
     searchProps={

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -21,11 +21,13 @@ import {
   selectHits,
 } from '../InsightsCloudSync/Components/InsightsTable/InsightsTableSelectors';
 import { redHatAdvisorSystems } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
+import { useAdvisorEngineConfig } from '../common/Hooks/ConfigHooks';
 
 const NewHostDetailsTab = ({ hostName, router }) => {
   const dispatch = useDispatch();
   const query = useSelector(selectSearch);
   const hits = useSelector(selectHits);
+  const isLocalAdvisorEngine = useAdvisorEngineConfig();
 
   useEffect(() => () => router.replace({ search: null }), [router]);
 
@@ -41,7 +43,7 @@ const NewHostDetailsTab = ({ hostName, router }) => {
     </DropdownItem>,
   ];
 
-  if (hits.length) {
+  if (hits.length && !isLocalAdvisorEngine) {
     const { host_uuid: uuid } = hits[0];
     dropdownItems.push(
       <DropdownItem key="insights-advisor-link" ouiaId="insights-advisor-link">

data/webpack/__mocks__/foremanReact/common/hooks/API/APIHooks.js

@@ -0,0 +1,3 @@
+export const useAPI = jest.fn(() => ({
+  response: {},
+}));

data/webpack/common/Hooks/ConfigHooks.js

@@ -0,0 +1,19 @@
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import {
+  ADVISOR_ENGINE_CONFIG_KEY,
+  ADVISOR_ENGINE_CONFIG_PATH,
+} from '../../InsightsCloudSync/Components/InsightsTable/InsightsTableConstants';
+
+export const useAdvisorEngineConfig = () => {
+  const { response: advisorEngineConfig } = useAPI(
+    'get',
+    ADVISOR_ENGINE_CONFIG_PATH,
+    {
+      key: ADVISOR_ENGINE_CONFIG_KEY,
+    }
+  );
+
+  // eslint-disable-next-line camelcase
+  const isLocalAdvisorEngine = advisorEngineConfig?.use_local_advisor_engine;
+  return isLocalAdvisorEngine;
+};