foreman_rh_cloud 14.5.0 → 14.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d41bcf3b5de41dab8c50751aecf9374fcb0bce44f1e0896011161b25ace53e
-  data.tar.gz: 8eb6a78729500fcb4ae06e8a35e452a0ed7a57e8dbc9f1d8ddf46b8c2a341016
+  metadata.gz: 6c5686d5268a4028cc883b95daa1948748a56a41cb54495668a4170cd1fcaab9
+  data.tar.gz: 533e44e09c87944392c120d57cc34e9244fbe3cf176dddb6c8d7ab7334ce4f92
 SHA512:
-  metadata.gz: d42639d1e4cb269096eb8cabe57a4337ee9c3e04e6339d2fdf8ac79ccf87188d60293820b5c6c61d79d03ecf40b5c042c2da8e81bb70251dda030cc24c74d1e2
-  data.tar.gz: c709b8044deff700aa3c541c6c21a9afdec88a449366785251057c64f1d85f73b9080b4391aca99d7564657509e3ee53c03de90f9f6d98dc9239d9de9a29f053
+  metadata.gz: ca9d76abf073cb2f31f74822d45c40d18f6f735f2d6251d67c3ebae1bec9d26c33fe6c9098e8bb6f1b21f922003eaecbfe0da7249111e28ea4cd0f04e0d25138
+  data.tar.gz: cbe8078e2ef86cde32ad7feef2c0dd19850de71cefec7aa61939d71605d749e0ad18225492c160b5f5d57ba15bea691f0af0a5978e5300979e4858bc959b0e72

data/app/services/foreman_rh_cloud/cert_auth.rb

@@ -11,8 +11,9 @@ module ForemanRhCloud
 
     def execute_cloud_request(params)
       organization = params.delete(:organization)
+      force_cloud = params[:force_cloud]
       # Cache the value of with_iop_smart_proxy? to avoid multiple calls to the database
-      with_iop_smart_proxy = ForemanRhCloud.with_iop_smart_proxy?
+      with_iop_smart_proxy = ForemanRhCloud.with_iop_smart_proxy? && !force_cloud
       certs = with_iop_smart_proxy ? foreman_certificate : candlepin_id_cert(organization)
       default_params = {
         ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),

data/app/services/foreman_rh_cloud/cloud_request.rb

@@ -3,12 +3,13 @@ module ForemanRhCloud
     extend ActiveSupport::Concern
 
     def execute_cloud_request(params)
+      force_cloud = params.delete(:force_cloud)
       final_params = {
         verify_ssl: ForemanRhCloud.verify_ssl_method,
         proxy: ForemanRhCloud.transformed_http_proxy_string,
       }.deep_merge(params)
 
-      if ForemanRhCloud.with_iop_smart_proxy?
+      if ForemanRhCloud.with_iop_smart_proxy? && !force_cloud
         final_params[:ssl_ca_file] ||= ForemanRhCloud.ca_cert
       end
 

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -36,8 +36,9 @@ module ForemanRhCloud
       }
       requested_url = original_request.original_fullpath.end_with?('/') ? original_request.path + '/' : original_request.path
       params = path_params(requested_url)
+      force_cloud = params[:force_cloud]
 
-      if ForemanRhCloud.with_iop_smart_proxy?
+      if ForemanRhCloud.with_iop_smart_proxy? && !force_cloud
         params[:ssl_ca_file] = ForemanRhCloud.ca_cert
       end
 
@@ -70,10 +71,13 @@ module ForemanRhCloud
 
     def path_params(request_path)
       case request_path
-      when lightspeed?
+      when lightspeed_cla?
+        force_cloud = ForemanRhCloud.with_iop_smart_proxy? && Setting[:force_cla_connection]
         {
-          url: ForemanRhCloud.cert_base_url + request_path,
-        }
+          url: ForemanRhCloud.cloud_cert_base_url + request_path,
+          force_cloud: force_cloud,
+          proxy: (force_cloud ? ForemanRhCloud.transformed_cloud_http_proxy_string : nil),
+        }.compact
       when platform_request?
         {
           url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
@@ -104,7 +108,7 @@ module ForemanRhCloud
       "for=\"_#{host.subscription_facet.uuid}\""
     end
 
-    def lightspeed?
+    def lightspeed_cla?
       ->(request_path) { request_path.include? '/lightspeed' }
     end
 

data/lib/foreman_rh_cloud/plugin.rb

@@ -22,6 +22,7 @@ module ForemanRhCloud
             setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman? Ignored when using local Insights.'), default: false, full_name: N_('Include parameters in insights-client reports'))
             setting('rhc_instance_id', type: :string, description: N_('RHC daemon id. Ignored when using local Insights.'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
             setting('insights_minimal_data_collection', type: :boolean, default: false, full_name: N_('Minimal data collection'), description: N_('Only include the minimum required data in inventory reports for uploading to Red Hat cloud. When this is true, installed packages are excluded from the report regardless of the exclude_installed_packages setting, and host names and IPv4 addresses are excluded from the report regardless of obfuscation settings. Ignored when using local Insights.'))
+            setting('force_cla_connection', type: :boolean, default: false, full_name: N_('Force RHEL Lightspeed CLA connection'), description: N_('Forward requests to Lightspeed CLA even when in IoP mode. Ignored when IoP mode is off.'))
           end
         end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '14.5.0'.freeze
+  VERSION = '14.6.0'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -21,6 +21,14 @@ module ForemanRhCloud
     env_or_on_premise_url('SATELLITE_CERT_RH_CLOUD_URL') || 'https://cert.cloud.redhat.com'
   end
 
+  # Lightspeed/CLA is cloud-only. Use the cloud URL only when the admin
+  # enables force_cla_connection; otherwise follow cert_base_url (IoP when IoP is on).
+  def self.cloud_cert_base_url
+    return cert_base_url unless Setting[:force_cla_connection]
+
+    ENV['SATELLITE_CERT_RH_CLOUD_URL'] || 'https://cert.cloud.redhat.com'
+  end
+
   def self.legacy_insights_url
     env_or_on_premise_url('SATELLITE_LEGACY_INSIGHTS_URL') || 'https://cert-api.access.redhat.com'
   end
@@ -48,11 +56,19 @@ module ForemanRhCloud
   def self.proxy_string
     return '' if ForemanRhCloud.with_iop_smart_proxy?
 
+    cloud_proxy_string
+  end
+
+  def self.cloud_proxy_string
     HttpProxy.default_global_content_proxy&.full_url ||
     ForemanRhCloud.global_foreman_proxy ||
     ''
   end
 
+  def self.transformed_cloud_http_proxy_string
+    transform_scheme(fix_port(cloud_proxy_string))
+  end
+
   def self.fix_port(uri_string)
     return '' if uri_string.empty?
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "14.5.0",
+  "version": "14.6.0",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/unit/foreman_rh_cloud_iop_metadata_test.rb

@@ -101,6 +101,22 @@ class ForemanRhCloudIopMetadataTest < ActiveSupport::TestCase
       assert_equal 'https://iop.example.com', ForemanRhCloud.cert_base_url
     end
 
+    test 'cloud_cert_base_url returns IoP URL when IoP exists and force_cla_connection is off' do
+      create_iop_proxy
+      Setting[:force_cla_connection] = false
+
+      assert_equal 'https://iop.example.com', ForemanRhCloud.cloud_cert_base_url
+    end
+
+    test 'cloud_cert_base_url returns cloud URL when IoP exists and force_cla_connection is on' do
+      create_iop_proxy
+      Setting[:force_cla_connection] = true
+
+      assert_equal 'https://cert.cloud.redhat.com', ForemanRhCloud.cloud_cert_base_url
+    ensure
+      Setting[:force_cla_connection] = false
+    end
+
     test 'legacy_insights_url returns IoP URL when IoP smart proxy exists' do
       create_iop_proxy
 
@@ -153,6 +169,17 @@ class ForemanRhCloudIopMetadataTest < ActiveSupport::TestCase
       ENV.delete('SATELLITE_CERT_RH_CLOUD_URL')
     end
 
+    test 'cloud_cert_base_url uses ENV var when force_cla_connection is on' do
+      ENV['SATELLITE_CERT_RH_CLOUD_URL'] = 'https://env-cert.cloud.test'
+      Setting[:force_cla_connection] = true
+      create_iop_proxy
+
+      assert_equal 'https://env-cert.cloud.test', ForemanRhCloud.cloud_cert_base_url
+    ensure
+      ENV.delete('SATELLITE_CERT_RH_CLOUD_URL')
+      Setting[:force_cla_connection] = false
+    end
+
     test 'legacy_insights_url prefers IoP URL over ENV var' do
       ENV['SATELLITE_LEGACY_INSIGHTS_URL'] = 'https://env-legacy.insights.test'
 

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

@@ -10,7 +10,9 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
 
     ForemanRhCloud.stubs(:base_url).returns('https://cloud.example.com')
     ForemanRhCloud.stubs(:cert_base_url).returns('https://cert.cloud.example.com')
+    ForemanRhCloud.stubs(:cloud_cert_base_url).returns('https://cert.cloud.example.com')
     ForemanRhCloud.stubs(:legacy_insights_url).returns('https://cert-api.access.example.com')
+    ForemanRhCloud.stubs(:transformed_cloud_http_proxy_string).returns(nil)
 
     UpstreamOnlySettingsTestHelper.set_if_available('allow_multiple_content_views')
     env = FactoryBot.create(:katello_k_t_environment)
@@ -34,6 +36,7 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
 
   test 'should prepare correct cloud url' do
     paths = {
+      "/api/lightspeed/v1/query" => "https://cert.cloud.example.com/api/lightspeed/v1/query",
       "/redhat_access/r/insights/platform/module-update-router/v1/channel?module=insights-core" => "https://cert.cloud.example.com/api/module-update-router/v1/channel?module=insights-core",
       "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cert-api.access.example.com/r/insights/v1/static/release/insights-core.egg",
       "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cert-api.access.example.com/r/insights/v1/static/uploader.v2.json",
@@ -50,6 +53,31 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
     end
   end
 
+  test 'does not force CLA to cloud when IoP is enabled and setting is off' do
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+    ForemanRhCloud.stubs(:cert_base_url).returns('https://iop.example.com')
+    ForemanRhCloud.stubs(:cloud_cert_base_url).returns('https://iop.example.com')
+    Setting.stubs(:[]).with(:force_cla_connection).returns(false)
+
+    actual = @forwarder.path_params('/api/lightspeed/v1/query')
+
+    assert_equal 'https://iop.example.com/api/lightspeed/v1/query', actual[:url]
+    refute actual[:force_cloud]
+  end
+
+  test 'forwards CLA to cloud when IoP is enabled and force_cla_connection is on' do
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+    ForemanRhCloud.stubs(:cert_base_url).returns('https://iop.example.com')
+    ForemanRhCloud.stubs(:cloud_cert_base_url).returns('https://cert.cloud.example.com')
+    ForemanRhCloud.stubs(:transformed_cloud_http_proxy_string).returns(nil)
+    Setting.stubs(:[]).with(:force_cla_connection).returns(true)
+
+    actual = @forwarder.path_params('/api/lightspeed/v1/query')
+
+    assert_equal 'https://cert.cloud.example.com/api/lightspeed/v1/query', actual[:url]
+    assert actual[:force_cloud]
+  end
+
   test 'should forward payload from request parameters' do
     params = { 'pumpkin' => 'pie' }
     req = ActionDispatch::Request.new(

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

@@ -1,82 +1,83 @@
 import React from 'react';
-import { shallow } from '@theforeman/test';
+import { render, screen } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
+import '@testing-library/jest-dom';
 import Toast from '../Toast';
 
+jest.mock('foremanReact/common/I18n', () => ({
+  translate: jest.fn(str => str),
+}));
+
+const renderToast = (props = {}) =>
+  render(
+    <MemoryRouter>
+      <Toast syncHosts={5} disconnectHosts={3} {...props} />
+    </MemoryRouter>
+  );
+
+const omittedText =
+  'Excluded from upload to console.redhat.com Inventory service because host_registration_insights_inventory parameter value is false:';
+
 describe('Toast', () => {
   it('renders with all three status counts including user_omitted', () => {
-    const wrapper = shallow(
-      <Toast syncHosts={5} disconnectHosts={3} userOmittedHosts={2} />
-    );
-
-    const links = wrapper.find('HostsWithStatusLink');
-    expect(links).toHaveLength(3);
+    renderToast({ userOmittedHosts: 2 });
 
-    // Check the children (numbers) of each link
-    expect(
-      links
-        .at(0)
-        .children()
-        .text()
-    ).toBe('5');
-    expect(
-      links
-        .at(1)
-        .children()
-        .text()
-    ).toBe('3');
-    expect(
-      links
-        .at(2)
-        .children()
-        .text()
-    ).toBe('2');
+    expect(screen.getByRole('link', { name: '10' })).toHaveAttribute(
+      'href',
+      '/new/hosts?search=set%3F+subscription_uuid&page=1'
+    );
+    expect(screen.getByRole('link', { name: '5' })).toHaveAttribute(
+      'href',
+      '/new/hosts?search=insights_inventory_sync_status+%3D+sync&page=1'
+    );
+    expect(screen.getByRole('link', { name: '3' })).toHaveAttribute(
+      'href',
+      '/new/hosts?search=insights_inventory_sync_status+%3D+disconnect&page=1'
+    );
+    expect(screen.getByRole('link', { name: '2' })).toHaveAttribute(
+      'href',
+      '/new/hosts?search=insights_inventory_sync_status+%3D+user_omitted&page=1'
+    );
+    expect(screen.getByText(omittedText, { exact: false })).toBeInTheDocument();
   });
 
   it('does not render user_omitted section when count is 0', () => {
-    const wrapper = shallow(
-      <Toast syncHosts={5} disconnectHosts={3} userOmittedHosts={0} />
-    );
-
-    // Should have only 2 HostsWithStatusLink components (sync and disconnect)
-    const links = wrapper.find('HostsWithStatusLink');
-    expect(links).toHaveLength(2);
+    renderToast({ userOmittedHosts: 0 });
 
-    // Should not contain the user_omitted explanation text
-    expect(wrapper.text()).not.toContain(
-      'host_registration_insights_inventory parameter value is false'
-    );
+    expect(screen.getByRole('link', { name: '8' })).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: '5' })).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: '3' })).toBeInTheDocument();
+    expect(screen.queryByRole('link', { name: '2' })).not.toBeInTheDocument();
+    expect(
+      screen.queryByText(omittedText, { exact: false })
+    ).not.toBeInTheDocument();
   });
 
   it('renders without crashing when userOmittedHosts is not provided (default)', () => {
-    const wrapper = shallow(<Toast syncHosts={5} disconnectHosts={3} />);
-
-    // Should use default value of 0, so only 2 links
-    const links = wrapper.find('HostsWithStatusLink');
-    expect(links).toHaveLength(2);
+    renderToast();
 
-    // Verify the count values
+    expect(screen.getByRole('link', { name: '8' })).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: '5' })).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: '3' })).toBeInTheDocument();
     expect(
-      links
-        .at(0)
-        .children()
-        .text()
-    ).toBe('5');
-    expect(
-      links
-        .at(1)
-        .children()
-        .text()
-    ).toBe('3');
+      screen.queryByText(omittedText, { exact: false })
+    ).not.toBeInTheDocument();
   });
 
   it('renders correct status links for each category', () => {
-    const wrapper = shallow(
-      <Toast syncHosts={5} disconnectHosts={3} userOmittedHosts={2} />
-    );
+    renderToast({ userOmittedHosts: 2 });
 
-    const links = wrapper.find('HostsWithStatusLink');
-    expect(links.at(0).prop('statusName')).toBe('sync');
-    expect(links.at(1).prop('statusName')).toBe('disconnect');
-    expect(links.at(2).prop('statusName')).toBe('user_omitted');
+    expect(screen.getByRole('link', { name: '5' })).toHaveAttribute(
+      'href',
+      expect.stringContaining('sync')
+    );
+    expect(screen.getByRole('link', { name: '3' })).toHaveAttribute(
+      'href',
+      expect.stringContaining('disconnect')
+    );
+    expect(screen.getByRole('link', { name: '2' })).toHaveAttribute(
+      'href',
+      expect.stringContaining('user_omitted')
+    );
   });
 });

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

@@ -1,17 +1,78 @@
 import React from 'react';
-import { IntegrationTestHelper } from '@theforeman/test';
+import { screen, waitFor } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { Provider } from 'react-redux';
+import { applyMiddleware, combineReducers, createStore } from 'redux';
+import thunk from 'redux-thunk';
+import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
+import { API } from 'foremanReact/redux/API';
 
 import InsightsTab from '../index';
 import reducers from '../../ForemanRhCloudReducers';
-import { hostID } from './InsightsTab.fixtures';
+import { INSIGHTS_HITS_SUCCESS } from '../InsightsTabConstants';
+import { hostID, hits } from './InsightsTab.fixtures';
 
-describe('InsightsTab integration test', () => {
-  it('should flow', async () => {
-    const integrationTestHelper = new IntegrationTestHelper(reducers);
-    const component = integrationTestHelper.mount(
+const { renderWithI18n } = rtlHelpers;
+
+jest.mock('foremanReact/redux/API');
+
+const recommendationTitle =
+  'New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled';
+
+const createTabStore = () =>
+  createStore(combineReducers({ ...reducers }), applyMiddleware(thunk));
+
+const renderConnectedTab = (store = createTabStore()) =>
+  renderWithI18n(
+    <Provider store={store}>
       <InsightsTab hostID={hostID} />
+    </Provider>
+  );
+
+describe('InsightsTab integration test', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('requests hits for the host and shows empty state when there are none', async () => {
+    let resolveHits;
+    API.get.mockReturnValue(
+      new Promise(resolve => {
+        resolveHits = resolve;
+      })
     );
-    component.update();
-    /** Create a Flow test */
+
+    const store = createTabStore();
+    store.dispatch({
+      type: INSIGHTS_HITS_SUCCESS,
+      payload: { hits },
+    });
+
+    renderConnectedTab(store);
+
+    expect(await screen.findByText(recommendationTitle)).toBeInTheDocument();
+
+    await waitFor(() => {
+      expect(API.get).toHaveBeenCalledWith(`/insights_cloud/hits/${hostID}`);
+    });
+
+    resolveHits({ data: { hits: [] } });
+
+    expect(
+      await screen.findByRole('heading', {
+        name: 'No recommendations were found for this host!',
+      })
+    ).toBeInTheDocument();
+    expect(screen.queryByText(recommendationTitle)).not.toBeInTheDocument();
+  });
+
+  it('shows recommendation titles from the hits API response', async () => {
+    API.get.mockResolvedValue({ data: { hits } });
+
+    renderConnectedTab();
+
+    expect(await screen.findByText(recommendationTitle)).toBeInTheDocument();
+
+    expect(API.get).toHaveBeenCalledWith(`/insights_cloud/hits/${hostID}`);
   });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 14.5.0
+  version: 14.6.0
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team