foreman_rh_cloud 4.0.36 → 5.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 224802f19d8eb36625b3d80121e6325d2733920417d1b45d229b448e20cd8164
-  data.tar.gz: 3ffe588112a4638c952b7dc11786e811dd484aba2f013b03fd070b09cd5292d0
+  metadata.gz: 012fcceed18a6413326df32052bee870b299682bc114d5c3e59954bda33b2475
+  data.tar.gz: bb72b384fc54d6c19951c453c69b0ecaae5d26bf844fc85b4d4b56f04e1e76bd
 SHA512:
-  metadata.gz: '08abdef66a17843cec33bf0a6fa84c689ecdceab413df010936c0b9b7226ce9b2ed00d1853c23838b49faa01a96ab86673d59554910ba78ebbfd654ecc439d8e'
-  data.tar.gz: 3f432ee32d4d1e81b1f5dddccd98265be4e62422ca28a062264be78dd3ce3c58f657aae55dd572a27cc8d88c38ac8b6250f328f17d9951572340af694644259b
+  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/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -33,25 +33,14 @@ module InsightsCloud::Api
         }, status: @cloud_response.code
       end
 
-      # Append redhat-specific headers
-      @cloud_response.headers.each do |key, value|
-        assign_header(response, @cloud_response, key, false) if key.to_s.start_with?('x_rh_')
+      if @cloud_response.headers[:content_disposition]
+        return send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
       end
-      # Append general headers
+
       assign_header(response, @cloud_response, :x_resource_count, true)
-      headers[Rack::ETAG] = @cloud_response.headers[:etag]
+      assign_header(response, @cloud_response, :x_rh_insights_request_id, false)
 
-      if @cloud_response.headers[:content_disposition]
-        # If there is a Content-Disposition header, it means we are forwarding binary data, send the raw data with proper
-        # content type
-        send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
-      elsif @cloud_response.headers[:content_type] =~ /zip/
-        # if there is no Content-Disposition, but the content type is binary according the content type,
-        # forward the request as binry too
-        send_data @cloud_response, type: @cloud_response.headers[:content_type]
-      else
-        render json: @cloud_response, status: @cloud_response.code
-      end
+      render json: @cloud_response, status: @cloud_response.code
     end
 
     def branch_info

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

@@ -25,12 +25,11 @@ module ForemanRhCloud
       base_params = {
         method: original_request.method,
         payload: forward_payload,
-        headers: original_headers(original_request).merge(
-          {
-            params: forward_params,
-            user_agent: http_user_agent(original_request),
-            content_type: original_request.media_type.presence || original_request.format.to_s,
-          }),
+        headers: {
+          params: forward_params,
+          user_agent: http_user_agent(original_request),
+          content_type: original_request.media_type,
+        },
       }
       base_params.merge(path_params(original_request.path, certs))
     end
@@ -81,16 +80,6 @@ module ForemanRhCloud
       end
     end
 
-    def original_headers(original_request)
-      headers = {
-        if_none_match: original_request.if_none_match,
-        if_modified_since: original_request.if_modified_since,
-      }.compact
-
-      logger.debug("Sending headers: #{headers}")
-      headers
-    end
-
     def platform_request?
       ->(request_path) { request_path.include? '/platform' }
     end