foreman_rh_cloud 4.0.29 → 5.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f3f2a8162edb347dbd28899eb364a171d3ab4ddb4845e7f9286c35a71af1f1
-  data.tar.gz: d81d2f8dacd27f22b3ef7ab58641b38a16ce132669c3f3390fcf2f150afc72de
+  metadata.gz: 652e5780da34877a7db2beabee9d7853df3e92d56e9336b135c2f5c10e591135
+  data.tar.gz: 41d79413f8cda24474d233512b75b301277058fec819cd0d8eb19c7ea24465b7
 SHA512:
-  metadata.gz: aa7f0d5467ae1f4c2b1c451aeb2597244b4afd4ecaa2b010c113d6ff31725ec0115afdfbcf172c5e895f637c38b9690459488b4c4150531122783b6cfad7d96d
-  data.tar.gz: 5279557b8d3fad37db9bea492b95801175ceb0ffbe296fa17139ebffc48ebfb52558a72bffd7617ba20ff9a0cadf4c68b42252dfca6cb8ac8bb55f100ef6a6b5
+  metadata.gz: 5f570c0fce387859fb5cd268452591bf7ab85033600571aa0953173ab2d906bcfc22f5f2dbba5868d88c7af86a4442a4c56b45e719c8f0c0f983a14f039a2b27
+  data.tar.gz: faa24509c2c3f8ef000c41bbbc0cddbc5352dc50998345883030b904d251cf8ee705a635caaf8ca3e9c84be38f188d529e60d5435dd506b76a7dac0a419e89db

data/app/controllers/concerns/inventory_upload/report_actions.rb

@@ -11,7 +11,7 @@ module InventoryUpload
     end
 
     def start_report_generation(organization_id)
-      ForemanInventoryUpload::Async::GenerateReportJob.perform_later(ForemanInventoryUpload.generated_reports_folder, organization_id)
+      ForemanTasks.async_task(ForemanInventoryUpload::Async::GenerateReportJob, ForemanInventoryUpload.generated_reports_folder, organization_id)
     end
 
     def report_file(organization_id)

data/app/controllers/foreman_inventory_upload/reports_controller.rb

@@ -7,7 +7,7 @@ module ForemanInventoryUpload
     def last
       label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(params[:organization_id])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
-      task_label = ForemanInventoryUpload::Async::GenerateAllReportsJob.singleton_job_name
+      task_label = ForemanInventoryUpload::Async::GenerateAllReportsJob.name
       scheduled = ForemanTasks::Task.where(
         :label => task_label,
         :state => 'scheduled'

data/app/controllers/insights_cloud/hits_controller.rb

@@ -7,7 +7,7 @@ module InsightsCloud
 
       render json: {
         hasToken: !Setting[:rh_cloud_token].empty?,
-        hits: hits.map { |hit| hit.attributes.merge(hostname: hit.host&.name, has_playbook: hit.has_playbook?) },
+        hits: hits.map { |hit| hit.attributes.merge(hostname: hit.host&.name, has_playbook: hit.has_playbook?, host_uuid: hit.host_uuid) },
         itemCount: hits.count,
       }, status: :ok
     end

data/app/models/insights_hit.rb

@@ -22,4 +22,8 @@ class InsightsHit < ApplicationRecord
   def has_playbook?
     !rule.nil?
   end
+
+  def host_uuid
+    insights_facet.uuid
+  end
 end

data/app/models/setting/rh_cloud.rb

@@ -12,7 +12,6 @@ class Setting::RhCloud < Setting
   end
 
   def self.default_settings
-    return unless ActiveRecord::Base.connection.table_exists?('settings')
     [
       set('allow_auto_inventory_upload', N_('Enable automatic upload of your host inventory to the Red Hat cloud'), true, N_('Automatic inventory upload')),
       set('allow_auto_insights_sync', N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), false, N_('Synchronize recommendations Automatically')),

data/app/models/task_output_line.rb

@@ -0,0 +1,2 @@
+class TaskOutputLine < ApplicationRecord
+end

data/app/models/task_output_status.rb

@@ -0,0 +1,2 @@
+class TaskOutputStatus < ApplicationRecord
+end