foreman_rh_cloud 3.0.16 → 3.0.17

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

@@ -0,0 +1,60 @@
+require 'test_plugin_helper'
+
+class BranchInfoTest < ActiveSupport::TestCase
+  setup do
+    User.current = User.find_by(login: 'secret_admin')
+
+    @env = FactoryBot.create(:katello_k_t_environment)
+    cv = @env.content_views << FactoryBot.create(:katello_content_view, organization: @env.organization)
+
+    @host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      :with_hostgroup,
+      :with_parameter,
+      content_view: cv.first,
+      lifecycle_environment: @env,
+      organization: @env.organization
+    )
+
+    @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)
+  end
+
+  test 'should generate branch info for host' do
+    uuid = 'abcd-1234-qwerty'
+    branch_id = 'efgh-ijkl-mnop'
+    hostname = 'test.host.example.com'
+    info = ::ForemanRhCloud::BranchInfo.new.generate(uuid, @host, branch_id, hostname)
+
+    assert_equal uuid, info[:remote_leaf]
+    assert_equal branch_id, info[:remote_branch]
+    assert_equal @host.organization.title, info[:display_name]
+    assert_equal hostname, info[:hostname]
+    assert_equal @host.organization.id, info[:organization_id]
+    assert_equal Foreman.instance_id, info[:satellite_instance_id]
+  end
+
+  test 'should generate appropriate labels' do
+    2.times { FactoryBot.create(:katello_host_collection, :organization_id => @host.organization.id) }
+
+    FactoryBot.create(:setting, :settings_type => 'boolean', :default => true, :name => :include_parameter_tags)
+
+    Katello::HostCollection.all.map do |collection|
+      FactoryBot.create(:katello_host_collection_host, :host_id => @host.id, :host_collection_id => collection.id)
+    end
+
+    labels = ::ForemanRhCloud::BranchInfo.new.generate('a1', @host, 'branch', 'foo')[:labels]
+
+    org_label = labels.find { |label| label[:key] == 'Organization' }
+    loc_label = labels.find { |label| label[:key] == 'Location' }
+    assert_equal @host.organization.title, org_label[:value]
+    assert_equal @host.location.title, loc_label[:value]
+
+    hg_label = labels.find { |label| label[:key] == 'Host Group' }
+    host_colections = labels.select { |label| label[:key] == 'Host Collection' }
+    assert_equal @host.hostgroup.name, hg_label[:value]
+    assert_equal 2, host_colections.count
+    refute_empty labels.select { |label| label[:namespace] == 'SatelliteParameter' }
+  end
+end

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

@@ -0,0 +1,106 @@
+require 'test_plugin_helper'
+require 'puma/null_io'
+
+class CloudRequestForwarderTest < ActiveSupport::TestCase
+  setup do
+    @forwarder = ::ForemanRhCloud::CloudRequestForwarder.new
+  end
+
+  test 'should prepare correct cloud url' do
+    paths = {
+      "/redhat_access/r/insights/platform/module-update-router/v1/channel?module=insights-core" => "https://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/platform/inventory/v1/hosts" => "https://cloud.redhat.com/api/inventory/v1/hosts",
+      "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cloud.redhat.com/api/ingress/v1/upload",
+    }
+
+    paths.each do |key, value|
+      assert_equal value, @forwarder.prepare_forward_cloud_url(ForemanRhCloud.base_url, key)
+    end
+  end
+
+  test 'should forward payload from request parameters' do
+    params = { 'pumpkin' => 'pie' }
+    req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/foo/bar',
+      'REQUEST_METHOD' => 'GET',
+      'rack.input' => ::Puma::NullIO.new,
+      "action_dispatch.request.request_parameters" => { 'vegetables' => params }
+    )
+    assert_equal params, @forwarder.prepare_forward_payload(req, 'vegetables')
+  end
+
+  test 'should forward post payload' do
+    post_data = 'Random POST data'
+    req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/foo/bar?baz=awesome',
+      'REQUEST_METHOD' => 'POST',
+      'rack.input' => ::Puma::NullIO.new,
+      'RAW_POST_DATA' => post_data
+    )
+    assert_equal post_data, @forwarder.prepare_forward_payload(req, '')
+  end
+
+  test 'should forward put payload' do
+    put_data = 'Random PUT data'
+    req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/foo/bar?baz=awesome',
+      'REQUEST_METHOD' => 'PUT',
+      'rack.input' => ::Puma::NullIO.new,
+      'RAW_POST_DATA' => put_data
+    )
+
+    assert_equal put_data, @forwarder.prepare_forward_payload(req, '')
+  end
+
+  test 'should forward patch payload' do
+    params = { 'pumpkin' => 'pie' }
+    req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/foo/bar?baz=awesome',
+      'REQUEST_METHOD' => 'PATCH',
+      'rack.input' => ::Puma::NullIO.new,
+      'RAW_POST_DATA' => 'Random PATCH data',
+      "action_dispatch.request.path_parameters" => { :format => "json" },
+      "action_dispatch.request.request_parameters" => { 'vegetables' => params }
+    )
+    assert_equal params.to_json, @forwarder.prepare_forward_payload(req, 'vegetables')
+  end
+
+  test 'should forward file with metadata' do
+    file_params = { :file => 'Test file', :metadata => 'File metadata' }
+    req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/foo/bar?baz=awesome',
+      'REQUEST_METHOD' => 'POST',
+      'rack.input' => ::Puma::NullIO.new,
+      "action_dispatch.request.request_parameters" => file_params.merge(:foo => 'bar')
+    )
+    assert_equal file_params, @forwarder.prepare_forward_payload(req, '')
+  end
+
+  test 'should prepare params to forward' do
+    params = { :page => 5, :per_page => 42 }
+    req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/foo/bar',
+      'REQUEST_METHOD' => 'GET',
+      'rack.input' => ::Puma::NullIO.new,
+      "action_dispatch.request.query_parameters" => params
+    )
+    assert_equal params, @forwarder.prepare_forward_params(req, nil)
+  end
+
+  test 'should add branch id into forwarded params' do
+    user_agent = { :foo => :bar }
+    params = { :page => 5, :per_page => 42 }
+
+    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
+    )
+    assert_equal params.merge(:branch_id => 74), @forwarder.prepare_forward_params(req, 74)
+  end
+end

data/test/unit/slice_generator_test.rb

@@ -18,6 +18,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     )
 
     @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+    @host.interfaces.first.identifier = 'test_nic1'
+    @host.save!
 
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
   end
@@ -81,7 +83,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_not_nil(actual_nic = actual_network_interfaces.first)
     refute actual_nic.key?('mtu')
     refute actual_nic.key?('mac_address')
-    refute actual_nic.key?('name')
+    assert_equal 'test_nic1', actual_nic['name']
   end
 
   test 'hosts report fields should be present if fact exist' do
@@ -123,8 +125,10 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'generates nic fields' do
+    empty_nic = FactoryBot.build(:nic_managed, ip6: '', identifier: 'empty_nic')
+    @host.interfaces << empty_nic
     ip6 = Array.new(4) { '%x' % rand(16**4) }.join(':') + '::' + '5'
-    nic = FactoryBot.build(:nic_managed, ip6: ip6)
+    nic = FactoryBot.build(:nic_managed, ip6: ip6, identifier: 'good_nic')
     nic.attrs['mtu'] = '1500'
     @host.interfaces << nic
     batch = Host.where(id: @host.id).in_batches.first
@@ -139,7 +143,9 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal @host.interfaces.where.not(mac: nil).first.mac, actual_host['mac_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_not_nil(actual_empty_nic = actual_network_interfaces.find { |actual_nic| actual_nic['name'] == 'empty_nic' })
+    assert actual_empty_nic['ipv6_addresses'].empty?
+    assert_not_nil(actual_nic = actual_network_interfaces.find { |actual_nic| actual_nic['name'] == 'good_nic' })
     assert_equal nic.ip, actual_nic['ipv4_addresses'].first
     assert_equal nic.ip6, actual_nic['ipv6_addresses'].first
     assert_equal 1500, actual_nic['mtu']
@@ -150,6 +156,26 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
+  test 'skips nameless nics' do
+    ip6 = Array.new(4) { '%x' % rand(16**4) }.join(':') + '::' + '5'
+    nic = FactoryBot.build(:nic_managed, ip6: ip6, identifier: '')
+    nic.attrs['mtu'] = '1500'
+    @host.interfaces << nic
+    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 @host.interfaces.where.not(ip: nil).first.ip, actual_host['ip_addresses'].first
+    assert_equal @host.interfaces.where.not(mac: nil).first.mac, actual_host['mac_addresses'].first
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
+    assert_nil actual_network_interfaces.find { |actual_nic| actual_nic['name'].empty? }
+  end
+
   test 'generates obfuscated ip_address fields without inisghts-client' do
     FactoryBot.create(:setting, :name => 'obfuscate_inventory_ips', :value => true)
 

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

@@ -38,7 +38,7 @@ export const ipsObfuscationEnabled = true;
 
 export const filterTerm = 'some_filter';
 
-export const cloudToken = 'some-cloud-token';
+export const cloudToken = true;
 
 export const excludePackages = false;
 

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

@@ -29,7 +29,7 @@ Array [
           },
         },
         "autoUploadEnabled": true,
-        "cloudToken": "some-cloud-token",
+        "cloudToken": true,
         "excludePackages": false,
         "hostObfuscationEnabled": true,
         "ipsObfuscationEnabled": true,

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

@@ -44,7 +44,7 @@ Object {
     },
   },
   "autoUploadEnabled": true,
-  "cloudToken": "some-cloud-token",
+  "cloudToken": true,
   "error": null,
   "excludePackages": false,
   "hostObfuscationEnabled": true,

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

@@ -22,7 +22,7 @@ Object {
 
 exports[`AccountList selectors should return AccountList autoUploadEnabled 1`] = `true`;
 
-exports[`AccountList selectors should return AccountList cloudToken 1`] = `"some-cloud-token"`;
+exports[`AccountList selectors should return AccountList cloudToken 1`] = `true`;
 
 exports[`AccountList selectors should return AccountList excludePackages 1`] = `false`;
 
@@ -50,7 +50,7 @@ Object {
     },
   },
   "autoUploadEnabled": true,
-  "cloudToken": "some-cloud-token",
+  "cloudToken": true,
   "excludePackages": false,
   "hostObfuscationEnabled": true,
   "pollingProcessID": 0,

data/webpack/ForemanInventoryUpload/Components/Dashboard/DashboardActions.js

@@ -67,7 +67,7 @@ export const setActiveTab = (accountID, tabName) => ({
 });
 
 export const downloadReports = accountID => {
-  window.location.href = inventoryUrl(`${accountID}/uploads/file`);
+  window.open(inventoryUrl(`${accountID}/uploads/file`), '_blank');
   return {
     type: INVENTORY_REPORTS_DOWNLOAD,
     payload: {

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardActions.test.js

@@ -36,15 +36,15 @@ const fixtures = {
 };
 
 describe('Dashboard actions', () => {
-  const { location } = window;
+  const { open } = window;
 
   beforeAll(() => {
-    delete window.location;
-    window.location = { href: jest.fn() };
+    delete window.open;
+    window.open = jest.fn();
   });
 
   afterAll(() => {
-    window.location = location;
+    window.open = open;
   });
 
   return testActionSnapshotWithFixtures(fixtures);

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

@@ -4,11 +4,13 @@ import InventorySettings from '../InventorySettings';
 import PageDescription from './components/PageDescription';
 import InventoryFilter from '../InventoryFilter';
 import ToolbarButtons from './components/ToolbarButtons';
+import SettingsWarning from './components/SettingsWarning';
 import PageTitle from './PageTitle';
 import './PageHeader.scss';
 
 const PageHeader = () => (
   <div className="inventory-upload-header">
+    <SettingsWarning />
     <PageTitle />
     <div className="inventory-upload-header-description">
       <InventorySettings />

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

@@ -1,5 +1,17 @@
 .rh-cloud-page {
   .inventory-upload-header {
+    .settings-alert {
+      margin-bottom: 30px;
+      .pf-c-alert {
+        margin-bottom: 5px;
+
+        .pf-c-alert__title {
+          font-size: var(--pf-global--FontSize--md);
+          line-height: var(--pf-global--LineHeight--md);
+        }
+      }
+    }
+
     .inventory-upload-header-description {
       overflow: auto;
     }

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

@@ -4,6 +4,7 @@ exports[`PageHeader rendering render without Props 1`] = `
 <div
   className="inventory-upload-header"
 >
+  <ConnectedSettingsWarning />
   <PageTitle />
   <div
     className="inventory-upload-header-description"

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

@@ -0,0 +1,64 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { Alert, AlertActionCloseButton } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export const SettingsWarning = ({
+  autoUpload,
+  hostObfuscation,
+  isCloudConnector,
+}) => {
+  const [showUploadWarning, setShowUploadWarning] = useState(true);
+  const [showObfuscationWarning, setShowObfuscationWarning] = useState(true);
+  if (!isCloudConnector || (!showUploadWarning && !showObfuscationWarning)) {
+    return null;
+  }
+  if (autoUpload && !hostObfuscation) {
+    return null;
+  }
+
+  const alerts = [];
+  if (!autoUpload && showUploadWarning) {
+    alerts.push(
+      <Alert
+        key="auto-upload"
+        variant="warning"
+        title={__(
+          "Cloud Connector has been configured however the inventory auto-upload is disabled, it's recommended to enable it"
+        )}
+        actionClose={
+          <AlertActionCloseButton onClose={() => setShowUploadWarning(false)} />
+        }
+      />
+    );
+  }
+  if (hostObfuscation && showObfuscationWarning) {
+    alerts.push(
+      <Alert
+        key="obfuscating-host"
+        variant="warning"
+        title={__(
+          "Cloud Connector has been configured however obfuscating host names setting is enabled, it's recommended to disable it"
+        )}
+        actionClose={
+          <AlertActionCloseButton
+            onClose={() => setShowObfuscationWarning(false)}
+          />
+        }
+      />
+    );
+  }
+  return <div className="settings-alert">{alerts}</div>;
+};
+
+SettingsWarning.propTypes = {
+  autoUpload: PropTypes.bool,
+  hostObfuscation: PropTypes.bool,
+  isCloudConnector: PropTypes.bool,
+};
+
+SettingsWarning.defaultProps = {
+  autoUpload: false,
+  hostObfuscation: false,
+  isCloudConnector: false,
+};

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SettingsWarning/SettingsWarning.test.js

@@ -0,0 +1,18 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { SettingsWarning } from './SettingsWarning';
+
+const fixtures = {
+  'with 2 alerts': {
+    autoUpload: false,
+    hostObfuscation: true,
+    isCloudConnector: true,
+  },
+  'with isCloudConnector false': {
+    autoUpload: true,
+    hostObfuscation: true,
+    isCloudConnector: false,
+  },
+};
+
+describe('SettingsWarning', () =>
+  testComponentSnapshotsWithFixtures(SettingsWarning, fixtures));

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

@@ -0,0 +1,30 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SettingsWarning with 2 alerts 1`] = `
+<div
+  className="settings-alert"
+>
+  <Alert
+    actionClose={
+      <AlertActionCloseButton
+        onClose={[Function]}
+      />
+    }
+    key="auto-upload"
+    title="Cloud Connector has been configured however the inventory auto-upload is disabled, it's recommended to enable it"
+    variant="warning"
+  />
+  <Alert
+    actionClose={
+      <AlertActionCloseButton
+        onClose={[Function]}
+      />
+    }
+    key="obfuscating-host"
+    title="Cloud Connector has been configured however obfuscating host names setting is enabled, it's recommended to disable it"
+    variant="warning"
+  />
+</div>
+`;
+
+exports[`SettingsWarning with isCloudConnector false 1`] = `""`;