foreman_rh_cloud 4.0.36 → 5.0.28

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

@@ -60,29 +60,6 @@ module InsightsCloud::Api
         assert_equal x_rh_insights_request_id, @response.headers['x_rh_insights_request_id']
       end
 
-      test "should set etag header to response from cloud" do
-        etag = '12345'
-        req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org', :headers => { "If-None-Match": etag})
-        net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
-        net_http_resp[Rack::ETAG] = etag
-        res = RestClient::Response.create(@body, net_http_resp, req)
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
-
-        get :forward_request, params: { "path" => "static/v1/release/insights-core.egg" }
-        assert_equal etag, @response.headers[Rack::ETAG]
-      end
-
-      test "should set content type header to response from cloud" do
-        req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org')
-        net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
-        net_http_resp['Content-Type'] = 'application/zip'
-        res = RestClient::Response.create(@body, net_http_resp, req)
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
-
-        get :forward_request, params: { "path" => "static/v1/release/insights-core.egg" }
-        assert_equal net_http_resp['Content-Type'], @response.headers['Content-Type']
-      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)

data/test/controllers/inventory_upload/cloud_status_controller_test.rb

@@ -29,8 +29,6 @@ class CloudStatusControllerTest < ActionController::TestCase
       RestClient::Response.new('TEST RESPONSE ORG 1')
     )
 
-    Katello::UpstreamConnectionChecker.any_instance.expects(:assert_connection).twice.returns(true)
-
     get :index, session: set_session_user
 
     assert_response :success

data/test/jobs/inventory_full_sync_test.rb

@@ -37,18 +37,6 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
     @host2.subscription_facet.pools << pool
     @host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
 
-    # this host would pass our plugin queries, so it could be uploaded to the cloud.
-    @host3 = FactoryBot.create(
-      :host,
-      :with_subscription,
-      :with_content,
-      content_view: cv.first,
-      lifecycle_environment: env,
-      organization: env.organization
-    )
-
-    @host3.subscription_facet.pools << pool
-
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
 
     inventory_json = <<-INVENTORY_JSON
@@ -163,7 +151,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
         {
           "insights_id": "b533848e-465f-4f1a-9b2b-b71cb2d5239d",
           "rhel_machine_id": null,
-          "subscription_manager_id": "#{@host3.subscription_facet.uuid}",
+          "subscription_manager_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
           "satellite_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
           "bios_uuid": "3cd5d972-cfb5-451a-8314-fd2f56629d7c",
           "ip_addresses": [
@@ -171,7 +159,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
             "fd6e:2298:736e::857",
             "fd6e:2298:736e:0:2c66:6101:9cc6:2b23"
           ],
-          "fqdn": "#{@host3.fqdn}",
+          "fqdn": "rhel8-demo.oss-lab.net",
           "mac_addresses": [
             "6e:66:a6:fe:fc:07",
             "00:00:00:00:00:00"
@@ -283,18 +271,4 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
   end
-
-  test 'Should skip hosts that are not returned in query' do
-    assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first
-
-    Setting[:rh_cloud_token] = 'TEST TOKEN'
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
-    InventorySync::Async::InventoryFullSync.any_instance.expects(:affected_host_ids).returns([@host1.id, @host2.id])
-    FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
-
-    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
-    @host2.reload
-
-    assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first
-  end
 end

data/test/jobs/inventory_hosts_sync_test.rb

@@ -265,19 +265,4 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     assert_equal @host2_inventory_id, @host2.insights.uuid
   end
-
-  test 'Inventory should sync empty facets list' do
-    empty_inventory = @inventory.deep_clone
-    empty_inventory['results'] = []
-    InventorySync::Async::InventoryHostsSync.any_instance.expects(:query_inventory).returns(empty_inventory)
-    InventorySync::Async::InventoryHostsSync.any_instance.expects(:plan_self_host_sync)
-
-    assert_nil @host2.insights
-
-    ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync)
-
-    @host2.reload
-
-    assert_nil @host2.insights
-  end
 end

data/test/jobs/upload_report_job_test.rb

@@ -1,6 +1,8 @@
 require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
 
-class UploadReportJobTest < ActiveJob::TestCase
+class UploadReportJobTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include FolderIsolation
 
   test 'returns aborted state when disconnected' do
@@ -12,7 +14,7 @@ class UploadReportJobTest < ActiveJob::TestCase
     )
     FactoryBot.create(:setting, :name => 'content_disconnected', :value => true)
 
-    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
@@ -24,7 +26,7 @@ class UploadReportJobTest < ActiveJob::TestCase
     organization = FactoryBot.create(:organization)
     Organization.any_instance.expects(:owner_details).returns(nil)
 
-    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)

data/test/unit/fact_helpers_test.rb

@@ -30,13 +30,13 @@ class FactHelpersTest < ActiveSupport::TestCase
   test 'obfuscates ips with insights-client data' do
     host = mock('host')
     @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"}]'
+      '[{"obfuscated": "10.230.230.1", "original": "224.0.0.1"}, {"obfuscated": "10.230.230.2", "original": "224.0.0.251"}]'
     )
 
     actual = @instance.obfuscated_ips(host)
 
     assert_equal '10.230.230.1', actual['224.0.0.1']
-    assert_equal '10.230.231.0', actual['224.0.0.2']
+    assert_equal '10.230.230.3', actual['224.0.0.2']
   end
 
   test 'obfuscates ips without insights-client data' do

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

@@ -133,23 +133,4 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
     assert_equal 'GET', actual[:method]
     assert_equal params, actual[:headers][:params]
   end
-
-  test 'should forward content type correctly' do
-    user_agent = { :foo => :bar }
-    params = { :page => 5, :per_page => 42 }
-    ForemanRhCloud::BranchInfo.any_instance.expects(:core_app_name).returns('test_app')
-    ForemanRhCloud::BranchInfo.any_instance.expects(:core_app_version).returns('test_ver')
-
-    req = ActionDispatch::Request.new(
-      'REQUEST_URI' => '/foo/bar',
-      'REQUEST_METHOD' => 'GET',
-      'HTTP_USER_AGENT' => user_agent,
-      'rack.input' => ::Puma::NullIO.new,
-      'action_dispatch.request.query_parameters' => params
-    )
-
-    actual = @forwarder.prepare_request_opts(req, 'TEST PAYLOAD', params, generate_certs_hash)
-
-    assert_match /text\/html/, actual[:headers][:content_type]
-  end
 end

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

@@ -28,8 +28,6 @@ class CloudStatusServiceTest < ActiveSupport::TestCase
       RestClient::Response.new('TEST RESPONSE ORG 1')
     )
 
-    Katello::UpstreamConnectionChecker.any_instance.expects(:assert_connection).twice.returns(true)
-
     service = ForemanRhCloud::CloudPingService.new(organizations, nil)
     actual = service.ping
 
@@ -57,8 +55,6 @@ class CloudStatusServiceTest < ActiveSupport::TestCase
       'TEST RESPONSE ORG 0'
     )
 
-    Katello::UpstreamConnectionChecker.any_instance.expects(:assert_connection).returns(true)
-
     service = ForemanRhCloud::CloudPingService.new(organizations, nil)
     actual = service.ping
 

data/test/unit/shell_process_job_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
 
 class ShellProcessJobTest < ActiveSupport::TestCase
   class TestProcessJob < ForemanInventoryUpload::Async::ShellProcess
@@ -13,11 +14,12 @@ class ShellProcessJobTest < ActiveSupport::TestCase
     end
   end
 
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include FolderIsolation
 
   test 'Runs a process with environment vars' do
     label = Foreman.uuid
-    TestProcessJob.perform_now(label)
+    ForemanTasks.sync_task(TestProcessJob, label)
 
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
 

data/test/unit/slice_generator_test.rb

@@ -447,18 +447,6 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
-  test 'excludes hosts with host_registration_insights set to false' do
-    @host.host_parameters << HostParameter.create(
-      name: 'host_registration_insights',
-      value: "false",
-      parameter_type: 'boolean'
-    )
-
-    count = ForemanInventoryUpload::Generators::Queries.for_org(@host.organization_id).count
-
-    assert_equal 0, count
-  end
-
   test 'shows system_memory_bytes in bytes' do
     FactoryBot.create(:fact_value, fact_name: fact_names['memory::memtotal'], value: '1', host: @host)
 

data/test/unit/tags_generator_test.rb

@@ -103,21 +103,6 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     assert_equal 0, actual.count
   end
 
-  test 'truncates parameter tags' do
-    Setting[:include_parameter_tags] = true
-
-    @host.stubs(:host_params).returns(
-      {
-        'str_param' => 'a' * 251,
-      }
-    )
-
-    generator = create_generator
-    actual = Hash[generator.generate_parameters]
-
-    assert_equal 'Original value exceeds 250 characters', actual['str_param']
-  end
-
   private
 
   def create_generator

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

@@ -1,4 +1,12 @@
 .rh-cloud-inventory-page {
+  #main {
+    padding: 0;
+
+    #breadcrumb {
+      display: none;
+    }
+  }
+
   .account-list {
     .pf-c-accordion__toggle {
       margin-top: 10px;

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

@@ -1,5 +1,21 @@
 .rh-cloud-inventory-page {
   .inventory-upload-header {
+    margin-top: 35px;
+
+    h1 {
+      font-family: 'RedHatDisplay';
+      font-weight: 400;
+      margin: 0;
+    }
+
+    p {
+      font-size: 16px;
+    }
+
+    .pf-c-dropdown__toggle {
+      margin-right: -20px;
+    }
+
     .settings-alert {
       margin-bottom: 30px;
       .pf-c-alert {
@@ -18,10 +34,7 @@
 
     .inventory-upload-header-title {
       margin-top: -15px;
-
-      h1 {
-        margin: 0;
-      }
+      margin-bottom: 8px;
     }
 
     .title-dropdown {

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

@@ -4,7 +4,10 @@ import {
   DropdownItem,
   KebabToggle,
   DropdownPosition,
+  Grid,
+  GridItem,
 } from '@patternfly/react-core';
+import Head from 'foremanReact/components/Head';
 import {
   INVENTORY_PAGE_TITLE,
   ACTIONS_HISTORY_BUTTON_TEXT,
@@ -43,23 +46,32 @@ const PageTitle = () => {
     </DropdownItem>,
   ];
   return (
-    <div className="row form-group inventory-upload-header-title">
-      <h1 className="col-md-8">{INVENTORY_PAGE_TITLE}</h1>
-      <Dropdown
-        className="title-dropdown"
-        onSelect={() => setIsDropdownOpen(false)}
-        toggle={<KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />}
-        isOpen={isDropdownOpen}
-        isPlain
-        dropdownItems={dropdownItems}
-        position={DropdownPosition.right}
-      />
-      <CloudPingModal
-        isOpen={showPingModal}
-        toggle={togglePingModal}
-        title={CLOUD_PING_TITLE}
-      />
-    </div>
+    <Grid className="inventory-upload-header-title">
+      <GridItem span={6}>
+        <Head>
+          <title>{INVENTORY_PAGE_TITLE}</title>
+        </Head>
+        <h1>{INVENTORY_PAGE_TITLE}</h1>
+      </GridItem>
+      <GridItem span={6}>
+        <Dropdown
+          className="title-dropdown"
+          onSelect={() => setIsDropdownOpen(false)}
+          toggle={
+            <KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />
+          }
+          isOpen={isDropdownOpen}
+          isPlain
+          dropdownItems={dropdownItems}
+          position={DropdownPosition.right}
+        />
+        <CloudPingModal
+          isOpen={showPingModal}
+          toggle={togglePingModal}
+          title={CLOUD_PING_TITLE}
+        />
+      </GridItem>
+    </Grid>
   );
 };
 export default PageTitle;

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

@@ -1,53 +1,64 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`PageTitle rendering render without Props 1`] = `
-<div
-  className="row form-group inventory-upload-header-title"
+<Grid
+  className="inventory-upload-header-title"
 >
-  <h1
-    className="col-md-8"
+  <GridItem
+    span={6}
   >
-    Red Hat Inventory
-  </h1>
-  <Dropdown
-    className="title-dropdown"
-    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"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Actions history
-        </DropdownItem>,
-        <DropdownItem
-          href="/links/manual/+?root_url=https%3A%2F%2Faccess.redhat.com%2Fproducts%2Fsubscription-central"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Documentation
-        </DropdownItem>,
-        <DropdownItem
-          onClick={[Function]}
-        >
-          Connectivity test
-        </DropdownItem>,
-      ]
-    }
-    isOpen={false}
-    isPlain={true}
-    onSelect={[Function]}
-    position="right"
-    toggle={
-      <KebabToggle
-        onToggle={[Function]}
-      />
-    }
-  />
-  <CloudPingModal
-    isOpen={false}
-    title="Connectivity test"
-    toggle={[Function]}
-  />
-</div>
+    <Head>
+      <title>
+        Red Hat Inventory
+      </title>
+    </Head>
+    <h1>
+      Red Hat Inventory
+    </h1>
+  </GridItem>
+  <GridItem
+    span={6}
+  >
+    <Dropdown
+      className="title-dropdown"
+      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"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Actions history
+          </DropdownItem>,
+          <DropdownItem
+            href="/links/manual/+?root_url=https%3A%2F%2Faccess.redhat.com%2Fproducts%2Fsubscription-central"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Documentation
+          </DropdownItem>,
+          <DropdownItem
+            onClick={[Function]}
+          >
+            Connectivity test
+          </DropdownItem>,
+        ]
+      }
+      isOpen={false}
+      isPlain={true}
+      onSelect={[Function]}
+      position="right"
+      toggle={
+        <KebabToggle
+          onToggle={[Function]}
+        />
+      }
+    />
+    <CloudPingModal
+      isOpen={false}
+      title="Connectivity test"
+      toggle={[Function]}
+    />
+  </GridItem>
+</Grid>
 `;

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

@@ -46,7 +46,7 @@ const CloudPingModal = ({ title, isOpen, toggle }) => {
                       isPending={status === STATUS.PENDING}
                       authStatus={cert}
                     />{' '}
-                    {cert.org_name} {cert.error}
+                    {cert.org_name}
                   </>
                 ),
               },

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

@@ -1,24 +1,26 @@
 import React from 'react';
+import { Text } from '@patternfly/react-core';
+
 import { translate as __ } from 'foremanReact/common/I18n';
 
 export const PageDescription = () => (
   <div id="inventory_page_description">
-    <p>
+    <Text>
       {__(
         'Red Hat Insights is a set of cloud services which provide unified subscription reporting, predictive analysis and remediation of issues through this Satellite instance.'
       )}
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__(
         'You can toggle the Auto upload switch to the ON position to enable Satellite to automatically upload your host inventory once a day.'
       )}
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__(
         'Click Restart to upload your host inventory to Red Hat Insights. Perform this step for each organization from which you want to manually upload a host inventory.'
       )}
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__(
         'Enabling inventory uploads is required by subscription watch. For more information about subscription watch see link:'
       )}
@@ -30,8 +32,8 @@ export const PageDescription = () => (
       >
         {__('About subscription watch')}
       </a>
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__('For more information about Insights and Cloud Connector read')}
       &nbsp;
       <a
@@ -41,7 +43,7 @@ export const PageDescription = () => (
       >
         {__('Red Hat Insights Data and Application Security')}
       </a>
-    </p>
+    </Text>
   </div>
 );
 

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

@@ -4,16 +4,16 @@ exports[`PageDescription rendering render without Props 1`] = `
 <div
   id="inventory_page_description"
 >
-  <p>
+  <Text>
     Red Hat Insights is a set of cloud services which provide unified subscription reporting, predictive analysis and remediation of issues through this Satellite instance.
-  </p>
-  <p>
+  </Text>
+  <Text>
     You can toggle the Auto upload switch to the ON position to enable Satellite to automatically upload your host inventory once a day.
-  </p>
-  <p>
+  </Text>
+  <Text>
     Click Restart to upload your host inventory to Red Hat Insights. Perform this step for each organization from which you want to manually upload a host inventory.
-  </p>
-  <p>
+  </Text>
+  <Text>
     Enabling inventory uploads is required by subscription watch. For more information about subscription watch see link:
      
     <a
@@ -23,8 +23,8 @@ exports[`PageDescription rendering render without Props 1`] = `
     >
       About subscription watch
     </a>
-  </p>
-  <p>
+  </Text>
+  <Text>
     For more information about Insights and Cloud Connector read
      
     <a
@@ -34,6 +34,6 @@ exports[`PageDescription rendering render without Props 1`] = `
     >
       Red Hat Insights Data and Application Security
     </a>
-  </p>
+  </Text>
 </div>
 `;

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

@@ -33,7 +33,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
       >
         <Popover
           bodyContent={
-            <UNDEFINED
+            <Memo(Connect(AdvancedSettings))
               autoUploadEnabled={true}
               handleToggle={[Function]}
             />

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

@@ -60,7 +60,10 @@ exports[`InsightsTable rendering render with Props 1`] = `
     dropdownPosition="right"
     expandId="expandable-toggle"
     gridBreakPoint="grid-md"
+    isHeaderSelectDisabled={false}
+    isNested={false}
     isStickyHeader={false}
+    isTreeTable={false}
     onSelect={[Function]}
     onSort={[Function]}
     ouiaSafe={true}
@@ -77,7 +80,7 @@ exports[`InsightsTable rendering render with Props 1`] = `
     variant="compact"
   >
     <TableHeader />
-    <Component />
+    <TableBody />
   </Table>
   <TableEmptyState
     error={null}