foreman_rh_cloud 1.0.12 → 1.0.13

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -3,6 +3,8 @@ require 'rest-client'
 module InventorySync
   module Async
     class InventoryFullSync < ::ApplicationJob
+      include ::ForemanRhCloud::CloudAuth
+
       def perform(organization)
         @organization = organization
         @subscribed_hosts_ids = Set.new(
@@ -37,10 +39,6 @@ module InventorySync
         @host_statuses
       end
 
-      def rh_credentials
-        @rh_credentials ||= query_refresh_token
-      end
-
       private
 
       def update_hosts_status(status_hashes, touched)
@@ -77,25 +75,6 @@ module InventorySync
 
         JSON.parse(hosts_inventory_response)
       end
-
-      def query_refresh_token
-        token_response = RestClient::Request.execute(
-          method: :post,
-          url: ForemanRhCloud.authentication_url,
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
-          payload: {
-            grant_type: 'refresh_token',
-            client_id: 'rhsm-api',
-            refresh_token: Setting[:rh_cloud_token],
-          }
-        )
-
-        JSON.parse(token_response)['access_token']
-      rescue RestClient::ExceptionWithResponse => e
-        Foreman::Logging.exception('Unable to authenticate using rh_cloud_token setting', e)
-        raise ::Foreman::WrappedException.new(e, N_('Unable to authenticate using rh_cloud_token setting'))
-      end
     end
   end
 end

data/package.json

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

data/test/unit/fact_helpers_test.rb

@@ -26,4 +26,26 @@ class FactHelpersTest < ActiveSupport::TestCase
 
     assert actual
   end
+
+  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.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.230.3', actual['224.0.0.2']
+  end
+
+  test 'obfuscates ips without insights-client data' do
+    host = mock('host')
+    @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
 end

data/test/unit/insights_facet_test.rb

@@ -3,6 +3,7 @@ require 'test_plugin_helper'
 class InsightsFacetTest < ActiveSupport::TestCase
   setup do
     @host = FactoryBot.create(:host, :with_insights_hits)
+    InsightsFacet.reset_counters(@host.insights.id, :hits_count)
   end
 
   test 'host with hits can be deleted' do
@@ -13,4 +14,10 @@ class InsightsFacetTest < ActiveSupport::TestCase
     actual_host = Host.find_by_id(host_id)
     assert_nil actual_host
   end
+
+  test 'search host by recommendations_count' do
+    FactoryBot.create(:host) # create another host with no recommendations
+
+    assert_equal 1, Host.search_for('insights_recommendations_count = 1').count
+  end
 end

data/test/unit/slice_generator_test.rb

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-class ReportGeneratorTest < ActiveSupport::TestCase
+class SliceGeneratorTest < ActiveSupport::TestCase
   setup do
     User.current = User.find_by(login: 'secret_admin')
 
@@ -44,6 +44,8 @@ class ReportGeneratorTest < ActiveSupport::TestCase
       'dmi::chassis::asset_tag',
       'insights_client::obfuscate_hostname_enabled',
       'insights_client::hostname',
+      'insights_client::obfuscate_ip_enabled',
+      'insights_client::ips',
     ]
   end
 
@@ -69,6 +71,31 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
     assert_equal 1, generator.hosts_count
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_nil actual_system_profile['number_of_cpus']
+    assert_nil actual_system_profile['number_of_sockets']
+    assert_nil actual_system_profile['cores_per_socket']
+    assert_nil actual_system_profile['system_memory_bytes']
+    assert_nil actual_system_profile['os_release']
+  end
+
+  test 'hosts report fields should be present if fact exist' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::cpu(s)'], value: '4', host: @host)
+    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::cpu_socket(s)'], value: '2', host: @host)
+    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::core(s)_per_socket'], value: '1', 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 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1, actual_system_profile['cores_per_socket']
   end
 
   test 'generates ip_address and mac_address fields' do
@@ -88,6 +115,59 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
+  test 'generates obfuscated ip_address fields without inisghts-client' do
+    FactoryBot.create(:setting, :name => 'obfuscate_inventory_ips', :value => true)
+
+    @host.interfaces << FactoryBot.build(:nic_managed)
+    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 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal '10.230.230.1', actual_host['ip_addresses'].first
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
+    assert_not_nil(actual_nic = actual_network_interfaces.first)
+    assert_equal '10.230.230.1', actual_nic['ipv4_addresses'].first
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
+  end
+
+  test 'generates obfuscated ip_address fields with inisghts-client' do
+    nic = FactoryBot.build(:nic_primary_and_provision)
+    @host.interfaces = [nic]
+    @host.save!
+
+    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::ips'],
+      value: "[{\"obfuscated\": \"10.230.230.100\", \"original\": \"#{nic.ip}\"}]",
+      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 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal '10.230.230.100', actual_host['ip_addresses'].first
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
+    assert_not_nil(actual_nic = actual_network_interfaces.first)
+    assert_equal '10.230.230.100', actual_nic['ipv4_addresses'].first
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
+  end
+
   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)
@@ -449,6 +529,32 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 'alibaba', actual_profile['cloud_provider']
   end
 
+  test 'include packages installed in the report' do
+    FactoryBot.create(:setting, :name => 'exclude_installed_packages', :value => false)
+    installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvra: 'test-package-1.0.x86_64')
+
+    another_host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: @host.content_view,
+      lifecycle_environment: @host.lifecycle_environment,
+      organization: @host.organization,
+      installed_packages: [installed_package]
+    )
+
+    batch = Host.where(id: another_host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_profile = actual_host['system_profile'])
+    assert_not_nil(actual_profile['installed_packages'])
+  end
+
   private
 
   def create_generator(batch, name = 'slice_123')

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

@@ -34,10 +34,14 @@ export const autoUploadEnabled = true;
 
 export const hostObfuscationEnabled = true;
 
+export const ipsObfuscationEnabled = true;
+
 export const filterTerm = 'some_filter';
 
 export const cloudToken = 'some-cloud-token';
 
+export const excludePackages = false;
+
 export const props = {
   accounts,
   fetchAccountsStatus: noop,
@@ -46,6 +50,15 @@ export const props = {
   pollingProcessID,
 };
 
+export const pollingResponse = {
+  accounts,
+  autoUploadEnabled,
+  hostObfuscationEnabled,
+  ipsObfuscationEnabled,
+  cloudToken,
+  excludePackages,
+};
+
 export const fetchAccountsStatusResponse = {
-  data: { accounts, autoUploadEnabled, hostObfuscationEnabled, cloudToken },
+  data: pollingResponse,
 };

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

@@ -1,4 +1,5 @@
 import API from 'foremanReact/API';
+import { addToast } from 'foremanReact/redux/actions/toasts';
 import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
@@ -10,17 +11,10 @@ import {
 
 export const fetchAccountsStatus = () => async dispatch => {
   try {
-    const {
-      data: { accounts, autoUploadEnabled, hostObfuscationEnabled, cloudToken },
-    } = await API.get(inventoryUrl('accounts'));
+    const { data } = await API.get(inventoryUrl('accounts'));
     dispatch({
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
-      payload: {
-        accounts,
-        autoUploadEnabled,
-        hostObfuscationEnabled,
-        cloudToken,
-      },
+      payload: data,
     });
   } catch (error) {
     dispatch({
@@ -46,7 +40,7 @@ export const stopAccountStatusPolling = pollingProcessID => dispatch => {
   });
 };
 
-export const restartProcess = (accountID, activeTab) => dispatch => {
+export const restartProcess = (accountID, activeTab) => async dispatch => {
   let processController = null;
   let processStatusName = null;
 
@@ -58,12 +52,22 @@ export const restartProcess = (accountID, activeTab) => dispatch => {
     processStatusName = 'generate_report_status';
   }
 
-  API.post(inventoryUrl(`${accountID}/${processController}`));
-  dispatch({
-    type: INVENTORY_PROCESS_RESTART,
-    payload: {
-      accountID,
-      processStatusName,
-    },
-  });
+  try {
+    await API.post(inventoryUrl(`${accountID}/${processController}`));
+    dispatch({
+      type: INVENTORY_PROCESS_RESTART,
+      payload: {
+        accountID,
+        processStatusName,
+      },
+    });
+  } catch (error) {
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message: error.message,
+      })
+    );
+  }
 };

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

@@ -1,6 +1,8 @@
 import Immutable from 'seamless-immutable';
 import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
 import { HOST_OBFUSCATION_TOGGLE } from '../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
+import { IPS_OBFUSCATION_TOGGLE } from '../IpsObfuscationSwitcher/IpsObfuscationSwitcherConstants';
+import { EXCLUDE_PACKAGES_TOGGLE } from '../ExcludePackagesSwitcher/ExcludePackagesSwitcherConstants';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
   INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
@@ -24,7 +26,9 @@ export default (state = initialState, action) => {
       processStatusName,
       autoUploadEnabled,
       hostObfuscationEnabled,
+      ipsObfuscationEnabled,
       cloudToken,
+      excludePackages,
     } = {},
   } = action;
 
@@ -35,7 +39,9 @@ export default (state = initialState, action) => {
         accounts,
         autoUploadEnabled,
         hostObfuscationEnabled,
+        ipsObfuscationEnabled,
         cloudToken,
+        excludePackages,
         error: null,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:
@@ -67,6 +73,16 @@ export default (state = initialState, action) => {
         ...state,
         hostObfuscationEnabled,
       });
+    case EXCLUDE_PACKAGES_TOGGLE:
+      return state.merge({
+        ...state,
+        excludePackages,
+      });
+    case IPS_OBFUSCATION_TOGGLE:
+      return state.merge({
+        ...state,
+        ipsObfuscationEnabled,
+      });
     default:
       return state;
   }

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

@@ -16,4 +16,10 @@ export const selectAutoUploadEnabled = state =>
 export const selectHostObfuscationEnabled = state =>
   selectAccountsList(state).hostObfuscationEnabled;
 
+export const selectIpsObfuscationEnabled = state =>
+  selectAccountsList(state).ipsObfuscationEnabled;
+
 export const selectCloudToken = state => selectAccountsList(state).cloudToken;
+
+export const selectExcludePackages = state =>
+  selectAccountsList(state).excludePackages;

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListActions.test.js

@@ -22,6 +22,13 @@ const fixtures = {
   'should stopAccountStatusPolling': () =>
     stopAccountStatusPolling(pollingProcessID),
   'should restartProcess': () => restartProcess(accountID, activeTab),
+  'should invoke toast notification upon failure': () => {
+    API.post.mockImplementationOnce(() =>
+      Promise.reject(new Error('test error'))
+    );
+
+    return restartProcess(accountID, activeTab);
+  },
 };
 
 describe('AccountList actions', () => testActionSnapshotWithFixtures(fixtures));

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListReducer.test.js

@@ -9,29 +9,25 @@ import {
 } from '../AccountListConstants';
 import reducer from '../AccountListReducer';
 import {
-  accounts,
   error,
   pollingProcessID,
   accountID,
   processStatusName,
   autoUploadEnabled,
   hostObfuscationEnabled,
-  cloudToken,
+  ipsObfuscationEnabled,
+  pollingResponse,
 } from '../AccountList.fixtures';
 import { AUTO_UPLOAD_TOGGLE } from '../../AutoUploadSwitcher/AutoUploadSwitcherConstants';
 import { HOST_OBFUSCATION_TOGGLE } from '../../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
+import { IPS_OBFUSCATION_TOGGLE } from '../../IpsObfuscationSwitcher/IpsObfuscationSwitcherConstants';
 
 const fixtures = {
   'should return the initial state': {},
   'should handle INVENTORY_ACCOUNT_STATUS_POLLING': {
     action: {
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
-      payload: {
-        accounts,
-        autoUploadEnabled,
-        hostObfuscationEnabled,
-        cloudToken,
-      },
+      payload: pollingResponse,
     },
   },
   'should handle INVENTORY_ACCOUNT_STATUS_POLLING_ERROR': {
@@ -78,6 +74,14 @@ const fixtures = {
       },
     },
   },
+  'should handle IPS_OBFUSCATION_TOGGLE': {
+    action: {
+      type: IPS_OBFUSCATION_TOGGLE,
+      payload: {
+        ipsObfuscationEnabled,
+      },
+    },
+  },
 };
 
 describe('AccountList reducer', () =>