foreman_rh_cloud 11.4.4 → 12.0.0

data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -98,25 +98,13 @@ module InsightsCloud::Api
         assert_equal net_http_resp[:content_type], @response.headers['Content-Type']
       end
 
-      test "should handle 304 cloud" do
-        net_http_resp = Net::HTTPResponse.new(1.0, 304, "Not Modified")
-        res = RestClient::Response.create(@body, net_http_resp, @http_req)
-
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::NotModified.new(res))
-
-        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
-        assert_equal 304, @response.status
-        assert_equal 'Cloud request not modified', JSON.parse(@response.body)['message']
-      end
-
       test "should handle failed authentication to cloud" do
         net_http_resp = Net::HTTPResponse.new(1.0, 401, "Unauthorized")
         res = RestClient::Response.create(@body, net_http_resp, @http_req)
-
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::Unauthorized.new(res))
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
 
         get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
-        assert_equal 401, @response.status
+        assert_equal 502, @response.status
         assert_equal 'Authentication to the Insights Service failed.', JSON.parse(@response.body)['message']
       end
 

data/test/controllers/inventory_upload/api/inventory_controller_test.rb

@@ -14,7 +14,7 @@ module InventoryUpload::Api
         .expects(:start_report_generation)
         .with(@test_org.id.to_s, @disconnected)
 
-      post :generate_report, params: { organization_id: @test_org.id, disconnected: @disconnected }
+      post :generate_report, params: { organization_id: @test_org.id, no_upload: @disconnected }
 
       assert_response :success
     end

data/test/jobs/upload_report_job_test.rb

@@ -18,7 +18,7 @@ class UploadReportJobTest < ActiveSupport::TestCase
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
-    assert_match(/Upload was stopped/, progress_output.full_output)
+    assert_match(/Upload canceled/, progress_output.full_output)
     assert_match(/exit 1/, progress_output.status)
   end
 

data/test/unit/fact_helpers_test.rb

@@ -1,5 +1,4 @@
 require 'test_plugin_helper'
-require 'digest'
 
 class FactHelpersTest < ActiveSupport::TestCase
   class FactsHelpersTestStub
@@ -30,7 +29,7 @@ class FactHelpersTest < ActiveSupport::TestCase
 
   test 'obfuscates ips with insights-client data' do
     host = mock('host')
-    @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_ipv4').returns(
+    @instance.expects(:fact_value).with(host, 'insights_client::ips').returns(
       '[{"obfuscated": "10.230.230.1", "original": "224.0.0.1"}, {"obfuscated": "10.230.230.255", "original": "224.0.0.251"}]'
     )
 
@@ -42,275 +41,11 @@ class FactHelpersTest < ActiveSupport::TestCase
 
   test 'obfuscates ips without insights-client data' do
     host = mock('host')
-    @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_ipv4').returns(nil)
+    @instance.expects(:fact_value).with(host, 'insights_client::ips').returns(nil)
 
     actual = @instance.obfuscated_ips(host)
 
     assert_equal '10.230.230.1', actual['224.0.0.1']
     assert_equal '10.230.230.2', actual['224.0.0.2']
   end
-
-  describe 'obfuscate_hostname?' do
-    test 'returns true when global setting is enabled' do
-      Setting.expects(:[]).with(:obfuscate_inventory_hostnames).returns(true)
-      host = mock('host')
-
-      result = @instance.obfuscate_hostname?(host)
-
-      assert result
-    end
-
-    test 'returns false when global setting is disabled and no host-specific setting' do
-      Setting.expects(:[]).with(:obfuscate_inventory_hostnames).returns(false)
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_hostname_enabled').returns(nil)
-
-      result = @instance.obfuscate_hostname?(host)
-
-      refute result
-    end
-
-    test 'returns true when host-specific setting is enabled' do
-      Setting.expects(:[]).with(:obfuscate_inventory_hostnames).returns(false)
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_hostname_enabled').returns('true')
-
-      result = @instance.obfuscate_hostname?(host)
-
-      assert result
-    end
-
-    test 'returns false when host-specific setting is disabled' do
-      Setting.expects(:[]).with(:obfuscate_inventory_hostnames).returns(false)
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_hostname_enabled').returns('false')
-
-      result = @instance.obfuscate_hostname?(host)
-
-      refute result
-    end
-  end
-
-  describe 'fqdn' do
-    test 'returns original fqdn when obfuscation is disabled' do
-      host = mock('host')
-      host.expects(:fqdn).returns('test.example.com')
-      @instance.expects(:obfuscate_hostname?).with(host).returns(false)
-
-      result = @instance.fqdn(host)
-
-      assert_equal 'test.example.com', result
-    end
-
-    test 'returns obfuscated hostname from insights_client fact when available' do
-      host = mock('host')
-      host.expects(:fqdn).returns('test.example.com').once
-      @instance.expects(:obfuscate_hostname?).with(host).returns(true)
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_hostname').returns(
-        '[{"original": "test.example.com", "obfuscated": "abc123.example.com"}]'
-      )
-
-      result = @instance.fqdn(host)
-
-      assert_equal 'abc123.example.com', result
-    end
-
-    test 'returns dynamically obfuscated hostname when insights_client fact is not available' do
-      host = mock('host')
-      host.stubs(:fqdn).returns('test.example.com')
-      @instance.expects(:obfuscate_hostname?).with(host).returns(true)
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_hostname').returns(nil)
-
-      result = @instance.fqdn(host)
-
-      expected = "#{Digest::SHA1.hexdigest('test.example.com')}.example.com"
-      assert_equal expected, result
-    end
-
-    test 'returns dynamically obfuscated hostname when insights_client fact does not contain matching host' do
-      host = mock('host')
-      host.expects(:fqdn).returns('test.example.com').twice
-      @instance.expects(:obfuscate_hostname?).with(host).returns(true)
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_hostname').returns(
-        '[{"original": "other.example.com", "obfuscated": "abc123.example.com"}]'
-      )
-      @instance.expects(:obfuscate_fqdn).with('test.example.com').returns('dynamically_obfuscated.example.com')
-
-      result = @instance.fqdn(host)
-
-      assert_equal 'dynamically_obfuscated.example.com', result
-    end
-
-    test 'handles invalid JSON in insights_client fact gracefully' do
-      host = mock('host')
-      host.stubs(:fqdn).returns('test.example.com')
-      @instance.expects(:obfuscate_hostname?).with(host).returns(true)
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_hostname').returns('invalid json')
-
-      result = @instance.fqdn(host)
-
-      expected = "#{Digest::SHA1.hexdigest('test.example.com')}.example.com"
-      assert_equal expected, result
-    end
-
-    test 'handles empty insights_client fact' do
-      host = mock('host')
-      host.stubs(:fqdn).returns('test.example.com')
-      @instance.expects(:obfuscate_hostname?).with(host).returns(true)
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_hostname').returns('[]')
-
-      result = @instance.fqdn(host)
-
-      expected = "#{Digest::SHA1.hexdigest('test.example.com')}.example.com"
-      assert_equal expected, result
-    end
-  end
-
-  describe 'obfuscate_ips?' do
-    test 'returns true when global setting is enabled' do
-      Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(true)
-      host = mock('host')
-
-      result = @instance.obfuscate_ips?(host)
-
-      assert result
-    end
-
-    test 'returns false when global setting is disabled and no host-specific settings' do
-      Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(false)
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv4_enabled').returns(nil)
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv6_enabled').returns(nil)
-
-      result = @instance.obfuscate_ips?(host)
-
-      refute result
-    end
-
-    test 'returns true when host-specific IPv4 setting is enabled' do
-      Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(false)
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv4_enabled').returns('true')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv6_enabled').returns(nil)
-
-      result = @instance.obfuscate_ips?(host)
-
-      assert result
-    end
-
-    test 'returns true when host-specific IPv6 setting is enabled' do
-      Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(false)
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv4_enabled').returns(nil)
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv6_enabled').returns('true')
-
-      result = @instance.obfuscate_ips?(host)
-
-      assert result
-    end
-
-    test 'returns true when both IPv4 and IPv6 settings are enabled' do
-      Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(false)
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv4_enabled').returns('true')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv6_enabled').returns('true')
-
-      result = @instance.obfuscate_ips?(host)
-
-      assert result
-    end
-
-    test 'returns false when both IPv4 and IPv6 settings are disabled' do
-      Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(false)
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv4_enabled').returns('false')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv6_enabled').returns('false')
-
-      result = @instance.obfuscate_ips?(host)
-
-      refute result
-    end
-  end
-
-  describe 'obfuscate_ip' do
-    test 'generates first IP when no existing obfuscated IPs' do
-      ips_dict = {}
-
-      result = @instance.obfuscate_ip('192.168.1.1', ips_dict)
-
-      assert_equal '10.230.230.1', result
-    end
-
-    test 'generates next sequential IP when existing obfuscated IPs present' do
-      ips_dict = { '192.168.1.1' => '10.230.230.5', '192.168.1.2' => '10.230.230.10' }
-
-      result = @instance.obfuscate_ip('192.168.1.3', ips_dict)
-
-      assert_equal '10.230.230.11', result
-    end
-
-    test 'handles mixed IP ranges correctly' do
-      ips_dict = { '192.168.1.1' => '10.230.230.255', '192.168.1.2' => '10.230.230.1' }
-
-      result = @instance.obfuscate_ip('192.168.1.3', ips_dict)
-
-      assert_equal '10.230.231.0', result
-    end
-
-    test 'generates valid IP addresses' do
-      ips_dict = {}
-
-      result = @instance.obfuscate_ip('any.ip.address', ips_dict)
-
-      assert_match(/\A\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\z/, result)
-      assert_nothing_raised { IPAddr.new(result) }
-    end
-  end
-
-  describe 'obfuscated_ips' do
-    test 'handles invalid JSON in insights_client fact gracefully' do
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_ipv4').returns('invalid json')
-
-      result = @instance.obfuscated_ips(host)
-
-      assert_equal '10.230.230.1', result['192.168.1.1']
-    end
-
-    test 'handles empty insights_client fact' do
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_ipv4').returns('[]')
-
-      result = @instance.obfuscated_ips(host)
-
-      assert_equal '10.230.230.1', result['192.168.1.1']
-    end
-
-    test 'preserves existing obfuscated IPs and generates new ones' do
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_ipv4').returns(
-        '[{"original": "192.168.1.1", "obfuscated": "10.230.230.5"}]'
-      )
-
-      result = @instance.obfuscated_ips(host)
-
-      assert_equal '10.230.230.5', result['192.168.1.1']
-      assert_equal '10.230.230.6', result['192.168.1.2']
-    end
-
-    test 'default_proc generates unique sequential IPs' do
-      host = mock('host')
-      @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_ipv4').returns(nil)
-
-      result = @instance.obfuscated_ips(host)
-
-      ip1 = result['192.168.1.1']
-      ip2 = result['192.168.1.2']
-      ip3 = result['192.168.1.3']
-
-      assert_equal '10.230.230.1', ip1
-      assert_equal '10.230.230.2', ip2
-      assert_equal '10.230.230.3', ip3
-    end
-  end
 end

data/test/unit/slice_generator_test.rb

@@ -56,10 +56,9 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       'dmi::system::product_name',
       'dmi::chassis::asset_tag',
       'insights_client::obfuscate_hostname_enabled',
-      'insights_client::obfuscated_hostname',
-      'insights_client::obfuscate_ipv4_enabled',
-      'insights_client::obfuscated_ipv4',
       'insights_client::hostname',
+      'insights_client::obfuscate_ip_enabled',
+      'insights_client::ips',
       'insights_id',
     ]
   end
@@ -211,38 +210,14 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
-  test 'does not obfuscate fqdn when insights_client obfuscate_hostname_enabled fact is missing and obfuscate_inventory_hostnames setting is false' do
-    # Create a host and obfuscated_hostname fact, but do NOT create the obfuscate_hostname_enabled fact
-    obfuscated_hostname_data = [
-      { 'original' => @host.fqdn, 'obfuscated' => '0dd449d0a027.example.com' },
-    ]
-    obfuscated_hostname_value = JSON.generate(obfuscated_hostname_data)
-    FactoryBot.create(:fact_value,
-      fact_name: fact_names['insights_client::obfuscated_hostname'],
-      value: obfuscated_hostname_value,
-      host: @host)
-    # Do NOT create the 'insights_client::obfuscate_hostname_enabled' fact
-
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal @host.fqdn, actual_host['fqdn'], "FQDN should not be obfuscated when obfuscate_hostname_enabled is missing and setting is false"
-    assert_not_nil(actual_facts = actual_host['facts'].first['facts'])
-    assert_not_equal true, actual_facts['is_hostname_obfuscated']
-  end
-
-  test 'generates obfuscated ip_address fields when insights-client facts are present' do
+  test 'generates obfuscated ip_address fields with inisghts-client' do
     nic = FactoryBot.build(:nic_managed)
     @host.interfaces << nic
 
-    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::obfuscate_ipv4_enabled'], value: 'true', host: @host)
+    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::obfuscate_ip_enabled'], value: 'true', host: @host)
     FactoryBot.create(
       :fact_value,
-      fact_name: fact_names['insights_client::obfuscated_ipv4'],
+      fact_name: fact_names['insights_client::ips'],
       value: "[{\"obfuscated\": \"10.230.230.100\", \"original\": \"#{nic.ip}\"}]",
       host: @host
     )
@@ -265,17 +240,9 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
-  test 'obfuscates fqdn when insights-client facts are present' do
-    obfuscated_hostname_data = [
-      { 'original' => @host.fqdn, 'obfuscated' => '0dd449d0a027.example.com' },
-      { 'original' => 'satellite.theforeman.org', 'obfuscated' => 'host2.example.com' },
-    ]
-    obfuscated_hostname_value = JSON.generate(obfuscated_hostname_data)
-    FactoryBot.create(:fact_value,
-      fact_name: fact_names['insights_client::obfuscated_hostname'],
-      value: obfuscated_hostname_value,
-      host: @host)
+  test 'obfuscates fqdn when instructed by insights-client' do
     FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::obfuscate_hostname_enabled'], value: 'true', host: @host)
+    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::hostname'], value: 'obfuscated_name', host: @host)
 
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
@@ -285,7 +252,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
 
     assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal obfuscated_hostname_data.first['obfuscated'], actual_host['fqdn']
+    assert_equal 'obfuscated_name', actual_host['fqdn']
     assert_equal '1234', actual_host['account']
     assert_not_nil(actual_facts = actual_host['facts'].first['facts'])
     assert_equal true, actual_facts['is_hostname_obfuscated']
@@ -312,35 +279,9 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
-  test 'obfuscates host fqdn with insights-client when setting set' do
-    Setting[:obfuscate_inventory_hostnames] = true
-    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::hostname'], value: @host.fqdn, host: @host)
-
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    obfuscated_fqdn = Digest::SHA1.hexdigest(@host.fqdn) + '.example.com'
-
-    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal obfuscated_fqdn, actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_not_nil(actual_facts = actual_host['facts'].first['facts'])
-    assert_equal true, actual_facts['is_hostname_obfuscated']
-    assert_equal 1, generator.hosts_count
-  end
-
-  test 'does not obfuscate fqdn when host fact from insights-client has a value of false' do
-    obfuscated_hostname_data = [
-      { 'original' => @host.fqdn, 'obfuscated' => '0dd449d0a027.example.com' },
-      { 'original' => 'satellite.theforeman.org', 'obfuscated' => 'host2.example.com' },
-    ]
-    obfuscated_hostname_value = JSON.generate(obfuscated_hostname_data)
+  test 'does not obfuscate fqdn when insights-client sets to false' do
     FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::obfuscate_hostname_enabled'], value: 'false', host: @host)
-    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::obfuscated_hostname'], value: obfuscated_hostname_value, host: @host)
+    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::hostname'], value: 'obfuscated_name', host: @host)
 
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItem/__tests__/__snapshots__/ListItem.test.js.snap

@@ -10,13 +10,7 @@ exports[`ListItem rendering render with Props 1`] = `
       <Label
         className="account-icon"
         color="blue"
-        icon={
-          <UserIcon
-            color="currentColor"
-            noVerticalAlign={false}
-            size="sm"
-          />
-        }
+        icon={<UserIcon />}
         variant="outline"
       />
       test

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItemStatus/__tests__/__snapshots__/ListItemStatus.test.js.snap

@@ -12,11 +12,7 @@ exports[`ListItemStatus rendering render with Props 1`] = `
     <p>
       Generating
     </p>
-    <CheckIcon
-      color="currentColor"
-      noVerticalAlign={false}
-      size="sm"
-    />
+    <CheckIcon />
   </GridItem>
   <GridItem
     className="item"

data/webpack/ForemanInventoryUpload/Components/AccountList/accountList.scss

@@ -8,11 +8,11 @@
   }
 
   .account-list {
-    .pf-c-accordion__toggle {
+    .pf-v5-c-accordion__toggle {
       margin-top: 10px;
     }
 
-    .pf-c-accordion__toggle-text {
+    .pf-v5-c-accordion__toggle-text {
       font-size: 16px;
       display: flex;
       justify-content: space-between;
@@ -21,7 +21,7 @@
       .account-icon {
         margin-right: 5px;
 
-        .pf-c-label__icon {
+        .pf-v5-c-label__icon {
           margin: 0;
         }
       }

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilter.js

@@ -29,7 +29,7 @@ const InventoryFilter = ({
           value={filterTerm}
           type="text"
           placeholder={__('Filter..')}
-          onChange={handleFilterChange}
+          onChange={(e, v) => handleFilterChange(v)}
         />
         <ClearButton onClear={handleFilterClear} />
       </FormGroup>

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/inventoryFilter.scss

@@ -1,5 +1,5 @@
 #inventory_filter_form {
-  .pf-c-form__group-control {
+  .pf-v5-c-form__group-control {
     display: -ms-flexbox;
     display: -webkit-flex;
     display: flex;

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.scss

@@ -12,18 +12,18 @@
       font-size: 16px;
     }
 
-    .pf-c-dropdown__toggle {
+    .pf-v5-c-dropdown__toggle {
       margin-right: -20px;
     }
 
     .settings-alert {
       margin-bottom: 30px;
-      .pf-c-alert {
+      .pf-v5-c-alert {
         margin-bottom: 5px;
 
-        .pf-c-alert__title {
-          font-size: var(--pf-global--FontSize--md);
-          line-height: var(--pf-global--LineHeight--md);
+        .pf-v5-c-alert__title {
+          font-size: var(--pf-v5-global--FontSize--md);
+          line-height: var(--pf-v5-global--LineHeight--md);
         }
       }
     }

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageTitle.js

@@ -1,12 +1,11 @@
 import React, { useState } from 'react';
+import { Grid, GridItem } from '@patternfly/react-core';
 import {
   Dropdown,
   DropdownItem,
   KebabToggle,
   DropdownPosition,
-  Grid,
-  GridItem,
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 import Head from 'foremanReact/components/Head';
 import {
   INVENTORY_PAGE_TITLE,
@@ -58,7 +57,9 @@ const PageTitle = () => {
           className="title-dropdown"
           onSelect={() => setIsDropdownOpen(false)}
           toggle={
-            <KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />
+            <KebabToggle
+              onToggle={(_event, isOpen) => setIsDropdownOpen(isOpen)}
+            />
           }
           isOpen={isDropdownOpen}
           isPlain

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js

@@ -2,7 +2,11 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
-import { Table, TableBody, TableHeader } from '@patternfly/react-table';
+import {
+  Table,
+  TableBody,
+  TableHeader,
+} from '@patternfly/react-table/deprecated';
 import {
   Card,
   CardTitle,
@@ -11,6 +15,7 @@ import {
   ModalVariant,
   Spinner,
   Text,
+  Icon,
 } from '@patternfly/react-core';
 import {
   CheckCircleIcon,
@@ -108,8 +113,18 @@ const CloudPingModal = ({ title, isOpen, toggle }) => {
 
 const StatusIcon = ({ isPending, authStatus }) => {
   if (isPending) return <Spinner size="sm" />;
-  if (authStatus.success) return <CheckCircleIcon color="green" />;
-  if (authStatus.error) return <ExclamationCircleIcon color="red" />;
+  if (authStatus.success)
+    return (
+      <Icon color="green">
+        <CheckCircleIcon />
+      </Icon>
+    );
+  if (authStatus.error)
+    return (
+      <Icon color="red">
+        <ExclamationCircleIcon />
+      </Icon>
+    );
   return <Spinner size="sm" />;
 };
 

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

@@ -22,7 +22,6 @@ class SyncButton extends React.Component {
         <Button
           className="sync_button"
           onClick={handleClick}
-          size="lg"
           isDisabled={status === STATUS.PENDING}
           variant="secondary"
         >

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

@@ -6,7 +6,6 @@ exports[`SyncButton rendering render with Props 1`] = `
     className="sync_button"
     isDisabled={false}
     onClick={[Function]}
-    size="lg"
     variant="secondary"
   >
      Sync all inventory status

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/__snapshots__/InventoryAutoUpload.test.js.snap

@@ -56,11 +56,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
           >
             Show Advanced Settings
              
-            <CaretRightIcon
-              color="currentColor"
-              noVerticalAlign={false}
-              size="sm"
-            />
+            <CaretRightIcon />
           </Button>
         </Popover>
       </Col>
@@ -78,11 +74,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
         <Text
           component="p"
         >
-          <InfoAltIcon
-            color="currentColor"
-            noVerticalAlign={false}
-            size="sm"
-          />
+          <InfoAltIcon />
            
           More details can be found in