foreman_rh_cloud 4.0.25.1 → 5.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf14938ab96483d5b90b699ad095664ccda999db645f3d0e4b868b8e6066f268
-  data.tar.gz: 90062d9c4bf632a9d856d17e16639d6920e6a9b9d0bbad1334202041122fd19f
+  metadata.gz: 5a77b9dd6b10d3bf354a1ea4888ac4c829a66de66da4f432860e76ffe1b2a887
+  data.tar.gz: 81913ea4f9745d2c2e08d2c6b5117395c3b360b1879acdd21c8b83fabeccb4a0
 SHA512:
-  metadata.gz: 46eb0bfffd3853da3d4d0254756469e07f6f690166e96732bcb77a027d9cf3370cbe3d3f72e59a801cf85338fd2b2a042e45dd4a74907df3b66969a1006cb8c8
-  data.tar.gz: 1464b0f05e778e6b0a002114175b0c0a3f95b51c78af5fecd00395c42d6cd4196dffb0362724bcc62989403500e9994afe9012552e6e0ad00f0c0fe8f2e2fc5e
+  metadata.gz: 026bf10d2031f225aa64539059ed9fea96254a04e4dfb305db0ffc3ca7c0c3c9676b5d331a78cdf98320c3175765a1d862e7be707f4f69ef0f95a8149977119f
+  data.tar.gz: c8b159a4c8f86bfcf710094b3b6e49b06b00d0d8448f8d853ee0777bf356cd6a3165c497b98f9bba3106f1c1ac234f49f297ff3cf58b548fcb2d462c04eb4f33

data/app/controllers/api/v2/rh_cloud/inventory_controller.rb

@@ -7,6 +7,7 @@ module Api
         include InventoryUpload::TaskActions
 
         api :GET, "/organizations/:organization_id/rh_cloud/report", N_("Download latest report")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def download_file
           filename, file = report_file(params[:organization_id])
 
@@ -16,6 +17,7 @@ module Api
         end
 
         api :POST, "/organizations/:organization_id/rh_cloud/report", N_("Start report generation")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def generate_report
           organization_id = params[:organization_id]
 
@@ -27,6 +29,7 @@ module Api
         end
 
         api :POST, "/organizations/:organization_id/rh_cloud/inventory_sync", N_("Start inventory synchronization")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def sync_inventory_status
           selected_org = Organization.find(params[:organization_id])
 
@@ -39,7 +42,7 @@ module Api
           render json: { message: error.message }, status: :bad_request
         end
 
-        api :POST, "rh_cloud/enable_connector", N_("Enable cloud connector")
+        api :POST, "/rh_cloud/enable_connector", N_("Enable cloud connector")
         def enable_cloud_connector
           cloud_connector = ForemanRhCloud::CloudConnector.new
           render json: cloud_connector.install.to_json

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

@@ -25,6 +25,14 @@ module InsightsCloud::Api
         }, status: :bad_gateway
       end
 
+      if @cloud_response.code >= 300
+        return render json: {
+          :message => 'Cloud request failed',
+          :headers => {},
+          :response => @cloud_response,
+        }, status: @cloud_response.code
+      end
+
       if @cloud_response.headers[:content_disposition]
         return send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
       end

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

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -17,6 +17,8 @@ module ForemanRhCloud
       logger.debug("Sending request to: #{request_opts[:url]}")
 
       execute_cloud_request(request_opts)
+    rescue RestClient::Exception => error_response
+      error_response.response
     end
 
     def prepare_request_opts(original_request, forward_payload, forward_params, certs)
@@ -62,6 +64,12 @@ module ForemanRhCloud
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
           ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
         }
+      when connection_test_request?
+        {
+          url: ForemanRhCloud.cert_base_url + '/api/apicast-tests/ping',
+          ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
+          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+        }
       else # Legacy insights API
         {
           url: ForemanRhCloud.legacy_insights_url + request_path.sub('/redhat_access/r/insights', '/r/insights'),
@@ -76,6 +84,10 @@ module ForemanRhCloud
       ->(request_path) { request_path.include? '/platform' }
     end
 
+    def connection_test_request?
+      ->(request_path) { request_path =~ /redhat_access\/r\/insights\/?$/ }
+    end
+
     def prepare_forward_cloud_url(base_url, request_path)
       cloud_path = request_path.sub('/redhat_access/r/insights/platform/', '')
                                .sub('/redhat_access/r/insights/', '')
@@ -84,11 +96,11 @@ module ForemanRhCloud
     end
 
     def core_app_name
-      'Foreman'
+      BranchInfo.new.core_app_name
     end
 
     def core_app_version
-      Foreman::Version.new
+      BranchInfo.new.core_app_version
     end
 
     def http_user_agent(original_request)