foreman_rh_cloud 2.0.18.1 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0cb65a3f6b1e94ef76531b38c7553a4f935d38cea6a26567f78eb563451a3d
-  data.tar.gz: 0f15f66bbf6595fc7049606a1ad19c5cedb8a9181f4abd47d1897c72db25e148
+  metadata.gz: 1b0882515e038d95959e1926b002f3caebb0b38ed0bd05951208d33cea7748ae
+  data.tar.gz: 29d8594297d6c4ed6936d568c7c7a8547186ab7390d03b81448cc5c563f5031d
 SHA512:
-  metadata.gz: 0db95fe4391d434965539c5a379a318e015d00f3b251af3a6ea03eb57db024fad68a98c804f1e7fe185f8f787b28cc2ec24e4e63d1ac7e0d0bb42aa73ed4f3a0
-  data.tar.gz: 6d7583b031a7bed576456a8eeed8b8e948a5af9e243c93975be51801f862211a7a311a683300c23da696ca4d0e06dc4339bf4d5c70914dd840b6c52475c036bc
+  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/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -10,11 +10,11 @@ module ForemanInventoryUpload
           upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportJob)
 
           [
-            label,
+            id,
             {
               generate_report_status: generate_report_status,
               upload_report_status: upload_report_status,
-              id: id,
+              label: label,
             },
           ]
         end

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -14,7 +14,14 @@ module ForemanInventoryUpload
       files = Dir["{#{ForemanInventoryUpload.uploads_file_path(filename)},#{ForemanInventoryUpload.done_file_path(filename)}}"]
 
       return send_file files.first, disposition: 'attachment', filename: filename unless files.empty?
-      raise ::Foreman::Exception.new("The report file doesn't exist")
+      throw_flash_error "File doesn't exist"
+    end
+
+    def throw_flash_error(message)
+      process_error(
+        :redirect => foreman_inventory_upload_index_path,
+        :error_msg => message
+      )
     end
 
     def auto_upload

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
@@ -62,7 +62,6 @@ module ForemanInventoryUpload
   end
 
   def self.inventory_export_url
-    tags = URI.encode("satellite/satellite_instance_id=#{Foreman.instance_id}")
-    ForemanRhCloud.base_url + "/api/inventory/v1/hosts?tags=#{tags}"
+    ForemanRhCloud.base_url + '/api/inventory/v1/hosts'
   end
 end

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/json_stream.rb

@@ -63,7 +63,7 @@ module ForemanInventoryUpload
         return value if value.is_a?(FalseClass)
         return value.to_json if value.is_a?(Hash)
 
-        ActiveSupport::JSON.encode(value)
+        "\"#{value}\""
       end
     end
   end

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.18.1'.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.18.1",
+  "version": "3.0.14",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/controllers/accounts_controller_test.rb

@@ -21,7 +21,7 @@ class AccountsControllerTest < ActionController::TestCase
 
     assert_response :success
     actual = JSON.parse(response.body)
-    actual_account_statuses = actual['accounts'][test_org.label]
+    actual_account_statuses = actual['accounts'][test_org.id.to_s]
     assert_equal 'generate_status_test', actual_account_statuses['generate_report_status']
     assert_equal 'upload_status_test', actual_account_statuses['upload_report_status']
 

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)
 
@@ -287,7 +261,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'generates a report with satellite facts' do
-    hostgroup = FactoryBot.create(:hostgroup, name: 'Special"name')
+    hostgroup = FactoryBot.create(:hostgroup)
     @host.hostgroup = hostgroup
     @host.save!
 

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

@@ -2,17 +2,17 @@ import { noop } from 'patternfly-react';
 
 export const accounts = {
   Account1: {
-    id: 1,
+    label: 'test_org1',
     upload_report_status: 'running',
     generate_report_status: 'running',
   },
   Account2: {
-    id: 2,
+    label: 'test_org2',
     upload_report_status: 'unknown',
     generate_report_status: 'failure',
   },
   Account3: {
-    id: 3,
+    label: 'test_org3',
     upload_report_status: 'success',
     generate_report_status: 'running',
   },

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

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { ListView, noop } from 'patternfly-react';
-import { isEmpty } from 'lodash';
 import PropTypes from 'prop-types';
 import ListItem from './Components/ListItem';
 import EmptyState from './Components/EmptyState';
@@ -24,23 +23,24 @@ class AccountList extends Component {
 
   render() {
     const { accounts, error, filterTerm } = this.props;
-    const filteredAccount = filterAccounts(accounts, filterTerm);
+    const accountIds = Object.keys(accounts);
+    const filteredAccountIds = filterAccounts(accounts, accountIds, filterTerm);
 
     if (error) {
       return <ErrorState error={error} />;
     }
 
-    if (isEmpty(accounts)) {
+    if (accountIds.length === 0) {
       return <EmptyState />;
     }
 
-    if (isEmpty(filteredAccount)) {
+    if (filteredAccountIds.length === 0) {
       return <EmptyResults />;
     }
 
-    const items = Object.keys(filteredAccount).map((label, index) => {
-      const account = accounts[label];
-      return <ListItem key={index} label={label} account={account} />;
+    const items = filteredAccountIds.map((accountID, index) => {
+      const account = accounts[accountID];
+      return <ListItem key={index} accountID={accountID} account={account} />;
     });
     return <ListView className="account_list">{items}</ListView>;
   }

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

@@ -1,10 +1,10 @@
-import { pickBy } from 'lodash';
-
-export const filterAccounts = (accounts, filterTerm) => {
-  if (!filterTerm) return accounts;
+export const filterAccounts = (accounts, accountIds, filterTerm) => {
+  if (!filterTerm || !accountIds.length) {
+    return accountIds;
+  }
 
   const filterTermLowerCased = filterTerm.toLowerCase();
-  return pickBy(accounts, (value, key) =>
-    key.toLowerCase().includes(filterTermLowerCased)
+  return accountIds.filter(id =>
+    accounts[id].label.toLowerCase().includes(filterTermLowerCased)
   );
 };

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

@@ -1,10 +1 @@
-export const props = {
-  label: 'test',
-  account: {
-    test: {
-      generate_report_status: 'unknown',
-      upload_report_status: 'unknown',
-      id: 1,
-    },
-  },
-};
+export const props = { accountID: '1' };

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

@@ -4,26 +4,26 @@ import PropTypes from 'prop-types';
 import ListItemStatus from '../ListItemStatus';
 import Dashboard from '../../../Dashboard';
 
-const ListItem = ({ label, account }) => (
+const ListItem = ({ accountID, account }) => (
   <ListView.Item
     leftContent={<ListView.Icon name="user" />}
-    heading={label}
+    heading={account.label}
     additionalInfo={[
-      <ListItemStatus key={`${label}_status`} account={account} />,
+      <ListItemStatus key={`${accountID}_status`} account={account} />,
     ]}
     stacked
     hideCloseIcon
   >
-    <Dashboard accountID={account.id} account={account} />
+    <Dashboard accountID={accountID} account={account} />
   </ListView.Item>
 );
 
 ListItem.propTypes = {
-  label: PropTypes.string.isRequired,
+  accountID: PropTypes.string.isRequired,
   account: PropTypes.shape({
     generate_report_status: PropTypes.string,
     upload_report_status: PropTypes.string,
-    id: PropTypes.number,
+    label: PropTypes.string,
   }),
 };
 
@@ -31,7 +31,7 @@ ListItem.defaultProps = {
   account: {
     generate_report_status: 'unknown',
     upload_report_status: 'unknown',
-    id: 0,
+    label: 'default_org_name',
   },
 };