foreman_rh_cloud 12.2.9 → 12.2.11

data/webpack/InsightsVulnerabilityHostIndexExtensions/CVECountCell.js

@@ -3,25 +3,31 @@ import PropTypes from 'prop-types';
 import { UnknownIcon } from '@patternfly/react-icons';
 import { Link } from 'react-router-dom';
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
-
 import { insightsCloudUrl } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
+import { useAdvisorEngineConfig } from '../common/Hooks/ConfigHooks';
 
 const vulnerabilityApiPath = path =>
   insightsCloudUrl(`api/vulnerability/v1/${path}`);
 
 export const CVECountCell = ({ hostDetails }) => {
+  const isIopEnabled = useAdvisorEngineConfig();
+
   // eslint-disable-next-line camelcase
   const uuid = hostDetails?.subscription_facet_attributes?.uuid;
 
   const key = `HOST_CVE_COUNT_${uuid}`;
   const response = useAPI(
-    uuid ? 'get' : null,
+    isIopEnabled && uuid ? 'get' : null,
     vulnerabilityApiPath(`systems?uuid=${uuid}`),
     {
       key,
     }
   );
 
+  if (!isIopEnabled) {
+    return <UnknownIcon />;
+  }
+
   if (uuid === undefined) {
     return <UnknownIcon />;
   }

data/webpack/InsightsVulnerabilityHostIndexExtensions/__tests__/CVECountCell.test.js

@@ -2,8 +2,11 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { API } from 'foremanReact/redux/API';
 import { CVECountCell } from '../CVECountCell';
+import * as ConfigHooks from '../../common/Hooks/ConfigHooks';
 
 jest.mock('foremanReact/redux/API');
+jest.mock('../../common/Hooks/ConfigHooks');
+
 API.get.mockImplementation(async () => ({
   data: [
     {
@@ -14,15 +17,58 @@ API.get.mockImplementation(async () => ({
   ],
 }));
 
+const hostDetailsMock = {
+      name: 'test-host.example.com',
+      subscription_facet_attributes: {
+        uuid: 'test-uuid-123',
+      },
+    };
+
 describe('CVECountCell', () => {
-  it('renders an empty cves count column', () => {
-    const hostDetailsMock = {
+  beforeEach(() => {
+    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(true);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders an empty cves count column when no subscription UUID', () => {
+    const hostDetailsMockIoP = {
       name: 'test-host.example.com',
       subscription_facet_attributes: {
         uuid: null, // no subscription
       },
     };
+    render(<CVECountCell hostDetails={hostDetailsMockIoP} />);
+    expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
+  });
+
+  it('renders UnknownIcon when IoP is not enabled', () => {
+    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(false);
+    render(<CVECountCell hostDetails={hostDetailsMock} />);
+    expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
+    expect(ConfigHooks.useAdvisorEngineConfig).toHaveBeenCalled();
+  });
+
+  it('renders UnknownIcon when IoP is enabled but CVE API call fails', () => {
+    // Mock successful IoP config
+    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(true);
+    // Mock CVE API failure - override the global mock for this test
+    API.get.mockImplementationOnce(async () => {
+      throw new Error('CVE API call failed');
+    });
+
+    render(<CVECountCell hostDetails={hostDetailsMock} />);
+    // Should render UnknownIcon when CVE API fails
+    expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
+    expect(ConfigHooks.useAdvisorEngineConfig).toHaveBeenCalled();
+  });
+
+  it('renders UnknownIcon when IoP is undefined (API call pending)', () => {
+    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(undefined);
     render(<CVECountCell hostDetails={hostDetailsMock} />);
     expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
+    expect(ConfigHooks.useAdvisorEngineConfig).toHaveBeenCalled();
   });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.2.9
+  version: 12.2.11
 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
@@ -619,6 +622,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