foreman_rh_cloud 4.0.21.1 → 4.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97882071192995f2da93032050b9ecdfa616dba407c8d032bfd29f6741ea9d56
-  data.tar.gz: 88bca49cea9ee2abac2d2dc9d608a33329ad9e214d57035424e8e24984691537
+  metadata.gz: ea5629e755a80131b35cb1509ff5d44fefccbe70c0362829e7d7c0f1d9f2484d
+  data.tar.gz: b1e1ded88509739b56711a97aa81797592d5b4ec8b32cb811ad9d6a280adfb57
 SHA512:
-  metadata.gz: 67dd2ada55ac862b2d57ddf893e7408d002c40c2f89a141e6bf8c115d6eeee32d19b156e7668751f591665f948fa04d628719e5f6f5ab9e4609c02f0a14a93f4
-  data.tar.gz: 54ded7bb163e4a38cd3fa4a62dfe101484b98e87c016514b985190f77a07c7556e980dd8574dc5fb70cacb3fcc521a37a1f4f2325e5360cdbb2ddd6f38816804
+  metadata.gz: 1ac6593a54fd506e2a8bb690bc4c6e046f92fea706333c77a54f9472b4977fd88201e2d13852f15418e326cee9961b25f31ef9cfda4703cc88f29c84d63a6459
+  data.tar.gz: '02649cb1f8b0e11d6570988f3cafe55e82d14bad6f133f5cf691c396b542156e0e2c2e132d0eb38a11bb421d14e5d31757e630ba463052cd4cbf71c701564fc7'

data/app/services/foreman_rh_cloud/cloud_auth.rb

@@ -2,6 +2,8 @@ module ForemanRhCloud
   module CloudAuth
     extend ActiveSupport::Concern
 
+    include CloudRequest
+
     def rh_credentials
       @rh_credentials ||= query_refresh_token
     end
@@ -24,5 +26,15 @@ module ForemanRhCloud
       Foreman::Logging.exception('Unable to authenticate using rh_cloud_token setting', e)
       raise ::Foreman::WrappedException.new(e, N_('Unable to authenticate using rh_cloud_token setting'))
     end
+
+    def execute_cloud_request(params)
+      final_params = {
+        headers: {
+          Authorization: "Bearer #{rh_credentials}",
+        },
+      }.deep_merge(params)
+
+      super(final_params)
+    end
   end
 end

data/app/services/foreman_rh_cloud/cloud_request.rb

@@ -0,0 +1,14 @@
+module ForemanRhCloud
+  module CloudRequest
+    extend ActiveSupport::Concern
+
+    def execute_cloud_request(params)
+      final_params = {
+        verify_ssl: ForemanRhCloud.verify_ssl_method,
+        proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
+      }.deep_merge(params)
+
+      RestClient::Request.execute(final_params)
+    end
+  end
+end

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -2,7 +2,7 @@ require 'rest-client'
 
 module ForemanRhCloud
   class CloudRequestForwarder
-    include ::ForemanRhCloud::CloudAuth
+    include ForemanRhCloud::CloudRequest
 
     def forward_request(original_request, controller_name, branch_id, certs)
       forward_params = prepare_forward_params(original_request, branch_id)
@@ -22,7 +22,6 @@ module ForemanRhCloud
     def prepare_request_opts(original_request, forward_payload, forward_params, certs)
       base_params = {
         method: original_request.method,
-        verify_ssl: ForemanRhCloud.verify_ssl_method,
         payload: forward_payload,
         headers: {
           params: forward_params,
@@ -33,10 +32,6 @@ module ForemanRhCloud
       base_params.merge(path_params(original_request.path, certs))
     end
 
-    def execute_cloud_request(request_opts)
-      RestClient::Request.execute request_opts
-    end
-
     def prepare_forward_payload(original_request, controller_name)
       forward_payload = original_request.request_parameters[controller_name]
 

data/app/services/foreman_rh_cloud/remediations_retriever.rb

@@ -62,14 +62,11 @@ module ForemanRhCloud
     end
 
     def query_playbook
-      RestClient::Request.execute(
+      execute_cloud_request(
         method: :post,
         url: InsightsCloud.playbook_url,
-        verify_ssl: ForemanRhCloud.verify_ssl_method,
-        proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
         headers: {
           content_type: :json,
-          Authorization: "Bearer #{rh_credentials}",
         },
         payload: playbook_request.to_json
       )

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -10,6 +10,8 @@ module ForemanInventoryUpload
       CLOUD_AZURE = 'azure'
       CLOUD_ALIBABA = 'alibaba'
 
+      UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+
       def fact_value(host, fact_name)
         value_record = host.fact_values.find do |fact_value|
           fact_value.fact_name_id == ForemanInventoryUpload::Generators::Queries.fact_names[fact_name]
@@ -104,6 +106,23 @@ module ForemanInventoryUpload
       def obfuscate_ip(ip, ips_dict)
         "10.230.230.#{ips_dict.count + 1}"
       end
+
+      def bios_uuid(host)
+        value = fact_value(host, 'dmi::system::uuid') || ''
+        uuid_value(value)
+      end
+
+      def uuid_value(value)
+        uuid_match = UUID_REGEX.match(value)
+        uuid_match&.to_s
+      end
+
+      def uuid_value!(value)
+        uuid = uuid_value(value)
+        raise Foreman::Exception.new(N_('Value %{value} is not a valid UUID') % {value: value}) if value && uuid.empty?
+
+        uuid
+      end
     end
   end
 end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -25,7 +25,7 @@ module ForemanInventoryUpload
 
       def report_slice(hosts_batch)
         @stream.object do
-          @stream.simple_field('report_slice_id', @slice_id)
+          @stream.simple_field('report_slice_id', uuid_value!(@slice_id))
           @stream.array_field('hosts', :last) do
             first = true
             hosts_batch.each do |host|
@@ -45,10 +45,10 @@ module ForemanInventoryUpload
         @stream.object do
           @stream.simple_field('fqdn', fqdn(host))
           @stream.simple_field('account', account_id(host.organization).to_s)
-          @stream.simple_field('subscription_manager_id', host.subscription_facet&.uuid)
-          @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.simple_field('subscription_manager_id', uuid_value!(host.subscription_facet&.uuid))
+          @stream.simple_field('satellite_id', uuid_value!(host.subscription_facet&.uuid))
+          @stream.simple_field('bios_uuid', bios_uuid(host))
+          @stream.simple_field('vm_uuid', uuid_value(fact_value(host, 'virt::uuid')))
           report_ip_addresses(host, host_ips_cache)
           report_mac_addresses(host)
           @stream.object_field('system_profile') do

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '4.0.21.1'.freeze
+  VERSION = '4.0.22'.freeze
 end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -50,28 +50,18 @@ module InsightsCloud
       end
 
       def query_insights_hits
-        hits_response = RestClient::Request.execute(
+        hits_response = execute_cloud_request(
           method: :get,
-          url: InsightsCloud.hits_export_url,
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
-          headers: {
-            Authorization: "Bearer #{rh_credentials}",
-          }
+          url: InsightsCloud.hits_export_url
         )
 
         JSON.parse(hits_response)
       end
 
       def query_insights_rules
-        rules_response = RestClient::Request.execute(
+        rules_response = execute_cloud_request(
           method: :get,
-          url: InsightsCloud.rules_url,
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
-          headers: {
-            Authorization: "Bearer #{rh_credentials}",
-          }
+          url: InsightsCloud.rules_url
         )
 
         JSON.parse(rules_response)

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -22,14 +22,11 @@ module InsightsCloud
       private
 
       def query_insights_resolutions(rule_ids)
-        resolutions_response = RestClient::Request.execute(
+        resolutions_response = execute_cloud_request(
           method: :post,
           url: InsightsCloud.resolutions_url,
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           headers: {
             content_type: :json,
-            Authorization: "Bearer #{rh_credentials}",
           },
           payload: {
             issues: rule_ids,

data/lib/insights_cloud/async/insights_rules_sync.rb

@@ -37,14 +37,9 @@ module InsightsCloud
       private
 
       def query_insights_rules(offset)
-        rules_response = RestClient::Request.execute(
+        rules_response = execute_cloud_request(
           method: :get,
-          url: InsightsCloud.rules_url(offset: offset),
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
-          headers: {
-            Authorization: "Bearer #{rh_credentials}",
-          }
+          url: InsightsCloud.rules_url(offset: offset)
         )
 
         JSON.parse(rules_response)

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -24,6 +24,7 @@ module InventorySync
 
         logger.debug("Synced hosts amount: #{host_statuses[:sync]}")
         logger.debug("Disconnected hosts amount: #{host_statuses[:disconnect]}")
+        output[:host_statuses] = host_statuses
       end
 
       def update_statuses_batch
@@ -53,7 +54,7 @@ module InventorySync
       end
 
       def host_statuses
-        output[:host_statuses] ||= {
+        @host_statuses ||= {
           sync: 0,
           disconnect: 0,
         }

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -4,6 +4,14 @@ module InventorySync
       include ::Actions::RecurringAction
 
       def plan
+        unless Setting[:allow_auto_inventory_upload]
+          logger.debug(
+            'The scheduled process is disabled due to the "allow_auto_inventory_upload"
+            setting being set to false.'
+          )
+          return
+        end
+
         Organization.unscoped.each do |org|
           plan_org_sync(org)
         end

data/lib/inventory_sync/async/query_inventory_job.rb

@@ -29,13 +29,10 @@ module InventorySync
       private
 
       def query_inventory(page = 1)
-        hosts_inventory_response = RestClient::Request.execute(
+        hosts_inventory_response = execute_cloud_request(
           method: :get,
           url: ForemanInventoryUpload.inventory_export_url,
-          verify_ssl: ForemanRhCloud.verify_ssl_method,
-          proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
           headers: {
-            Authorization: "Bearer #{rh_credentials}",
             params: {
               per_page: 100,
               page: page,

data/lib/tasks/rh_cloud_inventory.rake

@@ -23,6 +23,12 @@ namespace :rh_cloud_inventory do
       organizations = [ENV['organization_id']]
       base_folder = ENV['target'] || Dir.pwd
 
+      unless File.writable?(base_folder)
+        puts "#{base_folder} is not writable by the current process"
+        base_folder = Dir.mktmpdir
+        puts "Using #{base_folder} for the output"
+      end
+
       unless portal_user || organizations.empty?
         puts "Must specify either portal_user or organization_id"
       end

data/package.json

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

data/test/factories/inventory_upload_factories.rb

@@ -49,7 +49,7 @@ end
 
 FactoryBot.define do
   factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
-    sequence(:uuid) { |n| "uuid-#{n}-#{rand(500)}" }
+    sequence(:uuid) { |n| "00000000-%<n>04d-%<r>04d-0000-000000000000" % {n: n, r: rand(500)} }
     facts { { 'memory.memtotal' => "12 GB" } }
   end
 end

data/test/test_plugin_helper.rb

@@ -33,7 +33,6 @@ module KatelloLocationFix
       FactoryBot.create(:setting, name: 'default_location_subscribed_hosts')
       FactoryBot.create(:setting, name: 'default_location_puppet_content')
       Setting[:default_location_subscribed_hosts] = Location.first.title
-      Setting[:default_location_puppet_content] = Location.first.title
     end
   end
 end

data/test/unit/slice_generator_test.rb

@@ -71,7 +71,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_nil actual_host['ip_addresses']
     assert_nil actual_host['mac_addresses']
@@ -102,7 +102,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_system_profile = actual_host['system_profile'])
     assert_equal 4, actual_system_profile['number_of_cpus']
@@ -120,7 +120,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', 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
@@ -142,7 +142,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', 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
@@ -172,7 +172,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', 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
@@ -191,7 +191,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal '10.230.230.1', actual_host['ip_addresses'].first
     assert_not_nil(actual_system_profile = actual_host['system_profile'])
@@ -221,7 +221,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal '10.230.230.100', actual_host['ip_addresses'].first
     assert_not_nil(actual_system_profile = actual_host['system_profile'])
@@ -243,7 +243,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal 'obfuscated_name', actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -263,7 +263,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
 
     obfuscated_fqdn = Digest::SHA1.hexdigest(@host.fqdn) + '.example.com'
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', 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']
@@ -282,7 +282,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -355,7 +355,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_not_nil(host_facts = actual_host['facts']&.first)
@@ -377,7 +377,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_not_nil(host_facts = actual_host['facts']&.first)
@@ -397,7 +397,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -417,7 +417,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -436,7 +436,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_equal 1, generator.hosts_count
   end
 
@@ -449,7 +449,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 1024, actual_profile['system_memory_bytes']
@@ -475,7 +475,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_host['account'])
     assert_not_empty(actual_host['account'])
@@ -492,7 +492,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'Red Hat Test Linux 7.1 (TestId)', actual_profile['os_release']
@@ -507,7 +507,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'virtual', actual_profile['infrastructure_type']
@@ -522,7 +522,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'physical', actual_profile['infrastructure_type']
@@ -537,7 +537,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'aws', actual_profile['cloud_provider']
@@ -552,7 +552,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'google', actual_profile['cloud_provider']
@@ -567,7 +567,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'azure', actual_profile['cloud_provider']
@@ -582,7 +582,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'alibaba', actual_profile['cloud_provider']
@@ -597,7 +597,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'alibaba', actual_profile['cloud_provider']
@@ -623,15 +623,43 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_not_nil(actual_profile['installed_packages'])
   end
 
+  test 'omits malformed bios_uuid field' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::system::uuid'], value: 'test value', host: @host)
+
+    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 '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_nil actual_host['bios_uuid']
+  end
+
+  test 'passes valid bios_uuid field' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::system::uuid'], value: 'D30B0B42-7824-2635-C62D-491394DE43F7', host: @host)
+
+    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 '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil actual_host['bios_uuid']
+  end
+
   private
 
-  def create_generator(batch, name = 'slice_123')
+  def create_generator(batch, name = '00000000-0000-0000-0000-000000000000')
     generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], name)
     if block_given?
       yield(generator)

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonActions.js

@@ -1,6 +1,5 @@
 import React from 'react';
-import { get, post } from 'foremanReact/redux/API';
-import { withInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import { post } from 'foremanReact/redux/API';
 import { addToast } from 'foremanReact/redux/actions/toasts';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
@@ -9,7 +8,10 @@ import {
   INVENTORY_SYNC,
   INVENTORY_SYNC_TASK_UPDATE,
 } from './SyncButtonConstants';
-import { foremanUrl } from '../../../../../ForemanRhCloudHelpers';
+import {
+  setupTaskPolling,
+  taskRelatedToast,
+} from '../../../../../common/ForemanTasks';
 
 export const handleSync = () => dispatch => {
   dispatch(
@@ -21,9 +23,9 @@ export const handleSync = () => dispatch => {
           task: { id },
         },
       }) => {
-        dispatch(getSyncTaskInterval(id));
+        dispatch(setupInventorySyncTaskPolling(id, dispatch));
         return dispatch(
-          taskPageRefererToast(id, 'info', __('Inventory sync has started:'))
+          taskRelatedToast(id, 'info', __('Inventory sync has started:'))
         );
       },
       errorToast: inventorySyncErrorToast,
@@ -31,62 +33,25 @@ export const handleSync = () => dispatch => {
   );
 };
 
-export const getSyncTaskInterval = id => dispatch => {
-  dispatch(
-    withInterval(
-      get({
-        key: INVENTORY_SYNC_TASK_UPDATE,
-        url: inventoryUrl(`tasks/${id}`),
-        handleSuccess: ({ data: { result, output } }, stopTaskInterval) => {
-          if (result === 'success') {
-            const {
-              host_statuses: { sync, disconnect },
-            } = output;
-            dispatch(
-              addToast({
-                sticky: true,
-                type: 'success',
-                message: (
-                  <Toast syncHosts={sync} disconnectHosts={disconnect} />
-                ),
-              })
-            );
-          }
-          if (result === 'error') {
-            dispatch(
-              taskPageRefererToast(
-                id,
-                'error',
-                __('Inventory sync has failed:'),
-                true
-              )
-            );
-          }
-          stopTaskInterval();
-        },
-        errorToast: inventorySyncErrorToast,
-      })
-    )
-  );
-};
-
-const inventorySyncErrorToast = ({ message, response }) =>
-  `${__('Inventory sync has failed: ')} ${response.data?.message || message}`;
-
-const taskPageRefererToast = (taskID, toastType, prefix, sticky = false) =>
-  addToast({
-    sticky,
-    type: toastType,
-    message: (
-      <span>
-        {prefix}{' '}
-        <a
-          target="_blank"
-          rel="noopener noreferrer"
-          href={foremanUrl(`/foreman_tasks/tasks/${taskID}`)}
-        >
-          {__('view the task page for more details')}
-        </a>
-      </span>
-    ),
+export const setupInventorySyncTaskPolling = (id, dispatch) =>
+  setupTaskPolling({
+    taskId: id,
+    key: INVENTORY_SYNC_TASK_UPDATE,
+    onTaskSuccess: ({
+      output: {
+        host_statuses: { sync, disconnect },
+      },
+    }) =>
+      dispatch(
+        addToast({
+          sticky: true,
+          type: 'success',
+          message: <Toast syncHosts={sync} disconnectHosts={disconnect} />,
+        })
+      ),
+    dispatch,
   });
+
+const inventorySyncErrorToast = message =>
+  `${__('Inventory sync has failed: ')} ${message.response?.data?.message ||
+    message}`;

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

@@ -22,7 +22,7 @@ Array [
       "errorToast": [Function],
       "interval": 3000,
       "type": "API_GET",
-      "url": "/foreman_inventory_upload/tasks/1",
+      "url": "/foreman_tasks/api/tasks/1/details?include_permissions",
     },
   ],
   Array [
@@ -31,7 +31,7 @@ Array [
         "message": Object {
           "message": <span>
             Inventory sync has started:
-             
+            <br />
             <a
               href="/foreman_tasks/tasks/1"
               rel="noopener noreferrer"
@@ -40,7 +40,6 @@ Array [
               view the task page for more details
             </a>
           </span>,
-          "sticky": false,
           "type": "info",
         },
       },

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableActions.js

@@ -19,25 +19,6 @@ export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
     ...queryParams,
   };
 
-  dispatch(
-    get({
-      key: INSIGHTS_HITS_API_KEY,
-      url: INSIGHTS_HITS_PATH,
-      params: {
-        page,
-        per_page: perPage,
-        search: query,
-        order: `${sortBy} ${sortOrder}`,
-      },
-      handleSuccess: response => {
-        if (isSelectAll) {
-          selectAllIds(dispatch, response.data.hits || []);
-          dispatch(selectAll());
-        }
-      },
-    })
-  );
-
   const uri = new URI();
   uri.search({
     page,
@@ -58,6 +39,25 @@ export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
   if (!isSelectAll) {
     dispatch(setSelectAllAlert(false));
   }
+
+  return dispatch(
+    get({
+      key: INSIGHTS_HITS_API_KEY,
+      url: INSIGHTS_HITS_PATH,
+      params: {
+        page,
+        per_page: perPage,
+        search: query,
+        order: `${sortBy} ${sortOrder}`,
+      },
+      handleSuccess: response => {
+        if (isSelectAll) {
+          selectAllIds(dispatch, response.data.hits || []);
+          dispatch(selectAll());
+        }
+      },
+    })
+  );
 };
 
 const selectAllIds = (dispatch, results, prevSelectedIds = {}) => {

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTableActions.test.js.snap

@@ -26,6 +26,20 @@ Array [
 
 exports[`insights table actions should fetchInsights 1`] = `
 Array [
+  Array [
+    Object {
+      "payload": Object {
+        "args": Array [
+          Object {
+            "pathname": "/foreman_rh_cloud/insights_cloud",
+            "search": "?page=2&per_page=7&search=&sort_by=&sort_order=&select_all=true",
+          },
+        ],
+        "method": "push",
+      },
+      "type": "@@router/CALL_HISTORY_METHOD",
+    },
+  ],
   Array [
     Object {
       "payload": Object {
@@ -61,20 +75,6 @@ Array [
       "url": "/insights_cloud/hits",
     },
   ],
-  Array [
-    Object {
-      "payload": Object {
-        "args": Array [
-          Object {
-            "pathname": "/foreman_rh_cloud/insights_cloud",
-            "search": "?page=2&per_page=7&search=&sort_by=&sort_order=&select_all=true",
-          },
-        ],
-        "method": "push",
-      },
-      "type": "@@router/CALL_HISTORY_METHOD",
-    },
-  ],
 ]
 `;
 

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -36,7 +36,10 @@ const InsightsCloudSync = ({
         toolbarButtons={
           <>
             <RemediationModal />
-            <Button variant="secondary" onClick={syncInsights}>
+            <Button
+              variant="secondary"
+              onClick={() => syncInsights(fetchInsights, query)}
+            >
               {__('Start recommendations sync')}
             </Button>
           </>

data/webpack/InsightsCloudSync/InsightsCloudSyncActions.js

@@ -1,25 +1,49 @@
-import React from 'react';
 import { post } from 'foremanReact/redux/API';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { insightsCloudUrl } from './InsightsCloudSyncHelpers';
-import { INSIGHTS_CLOUD_SYNC } from './InsightsCloudSyncConstants';
-import { foremanUrl } from '../ForemanRhCloudHelpers';
+import {
+  INSIGHTS_CLOUD_SYNC,
+  INSIGHTS_CLOUD_SYNC_TASK,
+} from './InsightsCloudSyncConstants';
+import { setupTaskPolling, taskRelatedToast } from '../common/ForemanTasks';
 
-export const syncInsights = () =>
-  post({
-    key: INSIGHTS_CLOUD_SYNC,
-    url: insightsCloudUrl('tasks'),
-    successToast: response => (
-      <span>
-        {__('Recommendation sync has started: ')}
-        <a
-          target="_blank"
-          rel="noopener noreferrer"
-          href={foremanUrl(`/foreman_tasks/tasks/${response.data?.task?.id}`)}
-        >
-          {__('view the task in progress')}
-        </a>
-      </span>
-    ),
-    errorToast: error => `${__('Recommendation sync has failed: ')} ${error}`,
+export const syncInsights = (fetchInsights, query) => dispatch =>
+  dispatch(
+    post({
+      key: INSIGHTS_CLOUD_SYNC,
+      url: insightsCloudUrl('tasks'),
+      handleSuccess: ({
+        data: {
+          task: { id },
+        },
+      }) => {
+        dispatch(syncInsightsStartedToast(id));
+        dispatch(setupInsightsTaskPolling(id, fetchInsights, query, dispatch));
+      },
+      errorToast: error => syncInsightsError(error),
+    })
+  );
+
+const syncInsightsError = error =>
+  `${__('Recommendation sync has failed: ')} ${error}`;
+
+const syncInsightsStartedToast = taskId =>
+  taskRelatedToast(taskId, 'info', __('Recommendation sync has started: '));
+
+const setupInsightsTaskPolling = (taskId, fetchInsights, query, dispatch) =>
+  setupTaskPolling({
+    taskId,
+    key: INSIGHTS_CLOUD_SYNC_TASK,
+    onTaskSuccess: () => {
+      fetchInsights({ query, page: 1 });
+      dispatch(
+        taskRelatedToast(
+          taskId,
+          'success',
+          __('Recommendations synced successfully')
+        )
+      );
+    },
+    taskErrorMessage: data => syncInsightsError(data.humanized.errors),
+    dispatch,
   });

data/webpack/InsightsCloudSync/InsightsCloudSyncConstants.js

@@ -4,6 +4,8 @@ import { foremanUrl } from '../ForemanRhCloudHelpers';
 
 export const INSIGHTS_CLOUD_SYNC = 'INSIGHTS_CLOUD_SYNC';
 
+export const INSIGHTS_CLOUD_SYNC_TASK = 'INSIGHTS_CLOUD_SYNC_TASK';
+
 export const INSIGHTS_SYNC_PAGE_TITLE = __('Red Hat Insights');
 
 export const INSIGHTS_PATH = foremanUrl('/foreman_rh_cloud/insights_cloud');

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

@@ -1,11 +1,15 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Insights cloud sync actions should syncInsights 1`] = `
-Object {
-  "errorToast": [Function],
-  "key": "INSIGHTS_CLOUD_SYNC",
-  "successToast": [Function],
-  "type": "post-some-type",
-  "url": "/insights_cloud/tasks",
-}
+Array [
+  Array [
+    Object {
+      "errorToast": [Function],
+      "handleSuccess": [Function],
+      "key": "INSIGHTS_CLOUD_SYNC",
+      "type": "post-some-type",
+      "url": "/insights_cloud/tasks",
+    },
+  ],
+]
 `;

data/webpack/common/ForemanTasks/ForemanTasksActions.js

@@ -0,0 +1,64 @@
+import React from 'react';
+import { get } from 'foremanReact/redux/API';
+import { withInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import { addToast } from 'foremanReact/redux/actions/toasts';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanTaskDetailsUrl } from './ForemanTasksHelpers';
+import { foremanUrl } from '../../ForemanRhCloudHelpers';
+
+export const setupTaskPolling = ({
+  taskId,
+  key,
+  onTaskSuccess,
+  onTaskError,
+  taskErrorMessage,
+  dispatch,
+}) =>
+  withInterval(
+    get({
+      key,
+      url: foremanTaskDetailsUrl(taskId),
+      handleSuccess: ({ data }, stopTaskInterval) => {
+        if (data.result === 'success') {
+          stopTaskInterval();
+          onTaskSuccess(data, dispatch);
+        }
+        if (data.result === 'error') {
+          stopTaskInterval();
+          if (taskErrorMessage === undefined) {
+            taskErrorMessage = errorData =>
+              `${__('The task failed with the following error:')} ${
+                errorData.humanized.errors
+              }`;
+          }
+          if (onTaskError === undefined) {
+            onTaskError = errorData =>
+              dispatch(defaultTaskErrorHandler(errorData, taskErrorMessage));
+          }
+          onTaskError(data, dispatch);
+        }
+      },
+      errorToast: error => `Could not get task details: ${error}`,
+    })
+  );
+
+export const taskRelatedToast = (taskID, type, message) =>
+  addToast({
+    type,
+    message: (
+      <span>
+        {message}
+        <br />
+        <a
+          target="_blank"
+          rel="noopener noreferrer"
+          href={foremanUrl(`/foreman_tasks/tasks/${taskID}`)}
+        >
+          {__('view the task page for more details')}
+        </a>
+      </span>
+    ),
+  });
+
+const defaultTaskErrorHandler = (data, taskErrorMessage) =>
+  taskRelatedToast(data.id, 'error', taskErrorMessage(data));

data/webpack/common/ForemanTasks/ForemanTasksHelpers.js

@@ -0,0 +1,7 @@
+import { foremanUrl } from '../../ForemanRhCloudHelpers';
+
+export const foremanTasksApiPath = path =>
+  foremanUrl(`/foreman_tasks/api/tasks/${path}`);
+
+export const foremanTaskDetailsUrl = id =>
+  foremanTasksApiPath(`${id}/details?include_permissions`);

data/webpack/common/ForemanTasks/index.js

@@ -0,0 +1 @@
+export { setupTaskPolling, taskRelatedToast } from './ForemanTasksActions';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 4.0.21.1
+  version: 4.0.22
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-06 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -172,6 +172,7 @@ files:
 - app/services/foreman_rh_cloud/branch_info.rb
 - app/services/foreman_rh_cloud/cloud_auth.rb
 - app/services/foreman_rh_cloud/cloud_connector.rb
+- app/services/foreman_rh_cloud/cloud_request.rb
 - app/services/foreman_rh_cloud/cloud_request_forwarder.rb
 - app/services/foreman_rh_cloud/remediations_retriever.rb
 - app/services/foreman_rh_cloud/template_renderer_helper.rb
@@ -620,6 +621,9 @@ files:
 - webpack/__tests__/__snapshots__/ForemanRhCloudHelpers.test.js.snap
 - webpack/__tests__/__snapshots__/ForemanRhCloudSelectors.test.js.snap
 - webpack/__tests__/__snapshots__/ForemanRhCloudTestHelpers.test.js.snap
+- webpack/common/ForemanTasks/ForemanTasksActions.js
+- webpack/common/ForemanTasks/ForemanTasksHelpers.js
+- webpack/common/ForemanTasks/index.js
 - webpack/common/Switcher/HelpLabel.js
 - webpack/common/Switcher/SwitcherPF4.js
 - webpack/common/Switcher/SwitcherPF4.scss