foreman_rh_cloud 12.2.17 → 12.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df237afaaed946309bf58184191f10cc41adad7ad746077f7445a26d880e24f
-  data.tar.gz: 302e496860920fc29db9807621fd8ceb442d08af831184ee8dd743963e153b50
+  metadata.gz: 79c93d459f33a153d6d5ef0477cddc3b0f4b992716bb1a9b9352d0d8274b9185
+  data.tar.gz: 0f7d20917c23789936882787bcb492353a56ac4061b27fcabb138a93dc9c9909
 SHA512:
-  metadata.gz: 20278c38dcedc487a60321c837bbdb4bfe20f3db46873a7482ab43922c91b9d8c4b1529a2d4e024bf24ba5c2197163832e323bb4a4da26a4c2cb14cb2ad492b7
-  data.tar.gz: 78c2f26bf97d4f70fe7f72ef3e8fd1d2c297bac241da5e43cefbb23f221eb2e934179937dd858f695be4bcc5761fbf869b4e48e71bde607e94541df38e93e496
+  metadata.gz: 61917464374fddd39409ba0e4dd5c8f2b40a8eb18091a0e4af381b78930a460186c334f5e7b93a5b052b6dff98101551da59390f82ee94880601abe08bf645dc
+  data.tar.gz: 49af34b52d989a0558c538f5da8e027d26953261d69cbea8ed5535c11ae407ab50b0b7c2dcf78302b7281cfff2a6f1c74dc93cf0f8cb942a15d141263000a93d

data/lib/foreman_inventory_upload/async/upload_report_direct_job.rb

@@ -95,8 +95,8 @@ module ForemanInventoryUpload
           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")
+            done_path = move_to_done_folder
+            progress_output.write_line("Uploaded report moved to #{done_path}")
             progress_output.status = "pid #{Process.pid} exit 0"
           rescue StandardError => e
             progress_output.write_line("Upload failed: #{e.message}")
@@ -139,6 +139,7 @@ module ForemanInventoryUpload
         done_file = ForemanInventoryUpload.done_file_path(File.basename(filename))
         FileUtils.mv(filename, done_file)
         logger.debug("Moved #{filename} to #{done_file}")
+        done_file
       end
 
       def certificate

data/lib/foreman_inventory_upload.rb

@@ -32,7 +32,18 @@ module ForemanInventoryUpload
 
   def self.report_file_paths(organization_id)
     filename = facts_archive_name(organization_id)
-    Dir[ForemanInventoryUpload.uploads_file_path(filename), ForemanInventoryUpload.done_file_path(filename)]
+    # Report files start in generated
+    # They are then MOVED (not copied) to uploads, then done.
+    # When they are moved to the new folder, they overwrite any file with the same name.
+    # If it's a generate-only, it will be in generated
+    # Failed or incomplete uploads will be in uploads
+    # Completed uploads will be in done
+    # The ordering here ensures we get the correct file path every time.
+    Dir[
+      ForemanInventoryUpload.generated_reports_file_path(filename),
+      ForemanInventoryUpload.uploads_file_path(filename),
+      ForemanInventoryUpload.done_file_path(filename)
+    ]
   end
 
   def self.generated_reports_folder
@@ -44,6 +55,10 @@ module ForemanInventoryUpload
     )
   end
 
+  def self.generated_reports_file_path(filename)
+    File.join(ForemanInventoryUpload.generated_reports_folder, filename)
+  end
+
   def self.outputs_folder
     @outputs_folder ||= ensure_folder(File.join(ForemanInventoryUpload.base_folder, 'outputs/'))
   end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.2.17'.freeze
+  VERSION = '12.2.18'.freeze
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -46,6 +46,10 @@ namespace :rh_cloud_inventory do
             filter,
             false # don't upload; the user ran report:generate and not report:generate_upload
           )
+          unless Setting[:subscription_connection_enabled]
+            report_paths = ForemanInventoryUpload.report_file_paths(organization_id)
+            puts "Report saved to #{report_paths.first}" if report_paths.any?
+          end
         end
         puts "Check the Uploading tab for report uploading status." if Setting[:subscription_connection_enabled]
       end

data/package.json

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

data/test/controllers/accounts_controller_test.rb

@@ -5,6 +5,49 @@ class AccountsControllerTest < ActionController::TestCase
 
   include FolderIsolation
 
+  test 'report_file_paths finds report in generated_reports folder' do
+    test_org = FactoryBot.create(:organization)
+    filename = ForemanInventoryUpload.facts_archive_name(test_org.id)
+
+    generated_path = ForemanInventoryUpload.generated_reports_file_path(filename)
+    FileUtils.mkdir_p(File.dirname(generated_path))
+    FileUtils.touch(generated_path)
+
+    paths = ForemanInventoryUpload.report_file_paths(test_org.id)
+    assert_includes paths, generated_path
+  end
+
+  test 'report_file_paths finds report in uploads folder' do
+    test_org = FactoryBot.create(:organization)
+    filename = ForemanInventoryUpload.facts_archive_name(test_org.id)
+
+    uploads_path = ForemanInventoryUpload.uploads_file_path(filename)
+    FileUtils.mkdir_p(File.dirname(uploads_path))
+    FileUtils.touch(uploads_path)
+
+    paths = ForemanInventoryUpload.report_file_paths(test_org.id)
+    assert_includes paths, uploads_path
+  end
+
+  test 'report_file_paths finds report in done folder' do
+    test_org = FactoryBot.create(:organization)
+    filename = ForemanInventoryUpload.facts_archive_name(test_org.id)
+
+    done_path = ForemanInventoryUpload.done_file_path(filename)
+    FileUtils.mkdir_p(File.dirname(done_path))
+    FileUtils.touch(done_path)
+
+    paths = ForemanInventoryUpload.report_file_paths(test_org.id)
+    assert_includes paths, done_path
+  end
+
+  test 'report_file_paths returns empty when no report exists' do
+    test_org = FactoryBot.create(:organization)
+
+    paths = ForemanInventoryUpload.report_file_paths(test_org.id)
+    assert_empty paths
+  end
+
   test 'Returns statuses for each process type' do
     test_org = FactoryBot.create(:organization)
 

data/test/test_plugin_helper.rb

@@ -31,6 +31,7 @@ module FolderIsolation
       ForemanInventoryUpload.stubs(:base_folder).returns(@tmpdir)
       ForemanInventoryUpload.instance_variable_set(:@outputs_folder, nil)
       ForemanInventoryUpload.instance_variable_set(:@uploads_folders, nil)
+      ForemanInventoryUpload.instance_variable_set(:@generated_reports_folder, nil)
     end
 
     teardown do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.2.17
+  version: 12.2.18
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team