foreman_rh_cloud 4.0.22 → 4.0.25

data/test/models/insights_client_report_status_test.rb

@@ -1,77 +1,75 @@
 require 'test_plugin_helper'
 
 class InsightsClientReportStatusTest < ActiveSupport::TestCase
-  describe 'to_status' do
-    let(:host) { FactoryBot.create(:host, :managed) }
-
-    setup do
-      CommonParameter.where(name: 'host_registration_insights').destroy_all
-    end
-
-    test 'host_registration_insights = true & is getting data' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-
-      assert_equal 0, host_status.to_status(data: true)
-    end
-
-    test 'host_registration_insights = true & no data in less than 48 hours' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 1.day.ago)
-      assert_equal 0, host_status.to_status
-    end
-
-    test 'host_registration_insights = true & no data in more than 48 hours' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 3.days.ago)
-      assert_equal 1, host_status.to_status
-    end
-
-    test 'host_registration_insights = false & no data' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 2, host_status.to_status
-    end
-
-    test 'host_registration_insights = false & getting data' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 3, host_status.to_status(data: true)
-    end
-
-    test 'host_registration_insights = nil & is getting data' do
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 3, host_status.to_status(data: true)
-    end
-
-    test 'host_registration_insights = nil & no data in less than 48 hours' do
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 1.day.ago)
-      assert_equal 2, host_status.to_status
-    end
-
-    test 'host_registration_insights = nil & no data in more than 48 hours' do
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      host_status.update(reported_at: 3.days.ago)
-      assert_equal 2, host_status.to_status
-    end
-
-    test 'override param on host level from `false` to `true`' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
-      FactoryBot.create(:host_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true, host: host)
-
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 0, host_status.to_status(data: true)
-    end
-
-    test 'override param on host level from `true` to `false`' do
-      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
-      FactoryBot.create(:host_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false, host: host)
-
-      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
-      assert_equal 2, host_status.to_status
-    end
+  setup do
+    @host = FactoryBot.create(:host, :managed)
+  end
+
+  test 'fresh host does not have insights status' do
+    @host.reload
+
+    refute @host.host_statuses.where(type: 'InsightsClientReportStatus').exists?
+    insights_status = @host.get_status(InsightsClientReportStatus)
+    refute insights_status.relevant?
+  end
+
+  test 'host can refresh all its statuses' do
+    @host.refresh_statuses
+    @host.reload
+
+    refute @host.host_statuses.where(type: 'InsightsClientReportStatus').exists?
+  end
+
+  test 'host with correct report status sets global status to OK' do
+    global_status = @host.get_status(HostStatus.find_status_by_humanized_name('Global'))
+    # Status has to be OK before action
+    assert_equal HostStatus::Global::OK, global_status.status
+
+    # force create record
+    @host.get_status(InsightsClientReportStatus).refresh!
+    # now refresh should work
+    @host.refresh_statuses([InsightsClientReportStatus])
+
+    @host.reload
+    global_status = @host.get_status(HostStatus.find_status_by_humanized_name('Global'))
+    # Status has to be OK after the action too
+    assert_equal HostStatus::Global::OK, global_status.status
+
+    insights_status = @host.get_status(InsightsClientReportStatus)
+    # assert the status would be displayed
+    assert insights_status.relevant?
+  end
+
+  test 'host will return to OK once the status is refreshed' do
+    global_status = @host.get_status(HostStatus.find_status_by_humanized_name('Global'))
+    # Status has to be OK before action
+    assert_equal HostStatus::Global::OK, global_status.status
+
+    insights_status = @host.get_status(InsightsClientReportStatus)
+    insights_status.status = InsightsClientReportStatus::NO_REPORT
+    insights_status.save!
+    @host.refresh_global_status!
+    global_status = @host.global_status
+    assert_equal HostStatus::Global::ERROR, global_status
+
+    @host.refresh_statuses([InsightsClientReportStatus])
+
+    @host.reload
+    # Status has to be OK after the action too
+    assert_equal HostStatus::Global::OK, @host.global_status
+  end
+
+  test 'host with stale status would set global to ERROR' do
+    global_status = @host.get_status(HostStatus.find_status_by_humanized_name('Global'))
+    # Status has to be OK before action
+    assert_equal HostStatus::Global::OK, global_status.status
+
+    insights_status = @host.get_status(InsightsClientReportStatus)
+    insights_status.status = InsightsClientReportStatus::NO_REPORT
+    insights_status.save!
+    @host.refresh_global_status!
+    @host.reload
+
+    assert_equal HostStatus::Global::ERROR, @host.global_status
   end
 end

data/test/test_plugin_helper.rb

@@ -2,6 +2,8 @@
 require 'test_helper'
 
 # Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << "#{ForemanTasks::Engine.root}/test/factories"
+FactoryBot.definition_file_paths << "#{ForemanRemoteExecution::Engine.root}/test/factories"
 FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
 # FactoryBot.definition_file_paths << "#{Katello::Engine.root}/test/factories"
 FactoryBot.reload

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

@@ -42,9 +42,9 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
   test 'should prepare correct cloud url' do
     paths = {
       "/redhat_access/r/insights/platform/module-update-router/v1/channel?module=insights-core" => "https://cert.cloud.redhat.com/api/module-update-router/v1/channel?module=insights-core",
-      "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cloud.redhat.com/api/v1/static/release/insights-core.egg",
-      "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cloud.redhat.com/api/v1/static/uploader.v2.json",
-      "/redhat_access/r/insights/v1/static/uploader.v2.json.asc" => "https://cloud.redhat.com/api/v1/static/uploader.v2.json.asc",
+      "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cert-api.access.redhat.com/r/insights/v1/static/release/insights-core.egg",
+      "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cert-api.access.redhat.com/r/insights/v1/static/uploader.v2.json",
+      "/redhat_access/r/insights/v1/static/uploader.v2.json.asc" => "https://cert-api.access.redhat.com/r/insights/v1/static/uploader.v2.json.asc",
       "/redhat_access/r/insights/platform/inventory/v1/hosts" => "https://cert.cloud.redhat.com/api/inventory/v1/hosts",
       "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cert.cloud.redhat.com/api/ingress/v1/upload",
       "/redhat_access/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4" => "https://cert-api.access.redhat.com/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4",

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

@@ -0,0 +1,31 @@
+require 'test_plugin_helper'
+
+class InsightsStatusCleanerTest < ActiveSupport::TestCase
+  setup do
+    @host1 = FactoryBot.create(:host)
+    @host2 = FactoryBot.create(:host)
+
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host1.id).update(status: InsightsClientReportStatus::NO_REPORT, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL + 1.day)
+    InsightsClientReportStatus.find_or_initialize_by(host_id: @host2.id).update(status: InsightsClientReportStatus::NO_REPORT, reported_at: Time.now - InsightsClientReportStatus::REPORT_INTERVAL + 1.day)
+
+    @host1.refresh_global_status!
+    @host2.refresh_global_status!
+  end
+
+  test 'Cleans hosts by search condition' do
+    assert_equal HostStatus::Global::ERROR, @host1.global_status
+    assert_equal HostStatus::Global::ERROR, @host2.global_status
+
+    instance = ForemanRhCloud::InsightsStatusCleaner.new
+    actual_count = instance.clean("name = #{@host1.name}")
+
+    @host1.reload
+    @host2.refresh_global_status!
+
+    assert_equal 1, actual_count
+    assert_equal HostStatus::Global::OK, @host1.global_status
+    assert_equal HostStatus::Global::ERROR, @host2.global_status
+    assert InsightsClientReportStatus.where(host_id: @host1.id).empty?
+    refute InsightsClientReportStatus.where(host_id: @host2.id).empty?
+  end
+end

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

@@ -8,6 +8,7 @@ class TemplateRendererHelperTest < ActiveSupport::TestCase
     response.stubs(:body).returns('TEST PLAYBOOK')
     ForemanRhCloud::RemediationsRetriever.any_instance.stubs(:query_playbook).returns(response)
     @host1 = FactoryBot.create(:host)
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
   end
 
   test 'Generates a playbook for hit and remediation' do

data/test/unit/slice_generator_test.rb

@@ -53,6 +53,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       'insights_client::hostname',
       'insights_client::obfuscate_ip_enabled',
       'insights_client::ips',
+      'insights_id',
     ]
   end
 
@@ -657,6 +658,20 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_not_nil actual_host['bios_uuid']
   end
 
+  test 'passes valid insights_id field' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['insights_id'], value: 'D30B0B42-7824-2635-C62D-491394DE43F7', 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"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil actual_host['insights_id']
+  end
+
   private
 
   def create_generator(batch, name = '00000000-0000-0000-0000-000000000000')

data/test/unit/tags_generator_test.rb

@@ -62,6 +62,47 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     assert_equal false, actual.key?('content_view')
   end
 
+  test 'generates parameter tags' do
+    FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
+
+    @host.stubs(:host_inherited_params_objects).returns(
+      [
+        OpenStruct.new(name: 'bool_param', value: true),
+        OpenStruct.new(name: 'false_param', value: false),
+        OpenStruct.new(name: 'int_param', value: 1),
+        OpenStruct.new(name: 'empty_param', value: nil),
+        OpenStruct.new(name: 'empty_str_param', value: ''),
+      ]
+    )
+
+    generator = create_generator
+    actual = Hash[generator.generate_parameters]
+
+    assert_equal 3, actual.count
+    assert_equal true, actual['bool_param']
+    assert_equal false, actual['false_param']
+    assert_equal 1, actual['int_param']
+  end
+
+  test 'skips parameter tags if include_parameter_tags setting is off' do
+    FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+
+    @host.stubs(:host_inherited_params_objects).returns(
+      [
+        OpenStruct.new(name: 'bool_param', value: true),
+        OpenStruct.new(name: 'false_param', value: false),
+        OpenStruct.new(name: 'int_param', value: 1),
+        OpenStruct.new(name: 'empty_param', value: nil),
+        OpenStruct.new(name: 'empty_str_param', value: ''),
+      ]
+    )
+
+    generator = create_generator
+    actual = generator.generate_parameters.group_by { |key, value| key }
+
+    assert_equal 0, actual.count
+  end
+
   private
 
   def create_generator

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/EmptyState.js

@@ -9,7 +9,7 @@ const inventoryEmptyState = () => (
     <EmptyState.Title>
       {__('Fetching data about your accounts')}
     </EmptyState.Title>
-    <EmptyState.Info>{__('Loading')}...</EmptyState.Info>
+    <EmptyState.Info>{__('Loading...')}</EmptyState.Info>
   </EmptyState>
 );
 

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

@@ -19,8 +19,7 @@ exports[`EmptyState rendering render without Props 1`] = `
   <EmptyStateInfo
     className=""
   >
-    Loading
-    ...
+    Loading...
   </EmptyStateInfo>
 </EmptyState>
 `;

data/webpack/ForemanInventoryUpload/Components/FileDownload/FileDownload.js

@@ -2,12 +2,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Grid, Button, Icon } from 'patternfly-react';
 import { noop } from 'foremanReact/common/helpers';
+import { translate as __ } from 'foremanReact/common/I18n';
+
 import './fileDownload.scss';
 
 const FileDownload = ({ onClick }) => (
   <Grid.Col sm={12}>
     <Button onClick={onClick} className="download-button">
-      Download Report <Icon name="download" />
+      {__('Download Report')} <Icon name="download" />
     </Button>
   </Grid.Col>
 );

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

@@ -15,7 +15,8 @@ exports[`FileDownload rendering render without Props 1`] = `
     disabled={false}
     onClick={[Function]}
   >
-    Download Report 
+    Download Report
+     
     <Icon
       name="download"
       type="fa"

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

@@ -15,8 +15,7 @@ const InventoryFilter = ({
   organization,
 }) => {
   useEffect(() => {
-    const initialTerm =
-      organization === __(ANY_ORGANIZATION) ? '' : organization;
+    const initialTerm = organization === ANY_ORGANIZATION ? '' : organization;
     handleFilterChange(initialTerm);
   }, []);
 

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

@@ -1,3 +1,5 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
 export const INVENTORY_FILTER_UPDATE = 'INVENTORY_FILTER_UPDATE';
 export const INVENTORY_FILTER_CLEAR = 'INVENTORY_FILTER_CLEAR';
-export const ANY_ORGANIZATION = 'Any Organization';
+export const ANY_ORGANIZATION = __('Any Organization');

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

@@ -28,7 +28,18 @@ export const PageDescription = () => (
         target="_blank"
         rel="noopener noreferrer"
       >
-        About subscription watch
+        {__('About subscription watch')}
+      </a>
+    </p>
+    <p>
+      {__('For more information about Insights and Cloud Connector read')}
+      &nbsp;
+      <a
+        href="https://console.redhat.com/security/insights/"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        {__('Red Hat Insights Data and Application Security')}
       </a>
     </p>
   </div>

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

@@ -24,5 +24,16 @@ exports[`PageDescription rendering render without Props 1`] = `
       About subscription watch
     </a>
   </p>
+  <p>
+    For more information about Insights and Cloud Connector read
+     
+    <a
+      href="https://console.redhat.com/security/insights/"
+      rel="noopener noreferrer"
+      target="_blank"
+    >
+      Red Hat Insights Data and Application Security
+    </a>
+  </p>
 </div>
 `;

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

@@ -48,7 +48,7 @@ const SyncModal = ({ show, toggleModal }) => (
           )}
         </p>
         <Button bsStyle="primary" bsSize="lg" onClick={toggleModal}>
-          Close
+          {__('Close')}
         </Button>
       </Grid>
     </Modal.Body>

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

@@ -20,13 +20,13 @@ const Toast = ({ syncHosts, disconnectHosts }) => {
         <strong>{disconnectHosts}</strong>
       </p>
       <p>
-        For more info, please visit the{' '}
+        {__('For more info, please visit the')}{' '}
         <a
           href={foremanUrl('/hosts')}
           target="_blank"
           rel="noopener noreferrer"
         >
-          hosts page
+          {__('hosts page')}
         </a>
       </p>
     </span>

data/webpack/ForemanInventoryUpload/Components/StatusChart/StatusChart.js

@@ -1,13 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Grid, DonutChart } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
 import './statusChart.scss';
 
 const StatusChart = ({ completed }) => {
   const donutConfigData = {
     columns: [
-      ['Completed', completed],
-      ['Remain', 100 - completed],
+      [__('Completed'), completed],
+      [__('Remain'), 100 - completed],
     ],
     order: null,
   };
@@ -37,7 +38,7 @@ const StatusChart = ({ completed }) => {
           title={{
             type: 'percent',
             primary: `${completed}%`,
-            secondary: 'Completed',
+            secondary: __('Completed'),
           }}
         />
       </div>