SAT-35237 - Keep report in generated folder for disconnected users

* Report was being moved regardless of the setting so added logger statements and to return out of the task if the disconnected setting is on.
* Added unit tests for queue_for_upload_job since we didn't have any and added some for the change I made

(cherry picked from commit e4177f9)

Author: chris1984

lib/foreman_inventory_upload/async/generate_report_job.rb

@@ -14,13 +14,14 @@ def plan(base_folder, organization_id, disconnected, hosts_filter = nil)
             hosts_filter: hosts_filter
           )
 
-          plan_action(
-            QueueForUploadJob,
-            base_folder,
-            ForemanInventoryUpload.facts_archive_name(organization_id, hosts_filter),
-            organization_id,
-            disconnected
-          )
+          unless content_disconnected?(disconnected)
+            plan_action(
+              QueueForUploadJob,
+              base_folder,
+              ForemanInventoryUpload.facts_archive_name(organization_id, hosts_filter),
+              organization_id
+            )
+          end
         end
       end
 
@@ -40,6 +41,10 @@ def env
         )
       end
 
+      def content_disconnected?(disconnected)
+        disconnected || !Setting[:subscription_connection_enabled]
+      end
+
       def base_folder
         input[:base_folder]
       end

lib/foreman_inventory_upload/async/queue_for_upload_job.rb

@@ -1,9 +1,9 @@
 module ForemanInventoryUpload
   module Async
     class QueueForUploadJob < ::Actions::EntryAction
-      def plan(base_folder, report_file, organization_id, disconnected)
+      def plan(base_folder, report_file, organization_id)
         enqueue_task = plan_self(base_folder: base_folder, report_file: report_file)
-        plan_upload_report(enqueue_task.output[:enqueued_file_name], organization_id, disconnected)
+        plan_upload_report(enqueue_task.output[:enqueued_file_name], organization_id)
       end
 
       def run
@@ -59,8 +59,8 @@ def report_file
         input[:report_file]
       end
 
-      def plan_upload_report(enqueued_file_name, organization_id, disconnected)
-        plan_action(UploadReportJob, enqueued_file_name, organization_id, disconnected)
+      def plan_upload_report(enqueued_file_name, organization_id)
+        plan_action(UploadReportJob, enqueued_file_name, organization_id)
       end
     end
   end

lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -7,15 +7,15 @@ def self.output_label(label)
         "upload_for_#{label}"
       end
 
-      def plan(filename, organization_id, disconnected = false)
+      def plan(filename, organization_id)
         label = UploadReportJob.output_label(organization_id)
-        super(label, filename: filename, organization_id: organization_id, disconnected: disconnected)
+        super(label, filename: filename, organization_id: organization_id)
       end
 
       def try_execute
         if content_disconnected?
           progress_output do |progress_output|
-            progress_output.write_line('Upload canceled because connection to Insights is not enabled or the --no-upload option was passed.')
+            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
@@ -89,7 +89,7 @@ def organization
       end
 
       def content_disconnected?
-        input[:disconnected] || !Setting[:subscription_connection_enabled]
+        !Setting[:subscription_connection_enabled]
       end
     end
   end

test/jobs/queue_for_upload_job_test.rb

@@ -0,0 +1,63 @@
+require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
+
+class QueueForUploadJobTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+  include FolderIsolation
+
+  let(:organization) { FactoryBot.create(:organization) }
+  let(:base_folder) { @tmpdir }
+  let(:report_file) { 'test_report.tar.xz' }
+  let(:report_path) { File.join(base_folder, report_file) }
+  let(:uploads_folder) { ForemanInventoryUpload.uploads_folder }
+  subject { ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization.id) }
+
+  setup do
+    # Stub the script template source
+    script_source = File.join(ForemanRhCloud::Engine.root, 'lib/foreman_inventory_upload/scripts/uploader.sh.erb')
+    File.stubs(:read).with(script_source).returns('#!/bin/bash\necho "Test script"')
+
+    # Stub template rendering
+    Foreman::Renderer.stubs(:render).returns('#!/bin/bash\necho "Rendered script"')
+
+    # Stub additional settings that are accessed
+    Setting.stubs(:[]).with(:content_default_http_proxy).returns(nil)
+    Setting.stubs(:[]).with(:http_proxy).returns(nil)
+    Setting.stubs(:[]).with("foreman_tasks_sync_task_timeout").returns(120)
+    FileUtils.touch(report_path)
+  end
+
+  teardown do
+    FileUtils.rm_rf(uploads_folder) if Dir.exist?(uploads_folder)
+  end
+
+  test 'plan method sets up the job correctly and calls plan_upload_report' do
+    # Mock plan_upload_report to verify it's called
+    ForemanInventoryUpload::Async::QueueForUploadJob.any_instance.expects(:plan_upload_report).once
+
+    assert_equal 'success', subject.result
+  end
+
+  test 'run method processes file and moves it to uploads folder' do
+    ForemanInventoryUpload::Async::QueueForUploadJob.any_instance.stubs(:plan_upload_report)
+
+    assert_equal 'success', subject.result
+
+    # Verify the file was moved
+    refute File.exist?(report_path), "Original file should be moved"
+    assert File.exist?(File.join(uploads_folder, report_file)), "File should exist in uploads folder"
+  end
+
+  test 'creates necessary folders and scripts' do
+    ForemanInventoryUpload::Async::QueueForUploadJob.any_instance.stubs(:plan_upload_report)
+
+    assert_equal 'success', subject.result
+
+    # Verify the uploads folder was created
+    assert Dir.exist?(uploads_folder), "Uploads folder should be created"
+
+    # Verify the script file was created
+    script_path = File.join(uploads_folder, ForemanInventoryUpload.upload_script_file)
+    assert File.exist?(script_path), "Upload script should be created"
+  end
+end

test/jobs/upload_report_job_test.rb

@@ -18,7 +18,8 @@ class UploadReportJobTest < ActiveSupport::TestCase
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
-    assert_match(/Upload canceled/, progress_output.full_output)
+    assert_match(/upload was canceled because connection to Insights is not enabled/, progress_output.full_output)
+    assert_match(/Report location:/, progress_output.full_output)
     assert_match(/exit 1/, progress_output.status)
   end