foreman_rh_cloud 4.0.35 → 5.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13d501dcd7ec95a0fc10ed4bd7b0a426e3f485aa3dd7ba597e56dbfd41268977
-  data.tar.gz: 6c392f1ad04344c887609894b64dac3bbd6add5c4a70cbf4ae1598c2851ac581
+  metadata.gz: 012fcceed18a6413326df32052bee870b299682bc114d5c3e59954bda33b2475
+  data.tar.gz: bb72b384fc54d6c19951c453c69b0ecaae5d26bf844fc85b4d4b56f04e1e76bd
 SHA512:
-  metadata.gz: c5bbe88508a4df1017b05d6dd13adb432040dbad271bc317abc10169decd43f1ab785dfc9733f3c8e4d5f6116ffa46252ace5996a5e133c2c48954da71679464
-  data.tar.gz: 448308053649ce5001aeb40b53f546a52c92a5a84c870d1bbda392655f579c0f16df61c53da16f58101708fdac855813c5f1adeb2039cf2c6a0f2ea1b4c6f709
+  metadata.gz: 70904b446fce3a2ca3a794c418aaa1591f4276bd35d1636a629e7361b75c62163fc76ad45caa024752a763ef6a9e6344e979dff8f9e9a017c19ac878f667a649
+  data.tar.gz: 4fd0e25610e4848565178f19e5a3ffb1da2d9b1505cd604f18a9276bba931f6fea3fbbddcd6c1e375a9d655a4c0b506c3937d89e9e7899b4aed37ae05c72b542

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/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

data/app/services/foreman_rh_cloud/cloud_ping_service.rb

@@ -39,9 +39,6 @@ module ForemanRhCloud
         certs = candlepin_id_cert(@org)
         return StandardError.new('certificate missing') unless certs
 
-        cert_checker = Katello::UpstreamConnectionChecker.new(@org)
-        cert_checker.assert_connection
-
         execute_cloud_request(
           method: :get,
           url: ForemanRhCloud.cert_base_url + "/api/apicast-tests/ping",
@@ -75,7 +72,7 @@ module ForemanRhCloud
               org,
               {
                 success: cert_response.is_a?(RestClient::Response),
-                error: (cert_response.is_a?(Exception) ? cert_response&.message || cert_response.inspect : nil),
+                error: (cert_response.is_a?(Exception) ? cert_response.inspect : nil),
               },
             ]
           end

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -28,7 +28,7 @@ module ForemanRhCloud
         headers: {
           params: forward_params,
           user_agent: http_user_agent(original_request),
-          content_type: original_request.media_type.presence || original_request.format.to_s,
+          content_type: original_request.media_type,
         },
       }
       base_params.merge(path_params(original_request.path, certs))