foreman_rh_cloud 3.0.18.1 → 4.0.21.1

data/test/models/insights_client_report_status_test.rb

@@ -0,0 +1,77 @@
+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
+  end
+end

data/test/unit/rh_cloud_http_proxy_test.rb

@@ -2,16 +2,16 @@ require 'test_plugin_helper'
 
 class RhCloudHttpProxyTest < ActiveSupport::TestCase
   setup do
-    @global_content_proxy_mock = 'http://global:content@localhost:8888'
-    @global_foreman_proxy_mock = 'http://global:foreman@localhost:8888'
+    @global_content_proxy_mock = 'http://global:content@localhost:80'
+    @global_foreman_proxy_mock = 'http://global:foreman@localhost:80'
     @katello_cdn_proxy_mock = {
       host: 'localhost',
-      port: '8888',
+      port: '80',
       user: 'katello',
       password: 'cdn',
       scheme: 'http',
     }
-    @katello_cdn_proxy_string_mock = 'http://katello:cdn@localhost:8888'
+    @katello_cdn_proxy_string_mock = 'http://katello:cdn@localhost:80'
   end
 
   test 'selects global content proxy' do

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

@@ -0,0 +1,49 @@
+require 'test_plugin_helper'
+
+class RemediationsRetrieverTest < ActiveSupport::TestCase
+  setup do
+    @host1 = FactoryBot.create(:host)
+    @host2 = FactoryBot.create(:host)
+  end
+  test 'groups hosts together' do
+    rule1 = FactoryBot.create(:insights_rule)
+    rule1_remediation1 = FactoryBot.create(:insights_resolution, rule_id: rule1.rule_id, resolution_type: 'fix')
+
+    FactoryBot.create(:insights_facet, uuid: 'HOST1', host_id: @host1.id)
+    host1_hit1 = FactoryBot.create(:insights_hit, rule_id: rule1.rule_id, host_id: @host1.id)
+
+    FactoryBot.create(:insights_facet, uuid: 'HOST2', host_id: @host2.id)
+    host2_hit1 = FactoryBot.create(:insights_hit, rule_id: rule1.rule_id, host_id: @host2.id)
+
+    pairs = [{'hit_id' => host1_hit1.id, 'resolution_id' => rule1_remediation1.id}, {'hit_id' => host2_hit1.id, 'resolution_id' => rule1_remediation1.id}]
+    retriever = ForemanRhCloud::RemediationsRetriever.new(pairs)
+
+    actual_request = retriever.send(:playbook_request)
+
+    assert_not_nil (issues = actual_request[:issues])
+    assert_not_nil (resolution = issues.first)
+    assert_equal 'fix', resolution[:resolution]
+    assert_equal "advisor:#{rule1.rule_id}", resolution[:id]
+    assert_same_elements ['HOST1', 'HOST2'], resolution[:systems]
+  end
+
+  test 'does not group different resolutions' do
+    rule1 = FactoryBot.create(:insights_rule)
+    rule1_remediation1 = FactoryBot.create(:insights_resolution, rule_id: rule1.rule_id, resolution_type: 'fix')
+    rule1_remediation2 = FactoryBot.create(:insights_resolution, rule_id: rule1.rule_id, resolution_type: 'panic')
+
+    FactoryBot.create(:insights_facet, uuid: 'HOST1', host_id: @host1.id)
+    host1_hit1 = FactoryBot.create(:insights_hit, rule_id: rule1.rule_id, host_id: @host1.id)
+
+    FactoryBot.create(:insights_facet, uuid: 'HOST2', host_id: @host2.id)
+    host2_hit1 = FactoryBot.create(:insights_hit, rule_id: rule1.rule_id, host_id: @host2.id)
+
+    pairs = [{'hit_id' => host1_hit1.id, 'resolution_id' => rule1_remediation1.id}, {'hit_id' => host2_hit1.id, 'resolution_id' => rule1_remediation2.id}]
+    retriever = ForemanRhCloud::RemediationsRetriever.new(pairs)
+
+    actual_request = retriever.send(:playbook_request)
+
+    assert_not_nil (issues = actual_request[:issues])
+    assert_equal 2, issues.count
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'test_plugin_helper'
+
+class TemplateRendererHelperTest < ActiveSupport::TestCase
+  include ForemanRhCloud::TemplateRendererHelper
+
+  setup do
+    response = mock('respone')
+    response.stubs(:body).returns('TEST PLAYBOOK')
+    ForemanRhCloud::RemediationsRetriever.any_instance.stubs(:query_playbook).returns(response)
+    @host1 = FactoryBot.create(:host)
+  end
+
+  test 'Generates a playbook for hit and remediation' do
+    rule = FactoryBot.create(:insights_rule)
+    hit = FactoryBot.create(:insights_hit, rule: rule, host_id: @host1.id)
+    remediation = FactoryBot.create(:insights_resolution, rule: rule)
+
+    pairs = [{hit_id: hit.id, remediation_id: remediation.id}].to_json
+
+    actual_playbook = remediations_playbook(pairs)
+
+    assert_equal 'TEST PLAYBOOK', actual_playbook
+  end
+
+  def template_logger
+    Logger.new(IO::NULL)
+  end
+end

data/test/unit/slice_generator_test.rb

@@ -296,6 +296,13 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     @host.hostgroup = hostgroup
     @host.save!
 
+    ForemanInventoryUpload::Generators::Tags.any_instance.expects(:generate_parameters).returns(
+      [
+        ['bool_param', true],
+        ['int_param', 1],
+      ]
+    )
+
     Foreman.expects(:instance_id).twice.returns('satellite-id')
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
@@ -316,6 +323,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_tag(@host.location.name, actual_host, 'location')
     assert_tag(@host.organization.name, actual_host, 'organization')
     assert_tag(@host.hostgroup.name, actual_host, 'hostgroup')
+    assert_tag('true', actual_host, 'bool_param', 'satellite_parameter')
+    assert_tag('1', actual_host, 'int_param', 'satellite_parameter')
 
     assert_equal false, satellite_facts['is_hostname_obfuscated']
 
@@ -632,8 +641,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     generator
   end
 
-  def assert_tag(expected_value, host, tag_id)
-    actual_tag = host['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == tag_id }
+  def assert_tag(expected_value, host, tag_id, namespace = 'satellite')
+    actual_tag = host['tags'].find { |tag| tag['namespace'] == namespace && tag['key'] == tag_id }
     assert_not_nil actual_tag
     assert_equal expected_value, actual_tag['value']
   end

data/test/unit/tags_generator_test.rb

@@ -52,6 +52,16 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     assert_equal @host.organization_id.to_s, actual['organization_id'].first.last
   end
 
+  test 'filters tags with empty values' do
+    generator = create_generator
+
+    @host.stubs(:content_view)
+
+    actual = generator.generate.group_by { |key, value| key }
+
+    assert_equal false, actual.key?('content_view')
+  end
+
   private
 
   def create_generator

data/webpack/ForemanInventoryUpload/Components/FullScreenModal/FullScreenModal.js

@@ -12,7 +12,7 @@ const FullScreenModal = ({
   terminalProps,
 }) => (
   <Modal
-    id="full-screen-terminal"
+    id="rh-cloud-inventory-full-screen-terminal"
     show={showFullScreen}
     onHide={toggleFullScreen}
   >

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

@@ -8,7 +8,7 @@ exports[`FullScreenModal rendering render without Props 1`] = `
   bsClass="modal"
   dialogComponentClass={[Function]}
   enforceFocus={true}
-  id="full-screen-terminal"
+  id="rh-cloud-inventory-full-screen-terminal"
   keyboard={true}
   manager={
     ModalManager {

data/webpack/ForemanInventoryUpload/Components/FullScreenModal/fullScreenModal.scss

@@ -1,21 +1,19 @@
-.rh-cloud-inventory-page {
-  #full-screen-terminal {
-    .modal-dialog {
-      width: 95%;
-      height: 95%;
-      margin: 30px 0 0 30px;
+#rh-cloud-inventory-full-screen-terminal {
+  .modal-dialog {
+    width: 95%;
+    height: 95%;
+    margin: 30px 0 0 30px;
 
-      .modal-body {
-        padding: 0;
-        display: flex;
-        height: -webkit-fill-available;
-        height: -moz-available;
-        height: fill-available;
+    .modal-body {
+      padding: 0;
+      display: flex;
+      height: -webkit-fill-available;
+      height: -moz-available;
+      height: fill-available;
 
-        .terminal {
-          margin: 0 -20px;
-          height: 100%;
-        }
+      .rh-cloud-inventory-terminal {
+        margin: 0 -20px;
+        height: 100%;
       }
     }
   }

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

@@ -18,7 +18,7 @@ const InventoryFilter = ({
     const initialTerm =
       organization === __(ANY_ORGANIZATION) ? '' : organization;
     handleFilterChange(initialTerm);
-  }, [organization]);
+  }, []);
 
   return (
     <form id="inventory_filter_form">

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/integration.test.js.snap

@@ -37,7 +37,6 @@ Object {
         "inventoryFilter": Object {
           "filterTerm": "some-org",
         },
-        "inventorySync": Object {},
       },
     },
   },

data/webpack/ForemanInventoryUpload/Components/InventorySettings/AdvancedSetting/AdvancedSettingsConstants.js

@@ -3,7 +3,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 export const settingsDict = {
   autoUploadEnabled: {
     name: 'allow_auto_inventory_upload',
-    label: __('Auto upload'),
+    label: __('Automatic inventory upload'),
     tooltip: __(
       'Enable automatic upload of your hosts inventory to the Red Hat cloud'
     ),
@@ -20,7 +20,9 @@ export const settingsDict = {
   },
   excludePackagesEnabled: {
     name: 'exclude_installed_packages',
-    label: __('Exclude Packages'),
-    tooltip: __('Exclude packages from being uploaded to the Red Hat cloud'),
+    label: __('Exclude installed Packages'),
+    tooltip: __(
+      'Exclude installed packages from being uploaded to the Red Hat cloud'
+    ),
   },
 };

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

@@ -10,14 +10,27 @@ export const PageDescription = () => (
     </p>
     <p>
       {__(
-        'In order to utilize these services, you can set the auto upload in the settings to "ON".'
+        '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>
       {__(
-        'You can also trigger the upload manually by opening the relevant organization card, and clicking on the "Restart" button'
+        '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>
+      {__(
+        'Enabling inventory uploads is required by subscription watch. For more information about subscription watch see link:'
+      )}
+      &nbsp;
+      <a
+        href="https://access.redhat.com/documentation/en-us/subscription_central/2020-04/html/getting_started_with_subscription_watch/assembly-about-subscriptionwatch"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        About subscription watch
+      </a>
+    </p>
   </div>
 );
 

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

@@ -8,10 +8,21 @@ exports[`PageDescription rendering render without Props 1`] = `
     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>
-    In order to utilize these services, you can set the auto upload in the settings to "ON".
+    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>
-    You can also trigger the upload manually by opening the relevant organization card, and clicking on the "Restart" button
+    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>
+    Enabling inventory uploads is required by subscription watch. For more information about subscription watch see link:
+     
+    <a
+      href="https://access.redhat.com/documentation/en-us/subscription_central/2020-04/html/getting_started_with_subscription_watch/assembly-about-subscriptionwatch"
+      rel="noopener noreferrer"
+      target="_blank"
+    >
+      About subscription watch
+    </a>
   </p>
 </div>
 `;

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

@@ -1,57 +1,92 @@
 import React from 'react';
-import { API } from 'foremanReact/redux/API';
+import { get, post } from 'foremanReact/redux/API';
+import { withInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
 import { addToast } from 'foremanReact/redux/actions/toasts';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
 import Toast from './components/Toast';
 import {
-  INVENTORY_SYNC_REQUEST,
-  INVENTORY_SYNC_SUCCESS,
-  INVENTORY_SYNC_ERROR,
+  INVENTORY_SYNC,
+  INVENTORY_SYNC_TASK_UPDATE,
 } from './SyncButtonConstants';
+import { foremanUrl } from '../../../../../ForemanRhCloudHelpers';
 
-export const handleSync = () => async dispatch => {
-  dispatch({
-    type: INVENTORY_SYNC_REQUEST,
-    payload: {},
-  });
-  try {
-    const {
-      data: { syncHosts, disconnectHosts },
-    } = await API.post(inventoryUrl('tasks'));
-    dispatch({
-      type: INVENTORY_SYNC_SUCCESS,
-      payload: {
-        syncHosts,
-        disconnectHosts,
-      },
-    });
-
-    dispatch(
-      addToast({
-        sticky: true,
-        type: 'success',
-        message: (
-          <Toast syncHosts={syncHosts} disconnectHosts={disconnectHosts} />
-        ),
-      })
-    );
-  } catch ({
-    message,
-    response: { data: { message: toastMessage } = {} } = {},
-  }) {
-    dispatch({
-      type: INVENTORY_SYNC_ERROR,
-      payload: {
-        error: message,
+export const handleSync = () => dispatch => {
+  dispatch(
+    post({
+      key: INVENTORY_SYNC,
+      url: inventoryUrl('tasks'),
+      handleSuccess: ({
+        data: {
+          task: { id },
+        },
+      }) => {
+        dispatch(getSyncTaskInterval(id));
+        return dispatch(
+          taskPageRefererToast(id, 'info', __('Inventory sync has started:'))
+        );
       },
-    });
+      errorToast: inventorySyncErrorToast,
+    })
+  );
+};
 
-    dispatch(
-      addToast({
-        sticky: true,
-        type: 'error',
-        message: toastMessage || message,
+export const getSyncTaskInterval = id => dispatch => {
+  dispatch(
+    withInterval(
+      get({
+        key: INVENTORY_SYNC_TASK_UPDATE,
+        url: inventoryUrl(`tasks/${id}`),
+        handleSuccess: ({ data: { result, output } }, stopTaskInterval) => {
+          if (result === 'success') {
+            const {
+              host_statuses: { sync, disconnect },
+            } = output;
+            dispatch(
+              addToast({
+                sticky: true,
+                type: 'success',
+                message: (
+                  <Toast syncHosts={sync} disconnectHosts={disconnect} />
+                ),
+              })
+            );
+          }
+          if (result === 'error') {
+            dispatch(
+              taskPageRefererToast(
+                id,
+                'error',
+                __('Inventory sync has failed:'),
+                true
+              )
+            );
+          }
+          stopTaskInterval();
+        },
+        errorToast: inventorySyncErrorToast,
       })
-    );
-  }
+    )
+  );
 };
+
+const inventorySyncErrorToast = ({ message, response }) =>
+  `${__('Inventory sync has failed: ')} ${response.data?.message || message}`;
+
+const taskPageRefererToast = (taskID, toastType, prefix, sticky = false) =>
+  addToast({
+    sticky,
+    type: toastType,
+    message: (
+      <span>
+        {prefix}{' '}
+        <a
+          target="_blank"
+          rel="noopener noreferrer"
+          href={foremanUrl(`/foreman_tasks/tasks/${taskID}`)}
+        >
+          {__('view the task page for more details')}
+        </a>
+      </span>
+    ),
+  });