foreman_rh_cloud 13.0.7 → 13.0.9

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

@@ -1,12 +1,14 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
+import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
 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');
 
+const { renderWithStore } = rtlHelpers;
+
 API.get.mockImplementation(async () => ({
   data: [
     {
@@ -18,17 +20,13 @@ API.get.mockImplementation(async () => ({
 }));
 
 const hostDetailsMock = {
-      name: 'test-host.example.com',
-      subscription_facet_attributes: {
-        uuid: 'test-uuid-123',
-      },
-    };
+  name: 'test-host.example.com',
+  subscription_facet_attributes: {
+    uuid: 'test-uuid-123',
+  },
+};
 
 describe('CVECountCell', () => {
-  beforeEach(() => {
-    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(true);
-  });
-
   afterEach(() => {
     jest.clearAllMocks();
   });
@@ -40,35 +38,92 @@ describe('CVECountCell', () => {
         uuid: null, // no subscription
       },
     };
-    render(<CVECountCell hostDetails={hostDetailsMockIoP} />);
+    renderWithStore(<CVECountCell hostDetails={hostDetailsMockIoP} />, {
+      router: {
+        location: {
+          pathname: '/',
+          search: '',
+          hash: '',
+          query: {},
+        },
+      },
+      API: {
+        ADVISOR_ENGINE_CONFIG: {
+          response: { use_iop_mode: true },
+          status: 'RESOLVED',
+        },
+      },
+    });
     expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
   });
 
   it('renders UnknownIcon when IoP is not enabled', () => {
-    ConfigHooks.useAdvisorEngineConfig.mockReturnValue(false);
-    render(<CVECountCell hostDetails={hostDetailsMock} />);
+    renderWithStore(<CVECountCell hostDetails={hostDetailsMock} />, {
+      router: {
+        location: {
+          pathname: '/',
+          search: '',
+          hash: '',
+          query: {},
+        },
+      },
+      API: {
+        ADVISOR_ENGINE_CONFIG: {
+          response: { use_iop_mode: false },
+          status: 'RESOLVED',
+        },
+      },
+    });
     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} />);
+    renderWithStore(<CVECountCell hostDetails={hostDetailsMock} />, {
+      router: {
+        location: {
+          pathname: '/',
+          search: '',
+          hash: '',
+          query: {},
+        },
+      },
+      API: {
+        ADVISOR_ENGINE_CONFIG: {
+          response: { use_iop_mode: true },
+          status: 'RESOLVED',
+        },
+        // Mock the API failure state for the CVE endpoint
+        [`HOST_CVE_COUNT_${hostDetailsMock.subscription_facet_attributes.uuid}`]: {
+          status: 'ERROR',
+          error: 'CVE API call failed',
+        },
+      },
+    });
     // 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} />);
+    renderWithStore(<CVECountCell hostDetails={hostDetailsMock} />, {
+      router: {
+        location: {
+          pathname: '/',
+          search: '',
+          hash: '',
+          query: {},
+        },
+      },
+      API: {
+        ADVISOR_ENGINE_CONFIG: {
+          status: 'PENDING',
+        },
+      },
+    });
     expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
-    expect(ConfigHooks.useAdvisorEngineConfig).toHaveBeenCalled();
   });
 });

data/webpack/common/Hooks/ConfigHooks.js

@@ -1,18 +1,5 @@
-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,
-    }
-  );
+import { useForemanContext } from 'foremanReact/Root/Context/ForemanContext';
 
+export const useIopConfig = () =>
   // eslint-disable-next-line camelcase
-  return advisorEngineConfig?.use_iop_mode;
-};
+  useForemanContext().metadata?.foreman_rh_cloud?.iop;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 13.0.7
+  version: 13.0.9
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -99,6 +99,7 @@ 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
@@ -195,7 +196,7 @@ files:
 - 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/async/upload_report_direct_job.rb
 - lib/foreman_inventory_upload/generators/archived_report.rb
 - lib/foreman_inventory_upload/generators/fact_helpers.rb
 - lib/foreman_inventory_upload/generators/json_stream.rb
@@ -204,7 +205,6 @@ files:
 - lib/foreman_inventory_upload/generators/slice.rb
 - lib/foreman_inventory_upload/generators/tags.rb
 - lib/foreman_inventory_upload/notifications/manifest_import_success_notification_override.rb
-- lib/foreman_inventory_upload/scripts/uploader.sh.erb
 - lib/foreman_rh_cloud.rb
 - lib/foreman_rh_cloud/async/exponential_backoff.rb
 - lib/foreman_rh_cloud/engine.rb
@@ -262,7 +262,11 @@ 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
@@ -273,13 +277,15 @@ files:
 - 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/jobs/single_host_report_job_test.rb
+- test/jobs/upload_report_direct_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - 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/lib/insights_cloud/async/vmaas_reposcan_sync_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/playbook_progress_generator_test.rb
@@ -436,7 +442,6 @@ files:
 - webpack/ForemanInventoryUpload/Components/PageHeader/PageTitle.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/PageHeader.test.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/PageTitle.test.js
-- webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageHeader.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageTitle.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/CloudConnectorActions.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/CloudConnectorButton.js
@@ -581,7 +586,6 @@ files:
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/InsightsTable.test.js
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/InsightsTableActions.test.js
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/InsightsTableSelectors.test.js
-- webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTable.test.js.snap
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTableActions.test.js.snap
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTableSelectors.test.js.snap
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/fixtures.js
@@ -641,7 +645,6 @@ files:
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/MountingService.js
 - webpack/__mocks__/foremanReact/common/helpers.js
-- webpack/__mocks__/foremanReact/common/hooks/API/APIHooks.js
 - webpack/__mocks__/foremanReact/components/ConfirmModal/index.js
 - webpack/__mocks__/foremanReact/components/Head.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js
@@ -717,7 +720,11 @@ 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
@@ -728,13 +735,15 @@ test_files:
 - 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/jobs/single_host_report_job_test.rb
+- test/jobs/upload_report_direct_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - 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/lib/insights_cloud/async/vmaas_reposcan_sync_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/playbook_progress_generator_test.rb

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -1,97 +0,0 @@
-require 'tempfile'
-
-module ForemanInventoryUpload
-  module Async
-    class UploadReportJob < ShellProcess
-      def self.output_label(label)
-        "upload_for_#{label}"
-      end
-
-      def plan(filename, organization_id)
-        label = UploadReportJob.output_label(organization_id)
-        super(label, filename: filename, organization_id: organization_id)
-      end
-
-      def try_execute
-        if content_disconnected?
-          progress_output do |progress_output|
-            progress_output.write_line("Report was not moved and upload was canceled because connection to Insights is not enabled. Report location: #{filename}.")
-            progress_output.status = "Task aborted, exit 1"
-            done!
-          end
-          return
-        end
-
-        unless organization.owner_details&.fetch('upstreamConsumer')&.fetch('idCert')
-          logger.info("Skipping organization '#{organization}', no candlepin certificate defined.")
-          progress_output do |progress_output|
-            progress_output.write_line("Skipping organization #{organization}, no candlepin certificate defined.")
-            progress_output.status = "Task aborted, exit 1"
-            done!
-          end
-          return
-        end
-
-        Tempfile.create([organization.name, '.pem']) do |cer_file|
-          cer_file.write(certificate[:cert])
-          cer_file.write(certificate[:key])
-          cer_file.flush
-          @cer_path = cer_file.path
-          super
-        end
-      end
-
-      def command
-        ['/bin/bash', File.join(File.dirname(filename), ForemanInventoryUpload.upload_script_file)]
-      end
-
-      def env
-        env_vars = super.merge(
-          'FILES' => filename,
-          'CER_PATH' => @cer_path,
-          'ORG_ID' => organization.label
-        )
-
-        http_proxy_string = ForemanRhCloud.http_proxy_string
-        if http_proxy_string
-          env_vars['http_proxy'] = http_proxy_string
-          env_vars['https_proxy'] = http_proxy_string
-        end
-        env_vars
-      end
-
-      def certificate
-        ForemanRhCloud.with_iop_smart_proxy? ? foreman_certificate : manifest_certificate
-      end
-
-      def manifest_certificate
-        @manifest_certificate ||= begin
-          candlepin_id_certificate = organization.owner_details['upstreamConsumer']['idCert']
-          {
-            cert: candlepin_id_certificate['cert'],
-            key: candlepin_id_certificate['key'],
-          }
-        end
-      end
-
-      def foreman_certificate
-        @foreman_certificate ||= {
-          cert: File.read(Setting[:ssl_certificate]),
-          key: File.read(Setting[:ssl_priv_key]),
-        }
-      end
-
-      def filename
-        input[:filename]
-      end
-
-      def organization
-        @organization ||= Organization.find(input[:organization_id])
-      end
-
-      def content_disconnected?
-        !Setting[:subscription_connection_enabled]
-      end
-    end
-  end
-end

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

@@ -1,55 +0,0 @@
-#! /bin/bash
-
-DEST=<%= @upload_url %>
-RH_USERNAME=<%= @rh_username %>
-
-if [ -z "$FILES" ]
-then
-        FILES=./*.tar.gz
-fi
-
-if [ -n "$CER_PATH" ]
-then
-        AUTH_KEY="--cert"
-        AUTH_VAL="$CER_PATH"
-else
-        if [ -z "$RH_USERNAME" ]
-        then
-                IFS= read -rp "Enter username: " RH_USERNAME
-        fi
-
-        if [ -z "$RH_PASSWORD" ]
-        then
-                IFS= read -rsp "Enter password: " RH_PASSWORD
-        fi
-
-        AUTH_KEY="-u"
-        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
-
-SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE:-0}")")
-DONE_DIR="$SCRIPT_DIR/done/"
-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" "${ORG_HEADER[@]}"
-  status=$?
-  if [ $status -eq 0 ]; then
-    mv $f $DONE_DIR
-    echo "Done: $f"
-  fi
-done
-echo "Uploaded files moved to done/ folder"
-
-# return the error code from the curl command
-exit $status

data/test/jobs/upload_report_job_test.rb

@@ -1,37 +0,0 @@
-require 'test_plugin_helper'
-require 'foreman_tasks/test_helpers'
-
-class UploadReportJobTest < ActiveSupport::TestCase
-  include ForemanTasks::TestHelpers::WithInThreadExecutor
-  include FolderIsolation
-
-  test 'returns aborted state when disconnected' do
-    organization = FactoryBot.create(:organization)
-    Organization.any_instance.stubs(:owner_details).returns(
-      'upstreamConsumer' => {
-        'idCert' => 'TEST_CERT',
-      }
-    )
-    ForemanInventoryUpload::Async::UploadReportJob.any_instance.expects(:content_disconnected?).returns(true)
-
-    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
-
-    label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
-    progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
-    assert_match(/upload was canceled because connection to Insights is not enabled/, progress_output.full_output)
-    assert_match(/Report location:/, progress_output.full_output)
-    assert_match(/exit 1/, progress_output.status)
-  end
-
-  test 'returns aborted state when no certificate defined on organization' do
-    organization = FactoryBot.create(:organization)
-    Organization.any_instance.expects(:owner_details).returns(nil)
-
-    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
-
-    label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
-    progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
-    assert_match(/Skipping organization/, progress_output.full_output)
-    assert_match(/exit 1/, progress_output.status)
-  end
-end

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

@@ -1,36 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`PageHeader rendering render without Props 1`] = `
-<div
-  className="inventory-upload-header"
->
-  <ConnectedSettingsWarning />
-  <PageTitle />
-  <div
-    className="inventory-upload-header-description"
-  >
-    <ConnectedInventorySettings />
-    <PageDescription />
-  </div>
-  <Row
-    bsClass="row"
-    componentClass="div"
-  >
-    <Col
-      bsClass="col"
-      componentClass="div"
-      xs={4}
-    >
-      <Connect(InventoryFilter) />
-    </Col>
-    <Col
-      bsClass="col"
-      componentClass="div"
-      xs={7}
-      xsOffset={1}
-    >
-      <ToolbarButtons />
-    </Col>
-  </Row>
-</div>
-`;

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTable.test.js.snap

@@ -1,112 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`InsightsTable rendering render with Props 1`] = `
-<Fragment>
-  <SelectAllAlert
-    clearAllSelection={[Function]}
-    isAllSelected={false}
-    selectAll={[Function]}
-    selectedIds={Object {}}
-    showSelectAllAlert={false}
-  />
-  <Table
-    actionsMenuAppendTo="inline"
-    aria-label="Recommendations Table"
-    borders={true}
-    canCollapseAll={false}
-    canSelectAll={false}
-    canSortFavorites={true}
-    cells={
-      Array [
-        Object {
-          "id": "hostname",
-          "sortKey": "hostname",
-          "title": "Hostname",
-          "transforms": Array [
-            [Function],
-            [Function],
-          ],
-        },
-        Object {
-          "id": "recommendation",
-          "sortKey": "title",
-          "title": "Recommendation",
-          "transforms": Array [
-            [Function],
-            [Function],
-          ],
-        },
-        Object {
-          "cellTransforms": Array [
-            [Function],
-          ],
-          "id": "total risk",
-          "sortKey": "total_risk",
-          "title": "Total risk",
-          "transforms": Array [
-            [Function],
-            [Function],
-          ],
-        },
-        Object {
-          "cellTransforms": Array [
-            [Function],
-          ],
-          "id": "remediate",
-          "title": "Remediate",
-          "transforms": Array [
-            [Function],
-          ],
-        },
-        Object {
-          "cellTransforms": Array [
-            [Function],
-          ],
-          "id": "actions",
-          "title": "",
-          "transforms": Array [
-            [Function],
-          ],
-        },
-      ]
-    }
-    className="rh-cloud-recommendations-table"
-    collapseAllAriaLabel=""
-    contentId="expanded-content"
-    dropdownDirection="down"
-    dropdownPosition="right"
-    expandId="expandable-toggle"
-    gridBreakPoint="grid-md"
-    isHeaderSelectDisabled={false}
-    isNested={false}
-    isStickyHeader={false}
-    isTreeTable={false}
-    onSelect={[Function]}
-    onSort={[Function]}
-    ouiaId="rh-cloud-recommendations-table"
-    ouiaSafe={true}
-    role="grid"
-    rowLabeledBy="simple-node"
-    rows={Array []}
-    selectVariant="checkbox"
-    sortBy={
-      Object {
-        "direction": "desc",
-        "index": 3,
-      }
-    }
-    variant="compact"
-  >
-    <TableHeader />
-    <TableBody />
-  </Table>
-  <TableEmptyState
-    error={null}
-    rowsLength={0}
-    status="RESOLVED"
-  />
-  <Pagination
-    variant="bottom"
-  />
-</Fragment>
-`;

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

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