foreman_rh_cloud 1.0.7 → 2.0.8

data/test/factories/inventory_upload_factories.rb

@@ -1,16 +1,16 @@
 # redefine katello factories, as long as katello is not compatible with dynamic properties
 FactoryBot.define do
   factory :katello_organization, :class => "Organization" do
-    type {"Organization"}
+    type { "Organization" }
     sequence(:name) { |n| "Organization#{n}" }
     sequence(:label) { |n| "org#{n}" }
     sequence(:id) { |n| n }
 
     trait :acme_corporation do
-      name {"ACME_Corporation"}
-      type {"Organization"}
-      description {"This is the first Organization."}
-      label {"acme_corporation_label"}
+      name { "ACME_Corporation" }
+      type { "Organization" }
+      description { "This is the first Organization." }
+      label { "acme_corporation_label" }
     end
 
     trait :with_library do
@@ -24,11 +24,11 @@ end
 FactoryBot.define do
   factory :katello_content_view, :class => Katello::ContentView do
     sequence(:name) { |n| "Database#{n}" }
-    description {"This content view is for database content"}
+    description { "This content view is for database content" }
     association :organization, :factory => :katello_organization
 
     trait :composite do
-      composite {true}
+      composite { true }
     end
   end
 end
@@ -50,23 +50,23 @@ end
 FactoryBot.define do
   factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
     sequence(:uuid) { |n| "uuid-#{n}-#{rand(500)}" }
-    facts { {'memory.memtotal' => "12 GB"} }
+    facts { { 'memory.memtotal' => "12 GB" } }
   end
 end
 
 FactoryBot.define do
   factory :katello_pool, :class => Katello::Pool do
-    active {true}
-    end_date {Date.today + 1.year}
+    active { true }
+    end_date { Date.today + 1.year }
   end
 end
 
 FactoryBot.modify do
   factory :host do
     transient do
-      content_view {nil}
-      lifecycle_environment {nil}
-      content_source {nil}
+      content_view { nil }
+      lifecycle_environment { nil }
+      content_source { nil }
     end
 
     trait :with_content do

data/test/jobs/insights_full_sync_test.rb

@@ -0,0 +1,62 @@
+require 'test_helper'
+
+class InsightsFullSyncTest < ActiveJob::TestCase
+  setup do
+    @host1 = FactoryBot.create(:host, :managed, name: 'host1')
+    @host2 = FactoryBot.create(:host, :managed, name: 'host2')
+
+    hits_json = <<-HITS_JSON
+    [
+        {
+            "hostname": "#{@host1.name}",
+            "rhel_version": "7.5",
+            "uuid": "accdf444-5628-451d-bf3e-cf909ad72756",
+            "last_seen": "2019-11-22T08:41:42.447244Z",
+            "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
+            "solution_url": "",
+            "total_risk": 2,
+            "likelihood": 2,
+            "publish_date": "2018-04-16T10:03:16Z",
+            "results_url": "https://cloud.redhat.com/insights/overview/stability/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/accdf444-5628-451d-bf3e-cf909ad72756/"
+        },
+        {
+            "hostname": "#{@host1.name}",
+            "rhel_version": "7.5",
+            "uuid": "accdf444-5628-451d-bf3e-cf909ad72756",
+            "last_seen": "2019-11-22T08:41:42.447244Z",
+            "title": "CPU vulnerable to side-channel attacks using Microarchitectural Data Sampling (CVE-2018-12130, CVE-2018-12126, CVE-2018-12127, CVE-2019-11091)",
+            "solution_url": "https://access.redhat.com/node/4134081",
+            "total_risk": 2,
+            "likelihood": 2,
+            "publish_date": "2019-05-14T17:00:00Z",
+            "results_url": "https://cloud.redhat.com/insights/overview/security/CVE_2018_12130_cpu_kernel%7CCVE_2018_12130_CPU_KERNEL_NEED_UPDATE/accdf444-5628-451d-bf3e-cf909ad72756/"
+        },
+        {
+            "hostname": "#{@host2.name}",
+            "rhel_version": "7.5",
+            "uuid": "accdf444-5628-451d-bf3e-cf909ad72757",
+            "last_seen": "2019-11-22T08:41:42.447244Z",
+            "title": "CPU vulnerable to side-channel attacks using L1 Terminal Fault (CVE-2018-3620)",
+            "solution_url": "https://access.redhat.com/node/3560291",
+            "total_risk": 2,
+            "likelihood": 2,
+            "publish_date": "2018-08-14T17:00:00Z",
+            "results_url": "https://cloud.redhat.com/insights/overview/security/CVE_2018_3620_cpu_kernel%7CCVE_2018_3620_CPU_KERNEL_NEED_UPDATE/accdf444-5628-451d-bf3e-cf909ad72756/"
+        }
+      ]
+    HITS_JSON
+    @hits = JSON.parse(hits_json)
+  end
+
+  test 'Hits data is replaced with data from cloud' do
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits)
+
+    InsightsCloud::Async::InsightsFullSync.perform_now(@host1.organization)
+
+    @host1.reload
+    @host2.reload
+
+    assert_equal 2, @host1.insights.hits.count
+    assert_equal 1, @host2.insights.hits.count
+  end
+end

data/test/unit/slice_generator_test.rb

@@ -82,6 +82,8 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_not_nil(actual_host = actual['hosts'].first)
     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']
     assert_equal 1, generator.hosts_count
   end
 
@@ -94,12 +96,14 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    obfuscated_fqdn = Base64.urlsafe_encode64(Digest::SHA1.digest(@host.fqdn), padding: false)
+    obfuscated_fqdn = Digest::SHA1.hexdigest(@host.fqdn)
 
     assert_equal 'slice_123', 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
 
@@ -117,6 +121,8 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
+    assert_not_nil(actual_facts = actual_host['facts'].first['facts'])
+    assert_equal false, actual_facts['is_hostname_obfuscated']
     assert_equal 1, generator.hosts_count
   end
 
@@ -134,13 +140,14 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 'satellite-id', satellite_facts['satellite_instance_id']
     assert_equal @host.organization_id, satellite_facts['organization_id']
 
-    instance_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'satellite_instance_id'}
+    instance_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'satellite_instance_id' }
     assert_not_nil instance_id_tag
     assert_equal 'satellite-id', instance_id_tag['value']
 
-    org_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'organization_id'}
+    org_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'organization_id' }
     assert_not_nil org_id_tag
     assert_equal @host.organization_id.to_s, org_id_tag['value']
+    assert_equal false, satellite_facts['is_hostname_obfuscated']
 
     version = satellite_facts['satellite_version']
     if defined?(ForemanThemeSatellite)

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

@@ -32,6 +32,8 @@ export const processStatusName = 'upload_report_status';
 
 export const autoUploadEnabled = true;
 
+export const hostObfuscationEnabled = true;
+
 export const filterTerm = 'some_filter';
 
 export const props = {
@@ -41,3 +43,7 @@ export const props = {
   stopAccountStatusPolling: noop,
   pollingProcessID,
 };
+
+export const fetchAccountsStatusResponse = {
+  data: { accounts, autoUploadEnabled, hostObfuscationEnabled },
+};

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

@@ -1,18 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { withKnobs } from '@storybook/addon-knobs';
-import { Provider } from 'react-redux';
-import configureStore from '../../../stories/configureStore';
 import AccountList from './AccountList';
 
-const store = configureStore();
+export default {
+  title: 'AccountList',
+  component: AccountList,
+};
 
-storiesOf('Account list', module)
-  .addDecorator(withKnobs)
-  .add('Account list', () => (
-    <div style={{ margin: '20px' }}>
-      <Provider store={store}>
-        <AccountList />
-      </Provider>
-    </div>
-  ));
+export const Basic = () => <AccountList />;

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

@@ -11,13 +11,14 @@ import {
 export const fetchAccountsStatus = () => async dispatch => {
   try {
     const {
-      data: { accounts, autoUploadEnabled },
+      data: { accounts, autoUploadEnabled, hostObfuscationEnabled },
     } = await API.get(inventoryUrl('accounts'));
     dispatch({
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
         accounts,
         autoUploadEnabled,
+        hostObfuscationEnabled,
       },
     });
   } catch (error) {

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

@@ -1,11 +1,12 @@
 import Immutable from 'seamless-immutable';
+import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
+import { HOST_OBFUSCATION_TOGGLE } from '../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
   INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
   INVENTORY_ACCOUNT_STATUS_POLLING_START,
   INVENTORY_PROCESS_RESTART,
 } from './AccountListConstants';
-import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
 
 const initialState = Immutable({
   accounts: {},
@@ -22,6 +23,7 @@ export default (state = initialState, action) => {
       accountID,
       processStatusName,
       autoUploadEnabled,
+      hostObfuscationEnabled,
     } = {},
   } = action;
 
@@ -31,6 +33,7 @@ export default (state = initialState, action) => {
         ...state,
         accounts,
         autoUploadEnabled,
+        hostObfuscationEnabled,
         error: null,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:
@@ -57,6 +60,11 @@ export default (state = initialState, action) => {
         ...state,
         autoUploadEnabled,
       });
+    case HOST_OBFUSCATION_TOGGLE:
+      return state.merge({
+        ...state,
+        hostObfuscationEnabled,
+      });
     default:
       return state;
   }

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

@@ -2,9 +2,16 @@ import { selectForemanInventoryUpload } from '../../../ForemanRhCloudSelectors';
 
 export const selectAccountsList = state =>
   selectForemanInventoryUpload(state).accountsList;
+
 export const selectAccounts = state => selectAccountsList(state).accounts;
+
 export const selectPollingProcessID = state =>
   selectAccountsList(state).pollingProcessID;
+
 export const selectError = state => selectAccountsList(state).error;
+
 export const selectAutoUploadEnabled = state =>
   selectAccountsList(state).autoUploadEnabled;
+
+export const selectHostObfuscationEnabled = state =>
+  selectAccountsList(state).hostObfuscationEnabled;

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import EmptyResults from '../EmptyResults';
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import EmptyState from '../EmptyState';
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ErrorState from '../ErrorState';
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ListItem from '../ListItem';
 import { props } from '../ListItem.fixtures';

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ListItemStatus from '../ListItemStatus';
 import { props } from '../ListItemStatus.fixtures';

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import AccountList from '../AccountList';
 import { props } from '../AccountList.fixtures';

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

@@ -1,13 +1,20 @@
-import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
+import API from 'foremanReact/API';
 import {
   fetchAccountsStatus,
   startAccountStatusPolling,
   stopAccountStatusPolling,
   restartProcess,
 } from '../AccountListActions';
-import { pollingProcessID } from '../AccountList.fixtures';
+import {
+  pollingProcessID,
+  fetchAccountsStatusResponse,
+} from '../AccountList.fixtures';
 import { accountID, activeTab } from '../../Dashboard/Dashboard.fixtures';
 
+jest.mock('foremanReact/API');
+API.get.mockImplementation(async () => fetchAccountsStatusResponse);
+
 const fixtures = {
   'should fetchAccountsStatus': () => fetchAccountsStatus(),
   'should startAccountStatusPolling': () =>

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { IntegrationTestHelper } from 'react-redux-test-utils';
+import { IntegrationTestHelper } from '@theforeman/test';
 
 import AccountList from '../index';
 import reducers from '../../../../ForemanRhCloudReducers';

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

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
@@ -15,8 +15,10 @@ import {
   accountID,
   processStatusName,
   autoUploadEnabled,
+  hostObfuscationEnabled,
 } from '../AccountList.fixtures';
 import { AUTO_UPLOAD_TOGGLE } from '../../AutoUploadSwitcher/AutoUploadSwitcherConstants';
+import { HOST_OBFUSCATION_TOGGLE } from '../../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
 
 const fixtures = {
   'should return the initial state': {},
@@ -26,6 +28,7 @@ const fixtures = {
       payload: {
         accounts,
         autoUploadEnabled,
+        hostObfuscationEnabled,
       },
     },
   },
@@ -65,6 +68,14 @@ const fixtures = {
       },
     },
   },
+  'should handle HOST_OBFUSCATION_TOGGLE': {
+    action: {
+      type: HOST_OBFUSCATION_TOGGLE,
+      payload: {
+        hostObfuscationEnabled,
+      },
+    },
+  },
 };
 
 describe('AccountList reducer', () =>

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

@@ -1,22 +1,25 @@
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 import {
   selectAccountsList,
   selectAccounts,
   selectPollingProcessID,
   selectAutoUploadEnabled,
+  selectHostObfuscationEnabled,
 } from '../AccountListSelectors';
 import {
   pollingProcessID,
   accounts,
   autoUploadEnabled,
+  hostObfuscationEnabled,
 } from '../AccountList.fixtures';
-import { inventoryStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
+import { rhCloudStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 
-const state = inventoryStateWrapper({
+const state = rhCloudStateWrapper({
   accountsList: {
     accounts,
     pollingProcessID,
     autoUploadEnabled,
+    hostObfuscationEnabled,
   },
 });
 
@@ -27,6 +30,8 @@ const fixtures = {
     selectPollingProcessID(state),
   'should return AccountList autoUploadEnabled': () =>
     selectAutoUploadEnabled(state),
+  'should return AccountList hostObfuscationEnabled': () =>
+    selectHostObfuscationEnabled(state),
 };
 
 describe('AccountList selectors', () =>

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

@@ -5,9 +5,27 @@ Array [
   Array [
     Object {
       "payload": Object {
-        "error": "Cannot read property 'data' of undefined",
+        "accounts": Object {
+          "Account1": Object {
+            "generate_report_status": "running",
+            "label": "test_org1",
+            "upload_report_status": "running",
+          },
+          "Account2": Object {
+            "generate_report_status": "failure",
+            "label": "test_org2",
+            "upload_report_status": "unknown",
+          },
+          "Account3": Object {
+            "generate_report_status": "running",
+            "label": "test_org3",
+            "upload_report_status": "success",
+          },
+        },
+        "autoUploadEnabled": true,
+        "hostObfuscationEnabled": true,
       },
-      "type": "INVENTORY_ACCOUNT_STATUS_POLLING_ERROR",
+      "type": "INVENTORY_ACCOUNT_STATUS_POLLING",
     },
   ],
 ]