foreman_rh_cloud 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b4d5750b4b0ff6361c7694fb3808a4c33d5ff12e37bd5d946c1baa454b805a1
-  data.tar.gz: 5e18ea289049d0525a82adb8f7cbeec66d5ac4abf2cae5867aa18c3aab753640
+  metadata.gz: c164b990c325cd1f5e90004585c0074c558ee29ece8b687d37115d88f278274d
+  data.tar.gz: 01f04d99170a49224c7687949acff8d7171ce73d0d620343ce348c324b2b6040
 SHA512:
-  metadata.gz: 7e9b9c292ed88641c954bc79d665c7f3e77a0c04e426bde5e12d92e25d53b72ef7ade25a69b08da5f20442c3a4a41a7d8854dac529108376eae49b188c1eb839
-  data.tar.gz: 94998762071b568f438dd03c37f22c969a55cc2c71410bf60c2b4e21ebda259e1e20a85d6a821324014d98683f1b928cce4fe94e39a0a4f8f34dd338237252ed
+  metadata.gz: dc211d399ff2f518b47ccfe76e8a569cac8b3356bab5dc6f2dabfc8c0a3de2926dd8fe99f2a84ea8dba9e4dea3b871cdd3380dfebb48e51cdcb1198dbac16bc8
+  data.tar.gz: 622e9894c0bef62e38f25b687d2acb0c5db74cf8e299e5a327f102052704324e2aafaee71fa30b595de66a29124789a815899e3f324000c559e3c75ce2ce401c

data/app/models/setting/rh_cloud.rb

@@ -3,7 +3,7 @@ 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'), true),
+      set('allow_auto_inventory_upload', N_('Allow automatic upload of the host inventory to the Red Hat cloud'), false),
       set('obfuscate_inventory_hostnames', N_('Obfuscate host names 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),
     ]

data/app/views/foreman_rh_cloud/react/insights_cloud.html.erb

@@ -1 +1,6 @@
-<%= mount_react_component('InsightsCloudSync', '#ForemanRhCloudReactRoot') %>
+<%= mount_react_component(
+'InsightsCloudSync',
+'#ForemanRhCloudReactRoot',
+{
+  settingsUrl: settings_url(search: 'name = rh_cloud_token')
+}.to_json) %>

data/lib/foreman_inventory_upload/async/shell_process.rb

@@ -9,7 +9,7 @@ module ForemanInventoryUpload
         klass_name = self.class.name
         logger.debug("Starting #{klass_name} with label #{instance_label}")
         progress_output = ProgressOutput.register(instance_label)
-        Open3.popen2e(hash_to_s(env), command) do |_stdin, stdout_stderr, wait_thread|
+        Open3.popen2e(hash_to_s(env), *preprocess_command(command)) do |_stdin, stdout_stderr, wait_thread|
           progress_output.status = "Running in pid #{wait_thread.pid}"
 
           stdout_stderr.each do |out_line|
@@ -33,6 +33,12 @@ module ForemanInventoryUpload
       def logger
         Foreman::Logging.logger('background')
       end
+
+      private
+
+      def preprocess_command(command)
+        command.kind_of?(Array) ? command : [command]
+      end
     end
   end
 end

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -21,7 +21,7 @@ module ForemanInventoryUpload
       end
 
       def command
-        File.join(File.dirname(@filename), ForemanInventoryUpload.upload_script_file)
+        ['/bin/bash', File.join(File.dirname(@filename), ForemanInventoryUpload.upload_script_file)]
       end
 
       def env

data/lib/foreman_inventory_upload/generators/json_stream.rb

@@ -36,6 +36,16 @@ module ForemanInventoryUpload
         @out << ',' unless last
       end
 
+      def string_array_value(name, value, last = false)
+        return if value.empty?
+
+        string_value = value.map { |v| stringify_value(v) }
+
+        array_field(name, last) do
+          raw(string_value.join(', '))
+        end
+      end
+
       def object_field(name, last = false, &block)
         @out << "\"#{name}\": "
         object(&block)

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -45,16 +45,8 @@ module ForemanInventoryUpload
           @stream.simple_field('satellite_id', host.subscription_facet&.uuid)
           @stream.simple_field('bios_uuid', fact_value(host, 'dmi::system::uuid'))
           @stream.simple_field('vm_uuid', fact_value(host, 'virt::uuid'))
-          @stream.array_field('ip_addresses') do
-            @stream.raw(host.interfaces.map do |nic|
-              @stream.stringify_value(nic.ip) if nic.ip
-            end.compact.join(', '))
-          end
-          @stream.array_field('mac_addresses') do
-            @stream.raw(host.interfaces.map do |nic|
-              @stream.stringify_value(nic.mac) if nic.mac
-            end.compact.join(', '))
-          end
+          report_ip_addresses(host)
+          report_mac_addresses(host)
           @stream.object_field('system_profile') do
             report_system_profile(host)
           end
@@ -161,6 +153,18 @@ module ForemanInventoryUpload
         @stream.simple_field('organization_id', host.organization_id, :last)
       end
 
+      def report_ip_addresses(host)
+        ip_addresses = host.interfaces.map { |nic| nic.ip }.compact
+
+        @stream.string_array_value('ip_addresses', ip_addresses)
+      end
+
+      def report_mac_addresses(host)
+        macs = host.interfaces.map { |nic| nic.mac }.compact
+
+        @stream.string_array_value('mac_addresses', macs)
+      end
+
       def os_release_value(name:, version:, codename:)
         "#{name} #{version} (#{codename})"
       end

data/lib/foreman_inventory_upload/scripts/uploader.sh.erb

@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 DEST=<%= @upload_url %>
 RH_USERNAME=<%= @rh_username %>

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '2.0.8'.freeze
+  VERSION = '2.0.9'.freeze
 end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -68,7 +68,7 @@ module InsightsCloud
       def replace_hits_data(hits)
         InsightsHit.transaction do
           InsightsHit.delete_all
-          InsightsHit.create(hits.map { |hits_hash| to_model_hash(hits_hash) })
+          InsightsHit.create(hits.map { |hits_hash| to_model_hash(hits_hash) }.compact)
           # create new facets for hosts that are missing one
           hosts_with_existing_facets = InsightsFacet.where(host_id: @host_ids.values).pluck(:host_id)
           InsightsFacet.create((@host_ids.values - hosts_with_existing_facets).map { |id| {host_id: id} })
@@ -76,8 +76,12 @@ module InsightsCloud
       end
 
       def to_model_hash(hit_hash)
+        hit_host_id = host_id(hit_hash['hostname'])
+
+        return unless hit_host_id
+
         {
-          host_id: host_id(hit_hash['hostname']),
+          host_id: hit_host_id,
           last_seen: DateTime.parse(hit_hash['last_seen']),
           publish_date: DateTime.parse(hit_hash['publish_date']),
           title: hit_hash['title'],

data/test/jobs/insights_full_sync_test.rb

@@ -59,4 +59,34 @@ class InsightsFullSyncTest < ActiveJob::TestCase
     assert_equal 2, @host1.insights.hits.count
     assert_equal 1, @host2.insights.hits.count
   end
+
+  test 'Hits ignoring non-existent hosts' do
+    hits_json = <<-HITS_JSON
+    [
+        {
+            "hostname": "#{@host1.name}_non_existent",
+            "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/"
+        }
+    ]
+    HITS_JSON
+    hits = JSON.parse(hits_json)
+
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(hits)
+
+    InsightsCloud::Async::InsightsFullSync.perform_now(@host1.organization)
+
+    @host1.reload
+    @host2.reload
+
+    assert_nil @host1.insights
+    assert_nil @host2.insights
+  end
 end

data/test/unit/slice_generator_test.rb

@@ -63,6 +63,25 @@ class ReportGeneratorTest < ActiveSupport::TestCase
 
     assert_equal 'slice_123', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
+    assert_nil actual_host['ip_addresses']
+    assert_nil actual_host['mac_addresses']
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
+  end
+
+  test 'generates ip_address and mac_address fields' do
+    @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 @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_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
     assert_equal 1, generator.hosts_count
@@ -262,10 +281,17 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     first_pool = @host.organization.pools.first
     second_pool = FactoryBot.create(:katello_pool, account_number: nil, cp_id: 2)
     new_org = FactoryBot.create(:organization, pools: [first_pool, second_pool])
-    @host.organization = new_org
-    @host.save!
 
-    batch = Host.where(id: @host.id).in_batches.first
+    another_host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: @host.content_view,
+      lifecycle_environment: @host.lifecycle_environment,
+      organization: new_org
+    )
+
+    batch = Host.where(id: another_host.id).in_batches.first
     generator = create_generator(batch)
 
     json_str = generator.render

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

@@ -10,12 +10,12 @@ export const PageDescription = () => (
     </p>
     <p>
       {__(
-        'In order to utilize these servies, you can set the auto upload in the settings to "ON".'
+        'In order to utilize these services, you can set the auto upload in the settings to "ON".'
       )}
     </p>
     <p>
       {__(
-        'You can also trigger the upload manually by openning the relevant organization card, and clicking on the "Restart" button'
+        'You can also trigger the upload manually by opening the relevant organization card, and clicking on the "Restart" button'
       )}
     </p>
   </div>

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

@@ -8,10 +8,10 @@ exports[`PageDescription rendering render without Props 1`] = `
     Red Hat Insights is a set of cloud services which provide unified subscription reporting, predictive analysis and remediation of issues through this Satellite instance.
   </p>
   <p>
-    In order to utilize these servies, you can set the auto upload in the settings to "ON".
+    In order to utilize these services, you can set the auto upload in the settings to "ON".
   </p>
   <p>
-    You can also trigger the upload manually by openning the relevant organization card, and clicking on the "Restart" button
+    You can also trigger the upload manually by opening the relevant organization card, and clicking on the "Restart" button
   </p>
 </div>
 `;

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -2,18 +2,44 @@ import React from 'react';
 import { IntlProvider } from 'react-intl';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { Button } from 'patternfly-react';
+import { Button, Icon } from 'patternfly-react';
 import { INSIGHTS_SYNC_PAGE_TITLE } from './InsightsCloudSyncConstants';
 
-const InsightsCloudSync = ({ syncInsights }) => {
+const InsightsCloudSync = ({ data: { settingsUrl }, syncInsights }) => {
   document.title = INSIGHTS_SYNC_PAGE_TITLE;
   return (
     <IntlProvider locale={navigator.language}>
       <div className="insights-cloud-sync">
         <h1>{__('Red Hat Insights Sync')}</h1>
-        <Button bsStyle="primary" onClick={syncInsights}>
-          {__('Sync now')}
-        </Button>
+        <p>
+          {__(`Insights synchronization process is used to provide Insights
+           recommendations output for hosts managed here`)}
+        </p>
+        <p>
+          {__(`1. Obtain an RHSM API token: `)}
+          <a
+            href="https://access.redhat.com/management/api"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            access.redhat.com <Icon name="external-link" size="xs" />
+          </a>
+          <br />
+          {__("2. Copy the token to 'Red Hat Cloud token' setting: ")}
+          <a href={settingsUrl} target="_blank" rel="noopener noreferrer">
+            {__('Red Hat Cloud token ')}
+            <Icon name="external-link" size="xs" />
+          </a>
+          <br />
+          {__(
+            '3. Now you can syncronize recommendations manually using the "Sync now" button.'
+          )}
+        </p>
+        <div>
+          <Button bsStyle="primary" onClick={syncInsights}>
+            {__('Sync now')}
+          </Button>
+        </div>
       </div>
     </IntlProvider>
   );
@@ -21,6 +47,9 @@ const InsightsCloudSync = ({ syncInsights }) => {
 
 InsightsCloudSync.propTypes = {
   syncInsights: PropTypes.func.isRequired,
+  data: PropTypes.shape({
+    settingsUrl: PropTypes.string.isRequired,
+  }).isRequired,
 };
 
 export default InsightsCloudSync;

data/webpack/InsightsCloudSync/InsightsCloudSync.test.js

@@ -6,6 +6,9 @@ import InsightsCloudSync from './InsightsCloudSync';
 const fixtures = {
   render: {
     syncInsights: noop,
+    data: {
+      settingsUrl: 'www.example.com/settings',
+    },
   },
 };
 

data/webpack/InsightsCloudSync/__snapshots__/InsightsCloudSync.test.js.snap

@@ -10,16 +10,53 @@ exports[`InsightsCloudSync render 1`] = `
     <h1>
       Red Hat Insights Sync
     </h1>
-    <Button
-      active={false}
-      block={false}
-      bsClass="btn"
-      bsStyle="primary"
-      disabled={false}
-      onClick={[Function]}
-    >
-      Sync now
-    </Button>
+    <p>
+      Insights synchronization process is used to provide Insights
+           recommendations output for hosts managed here
+    </p>
+    <p>
+      1. Obtain an RHSM API token: 
+      <a
+        href="https://access.redhat.com/management/api"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        access.redhat.com 
+        <Icon
+          name="external-link"
+          size="xs"
+          type="fa"
+        />
+      </a>
+      <br />
+      2. Copy the token to 'Red Hat Cloud token' setting: 
+      <a
+        href="www.example.com/settings"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        Red Hat Cloud token 
+        <Icon
+          name="external-link"
+          size="xs"
+          type="fa"
+        />
+      </a>
+      <br />
+      3. Now you can syncronize recommendations manually using the "Sync now" button.
+    </p>
+    <div>
+      <Button
+        active={false}
+        block={false}
+        bsClass="btn"
+        bsStyle="primary"
+        disabled={false}
+        onClick={[Function]}
+      >
+        Sync now
+      </Button>
+    </div>
   </div>
 </IntlProvider>
 `;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello