foreman_rh_cloud 2.0.17 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b34803af6696737993eb885384efd806b443d28668c96734e175f2595ce4829
-  data.tar.gz: e936612e09f71e9e3b351be01862763a4fae2f7caa29f6161547456416e8675f
+  metadata.gz: 1b0882515e038d95959e1926b002f3caebb0b38ed0bd05951208d33cea7748ae
+  data.tar.gz: 29d8594297d6c4ed6936d568c7c7a8547186ab7390d03b81448cc5c563f5031d
 SHA512:
-  metadata.gz: bb8e4f801f862736c5a4a93b3fe4b259067a1f7d44d1c81b5b11432e61b6047614c7ba7ec4e9d97af352fe85ee6a972ce1c7bcc5ac97b8602526750b0ff7018b
-  data.tar.gz: 59c87465077fbc67aac9e71076cc7f70ede3a577aa3cb37af8e257e78ee12f9955a77f2dfdf4a11fe84c76be073c6f84503e3a2b4178dda1bbe13bad458abf1d
+  metadata.gz: 71d58183a48ca30f148138bb036ba0cd7bea80dd1ce087b13605e884b763035b674207f91c359f193d658211f2e742f54b2f7e4fadac3f7bc723eb10dbd85f6e
+  data.tar.gz: ef3740403be8ab6cc6bb2848666833b424b41cabbc7fac78b06af573db3e59cfed40b01dad2deb88d3bfcba6b8ef86a5c7fe16f8dc48d6b68e821d8f5f2c3ddf

data/README.md

@@ -19,23 +19,10 @@ In UI: Configure -> Inventory Upload -> Restart
 
 From command-line:
 
-    # generate and upload report for all organizations
-    /usr/sbin/foreman-rake rh_cloud_inventory:report:generate_upload
-
-    # generate and upload report for specific organization
-    export organization_id=1
-    /usr/sbin/foreman-rake rh_cloud_inventory:report:generate_upload
-
-    # generate report for specific organization (don't upload)
     export organization_id=1
     export target=/var/lib/foreman/red_hat_inventory/generated_reports/
     /usr/sbin/foreman-rake rh_cloud_inventory:report:generate
 
-    # upload previously generated report (needs to be named 'report_for_#{organization_id}.tar.gz')
-    export organization_id=1
-    export target=/var/lib/foreman/red_hat_inventory/generated_reports/
-    /usr/sbin/foreman-rake rh_cloud_inventory:report:upload
-
 #### Fetch hosts remediation data
 
 In UI: Configure -> Insights -> Sync now

data/app/helpers/foreman_inventory_upload_host_helper.rb

@@ -6,14 +6,7 @@ module ForemanInventoryUploadHostHelper
   def hits_counts_cell(host)
     host_hits = hits_counts[host.id]
     tag.td class: ['hidden-xs', 'ellipsis', 'text-center'] do
-      if host_hits
-        link_to(
-          host_hits,
-          InsightsCloud::WebUi.system_url(InsightsCloud::WebUi::ADVISOR, host.insights.uuid),
-          :rel => 'external noopener noreferrer',
-          :target => '_blank'
-        )
-      end
+      link_to(host_hits, "#{host_path(host)}#insights") if host_hits
     end
   end
 end

data/app/models/setting/rh_cloud.rb

@@ -3,12 +3,12 @@ class Setting::RhCloud < Setting
     return unless ActiveRecord::Base.connection.table_exists?('settings')
     return unless super
     [
-      set('allow_auto_inventory_upload', N_('Allow automatic upload of the host inventory to the Red Hat cloud'), false, N_('Allow automatic inventory uploads')),
-      set('allow_auto_insights_sync', N_('Allow recommendations synchronization from Red Hat cloud'), false, N_('Allow recommendations synchronization')),
-      set('obfuscate_inventory_hostnames', N_('Obfuscate host names sent to Red Hat cloud'), false, N_('Obfuscate host names')),
-      set('obfuscate_inventory_ips', N_('Obfuscate ip addresses sent to Red Hat cloud'), false, N_('Obfuscate IPs')),
+      set('allow_auto_inventory_upload', N_('Allow automatic upload of the host inventory to the Red Hat cloud'), false),
+      set('allow_auto_insights_sync', N_('Allow recommendations synchronization from Red Hat cloud'), false),
+      set('obfuscate_inventory_hostnames', N_('Obfuscate host names sent to Red Hat cloud'), false),
+      set('obfuscate_inventory_ips', N_('Obfuscate ip addresses sent to Red Hat cloud'), false),
       set('rh_cloud_token', N_('Authentication token to Red Hat cloud services. Used to authenticate requests to cloud APIs'), 'DEFAULT', N_('Red Hat Cloud token'), nil, encrypted: true),
-      set('exclude_installed_packages', N_('Exclude installed packages from Red Hat cloud inventory report'), false, N_("Don't upload installed packages")),
+      set('exclude_installed_packages', N_('Exclude installed packages from Red Hat cloud inventory report'), false),
     ]
   end
 

data/lib/foreman_inventory_upload.rb

@@ -48,7 +48,7 @@ module ForemanInventoryUpload
   end
 
   def self.facts_archive_name(organization)
-    "report_for_#{organization}.tar.xz"
+    "report_for_#{organization}.tar.gz"
   end
 
   def self.upload_url

data/lib/foreman_inventory_upload/generators/archived_report.rb

@@ -28,7 +28,7 @@ module ForemanInventoryUpload
 
           @logger.info 'Archiving generated report'
           # success = system('tar', '-zcvf', @target, '-C', tmpdir, '.')
-          Open3.popen2e('tar', '-Jcvf', @target, '-C', tmpdir, '.') do |_in, out, wait_thr|
+          Open3.popen2e('tar', '-zcvf', @target, '-C', tmpdir, '.') do |_in, out, wait_thr|
             @logger.info("tar: #{out.read}")
 
             if wait_thr.value.success?

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -103,10 +103,10 @@ module ForemanInventoryUpload
         @stream.simple_field('cores_per_socket', fact_value(host, 'cpu::core(s)_per_socket')) { |v| v.to_i }
         @stream.simple_field('system_memory_bytes', fact_value(host, 'memory::memtotal')) { |v| kilobytes_to_bytes(v.to_i) }
         @stream.array_field('network_interfaces') do
-          @stream.raw(host.interfaces.reject { |nic| nic.identifier.empty? }.map do |nic|
+          @stream.raw(host.interfaces.map do |nic|
             {
-              'ipv4_addresses': [host_ips_cache[nic.ip]].reject(&:empty?),
-              'ipv6_addresses': [nic.ip6].reject(&:empty?),
+              'ipv4_addresses': [host_ips_cache[nic.ip]].compact,
+              'ipv6_addresses': [nic.ip6].compact,
               'mtu': nic.try(:mtu) && nic.mtu.to_i,
               'mac_address': nic.mac,
               'name': nic.identifier,

data/lib/foreman_rh_cloud/engine.rb

@@ -27,7 +27,7 @@ module ForemanRhCloud
 
     initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_rh_cloud do
-        requires_foreman '> 1.24'
+        requires_foreman '>= 2.3'
 
         # Add permissions
         security_block :foreman_rh_cloud do
@@ -64,7 +64,7 @@ module ForemanRhCloud
           end
         end
 
-        register_global_js_file 'subscriptions_extension'
+        register_global_js_file 'global'
 
         register_custom_status(InventorySync::InventoryStatus)
 
@@ -72,6 +72,7 @@ module ForemanRhCloud
           context.add_pagelet :main_tabs,
             partial: 'hosts/insights_tab',
             name: _('Insights'),
+            id: 'insights',
             onlyif: proc { |host| host.insights }
         end
       end
@@ -79,6 +80,7 @@ module ForemanRhCloud
       ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
 
       ::Host::Managed.include RhCloudHost
+      ::Host::Base.include RhCloudHost
     end
 
     initializer "foreman_rh_cloud.set_dynflow.config.on_init", :before => :finisher_hook do |_app|

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '2.0.17'.freeze
+  VERSION = '3.0.14'.freeze
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -2,21 +2,6 @@ require 'tempfile'
 
 namespace :rh_cloud_inventory do
   namespace :report do
-    desc 'Generate inventory report and send it to Red Hat cloud'
-    task generate_upload: [:environment, 'dynflow:client'] do
-      unless ENV['organization_id'].nil?
-        organizations = [ Organization.where(:id => ENV['organization_id']).first ]
-      else
-        organizations = Organization.unscoped.all
-      end
-
-      User.as_anonymous_admin do
-        organizations.each do |organization|
-          ForemanInventoryUpload::Async::GenerateReportJob.perform_now(ForemanInventoryUpload.generated_reports_folder, organization.id)
-          puts "Generated and uploaded inventory report for organization '#{organization.name}'"
-        end
-      end
-    end
     desc 'Generate inventory report to be sent to Red Hat cloud'
     task generate: :environment do
       portal_user = ENV['portal_user']
@@ -42,14 +27,6 @@ namespace :rh_cloud_inventory do
         end
       end
     end
-    desc 'Upload generated inventory report to Red Hat cloud'
-    task upload: [:environment, 'dynflow:client'] do
-      base_folder = ENV['target'] || ForemanInventoryUpload.generated_reports_folder
-      organization_id = ENV['organization_id']
-      report_file = ForemanInventoryUpload.facts_archive_name(organization_id)
-      ForemanInventoryUpload::Async::QueueForUploadJob.perform_now(base_folder, report_file, organization_id)
-      puts "Uploaded #{report_file}"
-    end
   end
 
   desc "Synchronize Insights hosts hits"

data/package.json

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

data/test/unit/slice_generator_test.rb

@@ -18,8 +18,6 @@ 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
@@ -83,7 +81,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')
-    assert_equal 'test_nic1', actual_nic['name']
+    refute actual_nic.key?('name')
   end
 
   test 'hosts report fields should be present if fact exist' do
@@ -125,10 +123,8 @@ 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, identifier: 'good_nic')
+    nic = FactoryBot.build(:nic_managed, ip6: ip6)
     nic.attrs['mtu'] = '1500'
     @host.interfaces << nic
     batch = Host.where(id: @host.id).in_batches.first
@@ -143,9 +139,7 @@ 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_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_not_nil(actual_nic = actual_network_interfaces.first)
     assert_equal nic.ip, actual_nic['ipv4_addresses'].first
     assert_equal nic.ip6, actual_nic['ipv6_addresses'].first
     assert_equal 1500, actual_nic['mtu']
@@ -156,26 +150,6 @@ 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/AutoUploadSwitcher/AutoUploadSwitcher.js

@@ -9,7 +9,7 @@ const AutoUploadSwitcher = ({ autoUploadEnabled, handleToggle }) => (
     <span>Auto upload</span>
     <FieldLevelHelp
       content={__(
-        'Enable automatic upload of your host inventory to the Red Hat cloud'
+        'Enable automatic upload of your hosts inventory to the Red Hat cloud'
       )}
     />
     <Switch

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

@@ -9,7 +9,7 @@ exports[`AutoUploadSwitcher rendering render with props 1`] = `
   </span>
   <FieldLevelHelp
     buttonClass=""
-    content="Enable automatic upload of your host inventory to the Red Hat cloud"
+    content="Enable automatic upload of your hosts inventory to the Red Hat cloud"
     placement="top"
     rootClose={true}
   />

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/InventoryAutoUpload.js

@@ -0,0 +1,92 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { Text, TextVariants, Popover, Button } from '@patternfly/react-core';
+import { InfoAltIcon, CaretRightIcon } from '@patternfly/react-icons';
+import { FormGroup, Grid } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from '../../../ForemanRhCloudHelpers';
+import Switcher from '../../../common/Switcher';
+import AdvancedSettings from './components/AdvancedSettings';
+
+const InventoryAutoUploadSwitcher = ({
+  autoUploadEnabled,
+  handleToggle,
+  fetchSettings,
+}) => {
+  useEffect(() => {
+    fetchSettings();
+  }, [fetchSettings]);
+
+  return (
+    <FormGroup>
+      <Grid>
+        <h3>{__('Red Hat Cloud Inventory')}</h3>
+        <hr />
+        <Grid.Row>
+          <Switcher
+            id="auto-upload"
+            label={__('Inventory Auto Upload')}
+            tooltip={__(
+              'Enable automatic upload of your hosts inventory to the Red Hat cloud'
+            )}
+            isChecked={autoUploadEnabled}
+            onChange={() => handleToggle(autoUploadEnabled)}
+            labelCol={5}
+          />
+
+          <Grid.Col sm={5}>
+            <Popover
+              headerContent={<strong>Advanced Inventory Settings</strong>}
+              bodyContent={
+                <AdvancedSettings
+                  autoUploadEnabled={autoUploadEnabled}
+                  handleToggle={handleToggle}
+                />
+              }
+              position="right"
+            >
+              <Button
+                variant="secondary"
+                style={{ fontSize: 'small', marginTop: '-4px' }}
+              >
+                {__('Show Advanced Settings')} <CaretRightIcon />
+              </Button>
+            </Popover>
+          </Grid.Col>
+        </Grid.Row>
+        <br />
+        <Grid.Row>
+          <Grid.Col sm={12}>
+            <Text component={TextVariants.p}>
+              <InfoAltIcon /> {__('More details can be found in')}{' '}
+              <Text
+                component={TextVariants.a}
+                href={foremanUrl('/foreman_rh_cloud/inventory_upload')}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <strong>
+                  {__('Configure')}
+                  {' > '}
+                  {__('Inventory Upload')}
+                </strong>
+              </Text>
+            </Text>
+          </Grid.Col>
+        </Grid.Row>
+      </Grid>
+    </FormGroup>
+  );
+};
+
+InventoryAutoUploadSwitcher.propTypes = {
+  autoUploadEnabled: PropTypes.bool,
+  handleToggle: PropTypes.func.isRequired,
+  fetchSettings: PropTypes.func.isRequired,
+};
+
+InventoryAutoUploadSwitcher.defaultProps = {
+  autoUploadEnabled: true,
+};
+
+export default InventoryAutoUploadSwitcher;

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/InventoryAutoUpload.test.js

@@ -0,0 +1,17 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { noop } from 'patternfly-react';
+
+import InventoryAutoUpload from '../InventoryAutoUpload';
+
+const fixtures = {
+  'render with props': {
+    autoUploadEnabled: true,
+    handleToggle: noop,
+    fetchSettings: noop,
+  },
+};
+
+describe('InventoryAutoUpload', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(InventoryAutoUpload, fixtures));
+});

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/__snapshots__/InventoryAutoUpload.test.js.snap

@@ -0,0 +1,106 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`InventoryAutoUpload rendering render with props 1`] = `
+<FormGroup
+  bsClass="form-group"
+>
+  <Grid
+    bsClass="container"
+    componentClass="div"
+    fluid={false}
+  >
+    <h3>
+      Red Hat Cloud Inventory
+    </h3>
+    <hr />
+    <Row
+      bsClass="row"
+      componentClass="div"
+    >
+      <Switcher
+        SwitchCol={2}
+        id="auto-upload"
+        isChecked={true}
+        label="Inventory Auto Upload"
+        labelCol={5}
+        onChange={[Function]}
+        tooltip="Enable automatic upload of your hosts inventory to the Red Hat cloud"
+      />
+      <Col
+        bsClass="col"
+        componentClass="div"
+        sm={5}
+      >
+        <Popover
+          bodyContent={
+            <UNDEFINED
+              autoUploadEnabled={true}
+              handleToggle={[Function]}
+            />
+          }
+          headerContent={
+            <strong>
+              Advanced Inventory Settings
+            </strong>
+          }
+          position="right"
+        >
+          <Button
+            style={
+              Object {
+                "fontSize": "small",
+                "marginTop": "-4px",
+              }
+            }
+            variant="secondary"
+          >
+            Show Advanced Settings
+             
+            <CaretRightIcon
+              color="currentColor"
+              noVerticalAlign={false}
+              size="sm"
+            />
+          </Button>
+        </Popover>
+      </Col>
+    </Row>
+    <br />
+    <Row
+      bsClass="row"
+      componentClass="div"
+    >
+      <Col
+        bsClass="col"
+        componentClass="div"
+        sm={12}
+      >
+        <Text
+          component="p"
+        >
+          <InfoAltIcon
+            color="currentColor"
+            noVerticalAlign={false}
+            size="sm"
+          />
+           
+          More details can be found in
+           
+          <Text
+            component="a"
+            href="/foreman_rh_cloud/inventory_upload"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            <strong>
+              Configure
+               &gt; 
+              Inventory Upload
+            </strong>
+          </Text>
+        </Text>
+      </Col>
+    </Row>
+  </Grid>
+</FormGroup>
+`;