foreman_rh_cloud 12.2.13 → 12.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27458c63e65391eef2cce60a1d6d0bab3ec76ebaac4cc844420e38f5b0074794
-  data.tar.gz: 157d7d238ca974f97e3253a7363f6b5eb8bd5fa378adf975d2e2816e947df8cc
+  metadata.gz: 298be7d24bfc6e80e79eee94df423d76892fcf4f45a8750b940776f0647e4761
+  data.tar.gz: 6c3f86b461e2697775133e0c9483eefc09b8ae35fc7912810f80f43a66f78512
 SHA512:
-  metadata.gz: 90533b7fec623776352cc2d0791556f78b6910913bfe8c2d1869fc2d10df0946d0e66dcd37c4d8788bc3451aa3e4c5c6991e9ebceedc19c620585d7e68a55f5b
-  data.tar.gz: 958964446134a0673007003fe45b4bda54add3a81d2b9c4f98799477e0f77a6df8cd5c82371b0794db7216e6c60b362ed686779c84beec050e79e5b3967fbb79
+  metadata.gz: 738e2cd68221abed620727ded441caee536a19f09ab5d668eb223dedbc37266e9813415ac3218d54e6b6a19e3f54e824a312a7304baa61d64e74f168544c6cd4
+  data.tar.gz: 44b1b35ecd68218582099ddff9fc1b94a56108a585eb9799adee89e615608ab4588d20bde9e0d53aa9d36de82cd58009cb0cc7dd5bdaa32778a402ee4b2314a9

data/app/controllers/concerns/foreman_rh_cloud/registration_manager_extensions.rb

@@ -13,13 +13,13 @@ module ForemanRhCloud
       host.reload
 
       # Only delete from HBI in IoP mode (hosted mode uses async job for cleanup)
-      hbi_host_destroy(host) if ForemanRhCloud.with_iop_smart_proxy? && !organization_destroy && host.insights_facet&.uuid&.presence
+      hbi_host_destroy(host) if ForemanRhCloud.with_iop_smart_proxy? && !organization_destroy && host.insights_uuid.presence
       host.insights&.destroy!
       super(host, options)
     end
 
     def hbi_host_destroy(host)
-      uuid = host.insights_facet.uuid
+      uuid = host.insights_uuid
       logger.debug "Unregistering host #{uuid} from HBI"
       execute_cloud_request(
         organization: host.organization,

data/app/controllers/concerns/insights_cloud/package_profile_upload_extensions.rb

@@ -21,6 +21,9 @@ module InsightsCloud
         @host.id
       )
 
+      # Ensure insights UUID matches subscription UUID (only runs in IoP mode per method guard above)
+      @host.ensure_iop_insights_uuid
+
       # in IoP case, the hosts are identified by the sub-man ID, and we can assume they already
       # exist in the local inventory. This will also handle facet creation for new hosts.
       return if @host.insights

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -7,7 +7,7 @@ module ForemanInventoryUpload
       accounts = Hash[
         labels.map do |id, label|
           generate_report_status = status_for(id, ForemanInventoryUpload::Async::GenerateReportJob)
-          upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportJob)
+          upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportDirectJob)
           report_file_paths = ForemanInventoryUpload.report_file_paths(id)
 
           [

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -6,7 +6,7 @@ module ForemanInventoryUpload
     before_action :require_non_iop_smart_proxy, only: [:enable_cloud_connector]
 
     def last
-      label = ForemanInventoryUpload::Async::UploadReportJob.output_label(params[:organization_id])
+      label = ForemanInventoryUpload::Async::UploadReportDirectJob.output_label(params[:organization_id])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
 
       render json: {

data/app/controllers/insights_cloud/ui_requests_controller.rb

@@ -2,7 +2,7 @@ module InsightsCloud
   class UIRequestsController < ::ApplicationController
     layout false
 
-    before_action :ensure_org, :ensure_loc, :only => [:forward_request]
+    before_action :ensure_org, :find_location, :only => [:forward_request]
 
     # The method that "proxies" requests over to Cloud
     def forward_request
@@ -93,9 +93,8 @@ module InsightsCloud
       return render_message 'Organization not found or invalid', :status => 400 unless @organization
     end
 
-    def ensure_loc
+    def find_location
       @location = Location.current
-      return render_message 'Location not found or invalid', :status => 400 unless @location
     end
 
     def base_url

data/app/models/concerns/rh_cloud_host.rb

@@ -26,5 +26,19 @@ module RhCloudHost
     def insights_facet
       insights
     end
+
+    # In IoP, read directly from the subscription facet to avoid stale data (see comment on ensure_iop_insights_uuid)
+    def insights_uuid
+      ForemanRhCloud.with_iop_smart_proxy? ? subscription_facet&.uuid : insights_facet&.uuid
+    end
+
+    # In non-IoP, insights_facet uuids are assigned by Hosted.
+    # In IoP, insights_facet uuids must match Katello subscription_facet uuids.
+    # If the host was previously registered to hosted Insights,
+    # we need to correct its uuid.
+    def ensure_iop_insights_uuid
+      return unless insights_facet.present? && subscription_facet.present? && insights_facet.uuid != subscription_facet.uuid
+      insights_facet.update!(uuid: subscription_facet.uuid)
+    end
   end
 end

data/app/models/foreman_rh_cloud/ping.rb

@@ -7,7 +7,7 @@ module ForemanRhCloud
       include ForemanRhCloud::CertAuth
 
       def iop_smart_proxy_url
-        @iop_smart_proxy_url ||= ForemanRhCloud.iop_smart_proxy.url
+        ForemanRhCloud.iop_smart_proxy&.url
       end
 
       def service_urls
@@ -33,6 +33,7 @@ module ForemanRhCloud
       end
 
       def ping
+        return {} unless ForemanRhCloud.with_iop_smart_proxy?
         ping_services
       end
 

data/app/services/foreman_rh_cloud/tags_auth.rb

@@ -20,7 +20,8 @@ module ForemanRhCloud
     end
 
     def update_tag
-      logger.debug("Updating tags for user: #{@user}, org: #{@org.name}, loc: #{@loc.name}")
+      loc_name = location_name_for_tag
+      logger.debug("Updating tags for user: #{@user}, org: #{@org.name}, loc: #{loc_name}")
 
       payload = tags_query_payload
       params = {
@@ -36,7 +37,9 @@ module ForemanRhCloud
     end
 
     def allowed_hosts
-      Host.authorized_as(@user, nil, nil).where(organization: @org, location: @loc).joins(:subscription_facet).pluck('katello_subscription_facets.uuid')
+      query = Host.authorized_as(@user, nil, nil).where(organization: @org)
+      query = query.where(location: @loc) if @loc
+      query.joins(:subscription_facet).pluck('katello_subscription_facets.uuid')
     end
 
     def tags_query_payload
@@ -47,11 +50,18 @@ module ForemanRhCloud
     end
 
     def tag_value
-      "U:\"#{@user.login}\"O:\"#{@org.name}\"L:\"#{@loc.name}\""
+      location_part = "L:\"#{location_name_for_tag}\""
+      "U:\"#{@user.login}\"O:\"#{@org.name}\"#{location_part}"
     end
 
     def auth_tag
       "#{TAG_NAME}=#{tag_value}"
     end
+
+    private
+
+    def location_name_for_tag
+      @loc ? @loc.name : '*'
+    end
   end
 end

data/app/views/api/v2/advisor_engine/host_details.json.rabl

@@ -1,9 +1,7 @@
 collection @hosts
 
 attributes :name
-node :insights_uuid do |host|
-  host.insights_facet&.uuid
-end
+node :insights_uuid, &:insights_uuid
 node :insights_hit_details do |host|
   host&.facts('insights::hit_details')&.values&.first
 end

data/app/views/api/v2/hosts/insights/base.rabl

@@ -1,5 +1,6 @@
-attributes :uuid
-
+node :uuid do |facet|
+  facet&.host&.insights_uuid
+end
 node :insights_hit_details do |facet|
   facet&.host&.facts('insights::hit_details')&.values&.first
 end

data/lib/foreman_inventory_upload/async/queue_for_upload_job.rb

@@ -9,7 +9,6 @@ module ForemanInventoryUpload
       def run
         logger.debug('Ensuring objects')
         ensure_ouput_folder
-        ensure_output_script
         logger.debug("Copying #{report_file} to #{uploads_folder}")
         enqueued_file_name = File.join(uploads_folder, report_file)
         FileUtils.mv(File.join(base_folder, report_file), enqueued_file_name)
@@ -22,31 +21,10 @@ module ForemanInventoryUpload
         @uploads_folder ||= ForemanInventoryUpload.uploads_folder
       end
 
-      def script_file
-        @script_file ||= File.join(uploads_folder, ForemanInventoryUpload.upload_script_file)
-      end
-
       def ensure_ouput_folder
         FileUtils.mkdir_p(uploads_folder)
       end
 
-      def ensure_output_script
-        return if File.exist?(script_file)
-
-        script_source = File.join(ForemanRhCloud::Engine.root, 'lib/foreman_inventory_upload/scripts/uploader.sh.erb')
-
-        template_src = Foreman::Renderer::Source::String.new(content: File.read(script_source))
-        scope = Foreman::Renderer::Scope::Base.new(
-          source: template_src,
-          variables: {
-            upload_url: ForemanInventoryUpload.upload_url,
-          }
-        )
-        script_source = Foreman::Renderer.render(template_src, scope)
-        File.write(script_file, script_source)
-        FileUtils.chmod('+x', script_file)
-      end
-
       def logger
         Foreman::Logging.logger('background')
       end
@@ -60,7 +38,7 @@ module ForemanInventoryUpload
       end
 
       def plan_upload_report(enqueued_file_name, organization_id)
-        plan_action(UploadReportJob, enqueued_file_name, organization_id)
+        plan_action(UploadReportDirectJob, enqueued_file_name, organization_id)
       end
     end
   end

data/lib/foreman_inventory_upload/async/upload_report_direct_job.rb

@@ -0,0 +1,200 @@
+require 'tempfile'
+require 'rest-client'
+
+module ForemanInventoryUpload
+  module Async
+    class UploadReportDirectJob < ::Actions::EntryAction
+      include AsyncHelpers
+      include ::ForemanRhCloud::Async::ExponentialBackoff
+      include ::ForemanRhCloud::CloudRequest
+
+      # Wrapper class to avoid monkey-patching File for multipart uploads
+      class FileUpload
+        attr_reader :file, :content_type
+
+        def initialize(file, content_type:)
+          @file = file
+          @content_type = content_type
+        end
+
+        def read(*args)
+          @file.read(*args)
+        end
+
+        def path
+          @file.path
+        end
+
+        def respond_to_missing?(method_name, include_private = false)
+          @file.respond_to?(method_name, include_private) || super
+        end
+
+        def method_missing(method_name, *args, &block)
+          if @file.respond_to?(method_name)
+            @file.send(method_name, *args, &block)
+          else
+            super
+          end
+        end
+      end
+
+      def self.output_label(label)
+        "upload_for_#{label}"
+      end
+
+      def plan(filename, organization_id)
+        # NOTE: This implementation assumes a single organization will not trigger multiple
+        # concurrent uploads. The instance_label is derived from organization_id alone, which
+        # means concurrent uploads for the same org would share ProgressOutput storage.
+        # This matches the pattern in GenerateReportJob. A full fix for thread-safety
+        # requires UI changes to display multiple concurrent tasks per org (tracked for PR #2).
+        label = UploadReportDirectJob.output_label(organization_id)
+        clear_task_output(label)
+        plan_self(
+          instance_label: label,
+          filename: filename,
+          organization_id: organization_id
+        )
+      end
+
+      def try_execute
+        if content_disconnected?
+          progress_output do |progress_output|
+            progress_output.write_line("Report was not moved and upload was canceled because connection to Insights is not enabled. Report location: #{filename}.")
+            progress_output.status = "Task aborted, exit 1"
+            done!
+          end
+          return
+        end
+
+        unless organization.owner_details&.dig('upstreamConsumer', 'idCert')
+          logger.info("Skipping organization '#{organization}', no candlepin certificate defined.")
+          progress_output do |progress_output|
+            progress_output.write_line("Skipping organization #{organization}, no candlepin certificate defined.")
+            progress_output.status = "Task aborted, exit 1"
+            done!
+          end
+          return
+        end
+
+        Tempfile.create([organization.name, '.pem']) do |cer_file|
+          cer_file.write(certificate[:cert])
+          cer_file.write(certificate[:key])
+          cer_file.flush
+          upload_report(cer_file.path)
+        end
+
+        done!
+      end
+
+      def upload_report(cer_path)
+        progress_output do |progress_output|
+          progress_output.write_line("Uploading report for organization #{organization.label}...")
+          progress_output.status = "Running upload"
+
+          begin
+            upload_file(cer_path)
+            progress_output.write_line("Upload completed successfully")
+            move_to_done_folder
+            progress_output.write_line("Uploaded file moved to done/ folder")
+            progress_output.status = "pid #{Process.pid} exit 0"
+          rescue StandardError => e
+            progress_output.write_line("Upload failed: #{e.message}")
+            progress_output.status = "pid #{Process.pid} exit 1"
+            raise
+          end
+        end
+      end
+
+      def upload_file(cer_path)
+        cert_content = File.read(cer_path)
+
+        File.open(filename, 'rb') do |file|
+          # Wrap file with FileUpload class for RestClient multipart handling
+          # RestClient requires objects with :read, :path, and :content_type methods
+          wrapped_file = FileUpload.new(file, content_type: 'application/vnd.redhat.qpc.tar+tgz')
+
+          response = execute_cloud_request(
+            method: :post,
+            url: ForemanInventoryUpload.upload_url,
+            payload: {
+              multipart: true,
+              file: wrapped_file,
+            },
+            headers: {
+              'X-Org-Id' => organization.label,
+            },
+            ssl_client_cert: OpenSSL::X509::Certificate.new(cert_content),
+            ssl_client_key: OpenSSL::PKey::RSA.new(cert_content),
+            timeout: 600,
+            open_timeout: 60
+          )
+
+          logger.debug("Upload response code: #{response.code}")
+        end
+      end
+
+      def move_to_done_folder
+        FileUtils.mkdir_p(ForemanInventoryUpload.done_folder)
+        done_file = ForemanInventoryUpload.done_file_path(File.basename(filename))
+        FileUtils.mv(filename, done_file)
+        logger.debug("Moved #{filename} to #{done_file}")
+      end
+
+      def certificate
+        ForemanRhCloud.with_iop_smart_proxy? ? foreman_certificate : manifest_certificate
+      end
+
+      def manifest_certificate
+        candlepin_id_certificate = organization.owner_details['upstreamConsumer']['idCert']
+        {
+          cert: candlepin_id_certificate['cert'],
+          key: candlepin_id_certificate['key'],
+        }
+      end
+
+      def foreman_certificate
+        {
+          cert: File.read(Setting[:ssl_certificate]),
+          key: File.read(Setting[:ssl_priv_key]),
+        }
+      end
+
+      def filename
+        input[:filename]
+      end
+
+      def organization
+        Organization.find(input[:organization_id])
+      end
+
+      def content_disconnected?
+        !Setting[:subscription_connection_enabled]
+      end
+
+      def progress_output
+        progress_output = ProgressOutput.register(instance_label)
+        yield(progress_output)
+      ensure
+        progress_output.close
+      end
+
+      def instance_label
+        input[:instance_label]
+      end
+
+      def logger
+        Foreman::Logging.logger('background')
+      end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
+
+      def clear_task_output(label)
+        TaskOutputLine.where(label: label).delete_all
+        TaskOutputStatus.where(label: label).delete_all
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload.rb

@@ -48,10 +48,6 @@ module ForemanInventoryUpload
     @outputs_folder ||= ensure_folder(File.join(ForemanInventoryUpload.base_folder, 'outputs/'))
   end
 
-  def self.upload_script_file
-    'uploader.sh'
-  end
-
   def self.facts_archive_name(organization, filter = nil)
     "report_for_#{organization}#{filter.empty? ? nil : "[#{filter.to_s.parameterize}]"}.tar.xz"
   end

data/lib/foreman_rh_cloud/plugin.rb

@@ -117,14 +117,17 @@ module ForemanRhCloud
           end
         end
 
+        # Preload insights facet to avoid N+1 queries when rendering host list with facets
+        add_controller_action_scope('Api::V2::HostsController', :index) do |base_scope|
+          base_scope.preload(:insights)
+        end
+
         register_global_js_file 'global'
 
         register_custom_status InventorySync::InventoryStatus
         register_custom_status InsightsClientReportStatus
-        if ForemanRhCloud.with_iop_smart_proxy?
-          register_ping_extension { ForemanRhCloud::Ping.ping }
-          register_status_extension { ForemanRhCloud::Ping.status }
-        end
+        register_ping_extension { ForemanRhCloud::Ping.ping }
+        register_status_extension { ForemanRhCloud::Ping.status }
 
         describe_host do
           overview_buttons_provider :insights_host_overview_buttons
@@ -146,6 +149,10 @@ module ForemanRhCloud
           end
         end
 
+        ::Foreman::Plugin.app_metadata_registry.register(:foreman_rh_cloud, {
+          iop: ForemanRhCloud.with_iop_smart_proxy?,
+        })
+
         extend_template_helpers ForemanRhCloud::TemplateRendererHelper
         allowed_template_helpers :remediations_playbook, :download_rh_playbook
       end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.2.13'.freeze
+  VERSION = '12.2.15'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -14,15 +14,15 @@ module ForemanRhCloud
 
   def self.base_url
     # for testing set ENV to 'https://ci.cloud.redhat.com'
-    @base_url ||= env_or_on_premise_url('SATELLITE_RH_CLOUD_URL') || 'https://cloud.redhat.com'
+    env_or_on_premise_url('SATELLITE_RH_CLOUD_URL') || 'https://cloud.redhat.com'
   end
 
   def self.cert_base_url
-    @cert_base_url ||= env_or_on_premise_url('SATELLITE_CERT_RH_CLOUD_URL') || 'https://cert.cloud.redhat.com'
+    env_or_on_premise_url('SATELLITE_CERT_RH_CLOUD_URL') || 'https://cert.cloud.redhat.com'
   end
 
   def self.legacy_insights_url
-    @legacy_insights_url ||= env_or_on_premise_url('SATELLITE_LEGACY_INSIGHTS_URL') || 'https://cert-api.access.redhat.com'
+    env_or_on_premise_url('SATELLITE_LEGACY_INSIGHTS_URL') || 'https://cert-api.access.redhat.com'
   end
 
   def self.verify_ssl_method

data/lib/insights_cloud/async/connector_playbook_execution_reporter_task.rb

@@ -126,10 +126,10 @@ module InsightsCloud
 
       def invocation_status
         hosts_state = Hash[job_invocation.targeting.hosts.map do |host|
-          next unless host.insights&.uuid
+          next unless host.insights_uuid
           [
-            host.insights.uuid,
-            task_status(job_invocation.sub_task_for_host(host), host.insights.uuid),
+            host.insights_uuid,
+            task_status(job_invocation.sub_task_for_host(host), host.insights_uuid),
           ]
         end.compact]
 

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -8,8 +8,6 @@ module InventorySync
       set_callback :step, :around, :create_missing_hosts
 
       def plan(organizations)
-        # Do not run for local advisor, since we use sub-man id to identify hosts.
-        return if ForemanRhCloud.with_iop_smart_proxy?
         # by default the tasks will be executed concurrently
         super(organizations)
         plan_self_host_sync

data/package.json

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

data/test/controllers/accounts_controller_test.rb

@@ -11,7 +11,7 @@ class AccountsControllerTest < ActionController::TestCase
     generate_label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(test_org.id)
     generate_output = ForemanInventoryUpload::Async::ProgressOutput.register(generate_label)
     generate_output.status = 'generate_status_test'
-    upload_label = ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id)
+    upload_label = ForemanInventoryUpload::Async::UploadReportDirectJob.output_label(test_org.id)
     upload_output = ForemanInventoryUpload::Async::ProgressOutput.register(upload_label)
     upload_output.status = 'upload_status_test'
 

data/test/controllers/insights_cloud/api/advisor_engine_controller_test.rb

@@ -13,7 +13,7 @@ module InsightsCloud
       end
 
       test 'shows hosts with uuids' do
-        uuids = [@host1.insights.uuid, @host2.insights.uuid]
+        uuids = [@host1.insights_uuid, @host2.insights_uuid]
         get :host_details, params: { organization_id: @test_org.id, host_uuids: uuids }
         assert_response :success
         assert_template 'api/v2/advisor_engine/host_details'
@@ -21,6 +21,33 @@ module InsightsCloud
         refute_equal @test_org.hosts.count, assigns(:hosts).count
       end
 
+      test 'in IoP mode host_details uses subscription uuid when insights uuid is stale' do
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+
+        stale_insights_uuid = 'stale-insights-uuid-123'
+        subscription_uuid   = 'subscription-uuid-456'
+
+        # Create host with diverging facet UUIDs
+        host = FactoryBot.create(:host, :with_subscription, organization: @test_org)
+        host.subscription_facet.update!(uuid: subscription_uuid)
+        host.insights = FactoryBot.create(:insights_facet, host_id: host.id, uuid: stale_insights_uuid)
+        host.save!
+
+        # Query using the stale insights UUID
+        get :host_details, params: {
+          organization_id: @test_org.id,
+          host_uuids: [stale_insights_uuid],
+        }
+
+        assert_response :success
+        body = JSON.parse(response.body)
+
+        # Should return the subscription UUID, not the stale insights UUID
+        insights_uuids = body.map { |h| h['insights_uuid'] }
+        assert_includes insights_uuids, subscription_uuid, "Should use subscription UUID in IoP mode"
+        refute_includes insights_uuids, stale_insights_uuid, "Should not use stale insights UUID"
+      end
+
       test 'shows error when no hosts found' do
         get :host_details, params: { organization_id: @test_org.id, host_uuids: ['nonexistentuuid'] }
         assert_response :not_found

data/test/controllers/insights_cloud/ui_requests_controller_test.rb

@@ -180,6 +180,32 @@ module InsightsCloud
         assert_equal 'Cloud request failed', JSON.parse(@response.body)['message']
         assert_match(/#{@body}/, JSON.parse(@response.body)['response'])
       end
+
+      test "should allow forward_request with nil location (Any location)" do
+        net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
+        res = RestClient::Response.create(@body, net_http_resp, @http_req)
+        ::ForemanRhCloud::InsightsApiForwarder.any_instance.stubs(:forward_request).returns(res)
+
+        # Set session with nil location_id to simulate "Any location"
+        session_with_nil_location = set_session_user.merge(
+          organization_id: @org.id,
+          location_id: nil
+        )
+
+        get :forward_request, params: { "controller" => "vulnerabilities", "path" => "api/vulnerability/v1/cves" }, session: session_with_nil_location
+        assert_equal 200, @response.status
+        assert_equal @body, @response.body
+      end
+
+      test "should allow forward_request with location set" do
+        net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
+        res = RestClient::Response.create(@body, net_http_resp, @http_req)
+        ::ForemanRhCloud::InsightsApiForwarder.any_instance.stubs(:forward_request).returns(res)
+
+        get :forward_request, params: { "controller" => "vulnerabilities", "path" => "api/vulnerability/v1/cves" }, session: set_session
+        assert_equal 200, @response.status
+        assert_equal @body, @response.body
+      end
     end
 
     def set_session

data/test/controllers/uploads_controller_test.rb

@@ -8,7 +8,7 @@ class UploadsControllerTest < ActionController::TestCase
     test_org = FactoryBot.create(:organization)
     ForemanInventoryUpload::Async::ProgressOutput
       .expects(:get)
-      .with(ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id))
+      .with(ForemanInventoryUpload::Async::UploadReportDirectJob.output_label(test_org.id))
       .returns(progress_output)
     progress_output.expects(:full_output).returns('test output')
 

data/test/factories/insights_factories.rb

@@ -58,5 +58,34 @@ FactoryBot.modify do
         host.insights = FactoryBot.create(:insights_facet, :with_hits, host_id: host.id)
       end
     end
+
+    trait :with_mismatched_insights_uuid do
+      # Simulates host previously registered to cloud with stale UUID
+      # Requires :with_subscription trait to be used together
+      after(:create) do |host, _evaluator|
+        raise "subscription_facet required for :with_mismatched_insights_uuid trait" unless host.subscription_facet&.uuid
+
+        host.insights = FactoryBot.create(
+          :insights_facet,
+          host_id: host.id,
+          uuid: 'stale-cloud-uuid' # Different from subscription_facet
+        )
+      end
+    end
+
+    trait :with_synced_insights_uuid do
+      # Ideal state: insights_facet UUID matches subscription_facet UUID
+      # Requires :with_subscription trait to be used together
+      after(:create) do |host, _evaluator|
+        raise "subscription_facet required for :with_synced_insights_uuid trait" unless host.subscription_facet&.uuid
+
+        subscription_uuid = host.subscription_facet.uuid
+        host.insights = FactoryBot.create(
+          :insights_facet,
+          host_id: host.id,
+          uuid: subscription_uuid  # Same as subscription_facet
+        )
+      end
+    end
   end
 end